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

libeplayer3: cleanup

Browse Source
This commit is contained in:
martii
2013-06-08 12:05:36 +02:00
parent 6e25a6f00f
commit 4f56cae01d
28 changed files with 27 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libeplayer3/manager/audio.c
View File

@@ -24,9 +24,7 @@
#include <stdlib.h>
#include <string.h>
#ifdef MARTII
#include <libavformat/avformat.h>
#endif
#include "manager.h"
#include "common.h"
@@ -179,9 +177,7 @@ static int Command(void *_context, ManagerCmd_t command, void * argument) {
break;
}
case MANAGER_LIST: {
#ifdef MARTII
container_ffmpeg_update_tracks(context, context->playback->uri);
#endif
*((char***)argument) = (char **)ManagerList(context);
break;
}
@@ -220,9 +216,7 @@ static int Command(void *_context, ManagerCmd_t command, void * argument) {
case MANAGER_SET: {
int id = *((int*)argument);
#ifdef MARTII
// What's the argument supposed to be? apid or local index? --martii
if (id >= TrackCount) {
int apid = id;
for (id = 0; id < TrackCount; id++) {
@@ -230,7 +224,6 @@ static int Command(void *_context, ManagerCmd_t command, void * argument) {
break;
}
}
#endif
audio_mgr_printf(20, "%s::%s MANAGER_SET id=%d\n", FILENAME, __FUNCTION__, id);
if (id < TrackCount)

4
libeplayer3/manager/dvbsubtitle.c
View File

@@ -1,4 +1,3 @@
#ifdef MARTII
/*
* dvbsubtitle manager handling.
*
@@ -178,9 +177,7 @@ static int Command(void *_context, ManagerCmd_t command, void * argument) {
break;
}
case MANAGER_LIST: {
#ifdef MARTII
container_ffmpeg_update_tracks(context, context->playback->uri);
#endif
*((char***)argument) = (char **)ManagerList(context);
break;
}
@@ -259,4 +256,3 @@ struct Manager_s DvbSubtitleManager = {
&Command,
NULL
};
#endif

4
libeplayer3/manager/manager.c
View File

@@ -40,20 +40,16 @@
extern Manager_t AudioManager;
extern Manager_t VideoManager;
extern Manager_t SubtitleManager;
#ifdef MARTII
extern Manager_t DvbSubtitleManager;
extern Manager_t TeletextManager;
#endif
ManagerHandler_t ManagerHandler = {
"ManagerHandler",
&AudioManager,
&VideoManager,
&SubtitleManager
#ifdef MARTII
, &DvbSubtitleManager
, &TeletextManager
#endif
};
/* ***************************** */

2
libeplayer3/manager/subtitle.c
View File

@@ -176,9 +176,7 @@ static int Command(void *_context, ManagerCmd_t command, void * argument) {
break;
}
case MANAGER_LIST: {
#ifdef MARTII
container_ffmpeg_update_tracks(context, context->playback->uri);
#endif
*((char***)argument) = (char **)ManagerList(context);
break;
}

4
libeplayer3/manager/teletext.c
View File

@@ -1,4 +1,3 @@
#ifdef MARTII
/*
* teletext manager handling.
*
@@ -178,9 +177,7 @@ static int Command(void *_context, ManagerCmd_t command, void * argument) {
break;
}
case MANAGER_LIST: {
#ifdef MARTII
container_ffmpeg_update_tracks(context, context->playback->uri);
#endif
*((char***)argument) = (char **)ManagerList(context);
break;
}
@@ -259,4 +256,3 @@ struct Manager_s TeletextManager = {
&Command,
NULL
};
#endif

2
libeplayer3/manager/video.c
View File

@@ -173,9 +173,7 @@ static int Command(void *_context, ManagerCmd_t command, void * argument) {
break;
}
case MANAGER_LIST: {
#ifdef MARTII
container_ffmpeg_update_tracks(context, context->playback->uri);
#endif
*((char***)argument) = (char **)ManagerList(context);
break;
}