diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c index b64135f0..aa800878 100644 --- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c +++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c @@ -27,17 +27,6 @@ static void tvhdhomerun_device_open_pid(tvhdhomerun_frontend_t *hfe, mpegts_pid_ static mpegts_pid_t * tvhdhomerun_frontend_open_pid( mpegts_input_t *mi, mpegts_mux_t *mm, int pid, int type, void *owner ); -static tvhdhomerun_frontend_t * -tvhdhomerun_frontend_find_by_number( tvhdhomerun_device_t *hd, int num ) -{ - tvhdhomerun_frontend_t *hfe; - - TAILQ_FOREACH(hfe, &hd->hd_frontends, hf_link) - if (hfe->hf_tunerNumber == num) - return hfe; - return NULL; -} - static int tvhdhomerun_frontend_is_free ( mpegts_input_t *mi ) { @@ -518,10 +507,6 @@ tvhdhomerun_frontend_save ( tvhdhomerun_frontend_t *hfe, htsmsg_t *fe ) /* Add to list */ snprintf(id, sizeof(id), "%s #%d", dvb_type2str(hfe->hf_type), hfe->hf_tunerNumber); htsmsg_add_msg(fe, id, m); - if (hfe->hf_master) { - snprintf(id, sizeof(id), "master for #%d", hfe->hf_tunerNumber); - htsmsg_add_u32(fe, id, hfe->hf_master); - } } @@ -603,7 +588,6 @@ tvhdhomerun_frontend_create(tvhdhomerun_device_t *hd, struct hdhomerun_discover_ const char *uuid = NULL; char id[16]; tvhdhomerun_frontend_t *hfe; - uint32_t master = 0; /* Internal config ID */ snprintf(id, sizeof(id), "%s #%u", dvb_type2str(type), frontend_number); @@ -627,7 +611,6 @@ tvhdhomerun_frontend_create(tvhdhomerun_device_t *hd, struct hdhomerun_discover_ hfe = calloc(1, sizeof(tvhdhomerun_frontend_t)); hfe->hf_device = hd; hfe->hf_type = type; - hfe->hf_master = master; hfe->hf_hdhomerun_tuner = hdhomerun_device_create(discover_info->device_id, discover_info->ip_addr, frontend_number, hdhomerun_debug_obj); @@ -669,18 +652,6 @@ tvhdhomerun_frontend_create(tvhdhomerun_device_t *hd, struct hdhomerun_discover_ hfe->hf_device = hd; TAILQ_INSERT_TAIL(&hd->hd_frontends, hfe, hf_link); - /* Slave networks update */ - if (master) { - tvhdhomerun_frontend_t *hfe2 = tvhdhomerun_frontend_find_by_number(hfe->hf_device, master); - if (hfe2) { - htsmsg_t *l = (htsmsg_t *)mpegts_input_class_network_get(hfe2); - if (l) { - mpegts_input_class_network_set(hfe, l); - htsmsg_destroy(l); - } - } - } - /* mutex init */ pthread_mutex_init(&hfe->hf_hdhomerun_device_mutex, NULL); pthread_mutex_init(&hfe->hf_input_thread_mutex, NULL); diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h index 40344a82..35a99c0e 100644 --- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h +++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h @@ -81,7 +81,6 @@ struct tvhdhomerun_frontend * Device */ tvhdhomerun_device_t *hf_device; - int hf_master; TAILQ_ENTRY(tvhdhomerun_frontend) hf_link;