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: subtitles will now be displayed by neutrino

Browse Source
This commit is contained in:
martii
2014-03-21 20:15:01 +01:00
parent 1853f87202
commit 8c577d8e6f
14 changed files with 133 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libspark/Makefile.am
View File

@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libspark.la
AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
AM_CPPFLAGS = \
AM_CPPFLAGS += \
-I$(top_srcdir)/common \
-I$(top_srcdir)/libeplayer3/include

11
libspark/playback_libeplayer3.cpp
View File

@@ -67,15 +67,7 @@ bool cPlayback::Open(playmode_t PlayMode)
if(player && player->output) {
player->output->Command(player,OUTPUT_ADD, (void*)"audio");
player->output->Command(player,OUTPUT_ADD, (void*)"video");
player->output->Command(player,OUTPUT_ADD, (void*)"subtitle");
player->output->Command(player,OUTPUT_ADD, (void*)"teletext");
if (framebuffer_callback) {
SubtitleOutputDef_t so;
memset(&so, 0, sizeof(so));
framebuffer_callback(&so.destination, &so.screen_width, &so.screen_height, &so.destStride, &so.framebufferBlit, &so.dvbsubWrite);
player->output->subtitle->Command(player, OUTPUT_SET_SUBTITLE_OUTPUT, (void*)&so);
}
}
return 0;
@@ -686,11 +678,10 @@ void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::str
}
//
cPlayback::cPlayback(int num __attribute__((unused)), void (*fbcb)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void), void (**)(void *, int64_t)))
cPlayback::cPlayback(int num __attribute__((unused)))
{
printf("%s:%s\n", FILENAME, __FUNCTION__);
playing=false;
framebuffer_callback = fbcb;
}
cPlayback::~cPlayback()

3
libspark/playback_libeplayer3.h
View File

@@ -18,10 +18,9 @@ class cPlayback
int mAudioStream;
int mSubtitleStream;
int mTeletextStream;
void (*framebuffer_callback)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void), void (**)(void *, int64_t));
bool Stop(void);
public:
cPlayback(int num = 0, void (*fbcb)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void), void (**)(void *, int64_t)) = NULL);
cPlayback(int num = 0);
~cPlayback();
bool Open(playmode_t PlayMode);