mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +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


Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
This commit is contained in:
[CST] Bas
2012-09-26 17:52:47 +08:00
parent 8b523be32e 5fdabf2554
commit 8965dc519f
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;