diff --git a/src/gui/followscreenings.cpp b/src/gui/followscreenings.cpp index 9b637bc3b..02f09486c 100644 --- a/src/gui/followscreenings.cpp +++ b/src/gui/followscreenings.cpp @@ -108,14 +108,16 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK break; // show conflicts only once } } - +#if 0 //ch is unused + CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id); +#endif if (g_Timerd->addRecordTimerEvent(channel_id, e->startTime, e->startTime + e->duration, e->eventID, e->startTime, e->startTime - (ANNOUNCETIME + 120 ), apids, true, e->startTime - (ANNOUNCETIME + 120) > time(NULL), recDir, true) == -1) { //FIXME -- no error handling, but this shouldn't happen ... } else { if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == FOLLOWSCREENINGS_ALWAYS)) - forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC; - else if (g_settings.timer_followscreenings != FOLLOWSCREENINGS_ALWAYS) //NI + forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_MARKER_RECORD; + else if (notify && g_settings.timer_followscreenings != FOLLOWSCREENINGS_ALWAYS) ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); return menu_return::RETURN_REPAINT; diff --git a/src/gui/followscreenings.h b/src/gui/followscreenings.h index 39c215a2d..e7dc061f4 100644 --- a/src/gui/followscreenings.h +++ b/src/gui/followscreenings.h @@ -57,6 +57,8 @@ class CFollowScreenings : public CMenuTarget CTimerd::RecordingInfo eventInfo; std::vector forwarders; void updateRightIcon(int i, time_t start, unsigned int duration); + bool notify; + public: enum { @@ -66,7 +68,7 @@ class CFollowScreenings : public CMenuTarget }; CFollowScreenings(const t_channel_id Channel_id, time_t Starttime, time_t Stoptime, const std::string &Title, uint64_t EpgID=0, - unsigned char Apids=TIMERD_APIDS_STD, bool Safety=false, std::string RecDir="", CChannelEventList *Evtlist=NULL) : CMenuTarget () { + unsigned char Apids=TIMERD_APIDS_STD, bool Safety=false, std::string RecDir="", CChannelEventList *Evtlist=NULL, bool Notify = false) : CMenuTarget () { this->channel_id = Channel_id; this->starttime = Starttime; this->stoptime = Stoptime; @@ -76,6 +78,7 @@ class CFollowScreenings : public CMenuTarget this->title = Title; this->safety = Safety; this->apids = Apids; + this->notify = Notify; }; ~CFollowScreenings(); CChannelEventList *getFollowScreenings(void);