revert partially 0e8a933 - wrong idclass handling

tvheadend · Nov 11, 2015 · b5184b2 · b5184b2
1 parent 39b1e51
commit b5184b2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
@@ -1705,7 +1705,13 @@ satip_frontend_create
   if (type == DVB_TYPE_S)
     idc = master ? &satip_frontend_dvbs_slave_class :
                    &satip_frontend_dvbs_class;
-  else if (!(idc = dvb_network_class_by_fe_type(type))) {
+  else if (type == DVB_TYPE_T)
+    idc = &satip_frontend_dvbt_class;
+  else if (type == DVB_TYPE_C)
+    idc = &satip_frontend_dvbc_class;
+  else if (type == DVB_TYPE_ATSC)
+    idc = &satip_frontend_atsc_class;
+  else {
     tvherror("satip", "unknown FE type %d", type);
     return NULL;
   }

diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
@@ -622,8 +622,14 @@ tvhdhomerun_frontend_create(tvhdhomerun_device_t *hd, struct hdhomerun_discover_
     uuid = htsmsg_get_str(conf, "uuid");
 
   /* Class */
-  if (!(idc = dvb_network_class_by_fe_type(type)) || type == DVB_TYPE_S) {
-    tvherror("tvhdhomerun", "unknown FE type %d", type);
+  if (type == DVB_TYPE_T)
+    idc = &tvhdhomerun_frontend_dvbt_class;
+  else if (type == DVB_TYPE_C)
+    idc = &tvhdhomerun_frontend_dvbc_class;
+  else if (type == DVB_TYPE_ATSC) {
+    idc = &tvhdhomerun_frontend_atsc_class;
+  } else {
+    tvherror("stvhdhomerun", "unknown FE type %d", type);
     return NULL;
   }