mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change default timers weekdays; Fix for fastscan crash; Open video with configured mode instead of PAL - for testing

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@809 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-10-02 12:30:04 +00:00
parent 51c742521c
commit f06efae567
7 changed files with 170 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/stream2file.cpp
View File

@@ -64,7 +64,7 @@ extern "C" {
}
static cRecord * record = NULL;
extern CZapitChannel *channel;
extern CZapitChannel *g_current_channel;
extern CCam *cam0;
extern bool autoshift;
@@ -132,8 +132,8 @@ stream2file_error_msg_t start_recording(const char * const filename,
return STREAM2FILE_INVALID_DIRECTORY;
}
if(channel)
cam0->setCaPmt(channel->getCaPmt(), 0, 5, true); // demux 0 + 2, update
if(g_current_channel)
cam0->setCaPmt(g_current_channel->getCaPmt(), 0, 5, true); // demux 0 + 2, update
CVFD::getInstance()->ShowIcon(VFD_ICON_CAM1, true);

10
src/driver/streamts.cpp
View File

@@ -24,7 +24,7 @@
#include <zapit/cam.h>
#include <zapit/channel.h>
extern CZapitChannel *channel;
extern CZapitChannel *g_current_channel;
extern CCam *cam0;
#define TS_SIZE 188
@@ -342,8 +342,8 @@ void * streamts_live_thread(void *data)
dmx->Start();
if(channel)
cam0->setCaPmt(channel->getCaPmt(), 0, 3, true); // demux 0 + 1, update
if(g_current_channel)
cam0->setCaPmt(g_current_channel->getCaPmt(), 0, 3, true); // demux 0 + 1, update
size_t pos;
ssize_t r;
@@ -376,8 +376,8 @@ void * streamts_live_thread(void *data)
}
printf("Exiting LIVE STREAM thread, fd %d\n", fd);
if(channel)
cam0->setCaPmt(channel->getCaPmt(), 0, 1, true); // demux 0, update
if(g_current_channel)
cam0->setCaPmt(g_current_channel->getCaPmt(), 0, 1, true); // demux 0, update
delete dmx;
free(buf);