From d5e1739f5288355869eccd53ab3eb1a4000d1cab Mon Sep 17 00:00:00 2001 From: deva Date: Thu, 14 Apr 2005 17:28:21 +0000 Subject: Unified the frame types. --- src/player.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/player.h') diff --git a/src/player.h b/src/player.h index 2af4165..ca2d241 100644 --- a/src/player.h +++ b/src/player.h @@ -34,13 +34,13 @@ #include #include #include -#include +//#include #include "util.h" -#include +#include "queue.h" #include "thread.h" -#include "ffframe.h" +#include "frame.h" #include @@ -56,7 +56,7 @@ public: Player(Error* err, volatile int *grunning, sem_t *gsem, - Queue *gqueue, + Queue *gqueue, pthread_mutex_t *gmutex); ~Player(); @@ -75,7 +75,7 @@ private: volatile int *running; sem_t *sem; - Queue *queue; + Queue *queue; pthread_mutex_t *mutex; sem_t play_sem; -- cgit v1.2.3