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

*neutrino clean up: Streaming settings removed

Browse Source 
- from all locales,
	locales.h,
	locales_intern.h
- usage of settings in
	filebrowser.cpp,
	movieplayer.cpp,
	neutrino.cpp,
	neutrino.h,
	neutrino_menue.cpp,
	setting_helpers.cpp,
	setting_helpers.h,
	settings.h
There is no reason to keep dead features,
but if we need streaming settings sometime in future again,
then we can dig out it.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1076 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-01-28 08:44:46 +00:00
parent 0e926fae30
commit bf20bb63b8
28 changed files with 1 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/filebrowser.cpp
View File

@@ -837,10 +837,7 @@ bool CFileBrowser::exec(const char * const dirname)
m_baseurl = base;
} else
#endif
{
m_baseurl = "http://" + g_settings.streaming_server_ip + ':'
+ g_settings.streaming_server_port + "/requests/browse.xml?dir=";
}
name = dirname;
std::replace(name.begin(), name.end(), '\\', '/');

8
src/gui/movieplayer.cpp
View File

@@ -178,9 +178,6 @@ void CMoviePlayerGui::Init(void)
Path_local = g_settings.network_nfs_moviedir;
else
Path_local = "/";
Path_vlc = "vlc://";
Path_vlc += g_settings.streaming_server_startdir;
Path_vlc_settings = g_settings.streaming_server_startdir;
if (g_settings.filebrowser_denydirectoryleave)
filebrowser = new CFileBrowser(Path_local.c_str());
@@ -277,11 +274,6 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
{
printf("[movieplayer] actionKey=%s\n", actionKey.c_str());
if (Path_vlc_settings != g_settings.streaming_server_startdir) {
Path_vlc = "vlc://";
Path_vlc += g_settings.streaming_server_startdir;
Path_vlc_settings = g_settings.streaming_server_startdir;
}
bookmarkmanager = new CBookmarkManager();
dvbsub_pause();

29
src/neutrino.cpp
View File

@@ -653,19 +653,6 @@ printf("***************************** rec dir %s timeshift dir %s\n", g_settings
g_settings.recording_epg_for_filename = configfile.getBool("recording_epg_for_filename" , true);
g_settings.recording_save_in_channeldir = configfile.getBool("recording_save_in_channeldir" , false);
g_settings.recording_in_spts_mode = true;
//streaming (server)
g_settings.streaming_type = configfile.getInt32( "streaming_type", 0 );
g_settings.streaming_server_ip = configfile.getString("streaming_server_ip", "10.10.10.10");
strcpy( g_settings.streaming_server_port, configfile.getString( "streaming_server_port", "8080").c_str() );
strcpy( g_settings.streaming_server_cddrive, configfile.getString("streaming_server_cddrive", "D:").c_str() );
strcpy( g_settings.streaming_videorate, configfile.getString("streaming_videorate", "1000").c_str() );
strcpy( g_settings.streaming_audiorate, configfile.getString("streaming_audiorate", "192").c_str() );
strcpy( g_settings.streaming_server_startdir, configfile.getString("streaming_server_startdir", "C:/Movies").c_str() );
g_settings.streaming_transcode_audio = configfile.getInt32( "streaming_transcode_audio", 0 );
g_settings.streaming_force_transcode_video = configfile.getInt32( "streaming_force_transcode_video", 0 );
g_settings.streaming_transcode_video_codec = configfile.getInt32( "streaming_transcode_video_codec", 0 );
g_settings.streaming_force_avi_rawaudio = configfile.getInt32( "streaming_force_avi_rawaudio", 0 );
g_settings.streaming_resolution = configfile.getInt32( "streaming_resolution", 0 );
// default plugin for movieplayer
g_settings.movieplayer_plugin = configfile.getString( "movieplayer_plugin", "Teletext" );
@@ -1176,26 +1163,11 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool ("recording_save_in_channeldir" , g_settings.recording_save_in_channeldir );
configfile.setBool ("recording_in_spts_mode" , g_settings.recording_in_spts_mode );
//streaming
configfile.setInt32 ( "streaming_type", g_settings.streaming_type );
configfile.setString( "streaming_server_ip", g_settings.streaming_server_ip );
configfile.setString( "streaming_server_port", g_settings.streaming_server_port );
configfile.setString( "streaming_server_cddrive", g_settings.streaming_server_cddrive );
configfile.setString ( "streaming_videorate", g_settings.streaming_videorate );
configfile.setString ( "streaming_audiorate", g_settings.streaming_audiorate );
configfile.setString( "streaming_server_startdir", g_settings.streaming_server_startdir );
configfile.setInt32 ( "streaming_transcode_audio", g_settings.streaming_transcode_audio );
configfile.setInt32 ( "streaming_force_avi_rawaudio", g_settings.streaming_force_avi_rawaudio );
configfile.setInt32 ( "streaming_force_transcode_video", g_settings.streaming_force_transcode_video );
configfile.setInt32 ( "streaming_transcode_video_codec", g_settings.streaming_transcode_video_codec );
configfile.setInt32 ( "streaming_resolution", g_settings.streaming_resolution );
// default plugin for movieplayer
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);
configfile.setInt32( "rf_soundenable", g_settings.rf_soundenable);
@@ -2326,7 +2298,6 @@ int CNeutrinoApp::run(int argc, char **argv)
delete hdd;
InitZapper();
InitStreamingSettings(streamingSettings);
AudioMute( current_muted, true);

1
src/neutrino.h
View File

@@ -171,7 +171,6 @@ private:
void RealRun(CMenuWidget &mainSettings);
void InitZapper();
void InitServiceSettings(CMenuWidget &, CMenuWidget &);
void InitStreamingSettings(CMenuWidget &streamingSettings);
void InitScreenSettings(CMenuWidget &);
void InitAudioplPicSettings(CMenuWidget &);
void InitMiscSettings(CMenuWidget &);

77
src/neutrino_menue.cpp
View File

@@ -266,7 +266,6 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
networksetup = new CNetworkSetup();
mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_NETWORK , true, NULL, networksetup , NULL, CRCInput::convertDigitToKey(sett_count++)));
mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_RECORDING , true, NULL, new CRecordSetup(), NULL, CRCInput::convertDigitToKey(sett_count++)));
//mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_STREAMING , true, NULL, &streamingSettings, NULL, CRCInput::convertDigitToKey(sett_count++)));
mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LANGUAGE , true, NULL, new COsdLangSetup(), NULL, CRCInput::convertDigitToKey(sett_count++)));
mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_OSD , true, NULL, new COsdSetup() , NULL, CRCInput::convertDigitToKey(sett_count++)));
@@ -1166,82 +1165,6 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings)
}
#define STREAMINGMENU_STREAMING_TRANSCODE_VIDEO_CODEC_OPTION_COUNT 2
const CMenuOptionChooser::keyval STREAMINGMENU_STREAMING_TRANSCODE_VIDEO_CODEC_OPTIONS[STREAMINGMENU_STREAMING_TRANSCODE_VIDEO_CODEC_OPTION_COUNT] =
{
{ 0, LOCALE_STREAMINGMENU_MPEG1 },
{ 1, LOCALE_STREAMINGMENU_MPEG2 }
};
#define STREAMINGMENU_STREAMING_RESOLUTION_OPTION_COUNT 4
const CMenuOptionChooser::keyval STREAMINGMENU_STREAMING_RESOLUTION_OPTIONS[STREAMINGMENU_STREAMING_RESOLUTION_OPTION_COUNT] =
{
{ 0, LOCALE_STREAMINGMENU_352X288 },
{ 1, LOCALE_STREAMINGMENU_352X576 },
{ 2, LOCALE_STREAMINGMENU_480X576 },
{ 3, LOCALE_STREAMINGMENU_704X576 }
};
#define STREAMINGMENU_STREAMING_TYPE_OPTION_COUNT 2
const CMenuOptionChooser::keyval STREAMINGMENU_STREAMING_TYPE_OPTIONS[STREAMINGMENU_STREAMING_TYPE_OPTION_COUNT] =
{
{ 0, LOCALE_STREAMINGMENU_OFF },
{ 1, LOCALE_STREAMINGMENU_ON }
};
void CNeutrinoApp::InitStreamingSettings(CMenuWidget &streamingSettings)
{
streamingSettings.addIntroItems();
CIPInput * streamingSettings_server_ip = new CIPInput(LOCALE_STREAMINGMENU_SERVER_IP, g_settings.streaming_server_ip, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
CStringInput * streamingSettings_server_port = new CStringInput(LOCALE_STREAMINGMENU_SERVER_PORT, g_settings.streaming_server_port, 6, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
CStringInputSMS * cddriveInput = new CStringInputSMS(LOCALE_STREAMINGMENU_STREAMING_SERVER_CDDRIVE, g_settings.streaming_server_cddrive, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""<EFBFBD>$%&/()=?-:\\ ");
CStringInput * streamingSettings_videorate = new CStringInput(LOCALE_STREAMINGMENU_STREAMING_VIDEORATE, g_settings.streaming_videorate, 5, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
CStringInput * streamingSettings_audiorate = new CStringInput(LOCALE_STREAMINGMENU_STREAMING_AUDIORATE, g_settings.streaming_audiorate, 5, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2,"0123456789 ");
CStringInputSMS * startdirInput = new CStringInputSMS(LOCALE_STREAMINGMENU_STREAMING_SERVER_STARTDIR, g_settings.streaming_server_startdir, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE,"abcdefghijklmnopqrstuvwxyz0123456789!""<EFBFBD>$%&/()=?-:\\ ");
CMenuForwarder* mf1 = new CMenuForwarder(LOCALE_STREAMINGMENU_SERVER_IP , (g_settings.streaming_type==1), g_settings.streaming_server_ip , streamingSettings_server_ip);
CMenuForwarder* mf2 = new CMenuForwarder(LOCALE_STREAMINGMENU_SERVER_PORT , (g_settings.streaming_type==1), g_settings.streaming_server_port , streamingSettings_server_port);
CMenuForwarder* mf3 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SERVER_CDDRIVE , (g_settings.streaming_type==1), g_settings.streaming_server_cddrive , cddriveInput);
CMenuForwarder* mf4 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_VIDEORATE , (g_settings.streaming_type==1), g_settings.streaming_videorate , streamingSettings_videorate);
CMenuForwarder* mf5 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_AUDIORATE , (g_settings.streaming_type==1), g_settings.streaming_audiorate , streamingSettings_audiorate);
CMenuForwarder* mf6 = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SERVER_STARTDIR, (g_settings.streaming_type==1), g_settings.streaming_server_startdir, startdirInput);
CMenuForwarder* mf7 = new CMenuForwarder(LOCALE_MOVIEPLAYER_DEFDIR, true, g_settings.network_nfs_moviedir,this,"moviedir");
CMenuForwarder* mf8 = new CMenuForwarder(LOCALE_MOVIEPLAYER_DEFPLUGIN, true, g_settings.movieplayer_plugin,this,"movieplugin");
CMenuOptionChooser* oj1 = new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_TRANSCODE_AUDIO , &g_settings.streaming_transcode_audio , MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
CMenuOptionChooser* oj2 = new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_FORCE_AVI_RAWAUDIO , &g_settings.streaming_force_avi_rawaudio , MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
CMenuOptionChooser* oj3 = new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_FORCE_TRANSCODE_VIDEO, &g_settings.streaming_force_transcode_video, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true);
// not yet supported by VLC
CMenuOptionChooser* oj4 = new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_TRANSCODE_VIDEO_CODEC, &g_settings.streaming_transcode_video_codec, STREAMINGMENU_STREAMING_TRANSCODE_VIDEO_CODEC_OPTIONS, STREAMINGMENU_STREAMING_TRANSCODE_VIDEO_CODEC_OPTION_COUNT, true);
CMenuOptionChooser* oj5 = new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_RESOLUTION , &g_settings.streaming_resolution , STREAMINGMENU_STREAMING_RESOLUTION_OPTIONS, STREAMINGMENU_STREAMING_RESOLUTION_OPTION_COUNT, true);
CStreamingNotifier *StreamingNotifier = new CStreamingNotifier(mf1,mf2,mf3,mf4,mf5,mf6,oj1,oj2,oj3,oj4,oj5);
streamingSettings.addItem(new CMenuOptionChooser(LOCALE_STREAMINGMENU_STREAMING_TYPE , &g_settings.streaming_type , STREAMINGMENU_STREAMING_TYPE_OPTIONS, STREAMINGMENU_STREAMING_TYPE_OPTION_COUNT, true, StreamingNotifier));
streamingSettings.addItem(GenericMenuSeparatorLine);
streamingSettings.addItem( mf1); //Server IP
streamingSettings.addItem( mf2); //Server Port
streamingSettings.addItem( mf3); //CD-Drive
streamingSettings.addItem( mf6); //Startdir
streamingSettings.addItem(GenericMenuSeparatorLine);
streamingSettings.addItem( mf4); //Video-Rate
streamingSettings.addItem( oj3);
streamingSettings.addItem( oj4);
streamingSettings.addItem( oj5);
streamingSettings.addItem(GenericMenuSeparatorLine);
streamingSettings.addItem( mf5); //Audiorate
streamingSettings.addItem( oj1);
streamingSettings.addItem( oj2);
streamingSettings.addItem(GenericMenuSeparatorLine);
streamingSettings.addItem( mf7); //default dir
streamingSettings.addItem( mf8); //default movieplugin
}
// USERMENU
// leave this functions, somebody might want to use it in the future again
void CNeutrinoApp::SelectNVOD()

