hls: m3u8: remove pointless client_has_main() function

We always have a main list.

diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c
index f7632fe62c72f0916c3e46c502fda910fdad06df..0ab1a43b6c10dc7e79196a3353e57c0b6f22e7b3 100644 (file)
--- a/ext/hls/gsthlsdemux.c
+++ b/ext/hls/gsthlsdemux.c
@@ -800,8 +800,7 @@ retry:
   g_free (main_uri);
   if (download == NULL) {
     if (update && !main_checked
-        && gst_m3u8_client_has_variant_playlist (demux->client)
-        && gst_m3u8_client_has_main (demux->client)) {
+        && gst_m3u8_client_has_variant_playlist (demux->client)) {
       GError *err2 = NULL;
       main_uri = gst_m3u8_client_get_uri (demux->client);
       GST_INFO_OBJECT (demux,

diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c
index 4d203d4a5e66f17d57689bc1202bc3c543ff924e..c49f4337f978a8fb39d77e4b6e2ae34ece41ed7b 100644 (file)
--- a/ext/hls/m3u8.c
+++ b/ext/hls/m3u8.c
@@ -1228,22 +1228,6 @@ gst_m3u8_client_get_current_uri (GstM3U8Client * client)
   return uri;
 }
 
-gboolean
-gst_m3u8_client_has_main (GstM3U8Client * client)
-{
-  gboolean ret;
-
-  g_return_val_if_fail (client != NULL, FALSE);
-
-  GST_M3U8_CLIENT_LOCK (client);
-  if (client->main)
-    ret = TRUE;
-  else
-    ret = FALSE;
-  GST_M3U8_CLIENT_UNLOCK (client);
-  return ret;
-}
-
 gboolean
 gst_m3u8_client_has_variant_playlist (GstM3U8Client * client)
 {

diff --git a/ext/hls/m3u8.h b/ext/hls/m3u8.h
index fa28810fa49a4de6d8380d3dcde78b20b1538395..24eaaa1ad32a0a37fe45c84353b888710cbc0b49 100644 (file)
--- a/ext/hls/m3u8.h
+++ b/ext/hls/m3u8.h
@@ -140,8 +140,6 @@ gchar *         gst_m3u8_client_get_uri             (GstM3U8Client * client);
 
 gchar *         gst_m3u8_client_get_current_uri     (GstM3U8Client * client);
 
-gboolean        gst_m3u8_client_has_main            (GstM3U8Client * client);
-
 gboolean        gst_m3u8_client_has_variant_playlist (GstM3U8Client * client);
 
 gboolean        gst_m3u8_client_is_live             (GstM3U8Client * client);