mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-24 10:06:31 +02:00
parent 06167cc8d0 07f447e0f9
commit f23c56ed95
6 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/record.h
View File

@@ -42,9 +42,11 @@
#include <OpenThreads/Mutex>
#include <OpenThreads/Thread>
#if 0
extern "C" {
#include <libavformat/avformat.h>
}
#endif
#define REC_MAX_APIDS 10
#define FILENAMEBUFFERSIZE 1024
@@ -244,6 +246,7 @@ class CRecordManager : public CMenuTarget /*, public CChangeObserver*/
#endif
};
#if 0
class CStreamRec : public CRecordInstance, OpenThreads::Thread
{
private:
@@ -270,5 +273,6 @@ class CStreamRec : public CRecordInstance, OpenThreads::Thread
bool Stop(bool remove_event = true);
static int Interrupt(void * data);
};
#endif
#endif