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

- disable shoutcast, when shoutcast_dev_id is empty

Browse Source
This commit is contained in:
vanhofen
2016-08-06 22:29:26 +02:00
committed by svenhoefer
parent 5837b922b1
commit 1f224be672
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/audioplayer.cpp
View File

@@ -641,12 +641,10 @@ int CAudioPlayerGui::show()
InputSelector.addItem(new CMenuForwarder( InputSelector.addItem(new CMenuForwarder(
LOCALE_AUDIOPLAYER_ADD_IC, true, NULL, InetRadioInputChanger, LOCALE_AUDIOPLAYER_ADD_IC, true, NULL, InetRadioInputChanger,
cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count); cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count);
if(g_settings.shoutcast_dev_id != "XXXXXXXXXXXXXXXX"){ sprintf(cnt, "%d", ++count);
sprintf(cnt, "%d", ++count); InputSelector.addItem(new CMenuForwarder(
InputSelector.addItem(new CMenuForwarder( LOCALE_AUDIOPLAYER_ADD_SC, g_settings.shoutcast_enabled, NULL, InetRadioInputChanger,
LOCALE_AUDIOPLAYER_ADD_SC, true, NULL, InetRadioInputChanger,
cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count); cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count);
}
//InputSelector.addItem(GenericMenuSeparator); //InputSelector.addItem(GenericMenuSeparator);
hide(); hide();

1
src/neutrino.cpp
View File

@@ -803,6 +803,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.audioplayer_show_playlist = configfile.getInt32("audioplayer_show_playlist",1); g_settings.audioplayer_show_playlist = configfile.getInt32("audioplayer_show_playlist",1);
g_settings.audioplayer_enable_sc_metadata = configfile.getInt32("audioplayer_enable_sc_metadata",1); g_settings.audioplayer_enable_sc_metadata = configfile.getInt32("audioplayer_enable_sc_metadata",1);
g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id","XXXXXXXXXXXXXXXX"); g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id","XXXXXXXXXXXXXXXX");
g_settings.shoutcast_enabled = ((g_settings.shoutcast_dev_id != "XXXXXXXXXXXXXXXX") && !g_settings.shoutcast_dev_id.empty());
//Movie-Player //Movie-Player
g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF); g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF);

2
src/system/settings.h
View File

@@ -714,6 +714,8 @@ struct SNeutrinoSettings
int audioplayer_show_playlist; int audioplayer_show_playlist;
int audioplayer_enable_sc_metadata; int audioplayer_enable_sc_metadata;
std::string shoutcast_dev_id; std::string shoutcast_dev_id;
int shoutcast_enabled;
//Filebrowser //Filebrowser
int filebrowser_showrights; int filebrowser_showrights;
int filebrowser_sortmethod; int filebrowser_sortmethod;