From 300354b0bc1d6f735b4b8773356e10530712d920 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 10 Jul 2014 20:48:09 +0200 Subject: [PATCH] epggrab: ota - fix the EPG scan mux config handling --- src/epggrab/otamux.c | 6 +++--- src/input/mpegts.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/epggrab/otamux.c b/src/epggrab/otamux.c index e3a0a6c1..4f246703 100644 --- a/src/epggrab/otamux.c +++ b/src/epggrab/otamux.c @@ -400,12 +400,12 @@ next_one: } epg_flag = mm->mm_is_epg(mm); - if (ARRAY_SIZE(modnames) >= epg_flag) + if (epg_flag > MM_EPG_LAST) epg_flag = MM_EPG_ENABLE; - modname = modnames[epg_flag]; + modname = epg_flag >= 0 ? modnames[epg_flag] : NULL; if (epg_flag < 0 || epg_flag == MM_EPG_DISABLE) { -#if TRACE_ENABLE +#if ENABLE_TRACE char name[256]; mpegts_mux_nice_name(mm, name, sizeof(name)); tvhtrace("epggrab", "epg mux %s is disabled, skipping", name); diff --git a/src/input/mpegts.h b/src/input/mpegts.h index 61bb2ba4..386f255f 100644 --- a/src/input/mpegts.h +++ b/src/input/mpegts.h @@ -316,6 +316,7 @@ enum mpegts_mux_epg_flag MM_EPG_FORCE_OPENTV_SKY_ITALIA, MM_EPG_FORCE_OPENTV_SKY_AUSAT, }; +#define MM_EPG_LAST MM_EPG_FORCE_OPENTV_SKY_AUSAT /* Multiplex */ struct mpegts_mux