From 97ea56e91c54a33a1c7237a93d92fff68ba98740 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 30 Nov 2015 11:05:38 +0000 Subject: [PATCH] hls: m3u8: remove pointless client_has_main() function We always have a main list. --- ext/hls/gsthlsdemux.c | 3 +-- ext/hls/m3u8.c | 16 ---------------- ext/hls/m3u8.h | 2 -- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c index f7632fe..0ab1a43 100644 --- 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 4d203d4..c49f433 100644 --- a/ext/hls/m3u8.c +++ b/ext/hls/m3u8.c @@ -1229,22 +1229,6 @@ gst_m3u8_client_get_current_uri (GstM3U8Client * client) } 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) { gboolean ret; diff --git a/ext/hls/m3u8.h b/ext/hls/m3u8.h index fa28810..24eaaa1 100644 --- 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); -- 2.7.4