adzap: port code from martiis-neutrino-mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: c015d4670f
Author: martii <m4rtii@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- adzap: port code from martiis-neutrino-mp

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2016-03-03 10:54:45 +01:00
committed by vanhofen
parent 648ea8ccf6
commit 155c0ba036
11 changed files with 406 additions and 7 deletions

View File

@@ -65,6 +65,7 @@
#include <driver/radiotext.h>
#include <driver/scanepg.h>
#include "gui/adzap.h"
#include "gui/audiomute.h"
#include "gui/audioplayer.h"
#include "gui/bouquetlist.h"
@@ -828,6 +829,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
}
g_settings.epg_search_history_size = g_settings.epg_search_history.size();
g_settings.adzap_zapBackPeriod = configfile.getInt32("adzap_zapBackPeriod", 180);
// USERMENU -> in system/settings.h
//-------------------------------------------
@@ -1314,6 +1316,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt64("startchanneltv_id", g_settings.startchanneltv_id);
configfile.setInt64("startchannelradio_id", g_settings.startchannelradio_id);
configfile.setInt32("uselastchannel", g_settings.uselastchannel);
configfile.setInt32("adzap_zapBackPeriod", g_settings.adzap_zapBackPeriod);
//epg search
g_settings.epg_search_history_size = g_settings.epg_search_history.size();
if (g_settings.epg_search_history_size > g_settings.epg_search_history_max)
@@ -4000,6 +4003,10 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
exit(1);
}
}
else if(actionKey == "adzap") {
CAdZapMenu::getInstance()->exec(parent, "adzap");
return menu_return::RETURN_EXIT_ALL;
}
else if(actionKey == "moviedir") {
parent->hide();