summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <wakeroid@gmail.com>2009-08-05 23:23:44 +0200
committerGravatar Alexey Yakovenko <wakeroid@gmail.com>2009-08-05 23:23:44 +0200
commit337d90098cf48c6e3600f321081492e33cc48229 (patch)
treeef0d26f051f02cfcf1b96a10fffbd92976c52990 /main.c
parent8f749dbc5721172d1e5cf9742955fb429fa0062a (diff)
alsa playback WIP
Diffstat (limited to 'main.c')
-rw-r--r--main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/main.c b/main.c
index 554f4020..d1785f9f 100644
--- a/main.c
+++ b/main.c
@@ -4,7 +4,7 @@
#include "interface.h"
#include "support.h"
#include "playlist.h"
-#include "psdl.h"
+#include "playback.h"
#include "unistd.h"
#include "threading.h"
#include "messagepump.h"
@@ -19,7 +19,7 @@ int psdl_terminate = 0;
void
psdl_thread (uintptr_t ctx) {
- psdl_play ();
+ p_play ();
while (!psdl_terminate) {
uint32_t msg;
uintptr_t ctx;
@@ -73,11 +73,11 @@ psdl_thread (uintptr_t ctx) {
break;
case M_SONGSEEK:
if (playlist_current.codec) {
- psdl_pause ();
+ p_pause ();
codec_lock ();
playlist_current.codec->seek (p1 / 1000.f);
codec_unlock ();
- psdl_unpause ();
+ p_unpause ();
}
break;
}
@@ -93,7 +93,7 @@ main (int argc, char *argv[]) {
messagepump_init ();
codec_init_locking ();
streamer_init ();
- psdl_init ();
+ p_init ();
thread_start (psdl_thread, 0);
g_thread_init (NULL);
@@ -108,7 +108,7 @@ main (int argc, char *argv[]) {
gdk_threads_leave ();
messagepump_free ();
psdl_terminate = 1;
- psdl_free ();
+ p_free ();
streamer_free ();
codec_free_locking ();
ps_free ();