summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-02-21 22:23:04 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-02-21 22:23:04 +0100
commit1ef235246790891eb6f4f3b59d2b545c3e34eb14 (patch)
treeab784f98376b57aba373d07553a2bebdd0939051
parent747c5f55408ce8ce47c4247a9719a4678ead9454 (diff)
downloadvdr-plugin-live-1ef235246790891eb6f4f3b59d2b545c3e34eb14.tar.gz
vdr-plugin-live-1ef235246790891eb6f4f3b59d2b545c3e34eb14.tar.bz2
Autoformating of the code in emacs. This makes editing not so anoying
when adding additional code. (sorry)
-rw-r--r--timerconflict.cpp117
-rw-r--r--timerconflict.h101
2 files changed, 114 insertions, 104 deletions
diff --git a/timerconflict.cpp b/timerconflict.cpp
index 78db815..a08a836 100644
--- a/timerconflict.cpp
+++ b/timerconflict.cpp
@@ -8,77 +8,76 @@
namespace vdrlive {
-bool CheckEpgsearchVersion();
+ bool CheckEpgsearchVersion();
-using namespace std;
+ using namespace std;
-static char ServiceInterface[] = "Epgsearch-services-v1.0";
+ static char ServiceInterface[] = "Epgsearch-services-v1.0";
-bool operator<( TimerConflict const& left, TimerConflict const& right )
-{
- return left.conflictTime < right.conflictTime;
-}
+ bool operator<( TimerConflict const& left, TimerConflict const& right )
+ {
+ return left.conflictTime < right.conflictTime;
+ }
-TimerConflict::TimerConflict()
-{
- Init();
-}
+ TimerConflict::TimerConflict()
+ {
+ Init();
+ }
-void TimerConflict::Init()
-{
- conflictTime = 0;
-}
+ void TimerConflict::Init()
+ {
+ conflictTime = 0;
+ }
-TimerConflict::TimerConflict( string const& data )
-{
- Init();
- vector< string > parts = StringSplit( data, ':' );
- try {
- vector< string >::const_iterator part = parts.begin();
- if (parts.size() > 0) {
- conflictTime = lexical_cast< time_t >( *part++ );
- for ( int i = 1; part != parts.end(); ++i, ++part ) {
- vector< string > timerparts = StringSplit( *part, '|' );
- vector< string >::const_iterator timerpart = timerparts.begin();
- TimerInConflict timer;
- for ( int j = 0; timerpart != timerparts.end(); ++j, ++timerpart )
- switch(j) {
- case 0: timer.timerIndex = lexical_cast< int >( *timerpart ); break;
- case 1: timer.percentage = lexical_cast< int >( *timerpart ); break;
- case 2:
- {
- vector< string > conctimerparts = StringSplit( *timerpart, '#' );
- vector< string >::const_iterator conctimerpart = conctimerparts.begin();
- for ( int k = 0; conctimerpart != conctimerparts.end(); ++k, ++conctimerpart )
- timer.concurrentTimerIndices.push_back(lexical_cast< int >( *conctimerpart ));
- break;
+ TimerConflict::TimerConflict( string const& data )
+ {
+ Init();
+ vector< string > parts = StringSplit( data, ':' );
+ try {
+ vector< string >::const_iterator part = parts.begin();
+ if (parts.size() > 0) {
+ conflictTime = lexical_cast< time_t >( *part++ );
+ for ( int i = 1; part != parts.end(); ++i, ++part ) {
+ vector< string > timerparts = StringSplit( *part, '|' );
+ vector< string >::const_iterator timerpart = timerparts.begin();
+ TimerInConflict timer;
+ for ( int j = 0; timerpart != timerparts.end(); ++j, ++timerpart )
+ switch (j) {
+ case 0: timer.timerIndex = lexical_cast< int >( *timerpart ); break;
+ case 1: timer.percentage = lexical_cast< int >( *timerpart ); break;
+ case 2: {
+ vector< string > conctimerparts = StringSplit( *timerpart, '#' );
+ vector< string >::const_iterator conctimerpart = conctimerparts.begin();
+ for ( int k = 0; conctimerpart != conctimerparts.end(); ++k, ++conctimerpart )
+ timer.concurrentTimerIndices.push_back(lexical_cast< int >( *conctimerpart ));
+ break;
+ }
}
- }
- conflictingTimers.push_back(timer);
+ conflictingTimers.push_back(timer);
+ }
}
}
+ catch ( bad_lexical_cast const& ex ) {
+ }
}
- catch ( bad_lexical_cast const& ex ) {
- }
-}
-TimerConflicts::TimerConflicts()
-{
- Epgsearch_services_v1_0 service;
- if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
- throw HtmlError( tr("EPGSearch version outdated! Please update.") );
+ TimerConflicts::TimerConflicts()
+ {
+ Epgsearch_services_v1_0 service;
+ if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
+ throw HtmlError( tr("EPGSearch version outdated! Please update.") );
- list< string > conflicts = service.handler->TimerConflictList();
- m_conflicts.assign( conflicts.begin(), conflicts.end() );
- m_conflicts.sort();
-}
+ list< string > conflicts = service.handler->TimerConflictList();
+ m_conflicts.assign( conflicts.begin(), conflicts.end() );
+ m_conflicts.sort();
+ }
-bool TimerConflicts::CheckAdvised()
-{
- Epgsearch_services_v1_0 service;
- if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
- throw HtmlError( tr("EPGSearch version outdated! Please update.") );
- return service.handler->IsConflictCheckAdvised();
-}
+ bool TimerConflicts::CheckAdvised()
+ {
+ Epgsearch_services_v1_0 service;
+ if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
+ throw HtmlError( tr("EPGSearch version outdated! Please update.") );
+ return service.handler->IsConflictCheckAdvised();
+ }
} // namespace vdrlive
diff --git a/timerconflict.h b/timerconflict.h
index f040789..07b82ff 100644
--- a/timerconflict.h
+++ b/timerconflict.h
@@ -8,56 +8,67 @@ namespace vdrlive {
// classes for timer conflict interface
// conflicting timer
-class TimerInConflict
-{
-public:
- int timerIndex; // it's index in VDR
- int percentage; // percentage of recording
- std::list<int> concurrentTimerIndices; // concurrent timer indices
+ class TimerInConflict
+ {
+ public:
+ int timerIndex; // it's index in VDR
+ int percentage; // percentage of recording
+ std::list<int> concurrentTimerIndices; // concurrent timer indices
- TimerInConflict(int TimerIndex=-1, int Percentage=0) : timerIndex(TimerIndex), percentage(Percentage) {}
-};
+ TimerInConflict(int TimerIndex=-1, int Percentage=0) : timerIndex(TimerIndex), percentage(Percentage) {}
+ };
-class TimerConflict;
+ class TimerConflict;
-bool operator<( TimerConflict const& left, TimerConflict const& right );
+ bool operator<( TimerConflict const& left, TimerConflict const& right );
// one timer conflict time
-class TimerConflict
-{
- time_t conflictTime; // time of conflict
- std::list< TimerInConflict > conflictingTimers; // conflicting timers at this time
-public:
- friend bool operator<( TimerConflict const& left, TimerConflict const& right );
-
- TimerConflict( std::string const& data );
- TimerConflict();
- void Init();
-
- time_t ConflictTime() { return conflictTime; }
- const std::list< TimerInConflict >& ConflictingTimers() { return conflictingTimers; }
-};
-
-class TimerConflicts
-{
-public:
- typedef std::list< TimerConflict > ConflictList;
- typedef ConflictList::size_type size_type;
- typedef ConflictList::iterator iterator;
- typedef ConflictList::const_iterator const_iterator;
-
- TimerConflicts();
-
- size_type size() const { return m_conflicts.size(); }
- iterator begin() { return m_conflicts.begin(); }
- const_iterator begin() const { return m_conflicts.begin(); }
- iterator end() { return m_conflicts.end(); }
- const_iterator end() const { return m_conflicts.end(); }
-
- static bool CheckAdvised();
-private:
- ConflictList m_conflicts;
-};
+ class TimerConflict
+ {
+ time_t conflictTime; // time of conflict
+ std::list< TimerInConflict > conflictingTimers; // conflicting timers at this time
+
+ friend bool operator<( TimerConflict const& left, TimerConflict const& right );
+
+ public:
+ TimerConflict( std::string const& data );
+ TimerConflict();
+ void Init();
+
+ time_t ConflictTime() { return conflictTime; }
+ const std::list< TimerInConflict >& ConflictingTimers() { return conflictingTimers; }
+ };
+
+ class TimerConflicts
+ {
+ public:
+ typedef std::list< TimerConflict > ConflictList;
+ typedef ConflictList::size_type size_type;
+ typedef ConflictList::iterator iterator;
+ typedef ConflictList::const_iterator const_iterator;
+
+ TimerConflicts();
+
+ size_type size() const { return m_conflicts.size(); }
+ iterator begin() { return m_conflicts.begin(); }
+ const_iterator begin() const { return m_conflicts.begin(); }
+ iterator end() { return m_conflicts.end(); }
+ const_iterator end() const { return m_conflicts.end(); }
+
+ static bool CheckAdvised();
+ private:
+ ConflictList m_conflicts;
+ };
+
+ class TimerConflictNotifier
+ {
+ public:
+ TimerConflictNotifier(time_t lastCheck = 0);
+
+ bool ShouldNotify() const;
+ std::string Message() const;
+
+ }; // class TimerConflictNotifier
}