From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 21 May 2009 08:46:13 +0000 (+0100)
Subject: more playlist handling fixes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6d775e0ae204ba08c4691d1b6fc08f0a45b575ee;p=users%2Fdwmw2%2Fmpc-car2pc.git

more playlist handling fixes
---

diff --git a/mpc-car2pc.c b/mpc-car2pc.c
index 9b9c206..9107eb7 100644
--- a/mpc-car2pc.c
+++ b/mpc-car2pc.c
@@ -218,10 +218,9 @@ void save_disc(void)
 	char buf[6];
 	sprintf(buf, "disc%d", disc);
 
-	mpd_sendCommandListBegin(mpd);
 	mpd_sendRmCommand(mpd, buf);
+	mpd_finishCommand(mpd);
 	mpd_sendSaveCommand(mpd, buf);
-	mpd_sendCommandListEnd(mpd);
 	mpd_finishCommand(mpd);
 
 	syslog(LOG_NOTICE, "Saved changes to playlist %s\n", buf);
@@ -249,7 +248,7 @@ int mainloop(void)
 			nr_tracks = CAR2PC_MAX_TRACK;
 		if (want_state != -1 && sts->state != want_state) {
 			if (want_state == MPD_STATUS_STATE_PLAY) {
-				track = plid = last_time = -1;
+				track = last_time = -1;
 				start_playback();
 			} else if (sts->state == MPD_STATUS_STATE_PLAY)
 				pause_playback();
@@ -257,7 +256,9 @@ int mainloop(void)
 			continue;
 		}
 
-		if (sts->playlist != plid) {
+		if (plid == -1)
+			plid = sts->playlist;
+		else if (sts->playlist != plid) {
 			save_disc();
 			track = -1;
 			plid = sts->playlist;