From f0147609d9774be4a230c2f0be414f4da0307850 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 10:31:25 +0200 Subject: [PATCH 1/8] buttons: use OFFSET defines Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/bf852064bcef5cbce388ba0ea78fbbe8a619a07f Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - buttons: use OFFSET defines --- src/gui/widget/buttons.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/widget/buttons.cpp b/src/gui/widget/buttons.cpp index e0095b45e..9c5a7995e 100644 --- a/src/gui/widget/buttons.cpp +++ b/src/gui/widget/buttons.cpp @@ -103,8 +103,8 @@ int paintButtons( const button_label_ext * const content, int w_footer = footerwidth; int h_footer = 0; - int w_space = 10; //minimal space between buttons - int h_space = 4; //minimal space between caption and/or icon and border + int w_space = OFFSET_INNER_MID; //minimal space between buttons + int h_space = OFFSET_INNER_SMALL; //minimal space between caption and/or icon and border int x_icon = x_footer + w_space; int x_caption = 0; @@ -312,8 +312,8 @@ int paintButtons( const int &x, int w_footer = footerwidth; int h_footer = 0; - int w_space = 10; //minimal space between buttons - int h_space = 4; //minimal space between caption and/or icon and border + int w_space = OFFSET_INNER_MID; //minimal space between buttons + int h_space = OFFSET_INNER_SMALL; //minimal space between caption and/or icon and border int x_icon = x_footer + w_space; int x_caption = 0; From 0a278faf0c21b0950b5fa4fefa7957a6b3764916 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:26:20 +0200 Subject: [PATCH 2/8] movieplayer: reduce timeout for bisectional jumps Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/a0918616dc84b70178a086fa4bc92164ac60f3ab Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - movieplayer: reduce timeout for bisectional jumps --- src/gui/movieplayer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 7f806bdaa..dde44218d 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1355,6 +1355,7 @@ void CMoviePlayerGui::PlayFileLoop(void) //NI - bisectional jumps int bisection_jump = 300; int bisection_loop = -1; + int bisection_loop_max = 5; while (playstate >= CMoviePlayerGui::PLAY) { @@ -1374,7 +1375,7 @@ void CMoviePlayerGui::PlayFileLoop(void) //NI - bisectional jumps if (bisection_loop > -1) bisection_loop++; - if (bisection_loop > 10) + if (bisection_loop > bisection_loop_max) bisection_loop = -1; if ((playstate >= CMoviePlayerGui::PLAY) && (timeshift != TSHIFT_MODE_OFF || (playstate != CMoviePlayerGui::PAUSE))) { @@ -1635,7 +1636,7 @@ void CMoviePlayerGui::PlayFileLoop(void) if (g_settings.movieplayer_bisection_jump) { - if ((lastmsg == CRCInput::RC_page_up || lastmsg == CRCInput::RC_page_down) && (bisection_loop > -1 && bisection_loop <= 10)) + if ((lastmsg == CRCInput::RC_page_up || lastmsg == CRCInput::RC_page_down) && (bisection_loop > -1 && bisection_loop <= bisection_loop_max)) bisection_jump /= 2; else bisection_jump = 300; From 4d2bab5fa04518ad2dd36b4df487c7f814e92c80 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:26:20 +0200 Subject: [PATCH 3/8] deutsch.locale: minor change Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e99b0188abc480204686df88f48a677fa2672911 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - deutsch.locale: minor change --- data/locale/deutsch.locale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 250e388da..0626d9b40 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1351,7 +1351,7 @@ menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus menu.hint_movie Wiedergabe von Filmen menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen) -menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des MovieBrowsers fest +menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des Moviebrowsers fest menu.hint_movieplayer_bisection_jump Für das Vor- und Zurückspringen mit Seite hoch/runter wird ein bisektionaler Modus verwendet menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255 From 53007ef0a958926390bc86cfeaa6a16ddc75d727 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:26:20 +0200 Subject: [PATCH 4/8] movieplayer: make bisection jump period configurable Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/69e5cb286caee0aa2592eb879817cd309e213b23 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - movieplayer: make bisection jump period configurable --- src/gui/keybind_setup.cpp | 7 ++++--- src/gui/movieplayer.cpp | 4 ++-- src/neutrino.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 4027eebe5..0926595c4 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -516,9 +516,10 @@ void CKeybindSetup::showKeyBindMovieplayerSetup(CMenuWidget *bindSettings_mplaye bindSettings_mplayer->addItem(GenericMenuSeparatorLine); //NI //NI - bisectional jumps - CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_MOVIEPLAYER_BISECTION_JUMP, &g_settings.movieplayer_bisection_jump, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_BISECTION_JUMP); - bindSettings_mplayer->addItem(mc); + CMenuOptionNumberChooser* nc = new CMenuOptionNumberChooser(LOCALE_MOVIEPLAYER_BISECTION_JUMP, &g_settings.movieplayer_bisection_jump, true, 0, 10, this, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); + nc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE)); + nc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_BISECTION_JUMP); + bindSettings_mplayer->addItem(nc); } void CKeybindSetup::showKeyBindMoviebrowserSetup(CMenuWidget *bindSettings_mbrowser) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index dde44218d..15611c12a 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1353,7 +1353,7 @@ void CMoviePlayerGui::PlayFileLoop(void) neutrino_msg_t lastmsg = 0; //NI //NI - bisectional jumps - int bisection_jump = 300; + int bisection_jump = g_settings.movieplayer_bisection_jump * 60; int bisection_loop = -1; int bisection_loop_max = 5; @@ -1639,7 +1639,7 @@ void CMoviePlayerGui::PlayFileLoop(void) if ((lastmsg == CRCInput::RC_page_up || lastmsg == CRCInput::RC_page_down) && (bisection_loop > -1 && bisection_loop <= bisection_loop_max)) bisection_jump /= 2; else - bisection_jump = 300; + bisection_jump = g_settings.movieplayer_bisection_jump * 60; bisection_loop = 0; jump = bisection_jump; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 702df0427..ad5f455bf 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -906,7 +906,7 @@ int CNeutrinoApp::loadSetup(const char * fname) //Movie-Player g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF); - g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 1); //NI + g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 5); //NI g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM"); //NI g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); g_settings.youtube_enabled = check_youtube_dev_id(); From aa49ad86ff14f9f1668ff2ff2fcf2425d33aca9c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:26:20 +0200 Subject: [PATCH 5/8] configure.ac: increase version to 3.40 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/cade9ead989c100fbd71d3616943bf80d2677774 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - configure.ac: increase version to 3.40 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index beb0a3b85..244e3bc9f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(NI-Neutrino,3.30.0) +AC_INIT(NI-Neutrino,3.40.0) AM_INIT_AUTOMAKE([1.0.1 nostdinc]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) From 994888144281c48f7c327bc8f0638334b87cf24d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:47:26 +0200 Subject: [PATCH 6/8] align existing g_settings.movieplayer_bisection_jump to new value Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/d657f993c40909984ab10c573985a8930e98ec32 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - align existing g_settings.movieplayer_bisection_jump to new value --- src/neutrino.cpp | 6 ++++++ version_pseudo.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ad5f455bf..c45aa540a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1143,6 +1143,12 @@ void CNeutrinoApp::upgradeSetup(const char * fname) configfile.deleteKey("screen_width"); configfile.deleteKey("screen_height"); } + //NI + if (g_settings.version_pseudo < "20170516150000") + { + if (g_settings.movieplayer_bisection_jump == 1) + g_settings.movieplayer_bisection_jump = 5; + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); diff --git a/version_pseudo.h b/version_pseudo.h index f72f31607..3cd859b22 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20170209181002" +#define NEUTRINO_VERSION_PSEUDO "20170516150000" From ce5eb71ba1b421cdec50a3896338153dea3bdaeb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:59:04 +0200 Subject: [PATCH 7/8] locale: clearify hints for bisection jumps Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/22d36d3e830f4d97257e992879a8af6155c22cf8 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - locale: clearify hints for bisection jumps --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 0626d9b40..b686e5dc5 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus menu.hint_movie Wiedergabe von Filmen menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen) menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des Moviebrowsers fest -menu.hint_movieplayer_bisection_jump Für das Vor- und Zurückspringen mit Seite hoch/runter wird ein bisektionaler Modus verwendet +menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus um mit Seite hoch/runter vor- bzw. zurückzuspringen. menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird 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 diff --git a/data/locale/english.locale b/data/locale/english.locale index f2848a9a0..eb15d259c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Initial TV/Radio channels menu.hint_movie Play movies menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes menu.hint_moviebrowser_setup Set selection and display options. -menu.hint_movieplayer_bisection_jump Use bisectional mode to jump forward/backward with page up/down +menu.hint_movieplayer_bisection_jump Start value for bisectional mode to jump forward/backward with page up/down. menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode 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 From 3f96fc3aa4417e9f39f4600c54dddcf69748baf9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 16:43:10 +0200 Subject: [PATCH 8/8] locale: more minor changes Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/af1e89e656dedb9a7168ebafd0894b5b2e055886 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - locale: more minor changes --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index b686e5dc5..8e1c8f0d6 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus menu.hint_movie Wiedergabe von Filmen menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen) menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des Moviebrowsers fest -menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus um mit Seite hoch/runter vor- bzw. zurückzuspringen. +menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus, um mit Seite hoch/runter vor- bzw. zurückzuspringen menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird 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 diff --git a/data/locale/english.locale b/data/locale/english.locale index eb15d259c..04f6b5eee 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Initial TV/Radio channels menu.hint_movie Play movies menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes 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_bisection_jump Start value for bisectional mode to jump forward/backward with page up/down menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode 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