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

Remove globals and use new zapit class members

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1698 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-09-18 13:35:08 +00:00
parent 0172f074b8
commit 6c6c2e9b29
15 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/streamts.cpp
View File

@@ -27,7 +27,7 @@
#include <dmx.h>
#include <zapit/cam.h>
#include <zapit/channel.h>
#include <zapit/zapit.h>
#define TS_SIZE 188
@@ -45,8 +45,6 @@
//unsigned char * buf;
extern CZapitChannel *g_current_channel;
extern t_channel_id live_channel_id;
extern CCam *cam0;
//int demuxfd[MAXPIDS];
@@ -336,7 +334,7 @@ void * streamts_live_thread(void *data)
dmx->Start(true);//FIXME
CCamManager::getInstance()->Start(live_channel_id, CCamManager::STREAM);
CCamManager::getInstance()->Start(CZapit::getInstance()->GetCurrentChannelID(), CCamManager::STREAM);
ssize_t r;
while (!exit_flag) {
@@ -347,7 +345,7 @@ void * streamts_live_thread(void *data)
printf("Exiting LIVE STREAM thread, fd %d\n", fd);
CCamManager::getInstance()->Stop(live_channel_id, CCamManager::STREAM);
CCamManager::getInstance()->Stop(CZapit::getInstance()->GetCurrentChannelID(), CCamManager::STREAM);
delete dmx;
free(buf);