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-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'martiis-libstb-hal/master'

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 6992b116ca
Author: max_10 <max_10@gmx.de>
Date: 2014-08-31 (Sun, 31 Aug 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2014-08-31 17:43:47 +02:00
parent 0a3d4db77b dcffc09371
commit 27a3e3a40a
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3/input.cpp
View File

@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#define ENABLE_LOGGING 1 #define ENABLE_LOGGING 0
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

8
libeplayer3/manager.cpp
View File

@@ -201,7 +201,7 @@ bool Manager::selectProgram(const int id)
if (it->second->hidden || it->second->inactive) { if (it->second->hidden || it->second->inactive) {
it->second->stream->discard = AVDISCARD_ALL; it->second->stream->discard = AVDISCARD_ALL;
} else { } else {
it->second->stream->discard = AVDISCARD_DEFAULT; it->second->stream->discard = AVDISCARD_NONE;
player->input.SwitchAudio(it->second); player->input.SwitchAudio(it->second);
} }
@@ -209,7 +209,7 @@ bool Manager::selectProgram(const int id)
if (it->second->hidden || it->second->inactive) { if (it->second->hidden || it->second->inactive) {
it->second->stream->discard = AVDISCARD_ALL; it->second->stream->discard = AVDISCARD_ALL;
} else { } else {
it->second->stream->discard = AVDISCARD_DEFAULT; it->second->stream->discard = AVDISCARD_NONE;
player->input.SwitchVideo(it->second); player->input.SwitchVideo(it->second);
} }
@@ -217,7 +217,7 @@ bool Manager::selectProgram(const int id)
if (it->second->hidden || it->second->inactive) { if (it->second->hidden || it->second->inactive) {
it->second->stream->discard = AVDISCARD_ALL; it->second->stream->discard = AVDISCARD_ALL;
} else { } else {
it->second->stream->discard = AVDISCARD_DEFAULT; it->second->stream->discard = AVDISCARD_NONE;
player->input.SwitchSubtitle(it->second); player->input.SwitchSubtitle(it->second);
} }
@@ -225,7 +225,7 @@ bool Manager::selectProgram(const int id)
if (it->second->hidden || it->second->inactive) { if (it->second->hidden || it->second->inactive) {
it->second->stream->discard = AVDISCARD_ALL; it->second->stream->discard = AVDISCARD_ALL;
} else { } else {
it->second->stream->discard = AVDISCARD_DEFAULT; it->second->stream->discard = AVDISCARD_NONE;
player->input.SwitchTeletext(it->second); player->input.SwitchTeletext(it->second);
} }

4
libspark/playback_libeplayer3.cpp
View File

@@ -82,7 +82,9 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
} else { } else {
std::vector<std::string> keys, values; std::vector<std::string> keys, values;
int selected_program = 0; int selected_program = 0;
if (!vpid && !apid && GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) { if (vpid || apid) {
;
} else if (GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) {
const char *key = ProgramSelectionCallback(ProgramSelectionCallbackData, keys, values); const char *key = ProgramSelectionCallback(ProgramSelectionCallbackData, keys, values);
if (!key) { if (!key) {
player->Close(); player->Close();