profile: remove unused get_mc functions

diff --git a/src/dvr/dvr.h b/src/dvr/dvr.h
index d4880b88061ae38061f6f5acb8e1d737ba3cacb5..6618cf25e95c7228b117032326827eb6f47b9a75 100644 (file)
--- a/src/dvr/dvr.h
+++ b/src/dvr/dvr.h
@@ -479,8 +479,6 @@ static inline int dvr_entry_is_editable(dvr_entry_t *de)
 static inline int dvr_entry_is_valid(dvr_entry_t *de)
   { return de->de_refcnt > 0; }
 
-int dvr_entry_get_mc(dvr_entry_t *de);
-
 char *dvr_entry_get_retention_string ( dvr_entry_t *de );
 
 char *dvr_entry_get_removal_string ( dvr_entry_t *de );

diff --git a/src/profile.c b/src/profile.c
index 5e64a67be362459fa1b3ea9046fe01faa21dc454..6a41be392a08235e07cb2a9025529e54069336ba 100644 (file)
--- a/src/profile.c
+++ b/src/profile.c
@@ -1071,19 +1071,12 @@ fail:
   return -1;
 }
 
-static muxer_container_type_t
-profile_htsp_get_mc(profile_t *_pro)
-{
-  return MC_UNKNOWN;
-}
-
 static profile_t *
 profile_htsp_builder(void)
 {
   profile_t *pro = calloc(1, sizeof(*pro));
   pro->pro_sflags = SUBSCRIPTION_PACKET;
   pro->pro_work   = profile_htsp_work;
-  pro->pro_get_mc = profile_htsp_get_mc;
   return pro;
 }
 
@@ -1205,12 +1198,6 @@ profile_mpegts_pass_open(profile_chain_t *prch,
   return 0;
 }
 
-static muxer_container_type_t
-profile_mpegts_pass_get_mc(profile_t *_pro)
-{
-  return MC_PASS;
-}
-
 static profile_t *
 profile_mpegts_pass_builder(void)
 {
@@ -1218,7 +1205,6 @@ profile_mpegts_pass_builder(void)
   pro->pro_sflags = SUBSCRIPTION_MPEGTS;
   pro->pro_reopen = profile_mpegts_pass_reopen;
   pro->pro_open   = profile_mpegts_pass_open;
-  pro->pro_get_mc = profile_mpegts_pass_get_mc;
   return (profile_t *)pro;
 }
 
@@ -1300,15 +1286,6 @@ profile_matroska_open(profile_chain_t *prch,
   return 0;
 }
 
-static muxer_container_type_t
-profile_matroska_get_mc(profile_t *_pro)
-{
-  profile_matroska_t *pro = (profile_matroska_t *)_pro;
-  if (pro->pro_webm)
-    return MC_WEBM;
-  return MC_MATROSKA;
-}
-
 static profile_t *
 profile_matroska_builder(void)
 {
@@ -1316,7 +1293,6 @@ profile_matroska_builder(void)
   pro->pro_sflags = SUBSCRIPTION_PACKET;
   pro->pro_reopen = profile_matroska_reopen;
   pro->pro_open   = profile_matroska_open;
-  pro->pro_get_mc = profile_matroska_get_mc;
   return (profile_t *)pro;
 }
 
@@ -1411,15 +1387,6 @@ profile_audio_open(profile_chain_t *prch,
   return 0;
 }
 
-static muxer_container_type_t
-profile_audio_get_mc(profile_t *_pro)
-{
-  profile_audio_t *pro = (profile_audio_t *)_pro;
-  if (pro->pro_mc == MC_UNKNOWN)
-    return MC_MPEG2AUDIO;
-  return pro->pro_mc;
-}
-
 static profile_t *
 profile_audio_builder(void)
 {
@@ -1427,7 +1394,6 @@ profile_audio_builder(void)
   pro->pro_sflags = SUBSCRIPTION_PACKET;
   pro->pro_reopen = profile_audio_reopen;
   pro->pro_open   = profile_audio_open;
-  pro->pro_get_mc = profile_audio_get_mc;
   return (profile_t *)pro;
 }
 
@@ -1487,12 +1453,6 @@ profile_libav_mpegts_open(profile_chain_t *prch,
   return 0;
 }
 
