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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2dfa1c952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-30 00:12:45 +02:00
parent 286fc1df97 2f7743c901
commit 776e5802d4
5 changed files with 101 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -1445,7 +1445,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) {
quickZap(msg);
} 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;
playstate = CMoviePlayerGui::STOPPED;
filelist_it = vzap_it;
@@ -1722,7 +1722,7 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
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 (vzap_it < (filelist.end() - 1))
@@ -1733,7 +1733,7 @@ void CMoviePlayerGui::set_vzap_it(bool up)
if (vzap_it > filelist.begin())
--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)