Commit Diff


commit - 2139c525dbcd33e08c153dd8dbe75cd1fddf6b30
commit + 5a4b30307238cd3830c084656fe79c1f00eebcde
blob - 300ba43879584007e51ad4ee42fe73e3f6b8ab3e
blob + e2e2457c551e2b94b22d90ca24b96c46487eb049
--- amused.c
+++ amused.c
@@ -41,7 +41,6 @@
 #include "playlist.h"
 #include "xmalloc.h"
 
-struct sio_hdl	*hdl;
 char		*csock = NULL;
 int		 debug;
 int		 verbose;
blob - 342b33930c82d67e0fa6c77211de1e43040f6244
blob + 1a34556b307eb012bf5cadbee3d8df60cee84f9e
--- amused.h
+++ amused.h
@@ -17,7 +17,6 @@
 #ifndef AMUSED_H
 #define AMUSED_H
 
-extern struct sio_hdl	*hdl;
 extern char		*csock;
 extern int		 debug;
 extern int		 verbose;
@@ -137,9 +136,6 @@ __dead void	ctl(int, char **);
 
 /* player.c */
 int	player_setup(int, int, int);
-void	player_senderr(void);
-void	player_sendeof(void);
-int	player_shouldstop(void);
 int	play(const void *, size_t);
 int	player(int, int);
 
blob - f2ca8cbd7e7d31f285a9aa277fa5ed395d38afad
blob + c92e7ef821c4105b0740c38406ce82dbec154ac7
--- player.c
+++ player.c
@@ -39,7 +39,8 @@
 #include "log.h"
 #include "xmalloc.h"
 
-static struct imsgbuf *ibuf;
+struct sio_hdl		*hdl;
+static struct imsgbuf	*ibuf;
 
 static int got_stop;
 static int nextfd = -1;