intermediate commit

* use mpv to play songs
* fix CurrentSong being a pointer to a changing slot in the playlist array
* wire up play and pause
* continue playing after a song is finished

1 files changed, 59 insertions, 5 deletions

diff --git a/player.go b/player.go
index 6e377a7..a672288 100644
--- a/player.go
+++ b/player.go
@@ -1,20 +1,25 @@
 package main
 
 import (
+	"fmt"
+	"io"
 	"log"
+	"os/exec"
+	"syscall"
 )
 
 type Backend interface {
-	Play(song *Song)
-	Pause()
+	Play(song *Song, player *Player)
 	Search(keyword string) []Song
 }
 
 type Player struct {
 	Backends map[string]Backend
+	mpv      *exec.Cmd
+	wrms     *Wrms
 }
 
-func NewPlayer() Player {
+func NewPlayer(wrms *Wrms) Player {
 	available_backends := map[string]Backend{}
 
 	spotify, err := NewSpotify()
@@ -26,14 +31,63 @@ func NewPlayer() Player {
 
 	available_backends["dummy"] = &DummyBackend{}
 
-	return Player{available_backends}
+	return Player{available_backends, nil, wrms}
 }
 
 func (player *Player) Play(song *Song) {
-	player.Backends[song.Source].Play(song)
+	if player.mpv != nil {
+		log.Println("Send SIGCONT to mpv subprocess")
+		player.mpv.Process.Signal(syscall.SIGCONT)
+		return
+	}
+
+	player.Backends[song.Source].Play(song, player)
+}
+
+func (player *Player) runMpv() {
+	out, err := player.mpv.CombinedOutput()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	log.Println("mpv finished with", out, "resetting mpv, the current song and call play")
+	player.mpv = nil
+	player.wrms.CurrentSong.Uri = ""
+	player.wrms.PlayPause()
+}
+
+func (player *Player) PlayUri(uri string) {
+	player.mpv = exec.Command("mpv", uri)
+	go player.runMpv()
+}
+
+func (player *Player) PlayData(data io.Reader) {
+	if player.mpv != nil {
+		log.Fatal("Player has already an mpv subprocess")
+	}
+
+	player.mpv = exec.Command("mpv", "-")
+	stdin, err := player.mpv.StdinPipe()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	go func() {
+		defer stdin.Close()
+
+		if _, err := io.Copy(stdin, data); err != nil {
+			log.Fatal(fmt.Sprintf("Failed to write song data to mpv (%v)", err))
+		}
+	}()
+
+	go player.runMpv()
 }
 
 func (player *Player) Pause() {
+	if player.mpv != nil {
+		log.Println("Send SIGSTOP to mpv subprocess")
+		player.mpv.Process.Signal(syscall.SIGSTOP)
+	}
 }
 
 func (player *Player) Search(pattern string) []Song {