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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c165d752d7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-29 18:12:43 +02:00
parent e24664e0ea c4e08feb16
commit d180f34ec9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -1413,7 +1413,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
} else if (msg == (neutrino_msg_t) g_settings.key_quickzap_up || msg == (neutrino_msg_t) g_settings.key_quickzap_down) { } else if (msg == (neutrino_msg_t) g_settings.key_quickzap_up || msg == (neutrino_msg_t) g_settings.key_quickzap_down) {
quickZap(msg); quickZap(msg);
} else if (fromInfoviewer && msg == CRCInput::RC_ok && !filelist.empty()) { } else if (fromInfoviewer && msg == CRCInput::RC_ok && !filelist.empty()) {
printf("CMoviePlayerGui::%s: start playlist movie #%ld\n", __func__, vzap_it - filelist.begin()); printf("CMoviePlayerGui::%s: start playlist movie #%d\n", __func__, (int)(vzap_it - filelist.begin()));
fromInfoviewer = false; fromInfoviewer = false;
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
filelist_it = vzap_it; filelist_it = vzap_it;
@@ -1690,7 +1690,7 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
void CMoviePlayerGui::set_vzap_it(bool up) void CMoviePlayerGui::set_vzap_it(bool up)
{ {
//printf("CMoviePlayerGui::%s: vzap_it: %d count %s\n", __func__, vzap_it - filelist.begin(), up ? "up" : "down"); //printf("CMoviePlayerGui::%s: vzap_it: %d count %s\n", __func__, (int)(vzap_it - filelist.begin()), up ? "up" : "down");
if (up) if (up)
{ {
if (vzap_it < (filelist.end() - 1)) if (vzap_it < (filelist.end() - 1))
@@ -1701,7 +1701,7 @@ void CMoviePlayerGui::set_vzap_it(bool up)
if (vzap_it > filelist.begin()) if (vzap_it > filelist.begin())
--vzap_it; --vzap_it;
} }
//printf("CMoviePlayerGui::%s: vzap_it: %d\n", __func__, vzap_it - filelist.begin()); //printf("CMoviePlayerGui::%s: vzap_it: %d\n", __func__, (int)(vzap_it - filelist.begin()));
} }
void CMoviePlayerGui::callInfoViewer(bool init_vzap_it) void CMoviePlayerGui::callInfoViewer(bool init_vzap_it)