audio/zuke: fix/enable playlist loading via plumber "audio" port

1 files changed, 48 insertions, 45 deletions

diff --git a/sys/src/cmd/audio/zuke/zuke.c b/sys/src/cmd/audio/zuke/zuke.c
index f8728554a..d09a356a1 100644
--- a/sys/src/cmd/audio/zuke/zuke.c
+++ b/sys/src/cmd/audio/zuke/zuke.c
@@ -42,6 +42,8 @@ enum
 	Dblow,
 	Dbinv,
 	Numcolors,
+
+	Ncol = 10,
 };
 
 struct Color {
@@ -85,8 +87,8 @@ static Channel *redrawc;
 static Mousectl *mctl;
 static Keyboardctl kctl;
 static int shiftdown;
-static int colwidth[10];
-static int mincolwidth[10];
+static int colwidth[Ncol];
+static int mincolwidth[Ncol];
 static char *cols = "AatD";
 static int colspath;
 static int *shuffle;
@@ -826,15 +828,6 @@ seekrel(Player *player, double off)
 }
 
 static void
-writeplist(void)
-{
-	int i;
-
-	for(i = 0; i < pl->n; i++)
-		printmeta(&out, pl->m+i);
-}
-
-static void
 freeplist(Playlist *pl)
 {
 	if(pl != nil){
@@ -872,7 +865,7 @@ readall(int f)
 }
 
 static Playlist *
-readplist(int fd)
+readplist(int fd, int mincolwidth[Ncol])
 {
 	char *raw, *s, *e, *a[5], *b;
 	int plsz, i, x;
@@ -1077,9 +1070,36 @@ toggleshuffle(void)
 }
 
 static void
+adjustcolumns(void)
+{
+	int i, n, total, width;
+
+	total = 0;
+	n = 0;
+	width = Dx(screen->r);
+	for(i = 0; cols[i] != 0; i++){
+		if(cols[i] == Pduration || cols[i] == Pdate || cols[i] == Ptrack)
+			width -= mincolwidth[i] + 8;
+		else{
+			total += mincolwidth[i];
+			n++;
+		}
+	}
+	colspath = 0;
+	for(i = 0; cols[i] != 0; i++){
+		if(cols[i] == Ppath || cols[i] == Pbasename)
+			colspath = 1;
+		if(cols[i] == Pduration || cols[i] == Pdate || cols[i] == Ptrack)
+			colwidth[i] = mincolwidth[i];
+		else
+			colwidth[i] = (width - Scrollwidth - n*8) * mincolwidth[i] / total;
+	}
+}
+
+static void
 plumbaudio(void *kbd)
 {
-	int i, f, pf;
+	int i, f, pf, mcw[Ncol], wasplaying;
 	Playlist *p;
 	Plumbmsg *m;
 	char *s, *e;
@@ -1099,15 +1119,23 @@ plumbaudio(void *kbd)
 				s = smprint("%s/%.*s", m->wdir, m->ndata, m->data);
 
 			if((e = strrchr(s, '.')) != nil && strcmp(e, ".plist") == 0 && (pf = open(s, OREAD)) >= 0){
-				p = readplist(pf);
+				p = readplist(pf, mcw);
 				close(pf);
 				if(p == nil)
 					continue;
-
+				wasplaying = pcurplaying;
+				/* make sure nothing is playing */
+				while(pcurplaying >= 0){
+					sendul(kbd, 'v');
+					sleep(100);
+				}
 				freeplist(pl);
 				pl = p;
-				memset(mincolwidth, 0, sizeof(mincolwidth)); /* readjust columns */
-				sendul(playc, 0);
+				memmove(mincolwidth, mcw, sizeof(mincolwidth));
+				adjustcolumns();
+				pcur = 0;
+				if(wasplaying >= 0)
+					sendul(kbd, '\n');
 			}else{
 				for(i = 0; i < pl->n; i++){
 					if(strcmp(pl->m[i].path, s) == 0){
@@ -1127,33 +1155,6 @@ plumbaudio(void *kbd)
 }
 
 static void
-adjustcolumns(void)
-{
-	int i, n, total, width;
-
-	total = 0;
-	n = 0;
-	width = Dx(screen->r);
-	for(i = 0; cols[i] != 0; i++){
-		if(cols[i] == Pduration || cols[i] == Pdate || cols[i] == Ptrack)
-			width -= mincolwidth[i] + 8;
-		else{
-			total += mincolwidth[i];
-			n++;
-		}
-	}
-	colspath = 0;
-	for(i = 0; cols[i] != 0; i++){
-		if(cols[i] == Ppath || cols[i] == Pbasename)
-			colspath = 1;
-		if(cols[i] == Pduration || cols[i] == Pdate || cols[i] == Ptrack)
-			colwidth[i] = mincolwidth[i];
-		else
-			colwidth[i] = (width - Scrollwidth - n*8) * mincolwidth[i] / total;
-	}
-}
-
-static void
 kbproc(void *cchan)
 {
 	char *s, buf[128], buf2[128];
@@ -1297,7 +1298,7 @@ threadmain(int argc, char **argv)
 	fmtinstall('P', positionfmt);
 	threadsetname("zuke");
 
-	if((pl = readplist(0)) == nil){
+	if((pl = readplist(0, mincolwidth)) == nil){
 		fprint(2, "playlist: %r\n");
 		sysfatal("playlist error");
 	}
@@ -1487,7 +1488,9 @@ playcur:
 				continue;
 			case 'v':
 				stop(playercurr);
+				stop(playernext);
 				playercurr = nil;
+				playernext = nil;
 				pcurplaying = -1;
 				freeimage(cover);
 				cover = nil;