commit 34af9f2c786920782753b967dcdea7ef2729dbae
parent 0fe34b8aa0c626918e18a6f4c9642de152bdf8d7
Author: sin <sin@2f30.org>
Date: Fri, 26 Dec 2014 11:05:04 +0000
Remove init/exit callbacks for the output
Diffstat:
3 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/sad.c b/sad.c
@@ -98,7 +98,6 @@ main(void)
FD_SET(listenfd, &master);
fdmax = listenfd;
- output->init();
decoder->init();
while (1) {
diff --git a/sad.h b/sad.h
@@ -34,12 +34,10 @@ typedef struct {
} Decoder;
typedef struct {
- int (*init)(void);
int (*vol)(int);
int (*open)(int, int, int);
void (*play)(void *, size_t);
int (*close)(void);
- void (*exit)(void);
} Output;
/* sad.c */
diff --git a/sndio.c b/sndio.c
@@ -10,12 +10,6 @@
static struct sio_hdl *hdl;
static int
-sndioinit(void)
-{
- return 0;
-}
-
-static int
sndiovol(int vol)
{
if (hdl) {
@@ -86,16 +80,9 @@ sndioclose(void)
puts("Closed sndio output");
}
-static void
-sndioexit(void)
-{
-}
-
Output sndiooutput = {
- .init = sndioinit,
.vol = sndiovol,
.open = sndioopen,
.play = sndioplay,
.close = sndioclose,
- .exit = sndioexit
};