mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Browse Source 
Conflicts:
	src/timerd/timermanager.cpp
This commit is contained in:
[CST] Bas
2012-09-26 17:52:47 +08:00
parent fbc512889f 83636ebb6e
commit a222240dbb
15 changed files with 163 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libcoolstream/dmx_cs.h
View File

@@ -36,8 +36,12 @@ typedef enum {
} DMX_CHANNEL_TYPE;
class cDemuxData;
class cVideo;
class cAudio;
class cDemux {
friend class cVideo;
friend class cAudio;
private:
DMX_CHANNEL_TYPE type;
int timeout;