summaryrefslogtreecommitdiff
path: root/src/libsink/desktop.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsink/desktop.c')
-rw-r--r--src/libsink/desktop.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libsink/desktop.c b/src/libsink/desktop.c
index 427a6f4..be3e797 100644
--- a/src/libsink/desktop.c
+++ b/src/libsink/desktop.c
@@ -3,7 +3,7 @@
#ifdef CAMU_NO_MINIAUDIO_BACKENDS
// @TODO: audio_null is incomplete in that it never actually reads from the buffers.
-// This is an issue in CAMU_DIRECT_MODE because eventually the server-side packet_pool
+// This is an issue in DIRECT_MODE because eventually the server-side packet_pool
// will be starved by pending audio packets.
#define DESKTOP_NULL_AUDIO
#endif
@@ -188,10 +188,10 @@ static void screen_callback(void *userdata, u8 op, void *opaque)
camu_sink_reseek(&c->sink);
break;
case CAMU_SCREEN_AUDIO_TRACK:
- camu_sink_adjust_audio_track(&c->sink, *(s32 *)opaque);
+ camu_sink_change_audio_track(&c->sink, *(s32 *)opaque);
break;
case CAMU_SCREEN_SUBTITLE_TRACK:
- camu_sink_adjust_subtitle_track(&c->sink, *(s32 *)opaque);
+ camu_sink_change_subtitle_track(&c->sink, *(s32 *)opaque);
break;
case CAMU_SCREEN_SHUFFLE:
camu_sink_shuffle(&c->sink);
@@ -219,9 +219,10 @@ static void screen_callback(void *userdata, u8 op, void *opaque)
bool camu_desktop_open(struct camu_desktop *c, char *window_name)
{
+ camu_screen_init(&c->scr);
c->scr.callback = screen_callback;
c->scr.userdata = c;
- if (!(camu_screen_init(&c->scr) && camu_screen_create_window(&c->scr, window_name))) {
+ if (!camu_screen_create_window(&c->scr, window_name)) {
log_error("Failed to create window.");
return false;
}