mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 23:43:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

eplayer3: fix playback termination handling

Browse Source
This commit is contained in:
martii
2014-03-09 14:16:45 +01:00
parent 8da0fecb53
commit 76a42bda44
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libeplayer3/container/container_ffmpeg.c
View File

@@ -799,7 +799,7 @@ static void FFMPEGThread(Context_t * context)
avcodec_free_frame(&decoded_frame); avcodec_free_frame(&decoded_frame);
if (context->playback) if (context->playback)
context->playback->abortRequested = 1; context->playback->abortPlayback = 1;
hasPlayThreadStarted = 0; hasPlayThreadStarted = 0;
ffmpeg_printf(10, "terminating\n"); ffmpeg_printf(10, "terminating\n");
@@ -813,7 +813,7 @@ static int terminating = 0;
static int interrupt_cb(void *ctx) static int interrupt_cb(void *ctx)
{ {
PlaybackHandler_t *p = (PlaybackHandler_t *) ctx; PlaybackHandler_t *p = (PlaybackHandler_t *) ctx;
return p->abortRequested; return p->abortPlayback | p->abortRequested;
} }
static void log_callback(void *ptr __attribute__ ((unused)), int lvl __attribute__ ((unused)), const char *format, va_list ap) static void log_callback(void *ptr __attribute__ ((unused)), int lvl __attribute__ ((unused)), const char *format, va_list ap)

1
libeplayer3/include/playback.h
View File

@@ -39,6 +39,7 @@ typedef struct PlaybackHandler_s {
unsigned char isTeletext; unsigned char isTeletext;
unsigned char mayWriteToFramebuffer; unsigned char mayWriteToFramebuffer;
unsigned char abortRequested; unsigned char abortRequested;
unsigned char abortPlayback;
int (*Command) ( /*Context_t */ void *, PlaybackCmd_t, void *); int (*Command) ( /*Context_t */ void *, PlaybackCmd_t, void *);
char *uri; char *uri;

3
libeplayer3/playback/playback.c
View File

@@ -78,7 +78,7 @@ static void SupervisorThread(Context_t * context)
playback_printf(10, ">\n"); playback_printf(10, ">\n");
while (context && context->playback && context->playback->isPlaying while (context && context->playback && context->playback->isPlaying
&& !context->playback->abortRequested) && !(context->playback->abortRequested | context->playback->abortPlayback))
usleep(100000); usleep(100000);
playback_printf(10, "<\n"); playback_printf(10, "<\n");
@@ -1013,6 +1013,7 @@ PlaybackHandler_t PlaybackHandler = {
0, 0,
1, 1,
0, 0,
0,
&Command, &Command,
"", "",
0, 0,