Merge remote-tracking branch 'tangocash/master'

Origin commit data
------------------
Branch: master
Commit: 7d4bd621e1
Author: max_10 <max_10@gmx.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:
max_10
2017-12-20 21:21:17 +01:00
7 changed files with 160 additions and 6 deletions

View File

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