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

libeplayer3: let neutrino handle bitmap subtitles

Browse Source
This commit is contained in:
martii
2014-03-16 07:29:38 +01:00
parent 12b070bc88
commit d9e8e98678
22 changed files with 116 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libeplayer3/playback/playback.c
View File

@@ -195,7 +195,6 @@ static int PlaybackClose(Context_t * context)
context->manager->audio->Command(context, MANAGER_DEL, NULL);
context->manager->video->Command(context, MANAGER_DEL, NULL);
context->manager->subtitle->Command(context, MANAGER_DEL, NULL);
context->manager->dvbsubtitle->Command(context, MANAGER_DEL, NULL);
context->manager->teletext->Command(context, MANAGER_DEL, NULL);
context->manager->chapter->Command(context, MANAGER_DEL, NULL);
@@ -726,8 +725,8 @@ static int PlaybackSwitchSubtitle(Context_t * context, int *track)
subtitle->Command(context, MANAGER_SET, track) < 0) {
playback_err("manager set track failed\n");
}
#if 0
if (*track < 0) {
if (*track < 0 && !strcmp(context->playback->uri, "file://")) {
//CHECK FOR SUBTITLES
if (context->container
&& context->container->textSrtContainer)
@@ -748,7 +747,7 @@ static int PlaybackSwitchSubtitle(Context_t * context, int *track)
CONTAINER_INIT,
NULL);
}
#endif
context->manager->subtitle->Command(context, MANAGER_GET,
&trackid);
@@ -791,31 +790,6 @@ static int PlaybackSwitchSubtitle(Context_t * context, int *track)
return ret;
}
static int PlaybackSwitchDVBSubtitle(Context_t * context, int *pid)
{
int ret = cERR_PLAYBACK_NO_ERROR;
playback_printf(10, "Track: %d\n", *pid);
if (context && context->manager && context->manager->dvbsubtitle) {
if (context->manager->
dvbsubtitle->Command(context,
*pid < 0 ? MANAGER_DEL : MANAGER_SET,
pid) < 0) {
playback_err("dvbsub manager set track failed\n");
ret = cERR_PLAYBACK_ERROR;
}
} else
playback_err("no dvbsubtitle\n");
if (*pid < 0)
container_ffmpeg_update_tracks(context, context->playback->uri, 0);
playback_printf(10, "exiting with value %d\n", ret);
return ret;
}
static int PlaybackSwitchTeletext(Context_t * context, int *pid)
{
int ret = cERR_PLAYBACK_NO_ERROR;
@@ -833,7 +807,7 @@ static int PlaybackSwitchTeletext(Context_t * context, int *pid)
playback_err("no ttxsubtitle\n");
if (*pid < 0)
container_ffmpeg_update_tracks(context, context->playback->uri, 0);
container_ffmpeg_update_tracks(context, context->playback->uri);
playback_printf(10, "exiting with value %d\n", ret);
@@ -962,10 +936,6 @@ static int Command(void *_context, PlaybackCmd_t command, void *argument)
(unsigned long long int *) argument);
break;
}
case PLAYBACK_SWITCH_DVBSUBTITLE:{
ret = PlaybackSwitchDVBSubtitle(context, (int *) argument);
break;
}
case PLAYBACK_SWITCH_TELETEXT:{
ret = PlaybackSwitchTeletext(context, (int *) argument);
break;