mirror of
https://github.com/tuxbox-neutrino/libstb-hal.git
synced 2025-08-27 07:23:11 +02:00
libeplayer3: c++ adjustments
This commit is contained in:
martii
@@ -23,15 +23,14 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <map>
|
||||
|
||||
#include <libavformat/avformat.h>
|
||||
#include "manager.h"
|
||||
#include "common.h"
|
||||
|
||||
/* ***************************** */
|
||||
/* Makros/Constants */
|
||||
/* ***************************** */
|
||||
#define TRACKWRAP 20
|
||||
|
||||
#define AUDIO_MGR_DEBUG
|
||||
|
||||
@@ -65,9 +64,8 @@ static const char FILENAME[] = __FILE__;
|
||||
/* Varaibles */
|
||||
/* ***************************** */
|
||||
|
||||
static Track_t *Tracks = NULL;
|
||||
static int TrackCount = 0;
|
||||
static int CurrentTrack = 0; //TRACK[0] as default.
|
||||
static std::map<int,Track_t> Tracks;
|
||||
static int CurrentPid = -1;
|
||||
|
||||
/* ***************************** */
|
||||
/* Prototypes */
|
||||
@@ -79,109 +77,39 @@ static int CurrentTrack = 0; //TRACK[0] as default.
|
||||
|
||||
static int ManagerAdd(Context_t * context, Track_t track)
|
||||
{
|
||||
|
||||
audio_mgr_printf(10, "%s::%s name=\"%s\" encoding=\"%s\" id=%d\n",
|
||||
FILENAME, __FUNCTION__, track.Name, track.Encoding,
|
||||
track.Id);
|
||||
|
||||
if (Tracks == NULL) {
|
||||
Tracks = malloc(sizeof(Track_t) * TRACKWRAP);
|
||||
int i;
|
||||
for (i = 0; i < TRACKWRAP; i++)
|
||||
Tracks[i].Id = -1;
|
||||
}
|
||||
|
||||
if (Tracks == NULL) {
|
||||
audio_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__);
|
||||
return cERR_AUDIO_MGR_ERROR;
|
||||
}
|
||||
|
||||
int i;
|
||||
for (i = 0; i < TRACKWRAP; i++) {
|
||||
if (Tracks[i].Id == track.Id) {
|
||||
Tracks[i].pending = 0;
|
||||
return cERR_AUDIO_MGR_NO_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
if (TrackCount < TRACKWRAP) {
|
||||
copyTrack(&Tracks[TrackCount], &track);
|
||||
TrackCount++;
|
||||
} else {
|
||||
audio_mgr_err("%s:%s TrackCount out if range %d - %d\n", FILENAME,
|
||||
__FUNCTION__, TrackCount, TRACKWRAP);
|
||||
return cERR_AUDIO_MGR_ERROR;
|
||||
}
|
||||
|
||||
if (TrackCount > 0)
|
||||
Tracks[track.Id] = track;
|
||||
context->playback->isAudio = 1;
|
||||
|
||||
audio_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
|
||||
if (CurrentPid < 0)
|
||||
CurrentPid = track.Id;
|
||||
|
||||
return cERR_AUDIO_MGR_NO_ERROR;
|
||||
return cERR_AUDIO_MGR_NO_ERROR;
|
||||
}
|
||||
|
||||
static char **ManagerList(Context_t * context __attribute__ ((unused)))
|
||||
{
|
||||
int i = 0, j = 0;
|
||||
char **tracklist = NULL;
|
||||
int j = 0;
|
||||
char **tracklist = (char **) malloc(sizeof(char *) * ((Tracks.size() * 2) + 1));
|
||||
|
||||
audio_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
|
||||
|
||||
if (Tracks != NULL) {
|
||||
|
||||
tracklist = malloc(sizeof(char *) * ((TrackCount * 2) + 1));
|
||||
|
||||
if (tracklist == NULL) {
|
||||
audio_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (i = 0, j = 0; i < TrackCount; i++, j += 2) {
|
||||
if (Tracks[i].pending)
|
||||
continue;
|
||||
size_t len = strlen(Tracks[i].Name) + 20;
|
||||
char tmp[len];
|
||||
snprintf(tmp, len, "%d %s\n", Tracks[i].Id, Tracks[i].Name);
|
||||
tracklist[j] = strdup(tmp);
|
||||
tracklist[j + 1] = strdup(Tracks[i].Encoding);
|
||||
for(std::map<int,Track_t>::iterator it = Tracks.begin(); it != Tracks.end(); ++it)
|
||||
{
|
||||
size_t len = it->second.Name.length() + 20;
|
||||
char tmp[len];
|
||||
snprintf(tmp, len, "%d %s\n", it->second.Id, it->second.Name.c_str());
|
||||
tracklist[j] = strdup(tmp);
|
||||
tracklist[j + 1] = strdup(it->second.Encoding);
|
||||
}
|
||||
tracklist[j] = NULL;
|
||||
}
|
||||
|
||||
audio_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME,
|
||||
__FUNCTION__, tracklist, j, TrackCount);
|
||||
|
||||
return tracklist;
|
||||
return tracklist;
|
||||
}
|
||||
|
||||
static int ManagerDel(Context_t * context)
|
||||
{
|
||||
|
||||
int i = 0;
|
||||
|
||||
audio_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
|
||||
|
||||
if (Tracks != NULL) {
|
||||
for (i = 0; i < TrackCount; i++) {
|
||||
freeTrack(&Tracks[i]);
|
||||
}
|
||||
free(Tracks);
|
||||
Tracks = NULL;
|
||||
} else {
|
||||
audio_mgr_err("%s::%s nothing to delete!\n", FILENAME,
|
||||
__FUNCTION__);
|
||||
return cERR_AUDIO_MGR_ERROR;
|
||||
}
|
||||
|
||||
TrackCount = 0;
|
||||
CurrentTrack = 0;
|
||||
context->playback->isAudio = 0;
|
||||
|
||||
audio_mgr_printf(10, "%s::%s return no error\n", FILENAME,
|
||||
__FUNCTION__);
|
||||
|
||||
return cERR_AUDIO_MGR_NO_ERROR;
|
||||
Tracks.clear();
|
||||
CurrentPid = -1;
|
||||
context->playback->isAudio = 0;
|
||||
return cERR_AUDIO_MGR_NO_ERROR;
|
||||
}
|
||||
|
||||
|
||||
@@ -193,90 +121,64 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument)
|
||||
|
||||
switch (command) {
|
||||
case MANAGER_ADD:{
|
||||
Track_t *track = argument;
|
||||
|
||||
Track_t *track = (Track_t *) argument;
|
||||
ret = ManagerAdd(context, *track);
|
||||
break;
|
||||
}
|
||||
case MANAGER_LIST:{
|
||||
container_ffmpeg_update_tracks(context, context->playback->uri);
|
||||
container_ffmpeg_update_tracks(context, context->playback->uri.c_str());
|
||||
*((char ***) argument) = (char **) ManagerList(context);
|
||||
break;
|
||||
}
|
||||
case MANAGER_GET:{
|
||||
audio_mgr_printf(20, "%s::%s MANAGER_GET\n", FILENAME,
|
||||
__FUNCTION__);
|
||||
|
||||
if ((TrackCount > 0) && (CurrentTrack >= 0))
|
||||
*((int *) argument) = (int) Tracks[CurrentTrack].Id;
|
||||
else
|
||||
*((int *) argument) = (int) -1;
|
||||
break;
|
||||
*((int *) argument) = (int) CurrentPid;
|
||||
break;
|
||||
}
|
||||
case MANAGER_GET_TRACK:{
|
||||
audio_mgr_printf(20, "%s::%s MANAGER_GET_TRACK\n", FILENAME,
|
||||
__FUNCTION__);
|
||||
|
||||
if ((TrackCount > 0) && (CurrentTrack >= 0))
|
||||
*((Track_t **) argument) =
|
||||
(Track_t *) & Tracks[CurrentTrack];
|
||||
else
|
||||
*((Track_t **) argument) = NULL;
|
||||
break;
|
||||
if (CurrentPid > -1)
|
||||
*((Track_t **) argument) = &Tracks[CurrentPid];
|
||||
else
|
||||
*((Track_t **) argument) = NULL;
|
||||
break;
|
||||
}
|
||||
case MANAGER_GETENCODING:{
|
||||
if ((TrackCount > 0) && (CurrentTrack >= 0))
|
||||
*((char **) argument) =
|
||||
(char *) strdup(Tracks[CurrentTrack].Encoding);
|
||||
else
|
||||
*((char **) argument) = (char *) strdup("");
|
||||
break;
|
||||
if (CurrentPid > -1)
|
||||
*((char **) argument) = strdup(Tracks[CurrentPid].Encoding);
|
||||
else
|
||||
*((char **) argument) = strdup("");
|
||||
break;
|
||||
}
|
||||
case MANAGER_GETNAME:{
|
||||
if ((TrackCount > 0) && (CurrentTrack >= 0))
|
||||
*((char **) argument) =
|
||||
(char *) strdup(Tracks[CurrentTrack].Name);
|
||||
else
|
||||
*((char **) argument) = (char *) strdup("");
|
||||
break;
|
||||
if (CurrentPid > -1)
|
||||
*((char **) argument) = strdup(Tracks[CurrentPid].Name.c_str());
|
||||
else
|
||||
*((char **) argument) = strdup("");
|
||||
break;
|
||||
}
|
||||
case MANAGER_SET:{
|
||||
int i;
|
||||
audio_mgr_printf(20, "%s::%s MANAGER_SET id=%d\n", FILENAME,
|
||||
__FUNCTION__, *((int *) argument));
|
||||
|
||||
for (i = 0; i < TrackCount; i++)
|
||||
if (Tracks[i].Id == *((int *) argument)) {
|
||||
CurrentTrack = i;
|
||||
break;
|
||||
}
|
||||
|
||||
if (i == TrackCount) {
|
||||
audio_mgr_err("%s::%s track id %d unknown\n", FILENAME,
|
||||
__FUNCTION__, *((int *) argument));
|
||||
ret = cERR_AUDIO_MGR_ERROR;
|
||||
}
|
||||
break;
|
||||
std::map<int,Track_t>::iterator it = Tracks.find(*((int *) argument));
|
||||
if (it != Tracks.end())
|
||||
CurrentPid = *((int *) argument);
|
||||
else
|
||||
ret = cERR_AUDIO_MGR_ERROR;
|
||||
break;
|
||||
}
|
||||
case MANAGER_DEL:{
|
||||
ret = ManagerDel(context);
|
||||
break;
|
||||
ret = ManagerDel(context);
|
||||
break;
|
||||
}
|
||||
case MANAGER_INIT_UPDATE:{
|
||||
int i;
|
||||
for (i = 0; i < TrackCount; i++)
|
||||
Tracks[i].pending = 1;
|
||||
break;
|
||||
for (std::map<int,Track_t>::iterator it = Tracks.begin(); it != Tracks.end(); ++it)
|
||||
it->second.pending = 1;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
audio_mgr_err("%s::%s ContainerCmd %d not supported!\n", FILENAME,
|
||||
__FUNCTION__, command);
|
||||
ret = cERR_AUDIO_MGR_ERROR;
|
||||
break;
|
||||
audio_mgr_err("%s::%s ContainerCmd %d not supported!\n", FILENAME, __FUNCTION__, command);
|
||||
ret = cERR_AUDIO_MGR_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
audio_mgr_printf(10, "%s:%s: returning %d\n", FILENAME, __FUNCTION__,
|
||||
ret);
|
||||
audio_mgr_printf(10, "%s:%s: returning %d\n", FILENAME, __FUNCTION__, ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user