mplayer: remove elem from slice

Author: xushiwei

chapter1/slice.go

@@ -0,0 +1,25 @@
+package main
+
+import "fmt"
+
+func remove(arr []int, i int) []int {
+	return append(arr[:i], arr[i+1:]...)
+}
+
+func testRemove() {
+	a := []int{1, 2, 3, 4, 5}
+
+	a = remove(a, 0)
+	fmt.Println(a) // [2, 3, 4, 5]
+
+	a = remove(a, 3)
+	fmt.Println(a) // [2, 3, 4]
+
+	a = remove(a, 1)
+	fmt.Println(a) // [2, 4]
+}
+
+func main() {
+	testRemove()
+}
+

chapter3/Makefile

@@ -0,0 +1,5 @@
+all: mplayer.build
+
+mplayer.build:
+	cd mplayer; go install -v ./...
+

chapter3/mplayer/src/cmd/mplayer.go renamed to chapter3/mplayer/src/mplayer/mplayer.go

@@ -6,9 +6,8 @@ import (
 	"os"
 	"strconv"
 	"strings"
-
-	"pkg/smp/mlib"
-	"pkg/smp/mp"
+	"smp/mlib"
+	"smp/mp"
 )
 
 var lib *mlib.MusicManager

chapter3/mplayer/src/pkg/smp/mlib/entry.go renamed to chapter3/mplayer/src/smp/mlib/entry.go

@@ -45,16 +45,7 @@ func (m *MusicManager) Remove(index int) *MusicEntry {
 	}
 
 	removedMusic := &m.musics[index]
-
-	// Remove the found item from the slice.
-	if index > 0 && index < len(m.musics)-1 { // Element between first and last
-		m.musics = append(m.musics[:index], m.musics[index+1:]...)
-	} else if index == 0 { // empty it.
-		m.musics = m.musics[1:]
-	} else { // The last element
-		m.musics = m.musics[:index]
-	}
-
+	m.musics = append(m.musics[:index], m.musics[index+1:]...)
 	return removedMusic
 }
 
@@ -70,3 +61,4 @@ func (m *MusicManager) RemoveByName(name string) *MusicEntry {
     }
     return nil
 }
+

chapter3/mplayer/src/pkg/smp/mlib/manager.go renamed to chapter3/mplayer/src/smp/mlib/manager.go

@@ -1,3 +1,3 @@
-export GOPATH=$GOPATH:$GOBOOK/chapter1/calcproj:$GOBOOK/chapter2/sorter:$GOBOOK/chapter4/cgss
-export PATH=$PATH:$GOBOOK/chapter1/calcproj/bin:$GOBOOK/chapter2/sorter/bin:$GOBOOK/chapter4/cgss/bin
+export GOPATH=$GOPATH:$GOBOOK/chapter1/calcproj:$GOBOOK/chapter2/sorter:$GOBOOK/chapter3/mplayer:$GOBOOK/chapter4/cgss
+export PATH=$PATH:$GOBOOK/chapter1/calcproj/bin:$GOBOOK/chapter2/sorter/bin:$GOBOOK/chapter3/mplayer/bin:$GOBOOK/chapter4/cgss/bin