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

Attempt to fix compile

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1584 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-07-21 12:00:15 +00:00
parent cf66aac017
commit dbb22467ec
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/record.cpp
View File

@@ -124,7 +124,7 @@ bool CRecordInstance::SaveXml()
return false; return false;
} }
record_error_msg_t CRecordInstance::Start(CZapitChannel * channel, APIDList &apid_list) record_error_msg_t CRecordInstance::Start(CZapitChannel * channel /*, APIDList &apid_list*/)
{ {
int fd; int fd;
std::string tsfile; std::string tsfile;
@@ -232,7 +232,7 @@ bool CRecordInstance::Update()
GetPids(channel); GetPids(channel);
FilterPids(apid_list); FilterPids(apid_list);
FillMovieInfo(channel, apid_list); FillMovieInfo(channel, apid_list);
record_error_msg_t ret = Start(channel, apid_list); record_error_msg_t ret = Start(channel /*, apid_list*/);
if(ret == RECORD_OK) { if(ret == RECORD_OK) {
CCamManager::getInstance()->Start(channel_id, CCamManager::RECORD, true); CCamManager::getInstance()->Start(channel_id, CCamManager::RECORD, true);
return true; return true;
@@ -366,7 +366,7 @@ record_error_msg_t CRecordInstance::Record()
FilterPids(apid_list); FilterPids(apid_list);
FillMovieInfo(channel, apid_list); FillMovieInfo(channel, apid_list);
ret = Start(channel, apid_list); ret = Start(channel /*, apid_list*/);
//FIXME recording_id (timerd eventID) is 0 means its user recording, in this case timer always added ? //FIXME recording_id (timerd eventID) is 0 means its user recording, in this case timer always added ?
if(ret == RECORD_OK && recording_id == 0) { if(ret == RECORD_OK && recording_id == 0) {
time_t now = time(NULL); time_t now = time(NULL);
@@ -987,7 +987,7 @@ int CRecordManager::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
return messages_return::unhandled; return messages_return::unhandled;
} }
int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey) int CRecordManager::exec(CMenuTarget* parent, const std::string & /*actionKey */)
{ {
if(parent) if(parent)
parent->hide(); parent->hide();
@@ -1126,7 +1126,7 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, const int mo
if(live_channel_id != channel_id) { if(live_channel_id != channel_id) {
if(SAME_TRANSPONDER(live_channel_id, channel_id)) { if(SAME_TRANSPONDER(live_channel_id, channel_id)) {
printf("%s zapTo_record channel_id %llx\n", __FUNCTION__, channel_id); printf("%s zapTo_record channel_id %llx\n", __FUNCTION__, channel_id);
ret = g_Zapit->zapTo_record(channel_id) >= 0; ret = g_Zapit->zapTo_record(channel_id) == 0;
} else { } else {
if (mode != last_mode && (last_mode != NeutrinoMessages::mode_standby || mode != CNeutrinoApp::getInstance()->getLastMode())) { if (mode != last_mode && (last_mode != NeutrinoMessages::mode_standby || mode != CNeutrinoApp::getInstance()->getLastMode())) {
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , mode | NeutrinoMessages::norezap ); CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , mode | NeutrinoMessages::norezap );
@@ -1134,7 +1134,7 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, const int mo
if(last_mode == NeutrinoMessages::mode_standby) if(last_mode == NeutrinoMessages::mode_standby)
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_standby); CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_standby);
} }
ret = g_Zapit->zapTo_serviceID(channel_id) >= 0; ret = g_Zapit->zapTo_serviceID(channel_id) > 0;
printf("%s zapTo_serviceID channel_id %llx result %d\n", __FUNCTION__, channel_id, ret); printf("%s zapTo_serviceID channel_id %llx result %d\n", __FUNCTION__, channel_id, ret);
if(!ret) if(!ret)

2
src/driver/record.h
View File

@@ -98,7 +98,7 @@ class CRecordInstance
void FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis); void FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis);
record_error_msg_t MakeFileName(CZapitChannel * channel); record_error_msg_t MakeFileName(CZapitChannel * channel);
bool SaveXml(); bool SaveXml();
record_error_msg_t Start(CZapitChannel * channel, APIDList &apid_list); record_error_msg_t Start(CZapitChannel * channel /*, APIDList &apid_list*/);
public: public:
CRecordInstance(const CTimerd::RecordingInfo * const eventinfo, std::string &dir, bool timeshift = false, bool stream_vtxt_pid = false, bool stream_pmt_pid = false); CRecordInstance(const CTimerd::RecordingInfo * const eventinfo, std::string &dir, bool timeshift = false, bool stream_vtxt_pid = false, bool stream_pmt_pid = false);
~CRecordInstance(); ~CRecordInstance();