Merge branch 'multischedule'

1 files changed, 8 insertions, 0 deletions

diff --git a/setup.cpp b/setup.cpp
index 11ee6c5..5737378 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -36,6 +36,8 @@ Setup::Setup():
 		m_screenshotInterval( 1000 ),
 		m_useAuth( 1 ),
 		m_adminLogin("admin"),
+        m_channelGroups( "" ),
+        m_scheduleDuration( "8" ),
 		m_theme("marine"),
 		m_lastwhatsonlistmode("detail"),
 		m_tntnetloglevel("WARN"),
@@ -120,6 +122,8 @@ bool Setup::ParseSetupEntry( char const* name, char const* 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 if ( strcmp( name, "ChannelGroups" ) == 0 ) m_channelGroups = value;
+	else if ( strcmp( name, "ScheduleDuration" ) == 0 ) m_scheduleDuration = value;
 	else if ( strcmp( name, "StartPage" ) == 0 ) m_startscreen = value;
 	else if ( strcmp( name, "Theme" ) == 0 ) m_theme = value;
 	else if ( strcmp( name, "LocalNetMask" ) == 0 ) { m_localnetmask = value; }
@@ -223,6 +227,8 @@ std::string const Setup::GetStartScreenLink() const
 		return "whats_on.html?type=next";
 	else if (m_startscreen == "schedule")
 		return "schedule.html";
+	else if (m_startscreen == "multischedule")
+		return "multischedule.html";
 	else if (m_startscreen == "timers")
 		return "timers.html";
 	else if (m_startscreen == "recordings")
@@ -284,6 +290,8 @@ bool Setup::SaveSetup()
 		liveplugin->SetupStore("LocalNetMask",  m_localnetmask.c_str());
 	}
 	liveplugin->SetupStore("UserdefTimes",  m_times.c_str());
+	liveplugin->SetupStore("ChannelGroups",  m_channelGroups.c_str());
+	liveplugin->SetupStore("ScheduleDuration",  m_scheduleDuration.c_str());
 	liveplugin->SetupStore("StartPage",  m_startscreen.c_str());
 	liveplugin->SetupStore("Theme", m_theme.c_str());
 	liveplugin->SetupStore("LastWhatsOnListMode", m_lastwhatsonlistmode.c_str());