mpegts: remove mi_is_free() callback, it is no longer used

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index 58c21b3d33660625e69f755950b321476bdbc04f..80c109af01bab62db331767705904a9cf2931396 100644 (file)
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -640,7 +640,6 @@ struct mpegts_input
   int  (*mi_is_enabled)     (mpegts_input_t*, mpegts_mux_t *mm, int flags);
   void (*mi_enabled_updated)(mpegts_input_t*);
   void (*mi_display_name)   (mpegts_input_t*, char *buf, size_t len);
-  int  (*mi_is_free)        (mpegts_input_t*);
   int  (*mi_get_weight)     (mpegts_input_t*, int flags);
   int  (*mi_get_priority)   (mpegts_input_t*, mpegts_mux_t *mm, int flags);
   int  (*mi_get_grace)      (mpegts_input_t*, mpegts_mux_t *mm);
@@ -837,8 +836,6 @@ void mpegts_input_recv_packets
   (mpegts_input_t *mi, mpegts_mux_instance_t *mmi, sbuf_t *sb,
    int64_t *pcr, uint16_t *pcr_pid);
 
-int mpegts_input_is_free ( mpegts_input_t *mi );
-
 int mpegts_input_get_weight ( mpegts_input_t *mi, int flags );
 int mpegts_input_get_priority ( mpegts_input_t *mi, mpegts_mux_t *mm, int flags );
 int mpegts_input_get_grace ( mpegts_input_t *mi, mpegts_mux_t *mm );

diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index 76f85ce18e596693b051fedfd65557bd31b52d0c..ffe814731fd68a06d969d0f2313555e070eefc3b 100644 (file)
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -599,7 +599,6 @@ void iptv_init ( void )
   iptv_input->mi_warm_mux       = iptv_input_warm_mux;
   iptv_input->mi_start_mux      = iptv_input_start_mux;
   iptv_input->mi_stop_mux       = iptv_input_stop_mux;
-  iptv_input->mi_is_free        = iptv_input_is_free;
   iptv_input->mi_get_weight     = iptv_input_get_weight;
   iptv_input->mi_get_grace      = iptv_input_get_grace;
   iptv_input->mi_get_priority   = iptv_input_get_priority;

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index 8daedbbffa8b5a8938eb39295f586ed0844fb211..57423e05697f8dd4faa3f5d941a58d773e6fe9ac 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -251,17 +251,6 @@ linuxdvb_frontend_enabled_updated ( mpegts_input_t *mi )
   }
 }
 
-static int
-linuxdvb_frontend_is_free ( mpegts_input_t *mi )
-{
-  linuxdvb_adapter_t *la = ((linuxdvb_frontend_t*)mi)->lfe_adapter;
-  linuxdvb_frontend_t *lfe;
-  LIST_FOREACH(lfe, &la->la_frontends, lfe_link)
-    if (!mpegts_input_is_free((mpegts_input_t*)lfe))
-      return 0;
-  return 1;
-}
-
 static int
 linuxdvb_frontend_get_weight ( mpegts_input_t *mi, int flags )
 {
@@ -1483,7 +1472,6 @@ linuxdvb_frontend_create
   if (!lfe) return NULL;
 
   /* Callbacks */
-  lfe->mi_is_free      = linuxdvb_frontend_is_free;
   lfe->mi_get_weight   = linuxdvb_frontend_get_weight;
   lfe->mi_get_priority = linuxdvb_frontend_get_priority;
   lfe->mi_get_grace    = linuxdvb_frontend_get_grace;

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_private.h b/src/input/mpegts/linuxdvb/linuxdvb_private.h
index b8039e4b9d5233a7396169ceeb017334e5316678..e053ac4ac7b510ad30eef7e7388335b8a7fe74e1 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_private.h
+++ b/src/input/mpegts/linuxdvb/linuxdvb_private.h
@@ -325,7 +325,6 @@ void linuxdvb_adapter_done ( void );
 
 void linuxdvb_adapter_save ( linuxdvb_adapter_t *la );
 
-int  linuxdvb_adapter_is_free        ( linuxdvb_adapter_t *la );
 int  linuxdvb_adapter_current_weight ( linuxdvb_adapter_t *la );
 
 linuxdvb_frontend_t *

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index f27fdfe32c835438ed7d17ebcb10e9c7a8e92775..b50dbd7801bf64c7858378fed89c5e733b8e338f 100644 (file)
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -321,18 +321,6 @@ mpegts_input_display_name ( mpegts_input_t *mi, char *buf, size_t len )
     *buf = 0;
 }
 
-int
-mpegts_input_is_free ( mpegts_input_t *mi )
-{
-  mpegts_mux_instance_t *mmi = LIST_FIRST(&mi->mi_mux_active);
-#if ENABLE_TRACE
-  char buf[256];
-  mi->mi_display_name(mi, buf, sizeof(buf));
-  tvhtrace("mpegts", "%s - is free? %d", buf, mmi == NULL);
-#endif
-  return mmi ? 0 : 1;
-}
-
 int
 mpegts_input_get_weight ( mpegts_input_t *mi, int flags )
 {
@@ -1464,7 +1452,6 @@ mpegts_input_create0
   /* Defaults */
   mi->mi_is_enabled           = mpegts_input_is_enabled;
   mi->mi_display_name         = mpegts_input_display_name;
-  mi->mi_is_free              = mpegts_input_is_free;
   mi->mi_get_weight           = mpegts_input_get_weight;
   mi->mi_get_priority         = mpegts_input_get_priority;
   mi->mi_warm_mux             = mpegts_input_warm_mux;

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index c17dbd9006c530430f294850867a84ae5b111146..918ffb39824ab96464843018fb929a3688bd93c0 100644 (file)
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -356,13 +356,6 @@ const idclass_t satip_frontend_atsc_class =
  * Class methods
  * *************************************************************************/
 
-static int
-satip_frontend_is_free ( mpegts_input_t *mi )
-{
-  /* TODO: Add some RTSP live checks here */
-  return mpegts_input_is_free(mi);
-}
-
 static int
 satip_frontend_get_weight ( mpegts_input_t *mi, int flags )
 {
@@ -1661,7 +1654,6 @@ satip_frontend_create
   lfe->sf_position     = -1;
 
   /* Callbacks */
-  lfe->mi_is_free      = satip_frontend_is_free;
   lfe->mi_get_weight   = satip_frontend_get_weight;
   lfe->mi_get_priority = satip_frontend_get_priority;
   lfe->mi_get_grace    = satip_frontend_get_grace;

diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
index 5e277cb1722859e12a64d58bb968a2f6dc8e6985..bbd1a4dfcc07616dc84a5af69f95661dd3a89af6 100644 (file)
--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
@@ -27,12 +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 int
-tvhdhomerun_frontend_is_free ( mpegts_input_t *mi )
-{
-  return mpegts_input_is_free(mi);
-}
-
 static int
 tvhdhomerun_frontend_get_weight ( mpegts_input_t *mi, int flags )
 {
@@ -658,7 +652,6 @@ tvhdhomerun_frontend_create(tvhdhomerun_device_t *hd, struct hdhomerun_discover_
   if (!hfe) return NULL;
 
   /* Callbacks */
-  hfe->mi_is_free      = tvhdhomerun_frontend_is_free;
   hfe->mi_get_weight   = tvhdhomerun_frontend_get_weight;
   hfe->mi_get_priority = tvhdhomerun_frontend_get_priority;
   hfe->mi_get_grace    = tvhdhomerun_frontend_get_grace;