Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: 9fd268cc31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
This commit is contained in:
vanhofen
2017-11-03 11:09:51 +01:00

View File

@@ -427,7 +427,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);
@@ -769,7 +769,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;