-static muxer_container_type_t
-profile_libav_mpegts_get_mc(profile_t *_pro)
-{
-  return MC_MPEGTS;
-}
-
 static profile_t *
 profile_libav_mpegts_builder(void)
 {
@@ -1500,7 +1460,6 @@ profile_libav_mpegts_builder(void)
   pro->pro_sflags = SUBSCRIPTION_PACKET;
   pro->pro_reopen = profile_libav_mpegts_reopen;
   pro->pro_open   = profile_libav_mpegts_open;
-  pro->pro_get_mc = profile_libav_mpegts_get_mc;
   return (profile_t *)pro;
 }
 
@@ -1584,15 +1543,6 @@ profile_libav_matroska_open(profile_chain_t *prch,
   return 0;
 }
 
-static muxer_container_type_t
-profile_libav_matroska_get_mc(profile_t *_pro)
-{
-  profile_libav_matroska_t *pro = (profile_libav_matroska_t *)_pro;
-  if (pro->pro_webm)
-    return MC_AVWEBM;
-  return MC_AVMATROSKA;
-}
-
 static profile_t *
 profile_libav_matroska_builder(void)
 {
@@ -1600,7 +1550,6 @@ profile_libav_matroska_builder(void)
   pro->pro_sflags = SUBSCRIPTION_PACKET;
   pro->pro_reopen = profile_libav_matroska_reopen;
   pro->pro_open   = profile_libav_matroska_open;
-  pro->pro_get_mc = profile_libav_matroska_get_mc;
   return (profile_t *)pro;
 }
 
@@ -1656,12 +1605,6 @@ profile_libav_mp4_open(profile_chain_t *prch,
   return 0;
 }
 
-static muxer_container_type_t
-profile_libav_mp4_get_mc(profile_t *_pro)
-{
-  return MC_AVMP4;
-}
-
 static profile_t *
 profile_libav_mp4_builder(void)
 {
@@ -1669,7 +1612,6 @@ profile_libav_mp4_builder(void)
   pro->pro_sflags = SUBSCRIPTION_PACKET;
   pro->pro_reopen = profile_libav_mp4_reopen;
   pro->pro_open   = profile_libav_mp4_open;
-  pro->pro_get_mc = profile_libav_mp4_get_mc;
   return (profile_t *)pro;
 }
 
@@ -2193,13 +2135,6 @@ profile_transcode_open(profile_chain_t *prch,
   return 0;
 }
 
-static muxer_container_type_t
-profile_transcode_get_mc(profile_t *_pro)
-{
-  profile_transcode_t *pro = (profile_transcode_t *)_pro;
-  return pro->pro_mc;
-}
-
 static void
 profile_transcode_free(profile_t *_pro)
 {
@@ -2220,7 +2155,6 @@ profile_transcode_builder(void)
   pro->pro_work   = profile_transcode_work;
   pro->pro_reopen = profile_transcode_reopen;
   pro->pro_open   = profile_transcode_open;
-  pro->pro_get_mc = profile_transcode_get_mc;
   return (profile_t *)pro;
 }
 

diff --git a/src/profile.h b/src/profile.h
index cd518c52e76948f8da470c98a252bdb34b5a6567..bcb8fd8dfd4fbb628371a7b96dd4929b3416c5fc 100644 (file)
--- a/src/profile.h
+++ b/src/profile.h
@@ -137,7 +137,6 @@ typedef struct profile {
 
   void (*pro_free)(struct profile *pro);
   void (*pro_conf_changed)(struct profile *pro);
-  muxer_container_type_t (*pro_get_mc)(struct profile *pro);
 
   int (*pro_work)(profile_chain_t *prch, struct streaming_target *dst,
                   uint32_t timeshift_period, int flags);
@@ -189,9 +188,6 @@ char *profile_validate_name(const char *name);
 
 const char *profile_get_name(profile_t *pro);
 
-static inline muxer_container_type_t profile_get_mc(profile_t *pro)
-  { return pro->pro_get_mc(pro); }
-
 void profile_get_htsp_list(htsmsg_t *array, htsmsg_t *filter);
 
 void profile_init(void);