armbox eplayer: align to last commits

Origin commit data
------------------
Branch: master
Commit: f5c1ff725f
Author: TangoCash <eric@loxat.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-12-20 21:06:34 +01:00
committed by Thilo Graf
parent 59c28a3081
commit 5e40958c79

View File

@@ -427,7 +427,6 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
lt_info("%s\n", __func__); lt_info("%s\n", __func__);
int max_numpida = *numpida; int max_numpida = *numpida;
*numpida = 0; *numpida = 0;
/*
if(player && player->manager && player->manager->audio) { if(player && player->manager && player->manager->audio) {
char ** TrackList = NULL; char ** TrackList = NULL;
player->manager->audio->Command(player, MANAGER_LIST, &TrackList); player->manager->audio->Command(player, MANAGER_LIST, &TrackList);
@@ -471,7 +470,7 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
free(TrackList); free(TrackList);
*numpida=j; *numpida=j;
} }
}*/ }
} }
void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language) void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language)
@@ -621,7 +620,7 @@ void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::str
char **metadata = NULL; char **metadata = NULL;
if (player && player->playback) if (player && player->playback)
{ {
//player->playback->Command(player, PLAYBACK_METADATA, &metadata); player->playback->Command(player, PLAYBACK_METADATA, &metadata);
if (metadata) if (metadata)
{ {
for (char **m = metadata; *m;) for (char **m = metadata; *m;)