From 67a681002200e74cb59731a0b331db4da3e41069 Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 31 Aug 2014 12:36:22 +0200 Subject: [PATCH] libeplayer3/manager: use AVDISCARD_NONE instead of AVDISCARD_DEFAULT to disable programs --- libeplayer3/input.cpp | 2 +- libeplayer3/manager.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index 52085a0..8f42bc8 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -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 #include diff --git a/libeplayer3/manager.cpp b/libeplayer3/manager.cpp index 9dc1d38..da39024 100644 --- a/libeplayer3/manager.cpp +++ b/libeplayer3/manager.cpp @@ -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); }