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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 255f1a0cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
This commit is contained in:
vanhofen
2017-11-03 11:09:28 +01:00
parent 28413bca7c 5c5e1b0603
commit d38b57d43e
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -400,7 +400,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
moviebrowser->setMode(MB_SHOW_RECORDS); moviebrowser->setMode(MB_SHOW_RECORDS);
//wakeup_hdd(g_settings.network_nfs_recordingdir.c_str()); //wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
} }
#if 0 #if HAVE_COOL_HARDWARE
else if (actionKey == "ytplayback") { else if (actionKey == "ytplayback") {
isMovieBrowser = true; isMovieBrowser = true;
moviebrowser->setMode(MB_SHOW_YT); moviebrowser->setMode(MB_SHOW_YT);
@@ -732,7 +732,7 @@ bool CMoviePlayerGui::prepareFile(CFile *file)
printf("CMoviePlayerGui::prepareFile: file %s start %d\n", file_name.c_str(), startposition); printf("CMoviePlayerGui::prepareFile: file %s start %d\n", file_name.c_str(), startposition);
} }
} }
#if 0 #if HAVE_COOL_HARDWARE
if (isYT) { if (isYT) {
file_name = file->Url; file_name = file->Url;
is_file_player = true; is_file_player = true;

16
src/neutrino.cpp
View File

@@ -326,22 +326,6 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
/************************************************************************************** /**************************************************************************************
* CNeutrinoApp - loadSetup, load the application-settings * * 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 = ""; std::string ttx_font_file = "";