diff options
| -rw-r--r-- | epg_events.cpp | 8 | ||||
| -rw-r--r-- | epgsearch.h | 4 | ||||
| -rw-r--r-- | pages/schedule.ecpp | 3 | ||||
| -rw-r--r-- | recman.cpp | 13 | ||||
| -rw-r--r-- | tasks.cpp | 5 | ||||
| -rw-r--r-- | timers.cpp | 5 |
6 files changed, 8 insertions, 30 deletions
diff --git a/epg_events.cpp b/epg_events.cpp index c960cf8..41b9d08 100644 --- a/epg_events.cpp +++ b/epg_events.cpp @@ -170,11 +170,9 @@ namespace vdrlive const string EpgRecording::Archived() const { - if (!m_checkedArchived) { - if (m_recording) { - m_archived = RecordingsManager::GetArchiveDescr(m_recording); - m_checkedArchived = true; - } + if (!m_checkedArchived && m_recording) { + m_archived = RecordingsManager::GetArchiveDescr(m_recording); + m_checkedArchived = true; } return m_archived; } diff --git a/epgsearch.h b/epgsearch.h index f6fbd2f..7545b39 100644 --- a/epgsearch.h +++ b/epgsearch.h @@ -421,8 +421,6 @@ public: static std::string EvaluateExpr(const std::string& expr, const cEvent* event); }; -} - - // namespace vdrlive +} // namespace vdrlive #endif // VDR_LIVE_EPGSEARCH_H diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 391140d..be09d9d 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -100,8 +100,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); string current_day = ""; const cEvent* PresentEvent = Schedule->GetPresentEvent(); time_t now = time(NULL) - ::Setup.EPGLinger * 60; - // tChannelID channel_id(Channel->GetChannelID()); - // int evntNr = 0; #if VDRVERSNUM >= 20301 for (const cEvent *Event = (cEvent *)Schedule->Events()->First(); Event; Event = (cEvent *)Schedule->Events()->Next(Event)) { #else @@ -119,7 +117,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); string end(epgEvent->EndTime(tr("%I:%M %p"))); string day(epgEvent->StartTime(tr("%A, %b %d %Y"))); string epgid = EpgEvents::EncodeDomId(Channel->GetChannelID(), Event->EventID()); - // string strEventID = lexical_cast<string>(Event->EventID()); bool truncated = false; bool lastEventCurrentDay = false; @@ -152,7 +152,6 @@ namespace vdrlive { if (!recording) return; - //dsyslog("[LIVE]: deleting resume '%s'", recording->Name()); cResumeFile ResumeFile(recording->FileName(), recording->IsPesRecording()); ResumeFile.Delete(); } @@ -162,7 +161,6 @@ namespace vdrlive { if (!recording) return; - //dsyslog("[LIVE]: deleting marks '%s'", recording->Name()); cMarks marks; marks.Load(recording->FileName()); if (marks.Count()) { @@ -413,17 +411,8 @@ namespace vdrlive { long RecordingsItemRec::Duration() const { - long RecLength = 0; if (!m_recording->FileName()) return 0; return m_recording->LengthInSeconds() / 60; - if (RecLength == 0) { - cString lengthFile = cString::sprintf("%s%s", m_recording->FileName(), LENGTHFILESUFFIX); - ifstream length(*lengthFile); - if(length) - length >> RecLength; - } - - return RecLength; } /** @@ -461,12 +450,14 @@ namespace vdrlive { RecordingsItemPtr recPtr (new RecordingsItemDir(dirName, level, dir)); dir->m_entries.insert(pair< string, RecordingsItemPtr > (dirName, recPtr)); i = findDir(dir, dirName); +#if 0 if (i != dir->m_entries.end()) { // esyslog("DH: added dir: '%s'", dirName.c_str()); } else { // esyslog("DH: panic: didn't found inserted dir: '%s'", dirName.c_str()); } +#endif } dir = i->second; // esyslog("DH: current dir: '%s'", dir->Name().c_str()); @@ -243,11 +243,6 @@ void TaskManager::DoScheduledTasks() return; cMutexLock lock( this ); - /*while ( !m_taskQueue.empty() ) { - Task* current = m_taskQueue.front(); - current->Action(); - m_taskQueue.pop_front(); - }*/ for_each( m_taskQueue.begin(), m_taskQueue.end(), bind( &Task::Action, _1 ) ); for_each( m_stickyTasks.begin(), m_stickyTasks.end(), bind( &Task::Action, _1 ) ); m_taskQueue.clear(); @@ -14,7 +14,6 @@ static bool operator<( cTimer const& left, cTimer const& right ) namespace vdrlive { using namespace std; - using namespace vdrlive; static char const* const TIMER_DELETE = "DELETE"; static char const* const TIMER_TOGGLE = "TOGGLE"; @@ -152,7 +151,7 @@ namespace vdrlive { << ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":" - << priority << ":" + << priority << ":" << lifetime << ":" << StringReplace(title, ":", "|" ) << ":" << StringReplace(aux, ":", "|" ); @@ -164,7 +163,7 @@ namespace vdrlive { // Fix was submitted by rofafor: see // http://www.vdr-portal.de/board/thread.php?threadid=100398 - // dsyslog("%s", builder.str().c_str()); + // dsyslog("%s", builder.str().c_str()); TimerPair timerData( timer, builder.str() ); |