diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index fe74c050e..ecc11b914 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1433,6 +1433,7 @@ menu.hint_moviebrowser_setup Auswahl- und Anzeigeoptionen einstellen. menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus, um mit Seite hoch/runter vor- bzw. zurückzuspringen menu.hint_movieplayer_display_playtime Zeigt während der Wiedergabe die Spielzeit anstatt des Fimtitels im VFD menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird +menu.hint_movieplayer_timeosd_while_searching Zeigt während des Spulens die aktuelle Spielzeit kurz auf dem OSD an menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255 menu.hint_net_dhcp Verwenden Sie einen DHCP-Server für die automatische Vergabe einer IP-Adresse im Netzwerk menu.hint_net_djmount Mountet UPnP-Geräte als Dateisystem unter /media/00upnp @@ -2111,6 +2112,7 @@ movieplayer.help_button_pause Pause / Weiter movieplayer.help_button_stop Stopp movieplayer.plugin Movieplayer-Plugin movieplayer.starting Wiedergabe starten ... +movieplayer.timeosd_while_searching Zeige Spielzeit während des Spulens movieplayer.titles Titel movieplayer.toomanybookmarks Sie haben bereits zu viele Lesezeichen angelegt.\nEs muß erst ein anderes gelöscht werden. movieplayer.tsplayback TS Abspielen diff --git a/data/locale/english.locale b/data/locale/english.locale index 0fdb7a723..9033b8768 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1433,6 +1433,7 @@ menu.hint_moviebrowser_setup Set selection and display options. menu.hint_movieplayer_bisection_jump Start value for bisectional mode to jump forward/backward with page up/down menu.hint_movieplayer_display_playtime While playback show playtime instead of movietitle on VFD menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode +menu.hint_movieplayer_timeosd_while_searching Shows playtime while searching for a short time on OSD menu.hint_net_broadcast Enter broadcast address\nif unsure, use IP address with last .255 menu.hint_net_dhcp Use DHCP server to auto-configure menu.hint_net_djmount Mount UPnP devices as filesystem\nunder /media/00upnp @@ -2111,6 +2112,7 @@ movieplayer.help_button_pause Pause / Continue movieplayer.help_button_stop Stop movieplayer.plugin Movieplayer plugin movieplayer.starting Starting playback ... +movieplayer.timeosd_while_searching Show playtime while searching movieplayer.titles Titles movieplayer.toomanybookmarks There are too many bookmarks.\nYou need to delete one of them first. movieplayer.tsplayback Play TS diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp index 477a15dce..a5931b942 100644 --- a/src/gui/mediaplayer_setup.cpp +++ b/src/gui/mediaplayer_setup.cpp @@ -134,6 +134,10 @@ int CMediaPlayerSetup::showMediaPlayerSetup() mc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_DISPLAY_PLAYTIME); mediaSetup->addItem(mc); + mc = new CMenuOptionChooser(LOCALE_MOVIEPLAYER_TIMEOSD_WHILE_SEARCHING, &g_settings.movieplayer_timeosd_while_searching, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_TIMEOSD_WHILE_SEARCHING); + mediaSetup->addItem(mc); + int res = mediaSetup->exec (NULL, ""); selected = mediaSetup->getSelected(); delete mediaSetup; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index ba36ee5de..b876a9046 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1586,7 +1586,7 @@ void CMoviePlayerGui::PlayFileLoop(void) if (playback->GetPosition(position, duration)) { FileTimeOSD->update(position, duration); - if (FileTimeOSD_tmp > -1 && !FileTimeOSD->IsVisible()) + if (FileTimeOSD_tmp > -1 && !FileTimeOSD->IsVisible() && g_settings.movieplayer_timeosd_while_searching) { FileTimeOSD->setMode(CTimeOSD::MODE_TMP); FileTimeOSD->show(position); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7a9a2deaa..6a770e5fe 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1002,6 +1002,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF); g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 5); //NI g_settings.movieplayer_display_playtime = configfile.getInt32("movieplayer_display_playtime", 0); + g_settings.movieplayer_timeosd_while_searching = configfile.getInt32("movieplayer_timeosd_while_searching", 1); //online services ///youtube @@ -1785,6 +1786,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "movieplayer_repeat_on", g_settings.movieplayer_repeat_on ); configfile.setInt32( "movieplayer_bisection_jump", g_settings.movieplayer_bisection_jump ); //NI configfile.setInt32( "movieplayer_display_playtime", g_settings.movieplayer_display_playtime ); + configfile.setInt32( "movieplayer_timeosd_while_searching", g_settings.movieplayer_timeosd_while_searching ); //online services #if ENABLE_YOUTUBE_KEY_MANAGE diff --git a/src/system/locals.h b/src/system/locals.h index 79953de4d..069c2298f 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1460,6 +1460,7 @@ typedef enum LOCALE_MENU_HINT_MOVIEPLAYER_BISECTION_JUMP, LOCALE_MENU_HINT_MOVIEPLAYER_DISPLAY_PLAYTIME, LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN, + LOCALE_MENU_HINT_MOVIEPLAYER_TIMEOSD_WHILE_SEARCHING, LOCALE_MENU_HINT_NET_BROADCAST, LOCALE_MENU_HINT_NET_DHCP, LOCALE_MENU_HINT_NET_DJMOUNT, @@ -2138,6 +2139,7 @@ typedef enum LOCALE_MOVIEPLAYER_HELP_BUTTON_STOP, LOCALE_MOVIEPLAYER_PLUGIN, LOCALE_MOVIEPLAYER_STARTING, + LOCALE_MOVIEPLAYER_TIMEOSD_WHILE_SEARCHING, LOCALE_MOVIEPLAYER_TITLES, LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS, LOCALE_MOVIEPLAYER_TSPLAYBACK, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 4c50389fb..1775187a0 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1460,6 +1460,7 @@ const char * locale_real_names[] = "menu.hint_movieplayer_bisection_jump", "menu.hint_movieplayer_display_playtime", "menu.hint_movieplayer_plugin", + "menu.hint_movieplayer_timeosd_while_searching", "menu.hint_net_broadcast", "menu.hint_net_dhcp", "menu.hint_net_djmount", @@ -2138,6 +2139,7 @@ const char * locale_real_names[] = "movieplayer.help_button_stop", "movieplayer.plugin", "movieplayer.starting", + "movieplayer.timeosd_while_searching", "movieplayer.titles", "movieplayer.toomanybookmarks", "movieplayer.tsplayback", diff --git a/src/system/settings.h b/src/system/settings.h index 6dcee2ad9..0dcc88895 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -829,6 +829,7 @@ struct SNeutrinoSettings int movieplayer_repeat_on; int movieplayer_bisection_jump; //NI int movieplayer_display_playtime; + int movieplayer_timeosd_while_searching; //online services std::string youtube_dev_id;