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-29 16:30:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TangoCash/libstb-hal-cst-next

Browse Source 
Origin commit data
------------------
Branch: master
Commit: c2628b7106
Author: vanhofen <vanhofen@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:
vanhofen
2017-12-20 22:09:12 +01:00
parent 01ac316e47 8b1472cab0
commit 9b60689f7b
12 changed files with 417 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libarmbox/playback_libeplayer3.cpp
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);
@@ -592,7 +591,6 @@ void cPlayback::GetChapters(std::vector<int> &positions, std::vector<std::string
{
positions.clear();
titles.clear();
/*
if(player && player->manager && player->manager->chapter) {
char ** TrackList = NULL;
player->manager->chapter->Command(player, MANAGER_LIST, &TrackList);
@@ -611,7 +609,6 @@ void cPlayback::GetChapters(std::vector<int> &positions, std::vector<std::string
free(TrackList);
}
}
*/
}
void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values)
@@ -621,7 +618,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;)

2
libarmbox/video.cpp
View File

@@ -361,7 +361,7 @@ void cVideo::closeDevice(void)
int cVideo::setAspectRatio(int aspect, int mode)
{
static const char *a[] = { "n/a", "4:3", "14:9", "16:9" };
static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" };
static const char *m[] = { "panscan", "bestfit", "letterbox", "nonlinear", "(unset)" };
int n;
lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]);