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

movieplayer: fix invalid casts for debug messages

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 334eb8eb6d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-12-25 18:18:56 +01:00
parent 0907440240
commit 02002cf5f6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/movieplayer.cpp
View File

@@ -664,7 +664,7 @@ bool CMoviePlayerGui::PlayBackgroundStart(const std::string &file, const std::st
fprintf(stderr, "ERROR: pthread_create(%s)\n", __func__); fprintf(stderr, "ERROR: pthread_create(%s)\n", __func__);
} else } else
PlayFileEnd(); PlayFileEnd();
printf("%s: this %x started: res %d thread %x\n", __func__, (int) this, res, (int) CMoviePlayerGui::bgPlayThread);fflush(stdout); printf("%s: this %p started: res %d thread %p\n", __func__, this, res, CMoviePlayerGui::bgPlayThread);fflush(stdout);
return res; return res;
} }
@@ -675,7 +675,7 @@ void CMoviePlayerGui::stopPlayBack(void)
repeat_mode = REPEAT_OFF; repeat_mode = REPEAT_OFF;
if (bgThread) { if (bgThread) {
printf("%s: this %x join background thread %x\n", __func__, (int) this, (int) CMoviePlayerGui::bgPlayThread);fflush(stdout); printf("%s: this %p join background thread %p\n", __func__, this, CMoviePlayerGui::bgPlayThread);fflush(stdout);
cond.broadcast(); cond.broadcast();
pthread_join(bgThread, NULL); pthread_join(bgThread, NULL);
bgThread = 0; bgThread = 0;
@@ -1068,7 +1068,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
} }
} }
} }
printf("CMoviePlayerGui::PlayFile: exit, isMovieBrowser %d p_movie_info %x\n", isMovieBrowser, (int) p_movie_info); printf("CMoviePlayerGui::PlayFile: exit, isMovieBrowser %d p_movie_info %p\n", isMovieBrowser, p_movie_info);
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_stop, position); handleMovieBrowser((neutrino_msg_t) g_settings.mpkey_stop, position);
if (position >= 300000 || (duration < 300000 && (position > (duration /2)))) if (position >= 300000 || (duration < 300000 && (position > (duration /2))))
@@ -1085,7 +1085,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
void CMoviePlayerGui::PlayFileEnd(bool restore) void CMoviePlayerGui::PlayFileEnd(bool restore)
{ {
printf("%s: stopping, this %x thread %x\n", __func__, (int) this, (int) CMoviePlayerGui::bgPlayThread);fflush(stdout); printf("%s: stopping, this %p thread %p\n", __func__, this, CMoviePlayerGui::bgPlayThread);fflush(stdout);
if (filelist_it == filelist.end()) if (filelist_it == filelist.end())
FileTime.kill(); FileTime.kill();
clearSubtitle(); clearSubtitle();