Renamed EPG Grabber to uk_cable_virgin

diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
index 4ffb81d5ef5480231922c05d043ca7014b4df19e..7d44ee6f3eec8bbc0c8a06fa20dd3ee41c253f91 100644 (file)
--- a/src/epggrab/module/eit.c
+++ b/src/epggrab/module/eit.c
@@ -42,9 +42,9 @@ typedef struct eit_private
 
 #define EIT_CONV_HUFFMAN     1
 
-#define EIT_SPEC_UK_FREESAT  1
-#define EIT_SPEC_NZ_FREEVIEW 2
-#define EIT_SPEC_UK_CABLE    3
+#define EIT_SPEC_UK_FREESAT         1
+#define EIT_SPEC_NZ_FREEVIEW        2
+#define EIT_SPEC_UK_CABLE_VIRGIN    3
 
 
 /* Provider configuration */
@@ -854,7 +854,7 @@ _eit_callback
   
   /* UK Cable: EPG data for services in other transponders is transmitted 
   // in the 'actual' transpoder table IDs */
-  if (spec == EIT_SPEC_UK_CABLE && (tableid == 0x50 || tableid == 0x4E)) {
+  if (spec == EIT_SPEC_UK_CABLE_VIRGIN && (tableid == 0x50 || tableid == 0x4E)) {
     mm = mpegts_network_find_mux(mm->mm_network, onid, tsid, 1);
   }
   if(!mm)
@@ -1168,7 +1168,7 @@ void eit_init ( void )
   EIT_OPS(ops_nz_freeview, 0, EIT_CONV_HUFFMAN, EIT_SPEC_NZ_FREEVIEW);
   EIT_OPS(ops_baltic, 0x39, 0, 0);
   EIT_OPS(ops_bulsat, 0x12b, 0, 0);
-  EIT_OPS(ops_uk_cable, 0x2bc, 0, EIT_SPEC_UK_CABLE);
+  EIT_OPS(ops_uk_cable_virgin, 0x2bc, 0, EIT_SPEC_UK_CABLE_VIRGIN);
 
   EIT_CREATE("eit", "EIT: DVB Grabber", 1, &ops);
   EIT_CREATE("uk_freesat", "UK: Freesat", 5, &ops_uk_freesat);
@@ -1176,7 +1176,7 @@ void eit_init ( void )
   EIT_CREATE("nz_freeview", "New Zealand: Freeview", 5, &ops_nz_freeview);
   EIT_CREATE("viasat_baltic", "VIASAT: Baltic", 5, &ops_baltic);
   EIT_CREATE("Bulsatcom_39E", "Bulsatcom: Bula 39E", 5, &ops_bulsat);
-  EIT_CREATE("uk_cable", "UK: Cable", 5, &ops_uk_cable);
+  EIT_CREATE("uk_cable_virgin", "UK: Cable Virgin", 5, &ops_uk_cable_virgin);
 }
 
 void _eit_done ( void *m )

diff --git a/src/epggrab/otamux.c b/src/epggrab/otamux.c
index 5bd8eef64fd31d2d42654067d40722e58816b683..7fff8c14ba854addda0ecd49de925ca85997e0cb 100644 (file)
--- a/src/epggrab/otamux.c
+++ b/src/epggrab/otamux.c
@@ -492,7 +492,7 @@ epggrab_ota_kick_cb ( void *p )
     [MM_EPG_ONLY_PSIP]               = "psip",
     [MM_EPG_ONLY_UK_FREESAT]         = "uk_freesat",
     [MM_EPG_ONLY_UK_FREEVIEW]        = "uk_freeview",
-    [MM_EPG_ONLY_UK_CABLE]           = "uk_cable",
+    [MM_EPG_ONLY_UK_CABLE_VIRGIN]    = "uk_cable_virgin",
     [MM_EPG_ONLY_VIASAT_BALTIC]      = "viasat_baltic",
     [MM_EPG_ONLY_BULSATCOM_39E]      = "Bulsatcom_39E",
     [MM_EPG_ONLY_OPENTV_SKY_UK]      = "opentv-skyuk",

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index 83813553b5d82285dcbc13b5bd5d26418530fb95..ccc62c8f8ba6a064fc7f16dcf413f2357005dd26 100644 (file)
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -398,7 +398,7 @@ enum mpegts_mux_epg_flag
   MM_EPG_ONLY_EIT,
   MM_EPG_ONLY_UK_FREESAT,
   MM_EPG_ONLY_UK_FREEVIEW,
-  MM_EPG_ONLY_UK_CABLE,
+  MM_EPG_ONLY_UK_CABLE_VIRGIN,
   MM_EPG_ONLY_VIASAT_BALTIC,
   MM_EPG_ONLY_OPENTV_SKY_UK,
   MM_EPG_ONLY_OPENTV_SKY_ITALIA,

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index 162a5f5078e78e30b5942ba0d915bc099daec841..6e9a124412cb302bb6868c97e0b4ac3b5dc03754 100644 (file)
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -485,7 +485,7 @@ mpegts_mux_epg_list ( void *o, const char *lang )
     { N_("Only PSIP (ATSC)"),         MM_EPG_ONLY_PSIP },
     { N_("Only UK Freesat"),          MM_EPG_ONLY_UK_FREESAT },
     { N_("Only UK Freeview"),         MM_EPG_ONLY_UK_FREEVIEW },
-    { N_("Only UK Cable"),            MM_EPG_ONLY_UK_CABLE },
+    { N_("Only UK Cable Virgin"),     MM_EPG_ONLY_UK_CABLE_VIRGIN },
     { N_("Only Viasat Baltic"),       MM_EPG_ONLY_VIASAT_BALTIC },
     { N_("Only Bulsatcom 39E"),       MM_EPG_ONLY_BULSATCOM_39E },
     { N_("Only OpenTV Sky UK"),       MM_EPG_ONLY_OPENTV_SKY_UK },