diff --git a/data/locale/bayrisch.locale b/data/locale/bayrisch.locale old mode 100644 new mode 100755 index 8ea0cfe1d..69c192f7a --- a/data/locale/bayrisch.locale +++ b/data/locale/bayrisch.locale @@ -399,7 +399,6 @@ mainsettings.network Netzwerk mainsettings.recording Streamingserva mainsettings.savesettingsnow Eistellunga jetz speichan mainsettings.savesettingsnow_hint De Eistellunga wern jezt gespeichat,\noan Moment bitte... -mainsettings.streaming Movieplayer mainsettings.video Video menu.back Zruck messagebox.back Zruck diff --git a/data/locale/bosanski.locale b/data/locale/bosanski.locale old mode 100644 new mode 100755 index f4dbae3bd..70f23c03f --- a/data/locale/bosanski.locale +++ b/data/locale/bosanski.locale @@ -404,7 +404,6 @@ mainsettings.recording snimanje mainsettings.savesettingsnow namješćenje sada memorisati mainsettings.savesettingsnow_hint memoriše se namješćenje,\nčekajte molim ... mainsettings.scan namjestiti traženja kanala -mainsettings.streaming promatrač filmova mainsettings.video video menu.back nazad messagebox.back nazad diff --git a/data/locale/ch-baslerdeutsch.locale b/data/locale/ch-baslerdeutsch.locale old mode 100644 new mode 100755 index 9bc52c085..6f38e4d54 --- a/data/locale/ch-baslerdeutsch.locale +++ b/data/locale/ch-baslerdeutsch.locale @@ -404,7 +404,6 @@ mainsettings.recording Sdreamingsörfer mainsettings.savesettingsnow Iischdellige jetz speichere mainsettings.savesettingsnow_hint Iistellige wärde jetz g'speichered,\ne'Moment warde... mainsettings.scan Iischdellige Kanalsürch -mainsettings.streaming Movieplayer mainsettings.video Video menu.back z'ruck messagebox.back z'ruck diff --git a/data/locale/ch-berndeutsch.locale b/data/locale/ch-berndeutsch.locale old mode 100644 new mode 100755 index 9e5b26f97..c44c3ed1c --- a/data/locale/ch-berndeutsch.locale +++ b/data/locale/ch-berndeutsch.locale @@ -479,7 +479,6 @@ mainsettings.network Netzwärk mainsettings.recording Ufnahm mainsettings.savesettingsnow Ischtöuige jetzt schpichere mainsettings.savesettingsnow_hint Ischtöuige wärde jetzt gschpicheret,\nbitte wartä... -mainsettings.streaming Movieplayer mainsettings.video Video menu.back Zrugg messagebox.back Zrugg diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale old mode 100644 new mode 100755 index 392e3f9b0..952f80eeb --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -699,7 +699,6 @@ mainsettings.osd OSD mainsettings.recording Aufnahme mainsettings.savesettingsnow Einstellungen jetzt speichern mainsettings.savesettingsnow_hint Einstellungen werden jetzt gespeichert,\nbitte warten... -mainsettings.streaming Movieplayer mainsettings.timezone Zeitzone mainsettings.video Video menu.back Zurück diff --git a/data/locale/dutch.locale b/data/locale/dutch.locale old mode 100644 new mode 100755 index e8faa11e9..12d73e9d6 --- a/data/locale/dutch.locale +++ b/data/locale/dutch.locale @@ -511,7 +511,6 @@ mainsettings.osd OSD instellingen mainsettings.recording Opnemen mainsettings.savesettingsnow sla instellingen nu op mainsettings.savesettingsnow_hint Sla instellingen op,\nwacht aub... -mainsettings.streaming Filmspeler mainsettings.timezone Tijdzone mainsettings.video Video menu.back terug diff --git a/data/locale/english.locale b/data/locale/english.locale old mode 100644 new mode 100755 index 75da6fe1c..699755bf6 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -537,7 +537,6 @@ mainsettings.network Network mainsettings.recording Recording mainsettings.savesettingsnow Save settings now mainsettings.savesettingsnow_hint Saving settings,\nplease wait... -mainsettings.streaming Movieplayer mainsettings.video Video menu.back Back menu.cancel Cancel diff --git a/data/locale/francais.locale b/data/locale/francais.locale old mode 100644 new mode 100755 index 4e10ecbad..a2d86ac85 --- a/data/locale/francais.locale +++ b/data/locale/francais.locale @@ -471,7 +471,6 @@ mainsettings.network Réseau mainsettings.recording Enregistrement mainsettings.savesettingsnow Sauvegarder réglage maintenant mainsettings.savesettingsnow_hint Sauvegarde de réglage,\nPatientez SVP... -mainsettings.streaming Lecteur vidéo mainsettings.video Vidéo menu.back Retour messagebox.back Retour diff --git a/data/locale/french.locale b/data/locale/french.locale old mode 100644 new mode 100755 index 013108796..243847855 --- a/data/locale/french.locale +++ b/data/locale/french.locale @@ -457,7 +457,6 @@ mainsettings.network Réseau mainsettings.recording Enregistrement mainsettings.savesettingsnow Sauvegarder réglage maintenant mainsettings.savesettingsnow_hint Sauvegarde de réglage,\nPatientez SVP... -mainsettings.streaming Lecteur vidéo mainsettings.video Vidéo menu.back Retour messagebox.back Retour diff --git a/data/locale/hungarian.locale b/data/locale/hungarian.locale old mode 100644 new mode 100755 index 8c4ab8666..ef50f52f0 --- a/data/locale/hungarian.locale +++ b/data/locale/hungarian.locale @@ -454,7 +454,6 @@ mainsettings.network Hálózat mainsettings.recording Felvétel mainsettings.savesettingsnow Beállítások mentése mainsettings.savesettingsnow_hint Mentés folyamatban,\nkérem várjon... -mainsettings.streaming Filmek mainsettings.video TV beállítások menu.back Vissza messagebox.back Vissza diff --git a/data/locale/italiano.locale b/data/locale/italiano.locale old mode 100644 new mode 100755 index 6a3e09f08..baf6d2fe1 --- a/data/locale/italiano.locale +++ b/data/locale/italiano.locale @@ -473,7 +473,6 @@ mainsettings.network Network mainsettings.recording Registrazione mainsettings.savesettingsnow salva impostazioni mainsettings.savesettingsnow_hint Salvataggio impostazioni,\nattendere... -mainsettings.streaming Movieplayer mainsettings.video Video menu.back Indietro messagebox.back Indietro diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale old mode 100644 new mode 100755 index 42d915523..519daae7a --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -442,7 +442,6 @@ mainsettings.network Netwerk mainsettings.recording Opnemen mainsettings.savesettingsnow Bewaar de settings nu mainsettings.savesettingsnow_hint Even geduld, settings worden bewaard -mainsettings.streaming Filmspeler mainsettings.video Beeld menu.back Terug messagebox.back terug diff --git a/data/locale/polski.locale b/data/locale/polski.locale old mode 100644 new mode 100755 index b0a3ef3fd..7d5e91d41 --- a/data/locale/polski.locale +++ b/data/locale/polski.locale @@ -496,7 +496,6 @@ mainsettings.network Sieć mainsettings.recording Nagrywanie mainsettings.savesettingsnow Zapisz mainsettings.savesettingsnow_hint Trwa zapisywanie ustawień, proszę czekać... -mainsettings.streaming Odtwarzacz filmów mainsettings.video Obraz menu.back wstecz menu.next dalej (Menu aby wyjść) diff --git a/data/locale/portugues.locale b/data/locale/portugues.locale old mode 100644 new mode 100755 index 84b177252..3c7ee0d3d --- a/data/locale/portugues.locale +++ b/data/locale/portugues.locale @@ -457,7 +457,6 @@ mainsettings.network Rede mainsettings.recording Gravação mainsettings.savesettingsnow Guardar alterações agora mainsettings.savesettingsnow_hint A guardar alterações,\npor favor aguarde... -mainsettings.streaming Reprodutor de Vídeo mainsettings.video Video menu.back Voltar messagebox.back Atrás diff --git a/data/locale/russkij.locale b/data/locale/russkij.locale old mode 100644 new mode 100755 index b8cffdc68..7aeb0c2f2 --- a/data/locale/russkij.locale +++ b/data/locale/russkij.locale @@ -462,7 +462,6 @@ mainsettings.network Сеть mainsettings.recording Запись mainsettings.savesettingsnow сохранить изменения mainsettings.savesettingsnow_hint Сохранение сделанных изменений.\nвыполняется... -mainsettings.streaming Видеоплеер mainsettings.video Видео menu.back назад messagebox.back Назад diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale old mode 100644 new mode 100755 index 260954e1a..690cbfee2 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -529,7 +529,6 @@ mainsettings.network Sieť mainsettings.recording Nahrávanie mainsettings.savesettingsnow Uloženie nastavenia mainsettings.savesettingsnow_hint Zapisovanie nastavení,\nprosím čakaj... -mainsettings.streaming Tvorenie filmov mainsettings.video Obraz menu.back späť menu.next ďaľej (MENU ukončí) diff --git a/data/locale/suomi.locale b/data/locale/suomi.locale old mode 100644 new mode 100755 index 39a797918..c14537224 --- a/data/locale/suomi.locale +++ b/data/locale/suomi.locale @@ -504,7 +504,6 @@ mainsettings.network Verkko mainsettings.recording Tallennus mainsettings.savesettingsnow Tallenna asetukset mainsettings.savesettingsnow_hint Asetuksien tallennus,\nodota hetki... -mainsettings.streaming Mediasoitin mainsettings.video Kuva menu.back Palaa messagebox.back Palaa diff --git a/data/locale/svenska.locale b/data/locale/svenska.locale old mode 100644 new mode 100755 index 99883ea33..aa6c67b5a --- a/data/locale/svenska.locale +++ b/data/locale/svenska.locale @@ -504,7 +504,6 @@ mainsettings.network Nätverk mainsettings.recording Inspelning mainsettings.savesettingsnow spara inställningar nu mainsettings.savesettingsnow_hint Sparar inställningar,\nvänta... -mainsettings.streaming Filmspelare mainsettings.video Video menu.back tillbaka messagebox.back tillbaka diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 6c9d0f5c0..87c432a64 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -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(), '\\', '/'); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 571e29162..29abcb443 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -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(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index dea24546e..2c4254587 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -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); diff --git a/src/neutrino.h b/src/neutrino.h index 0c9c1d894..ccfe5578e 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -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 &); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index d3452f1f9..d00267e7b 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -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!""�$%&/()=?-:\\ "); - 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!""�$%&/()=?-:\\ "); - - 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() diff --git a/src/system/locals.h b/src/system/locals.h index 73309ebd2..666c650b8 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -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, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 2708e1bac..4103087d1 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -569,7 +569,6 @@ const char *locale_real_names[] = { "mainsettings.recording", "mainsettings.savesettingsnow", "mainsettings.savesettingsnow_hint", - "mainsettings.streaming", "mainsettings.video", "menu.back", "menu.cancel", diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 06940bc21..dcbd71ff4 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -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; diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index b26fc480a..141948354 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -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: diff --git a/src/system/settings.h b/src/system/settings.h index d03ead661..f7cad82da 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -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;