diff --git a/lib/timerdclient/timerdclient.cpp b/lib/timerdclient/timerdclient.cpp index 9633dffec..0368e7011 100644 --- a/lib/timerdclient/timerdclient.cpp +++ b/lib/timerdclient/timerdclient.cpp @@ -419,6 +419,7 @@ CTimerd::TimerList CTimerdClient::getOverlappingTimers(time_t& startTime, time_t } return overlapping; } + //------------------------------------------------------------------------- bool CTimerdClient::shutdown() diff --git a/lib/timerdclient/timerdclient.h b/lib/timerdclient/timerdclient.h index 9d03adef4..acd5cedf5 100644 --- a/lib/timerdclient/timerdclient.h +++ b/lib/timerdclient/timerdclient.h @@ -111,7 +111,7 @@ class CTimerdClient:private CBasicClient // adds new record timer event int addRecordTimerEvent(const t_channel_id channel_id, time_t alarmtime, time_t stoptime, uint64_t epgID=0, time_t epg_starttime=0, time_t announcetime = 0, - unsigned char apids=TIMERD_APIDS_STD, bool safety=false,std::string recDir="", bool forceAdd=true,/*NI*/bool channel_ci=false) + unsigned char apids=TIMERD_APIDS_STD, bool safety=false,std::string recDir="", bool forceAdd=true, bool channel_ci=false) //NI { CTimerd::RecordingInfo eventInfo; eventInfo.channel_id = channel_id; diff --git a/lib/timerdclient/timerdtypes.h b/lib/timerdclient/timerdtypes.h index 560ed27c5..8c7ab2432 100644 --- a/lib/timerdclient/timerdtypes.h +++ b/lib/timerdclient/timerdtypes.h @@ -162,6 +162,7 @@ class CTimerd char recordingDir[RECORD_DIR_MAXLEN]; //only filled if applicable char epgTitle[EPG_TITLE_MAXLEN]; //only filled if applicable bool channel_ci; //NI + bool operator< (const responseGetTimer& a) const { return this->alarmTime < a.alarmTime ; diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 7930a73ee..0ef042179 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -518,6 +518,7 @@ bool CEpgData::isCurrentEPG(const t_channel_id channel_id) return false; } +//NI #if 0 int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*mp_duration*/, bool doLoop) { diff --git a/src/gui/epgview.h b/src/gui/epgview.h index 0800f14c4..ce99fb434 100644 --- a/src/gui/epgview.h +++ b/src/gui/epgview.h @@ -111,6 +111,7 @@ class CEpgData ~CEpgData(); void start( ); int show(const t_channel_id channel_id, uint64_t id = 0, time_t* startzeit = NULL, bool doLoop = true, bool callFromfollowlist = false, bool mp_info = false ); +//NI #if 0 int show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position = 1, int mp_duration = 1, bool doLoop = true); #endif diff --git a/src/gui/followscreenings.cpp b/src/gui/followscreenings.cpp index df5adc20b..30034fd56 100644 --- a/src/gui/followscreenings.cpp +++ b/src/gui/followscreenings.cpp @@ -100,7 +100,7 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK #endif return menu_return::RETURN_REPAINT; } - if (!SAME_TRANSPONDER(channel_id, i->channel_id) ||/*NI*/CZapit::getInstance()->getUseChannelFilter()) { + if (!SAME_TRANSPONDER(channel_id, i->channel_id) || CZapit::getInstance()->getUseChannelFilter()) { //NI if (!askUserOnTimerConflict(start, stop, channel_id)) return menu_return::RETURN_REPAINT; else @@ -111,7 +111,7 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id); if (g_Timerd->addRecordTimerEvent(channel_id, e->startTime, e->startTime + e->duration, e->eventID, - e->startTime, e->startTime - (ANNOUNCETIME + 120 ), apids, true, recDir, true,/*NI*/ch->bUseCI) == -1) { + e->startTime, e->startTime - (ANNOUNCETIME + 120 ), apids, true, recDir, true, ch->bUseCI) == -1) { //NI //FIXME -- no error handling, but this shouldn't happen ... } else { #if 0 diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index c88d872f9..f2f09437a 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1077,6 +1077,7 @@ void CInfoViewer::loop(bool show_dot) g_RCInput->postMsg (msg, 0); res = messages_return::cancel_info; } else if (msg == CRCInput::RC_info) { //NI +//NI #if 0 if (fileplay) { diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index d1511d4c3..e5bddc5bc 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -2044,6 +2044,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) { if (m_movieSelectionHandler != NULL) { +//NI #if 0 if (m_settings.gui == MB_GUI_MOVIE_INFO && m_windowFocus == MB_FOCUS_MOVIE_INFO) g_EpgData->show_mp(m_movieSelectionHandler,0,0); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 212c350ff..3f943bb11 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1560,6 +1560,7 @@ void CMoviePlayerGui::PlayFileLoop(void) SetPosition(1000 * (hh * 3600 + mm * 60 + ss), true); } else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) { +//NI #if 0 if (fromInfoviewer) { diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 605b51bf0..ad435fd02 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1268,7 +1268,7 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id c CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); bool useCI = channel->bUseCI; - if (CFEManager::getInstance()->getEnabledCount() == 1 || /*NI*/useCI) { + if (CFEManager::getInstance()->getEnabledCount() == 1 || useCI) { //NI CTimerdClient Timer; CTimerd::TimerList overlappingTimers = Timer.getOverlappingTimers(announceTime,stopTime); //printf("[CTimerdClient] attention\n%d\t%d\t%d conflicts with:\n",timerNew.announceTime,timerNew.alarmTime,timerNew.stopTime); diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 29afd9626..752fc523c 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -1134,7 +1134,7 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time, event_id_t epgID, time_t epg_starttime, unsigned char apids, CTimerd::CTimerEventRepeat evrepeat, - uint32_t repeatcount, const std::string &recDir,/*NI*/bool channel_ci) : + uint32_t repeatcount, const std::string &recDir, bool channel_ci) : //NI CTimerEvent(getEventType(), announce_Time, alarm_Time, stop_Time, evrepeat, repeatcount) { eventInfo.epgID = epgID; diff --git a/src/timerd/timermanager.h b/src/timerd/timermanager.h index 01acd8ab0..84f8a1af9 100644 --- a/src/timerd/timermanager.h +++ b/src/timerd/timermanager.h @@ -123,7 +123,7 @@ class CTimerEvent_Record : public CTimerEvent time_t epg_starttime = 0, unsigned char apids = TIMERD_APIDS_STD, CTimerd::CTimerEventRepeat evrepeat = CTimerd::TIMERREPEAT_ONCE, - uint32_t repeatcount = 1, const std::string &recDir = "",/*NI*/bool channel_ci=false); + uint32_t repeatcount = 1, const std::string &recDir = "", bool channel_ci=false); //NI CTimerEvent_Record(CConfigFile *config, int iId); virtual ~CTimerEvent_Record(){}; virtual CTimerd::CTimerEventTypes getEventType(void) const { return CTimerd::TIMER_RECORD; };