channels: add Auto EPG Channel, fixes #2520

docs/html/config_channels.html

@@ -36,6 +36,11 @@
       display a direct link that can be used to open in preferred media
       player.
 
+  <dt>Auto EPG Channel
+  <dd>Auto-link EPG channels from XMLTV and OpenTV EPG grabbers using
+      the channel name for matching. If you turn this option off, only
+      OTA EPG grabber will be used for this channel.
+
   <dt>EPG Grab Source
   <dd>Name of the Internet-based EPG provider (typically XMLTV) channel
       that should be used to update this channels EPG info.

src/channels.c

@@ -248,9 +248,11 @@ channel_class_epggrab_set ( void *o, const void *v )
   }
 
   /* Link */
-  HTSMSG_FOREACH(f, l) {
-    if ((ec = epggrab_channel_find_by_id(htsmsg_field_get_str(f))))
-      save |= epggrab_channel_link(ec, ch);
+  if (ch->ch_epgauto && l) {
+    HTSMSG_FOREACH(f, l) {
+      if ((ec = epggrab_channel_find_by_id(htsmsg_field_get_str(f))))
+        save |= epggrab_channel_link(ec, ch);
+    }
   }
 
   /* Delete */
@@ -277,6 +279,14 @@ channel_class_epggrab_list ( void *o )
   return m;
 }
 
+static void
+channel_class_epgauto_notify ( void *obj )
+{
+  channel_t *ch = obj;
+  if (!ch->ch_epgauto)
+    channel_class_epggrab_set(obj, NULL);
+}
+
 static const void *
 channel_class_bouquet_get ( void *o )
 {
@@ -348,6 +358,13 @@ const idclass_t channel_class = {
       .get      = channel_class_get_icon,
       .opts     = PO_RDONLY | PO_NOSAVE | PO_HIDDEN,
     },
+    {
+      .type     = PT_BOOL,
+      .id       = "epgauto",
+      .name     = "Auto EPG Channel",
+      .off      = offsetof(channel_t, ch_epgauto),
+      .notify   = channel_class_epgauto_notify,
+    },
     {
       .type     = PT_STR,
       .islist   = 1,
@@ -731,6 +748,7 @@ channel_create0
 
   /* Defaults */
   ch->ch_enabled = 1;
+  ch->ch_epgauto = 1;
 
   if (conf) {
     ch->ch_load = 1;

src/channels.h

@@ -68,6 +68,7 @@ typedef struct channel
   gtimer_t              ch_epg_timer_head;
   gtimer_t              ch_epg_timer_current;
 
+  int ch_epgauto;
   LIST_HEAD(,epggrab_channel_link) ch_epggrab;
 
   /* DVR */

src/epggrab/channel.c

@@ -36,7 +36,7 @@ SKEL_DECLARE(epggrab_channel_skel, epggrab_channel_t);
 /* Check if channels match */
 int epggrab_channel_match ( epggrab_channel_t *ec, channel_t *ch )
 {
-  if (!ec || !ch) return 0;
+  if (!ec || !ch || !ch->ch_epgauto) return 0;
   if (LIST_FIRST(&ec->channels)) return 0; // ignore already paired
 
   if (ec->name && !strcmp(ec->name, channel_get_name(ch))) return 1;