From 1a913ff0fdcafbadbb14f8460d39460491e29d46 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 3 Nov 2017 09:53:50 +0100 Subject: [PATCH 1/3] src/gui/movieplayer.cpp fix page up/down jump and stop play after merge Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8746340a8766d8acdbe2e8965ba58ce0d6107df9 Author: Jacek Jendrzej Date: 2017-11-03 (Fri, 03 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index f473aa429..3b10d4379 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1735,7 +1735,8 @@ void CMoviePlayerGui::PlayFileLoop(void) g_Plugins->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ()); #if 0 } else if ((msg == (neutrino_msg_t) g_settings.mpkey_stop) || msg == CRCInput::RC_home) { -#endif } else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { +#endif + } else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { playstate = CMoviePlayerGui::STOPPED; keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP; ClearQueue(); @@ -1973,12 +1974,13 @@ void CMoviePlayerGui::PlayFileLoop(void) SetPosition(duration/2, true); } else if (msg == CRCInput::RC_8) { // goto end SetPosition(duration - 60 * 1000, true); -#if 0 +#if HAVE_COOL_HARDWARE } else if (msg == CRCInput::RC_page_up) { SetPosition(10 * 1000); } else if (msg == CRCInput::RC_page_down) { SetPosition(-10 * 1000); - +#endif +#if 0 //- bisectional jumps } else if (msg == CRCInput::RC_page_up || msg == CRCInput::RC_page_down) { int direction = (msg == CRCInput::RC_page_up) ? 1 : -1; From 632c42f78f50f3e6faf63047b8786a03eccdd58f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 3 Nov 2017 10:02:18 +0100 Subject: [PATCH 2/3] src/gui/movieplayer.cpp reEnable YT Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9ac5258ac0a3c25ff152153f52b0e89f4f78d01c Author: Jacek Jendrzej Date: 2017-11-03 (Fri, 03 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 3b10d4379..2562147f7 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -397,7 +397,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey) moviebrowser->setMode(MB_SHOW_RECORDS); wakeup_hdd(g_settings.network_nfs_recordingdir.c_str()); } -#if 0 +#if HAVE_COOL_HARDWARE else if (actionKey == "ytplayback") { isMovieBrowser = true; moviebrowser->setMode(MB_SHOW_YT); @@ -727,7 +727,7 @@ bool CMoviePlayerGui::prepareFile(CFile *file) printf("CMoviePlayerGui::prepareFile: file %s start %d\n", file_name.c_str(), startposition); } } -#if 0 +#if HAVE_COOL_HARDWARE if (isYT) { file_name = file->Url; is_file_player = true; From 5b9b81f40dd53d410f4ac7dba5ddf1e7c5b60a3e Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 3 Nov 2017 10:22:11 +0100 Subject: [PATCH 3/3] remove unused Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/39440333e8f4e012ea0447a3caf1f3f57ccf747d Author: Jacek Jendrzej Date: 2017-11-03 (Fri, 03 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d906874fd..5d4a80f5d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -313,22 +313,6 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = { /************************************************************************************** * CNeutrinoApp - loadSetup, load the application-settings * **************************************************************************************/ -#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE -#define DEFAULT_X_START_SD 32 -#define DEFAULT_Y_START_SD 26 -#define DEFAULT_X_END_SD 694 -#define DEFAULT_Y_END_SD 570 -#else -#define DEFAULT_X_START_SD 60 -#define DEFAULT_Y_START_SD 20 -#define DEFAULT_X_END_SD 1220 -#define DEFAULT_Y_END_SD 560 -#endif - -#define DEFAULT_X_START_HD 40 //5 -#define DEFAULT_Y_START_HD 25 //5 -#define DEFAULT_X_END_HD 1235 //1275 -#define DEFAULT_Y_END_HD 690 //715 std::string ttx_font_file = "";