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

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
3 changed files with 8 additions and 6 deletions

View File

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

View File

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