mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 468022c3cc
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-18 (Thu, 18 May 2017)
This commit is contained in:
gixxpunk
2017-05-18 08:40:58 +02:00
parent 551807d7b1 3f96fc3aa4
commit 5f0192b3af
8 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -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])

4
data/locale/deutsch.locale
View File

@@ -1351,8 +1351,8 @@ 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_movieplayer_bisection_jump Für das Vor- und Zurückspringen mit Seite hoch/runter wird ein bisektionaler Modus verwendet
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_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

2
data/locale/english.locale
View File

@@ -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

7
src/gui/keybind_setup.cpp
View File

@@ -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)

9
src/gui/movieplayer.cpp
View File

@@ -1353,8 +1353,9 @@ 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;
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,10 +1636,10 @@ 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;
bisection_jump = g_settings.movieplayer_bisection_jump * 60;
bisection_loop = 0;
jump = bisection_jump;

8
src/gui/widget/buttons.cpp
View File

@@ -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;

8
src/neutrino.cpp
View File

@@ -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();
@@ -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);

2
version_pseudo.h
View File

@@ -1 +1 @@
#define NEUTRINO_VERSION_PSEUDO "20170209181002"
#define NEUTRINO_VERSION_PSEUDO "20170516150000"