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

libeplayer3: subtitles will now be displayed by neutrino

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 8c577d8e6f
Author: martii <m4rtii@gmx.de>
Date: 2014-03-21 (Fri, 21 Mar 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-03-21 20:15:01 +01:00
parent 66f9917b3f
commit d15d3af044
14 changed files with 133 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
libeplayer3/playback/playback.c
View File

@@ -126,25 +126,6 @@ static int PlaybackOpen(Context_t * context, char *uri)
extension = getExtension(context->playback->uri + 7);
if (!extension)
return cERR_PLAYBACK_ERROR;
//CHECK FOR SUBTITLES
if (context->container && context->container->textSrtContainer)
context->container->textSrtContainer->Command(context,
CONTAINER_INIT,
context->playback->
uri + 7);
if (context->container && context->container->textSsaContainer)
context->container->textSsaContainer->Command(context,
CONTAINER_INIT,
context->playback->
uri + 7);
if (context->container && context->container->assContainer)
context->container->assContainer->Command(context,
CONTAINER_INIT,
NULL);
} else if (strstr(uri, "://")) {
context->playback->isHttp = 1;
extension = "mp3";
@@ -184,14 +165,6 @@ static int PlaybackClose(Context_t * context)
playback_err("container delete failed\n");
}
if (context->container && context->container->textSrtContainer)
context->container->textSrtContainer->Command(context,
CONTAINER_DEL, NULL);
if (context->container && context->container->textSsaContainer)
context->container->textSsaContainer->Command(context,
CONTAINER_DEL, NULL);
context->manager->audio->Command(context, MANAGER_DEL, NULL);
context->manager->video->Command(context, MANAGER_DEL, NULL);
context->manager->subtitle->Command(context, MANAGER_DEL, NULL);
@@ -726,56 +699,7 @@ static int PlaybackSwitchSubtitle(Context_t * context, int *track)
playback_err("manager set track failed\n");
}
if (*track < 0 && !strcmp(context->playback->uri, "file://")) {
//CHECK FOR SUBTITLES
if (context->container
&& context->container->textSrtContainer)
context->container->textSrtContainer->Command(context,
CONTAINER_INIT,
context->playback->uri
+ 7);
if (context->container
&& context->container->textSsaContainer)
context->container->textSsaContainer->Command(context,
CONTAINER_INIT,
context->playback->uri
+ 7);
if (context->container && context->container->assContainer)
context->container->assContainer->Command(context,
CONTAINER_INIT,
NULL);
}
context->manager->subtitle->Command(context, MANAGER_GET,
&trackid);
/* konfetti: I make this hack a little bit nicer,
* but its still a hack in my opinion ;)
*/
if (context->container && context->container->assContainer)
context->container->assContainer->Command(context,
CONTAINER_SWITCH_SUBTITLE,
&trackid);
if (trackid >= TEXTSRTOFFSET) {
if (context->container
&& context->container->textSrtContainer)
context->container->textSrtContainer->Command(context,
CONTAINER_SWITCH_SUBTITLE,
&trackid);
}
if (trackid >= TEXTSSAOFFSET) {
if (context->container
&& context->container->textSsaContainer)
context->container->textSsaContainer->Command(context,
CONTAINER_SWITCH_SUBTITLE,
&trackid);
}
context->manager->subtitle->Command(context, MANAGER_GET, &trackid);
} else {
ret = cERR_PLAYBACK_ERROR;
playback_err("no subtitle\n");