mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

-add eligible logo dir

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@996 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-01-03 10:41:58 +00:00
parent ff7d5c50cf
commit 8f02a26307
8 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/neutrino.cpp
View File

@@ -670,7 +670,7 @@ printf("***************************** rec dir %s timeshift dir %s\n", g_settings
g_settings.movieplayer_plugin = configfile.getString( "movieplayer_plugin", "Teletext" );
g_settings.onekey_plugin = configfile.getString( "onekey_plugin", "noplugin" );
g_settings.plugin_hdd_dir = configfile.getString( "plugin_hdd_dir", "/hdd/tuxbox/plugins" );
g_settings.logo_hdd_dir = configfile.getString( "logo_hdd_dir", "/var/share/icons/logo" );
//rc-key configuration
g_settings.key_tvradio_mode = configfile.getInt32( "key_tvradio_mode", CRCInput::RC_nokey );
g_settings.key_power_off = configfile.getInt32( "key_power_off", CRCInput::RC_standby );
@@ -1193,7 +1193,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString ( "movieplayer_plugin", g_settings.movieplayer_plugin );
configfile.setString ( "onekey_plugin", g_settings.onekey_plugin );
configfile.setString ( "plugin_hdd_dir", g_settings.plugin_hdd_dir );
configfile.setString ( "logo_hdd_dir", g_settings.logo_hdd_dir );
configfile.setInt32 ( "streaming_resolution", g_settings.streaming_resolution );
configfile.setInt32( "rf_subcarrier", g_settings.rf_subcarrier);
@@ -4050,6 +4050,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
{
// printf("ac: %s\n", actionKey.c_str());
int returnval = menu_return::RETURN_REPAINT;
const char *wrong_str = "Wrong/unsupported";
if(actionKey == "help_recording") {
ShowLocalizedMessage(LOCALE_SETTINGS_HELP, LOCALE_RECORDINGMENU_HELP, CMessageBox::mbrBack, CMessageBox::mbBack);
@@ -4200,7 +4201,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
if (fileBrowser.exec(g_settings.update_dir) == true) {
const char * newdir = fileBrowser.getSelectedFile()->Name.c_str();
if(check_dir(newdir))
printf("Wrong/unsupported recording dir %s\n", newdir);
printf("%s recording dir %s\n",wrong_str , newdir);
else {
strcpy(g_settings.update_dir, fileBrowser.getSelectedFile()->Name.c_str());
printf("[neutrino] new update dir %s\n", fileBrowser.getSelectedFile()->Name.c_str());
@@ -4215,7 +4216,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
if (b.exec(g_settings.epg_dir.c_str())) {
const char * newdir = b.getSelectedFile()->Name.c_str();
if(check_dir(newdir))
printf("Wrong/unsupported epg dir %s\n", newdir);
printf("%s epg dir %s\n",wrong_str , newdir);
else {
g_settings.epg_dir = b.getSelectedFile()->Name;
SendSectionsdConfig();
@@ -4224,23 +4225,37 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
return menu_return::RETURN_REPAINT;
}
else if(actionKey == "pluginhdddir") {
else if(actionKey == "plugin_dir") {
parent->hide();
CFileBrowser b;
b.Dir_Mode=true;
if (b.exec(g_settings.plugin_hdd_dir.c_str())) {
const char * newdir = b.getSelectedFile()->Name.c_str();
if(check_dir(newdir))
printf("Wrong/unsupported plugin dir %s\n", newdir);
printf("%s plugin dir %s\n",wrong_str , newdir);
else {
g_settings.plugin_hdd_dir = b.getSelectedFile()->Name;
SendSectionsdConfig();
g_PluginList->loadPlugins();
}
}
return menu_return::RETURN_REPAINT;
}
else if(actionKey == "logo_dir") {
parent->hide();
CFileBrowser b;
b.Dir_Mode=true;
if (b.exec(g_settings.logo_hdd_dir.c_str())) {
const char * newdir = b.getSelectedFile()->Name.c_str();
if(check_dir(newdir))
printf("%s logo dir %s\n",wrong_str , newdir);
else {
g_settings.logo_hdd_dir = b.getSelectedFile()->Name;
}
}
return menu_return::RETURN_REPAINT;
}
else if(actionKey == "movieplugin") {
parent->hide();
CMenuWidget MoviePluginSelector(LOCALE_MOVIEPLAYER_DEFPLUGIN, NEUTRINO_ICON_FEATURES);