projects
/
vompclient-marten.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
45e45aa
)
*** empty log message ***
author
Chris Tallon
<chris@vomp.tv>
Fri, 16 Nov 2007 22:39:44 +0000
(22:39 +0000)
committer
Chris Tallon
<chris@vomp.tv>
Fri, 16 Nov 2007 22:39:44 +0000
(22:39 +0000)
objects.mk
patch
|
blob
|
history
player.h
patch
|
blob
|
history
diff --git
a/objects.mk
b/objects.mk
index 08df825c395e90448b312b26db7242c90619f612..b854ba6c846511f66c240b3e779d9d66dbf30137 100644
(file)
--- a/
objects.mk
+++ b/
objects.mk
@@
-15,4
+15,6
@@
OBJECTS1 = command.o log.o tcp.o dsock.o thread.o timers.o i18n.o mutex.o \
fonts/helvB24.o fonts/helvB18.o \
remote.o led.o mtd.o video.o audio.o osd.o surface.o \
vmedialist.o media.o vpicture.o vpicturebanner.o \
- vaudioplayer.o audioplayer.o demuxeraudio.o abstractoption.o
+ vaudioplayer.o audioplayer.o demuxeraudio.o abstractoption.o \
+ eventdispatcher.o vdrrequestpacket.o vdrresponsepacket.o
+
diff --git
a/player.h
b/player.h
index b7033b5b8fed63a3934b85355f2dd8a82fd38312..5f457145cde74f98a54f976115fc1ba86f94fe67 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-139,7
+139,7
@@
class Player : public Thread_TYPE, public Callback
#ifndef WIN32
pthread_mutex_t mutex;
#else
- HANDLE mutex;
+
HANDLE mutex;
#endif
void lock();
void unLock();