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

src/gui/movieplayer.cpp delete chid if not used

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7daf49644d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-16 (Sat, 16 Apr 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-04-16 17:50:52 +02:00
parent e460a317af
commit 0db8b39baa
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/movieplayer.cpp
View File

@@ -694,12 +694,15 @@ void* CMoviePlayerGui::bgPlayThread(void *arg)
bool started = mp->StartWebtv(); bool started = mp->StartWebtv();
printf("%s: started: %d\n", __func__, started);fflush(stdout); printf("%s: started: %d\n", __func__, started);fflush(stdout);
bool chidused = false;
mutex.lock(); mutex.lock();
if (!webtv_started) if (!webtv_started)
started = false; started = false;
else if (!started) else if (!started){
g_RCInput->postMsg(NeutrinoMessages::EVT_ZAP_FAILED, (neutrino_msg_data_t) chid); g_RCInput->postMsg(NeutrinoMessages::EVT_ZAP_FAILED, (neutrino_msg_data_t) chid);
chidused = true;
}
webtv_started = started; webtv_started = started;
mutex.unlock(); mutex.unlock();
@@ -715,6 +718,7 @@ void* CMoviePlayerGui::bgPlayThread(void *arg)
if (eof > 5) { if (eof > 5) {
printf("CMoviePlayerGui::bgPlayThread: playback stopped, try to rezap...\n"); printf("CMoviePlayerGui::bgPlayThread: playback stopped, try to rezap...\n");
g_RCInput->postMsg(NeutrinoMessages::EVT_WEBTV_ZAP_COMPLETE, (neutrino_msg_data_t) chid); g_RCInput->postMsg(NeutrinoMessages::EVT_WEBTV_ZAP_COMPLETE, (neutrino_msg_data_t) chid);
chidused = true;
break; break;
} }
pos = mp->position; pos = mp->position;
@@ -728,6 +732,9 @@ void* CMoviePlayerGui::bgPlayThread(void *arg)
} }
printf("%s: play end...\n", __func__);fflush(stdout); printf("%s: play end...\n", __func__);fflush(stdout);
mp->PlayFileEnd(); mp->PlayFileEnd();
if(!chidused)
delete [] chid;
pthread_exit(NULL); pthread_exit(NULL);
} }