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: implement Manager class

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 6c1f7c13bd
Author: martii <m4rtii@gmx.de>
Date: 2014-04-06 (Sun, 06 Apr 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-06 21:12:56 +02:00
parent 0989514ed0
commit 65ac986fd0
12 changed files with 341 additions and 1357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
libeplayer3/playback/playback.cpp
View File

@@ -132,6 +132,7 @@ static int PlaybackOpen(Player * context, char *uri)
playback_err("Unknown stream (%s)\n", uri);
return cERR_PLAYBACK_ERROR;
}
context->manager.clearTracks();
if ((context->container->Command(context, CONTAINER_ADD, NULL) < 0)
|| (!context->container->selectedContainer)
@@ -153,11 +154,6 @@ static int PlaybackClose(Player * context)
playback_err("container delete failed\n");
}
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->teletext->Command(context, MANAGER_DEL, NULL);
context->manager->chapter->Command(context, MANAGER_DEL, NULL);
context->playback->isPaused = 0;
context->playback->isPlaying = 0;
@@ -610,97 +606,28 @@ static int PlaybackLength(Player * context, double *length)
return ret;
}
static int PlaybackSwitchAudio(Player * context, int *track)
static int PlaybackSwitchAudio(Player * context, int *pid)
{
int ret = cERR_PLAYBACK_NO_ERROR;
int curtrackid = 0;
int nextrackid = 0;
playback_printf(10, "\n");
if (context->playback->isPlaying) {
if (context->manager && context->manager->audio) {
context->manager->audio->Command(context, MANAGER_GET, &curtrackid);
context->manager->audio->Command(context, MANAGER_SET, track);
context->manager->audio->Command(context, MANAGER_GET, &nextrackid);
}
if (nextrackid != curtrackid) {
//PlaybackPause(context);
if (context->container && context->container->selectedContainer)
context->container->selectedContainer->Command(context, CONTAINER_SWITCH_AUDIO, (const char *)&nextrackid);
Track_t *t=NULL;
context->manager->audio->Command(context, MANAGER_GET_TRACK, &t);
if(t)
context->output.SwitchAudio(t->stream);
//PlaybackContinue(context);
}
} else {
playback_err("switch audio not possible\n");
ret = cERR_PLAYBACK_ERROR;
}
playback_printf(10, "exiting with value %d\n", ret);
return ret;
Track *track = context->manager.getAudioTrack(*pid);
if (track)
context->container->selectedContainer->Command(context, CONTAINER_SWITCH_AUDIO, (const char*) track);
return 0;
}
static int PlaybackSwitchSubtitle(Player * context, int *track)
static int PlaybackSwitchSubtitle(Player * context, int *pid)
{
int ret = cERR_PLAYBACK_NO_ERROR;
playback_printf(10, "Track: %d\n", *track);
if (context && context->playback && context->playback->isPlaying) {
if (context->manager && context->manager->subtitle) {
int trackid;
if (context->manager->
subtitle->Command(context, MANAGER_SET, track) < 0) {
playback_err("manager set track failed\n");
}
context->manager->subtitle->Command(context, MANAGER_GET, &trackid);
} else {
ret = cERR_PLAYBACK_ERROR;
playback_err("no subtitle\n");
}
} else {
playback_err("not possible\n");
ret = cERR_PLAYBACK_ERROR;
}
playback_printf(10, "exiting with value %d\n", ret);
return ret;
Track *track = context->manager.getSubtitleTrack(*pid);
if (track)
context->container->selectedContainer->Command(context, CONTAINER_SWITCH_SUBTITLE, (const char*) track);
return 0;
}
static int PlaybackSwitchTeletext(Player * context, int *pid)
{
int ret = cERR_PLAYBACK_NO_ERROR;
playback_printf(10, "Track: %d\n", *pid);
if (context && context->manager && context->manager->teletext) {
if (context->manager->
teletext->Command(context,
*pid < 0 ? MANAGER_DEL : MANAGER_SET, pid)) {
playback_err("ttxsub manager set track failed\n");
ret = cERR_PLAYBACK_ERROR;
}
} else
playback_err("no ttxsubtitle\n");
if (*pid < 0)
container_ffmpeg_update_tracks(context, context->playback->uri.c_str());
playback_printf(10, "exiting with value %d\n", ret);
return ret;
Track *track = context->manager.getTeletextTrack(*pid);
if (track)
context->container->selectedContainer->Command(context, CONTAINER_SWITCH_TELETEXT, (const char*) track);
return 0;
}
static int PlaybackMetadata(Player * context, char ***metadata)