1
src/system/locals.h
View File

@@ -569,7 +569,6 @@ typedef enum {
LOCALE_MAINSETTINGS_RECORDING,
LOCALE_MAINSETTINGS_SAVESETTINGSNOW,
LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT,
LOCALE_MAINSETTINGS_STREAMING,
LOCALE_MAINSETTINGS_VIDEO,
LOCALE_MENU_BACK,
LOCALE_MENU_CANCEL,

1
src/system/locals_intern.h
View File

@@ -569,7 +569,6 @@ const char *locale_real_names[] = {
"mainsettings.recording",
"mainsettings.savesettingsnow",
"mainsettings.savesettingsnow_hint",
"mainsettings.streaming",
"mainsettings.video",
"menu.back",
"menu.cancel",

30
src/system/setting_helpers.cpp
View File

@@ -241,36 +241,6 @@ bool CDHCPNotifier::changeNotify(const neutrino_locale_t, void * data)
return true;
}
CStreamingNotifier::CStreamingNotifier( CMenuItem* i1, CMenuItem* i2, CMenuItem* i3, CMenuItem* i4, CMenuItem* i5, CMenuItem* i6, CMenuItem* i7, CMenuItem* i8, CMenuItem* i9, CMenuItem* i10, CMenuItem* i11)
{
toDisable[0]=i1;
toDisable[1]=i2;
toDisable[2]=i3;
toDisable[3]=i4;
toDisable[4]=i5;
toDisable[5]=i6;
toDisable[6]=i7;
toDisable[7]=i8;
toDisable[8]=i9;
toDisable[9]=i10;
toDisable[10]=i11;
}
bool CStreamingNotifier::changeNotify(const neutrino_locale_t, void *)
{
if(g_settings.streaming_type==0)
{
for (int i=0; i<=10; i++)
toDisable[i]->setActive(false);
}
else if(g_settings.streaming_type==1)
{
for (int i=0; i<=10; i++)
toDisable[i]->setActive(true);
}
return true;
}
COnOffNotifier::COnOffNotifier( CMenuItem* a1,CMenuItem* a2,CMenuItem* a3,CMenuItem* a4,CMenuItem* a5)
{
number = 0;

8
src/system/setting_helpers.h
View File

@@ -88,14 +88,6 @@ class CDHCPNotifier : public CChangeObserver
bool changeNotify(const neutrino_locale_t, void * data);
};
class CStreamingNotifier : public CChangeObserver
{
private:
CMenuItem* toDisable[11];
public:
CStreamingNotifier( CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*);
bool changeNotify(const neutrino_locale_t, void *);
};
class COnOffNotifier : public CChangeObserver
{
private:

14
src/system/settings.h
View File

@@ -237,20 +237,6 @@ struct SNeutrinoSettings
int recording_in_spts_mode;
int recording_zap_on_announce;
//streaming
int streaming_type;
std::string streaming_server_ip;
char streaming_server_port[10];
char streaming_server_cddrive[21];
char streaming_videorate[6];
char streaming_audiorate[6];
char streaming_server_startdir[40];
int streaming_transcode_audio;
int streaming_force_avi_rawaudio;
int streaming_force_transcode_video;
int streaming_transcode_video_codec;
int streaming_resolution;
int filesystem_is_utf8;
// default plugin for ts-movieplayer (red button)
std::string movieplayer_plugin;