<{ EpgEvents epgEvents; - + time_t seektime = 0; + if (type == "at") + { + seektime = GetTimeT(attime); + if (seektime - time(0) + 3600 < 0) + seektime += 24 * 60 * 60; + } ReadLock channelsLock( Channels ); if (channelsLock) { int evntNr = 0; for (cChannel *Channel = Channels.First(); Channel && Channel->Number() <= LiveSetup().GetLastChannel(); Channel = Channels.Next(Channel)) { if (!Channel->GroupSep()) { const cSchedule *Schedule = Schedules->GetSchedule(Channel); - if (Schedule) { - const cEvent *Event = (type == "now" ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent()); + if (Schedule) { + const cEvent *Event = NULL; + if (type == "now") + Event = Schedule->GetPresentEvent(); + else if (type == "next") + Event = Schedule->GetFollowingEvent(); + else if (type == "at") + Event = Schedule->GetEventAround(seektime); + if (Event) { string evntId("eventId_"); evntId += lexical_cast(++evntNr); @@ -121,5 +147,17 @@ if (type == "now") { <%def whats_on_actions> <$ tr("Now") $> -<$ tr("Next") $> +<$ tr("Next") $> + diff --git a/setup.cpp b/setup.cpp index 247b81f..0b5a5c8 100644 --- a/setup.cpp +++ b/setup.cpp @@ -73,6 +73,7 @@ bool Setup::ParseSetupEntry( char const* name, char const* value ) else if ( strcmp( name, "UseAuth" ) == 0 ) m_useAuth = atoi( value ); else if ( strcmp( name, "AdminLogin" ) == 0 ) m_adminLogin = value; else if ( strcmp( name, "AdminPasswordMD5" ) == 0 ) m_adminPasswordMD5 = value; + else if ( strcmp( name, "UserdefTimes" ) == 0 ) m_times = value; else return false; return true; } @@ -141,6 +142,7 @@ bool Setup::SaveSetup() liveplugin->SetupStore("AdminLogin", m_adminLogin.c_str()); liveplugin->SetupStore("AdminPasswordMD5", m_adminPasswordMD5.c_str()); } + liveplugin->SetupStore("UserdefTimes", m_times.c_str()); return true; } diff --git a/setup.h b/setup.h index 85b19c0..e9e2aaa 100644 --- a/setup.h +++ b/setup.h @@ -32,12 +32,14 @@ public: std::string GetMD5HashAdminPassword() const; int GetAdminPasswordLength() const; bool UseAuth() const { return m_useAuth; } + std::string GetTimes() const { return m_times; } void SetLastChannel(int lastChannel) { m_lastChannel = lastChannel; } void SetAdminLogin(std::string login) { m_adminLogin = login; } std::string SetAdminPassword(std::string password); void SetUseAuth(int auth) { m_useAuth = auth; } void SetScrenshotInterval(int interval) { m_screenshotInterval = interval; } + void SetTimes(std::string times) { m_times = times; } bool SaveSetup(); @@ -64,6 +66,7 @@ private: int m_useAuth; std::string m_adminLogin; std::string m_adminPasswordMD5; + std::string m_times; bool CheckServerPort(); bool CheckServerIps(); diff --git a/tools.cpp b/tools.cpp index da3956f..a75068f 100644 --- a/tools.cpp +++ b/tools.cpp @@ -144,4 +144,19 @@ std::string MD5Hash(std::string const& str) return hashStr.str(); } +#define HOURS(x) ((x)/100) +#define MINUTES(x) ((x)%100) + +time_t GetTimeT(std::string timestring) // timestring in HH:MM +{ + timestring = StringReplace(timestring, ":", ""); + int iTime = lexical_cast< int >( timestring ); + struct tm tm_r; + time_t t = time(NULL); + tm* tmnow = localtime_r(&t, &tm_r); + tmnow->tm_hour = HOURS(iTime); + tmnow->tm_min = MINUTES(iTime); + return mktime(tmnow); +} + } // namespace vdrlive diff --git a/tools.h b/tools.h index 1576377..525df7d 100644 --- a/tools.h +++ b/tools.h @@ -32,6 +32,7 @@ std::string StringFormatBreak(std::string const& input); std::string StringTrim(const std::string& str); std::string ZeroPad(int number); std::string MD5Hash(std::string const& str); +time_t GetTimeT(std::string timestring); struct bad_lexical_cast: std::runtime_error { -- cgit v1.2.3