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

crude hack for movieplayer tuxtxt integration

Browse Source
This commit is contained in:
martii
2013-03-31 11:55:51 +02:00
committed by Stefan Seyfried
parent 6106d014e9
commit fec74fdcc7
2 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libeplayer3/output/output_pipe.c
View File

@@ -37,6 +37,7 @@
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <errno.h>
#include "common.h" #include "common.h"
#include "output.h" #include "output.h"

48
libeplayer3/playback/playback.c
View File

@@ -949,54 +949,42 @@ static int PlaybackSwitchSubtitle(Context_t *context, int* track) {
return ret; return ret;
} }
#ifdef MARTII #ifdef MARTII
static int PlaybackSwitchDVBSubtitle(Context_t *context, int* track) { static int PlaybackSwitchDVBSubtitle(Context_t *context, int* pid) {
int ret = cERR_PLAYBACK_NO_ERROR; int ret = cERR_PLAYBACK_NO_ERROR;
playback_printf(10, "Track: %d\n", *track); playback_printf(10, "Track: %d\n", *pid);
if (context && context->playback && context->playback->isPlaying ) { if (context && context->manager && context->manager->dvbsubtitle ) {
if (context->manager && context->manager->dvbsubtitle) { if (context->manager->dvbsubtitle->Command(context, *pid == 0xffff ? MANAGER_DEL : MANAGER_SET, pid) < 0) {
if (context->manager->dvbsubtitle->Command(context, MANAGER_SET, track) < 0) playback_err("dvbsub manager set track failed\n");
{ ret = cERR_PLAYBACK_ERROR;
playback_err("manager set track failed\n");
} }
} else } else
{
ret = cERR_PLAYBACK_ERROR;
playback_err("no dvbsubtitle\n"); playback_err("no dvbsubtitle\n");
}
} else if (*pid == 0xffff)
{ container_ffmpeg_update_tracks(context, "current stream");
playback_err("not possible\n");
ret = cERR_PLAYBACK_ERROR;
}
playback_printf(10, "exiting with value %d\n", ret); playback_printf(10, "exiting with value %d\n", ret);
return ret; return ret;
} }
static int PlaybackSwitchTeletext(Context_t *context, int* track) { static int PlaybackSwitchTeletext(Context_t *context, int* pid) {
int ret = cERR_PLAYBACK_NO_ERROR; int ret = cERR_PLAYBACK_NO_ERROR;
playback_printf(10, "Track: %d\n", *track); playback_printf(10, "Track: %d\n", *pid);
if (context && context->playback && context->playback->isPlaying ) { if (context && context->manager && context->manager->teletext ) {
if (context->manager && context->manager->teletext) { if (context->manager->teletext->Command(context, *pid == 0xffff ? MANAGER_DEL : MANAGER_SET, pid)) {
if (context->manager->teletext->Command(context, MANAGER_SET, track) < 0) playback_err("ttxsub manager set track failed\n");
{ ret = cERR_PLAYBACK_ERROR;
playback_err("manager set track failed\n");
} }
} else } else
{
ret = cERR_PLAYBACK_ERROR;
playback_err("no dvbsubtitle\n"); playback_err("no dvbsubtitle\n");
}
} else if (*pid == 0xffff)
{ container_ffmpeg_update_tracks(context, "current stream");
playback_err("not possible\n");
ret = cERR_PLAYBACK_ERROR;
}
playback_printf(10, "exiting with value %d\n", ret); playback_printf(10, "exiting with value %d\n", ret);