clapper: Rename "uri-list-demux" element

Move as harvest URI demuxer since it is supposed to work only with
harvest data from extractable src. Also change caps media type
to "text/x-uri" which is non-standard, but we have to differentiate
single URI from harvest and URI list (one or more URIs).

src/lib/clapper/clapper-app-bus-private.h

@@ -44,6 +44,8 @@ void clapper_app_bus_post_refresh_streams (ClapperAppBus *app_bus, GstObject *sr
 
 void clapper_app_bus_post_refresh_timeline (ClapperAppBus *app_bus, GstObject *src);
 
+void clapper_app_bus_post_insert_playlist (ClapperAppBus *app_bus, GstObject *src, GstObject *playlist_item, GObject *playlist);
+
 void clapper_app_bus_post_simple_signal (ClapperAppBus *app_bus, GstObject *src, guint signal_id);
 
 void clapper_app_bus_post_object_desc_signal (ClapperAppBus *app_bus, GstObject *src, guint signal_id, GstObject *object, const gchar *desc);

src/lib/clapper/clapper-app-bus.c

@@ -21,6 +21,7 @@
 #include "clapper-bus-private.h"
 #include "clapper-app-bus-private.h"
 #include "clapper-player-private.h"
+#include "clapper-queue-private.h"
 #include "clapper-media-item-private.h"
 #include "clapper-timeline-private.h"
 
@@ -41,6 +42,7 @@ enum
   CLAPPER_APP_BUS_STRUCTURE_PROP_NOTIFY,
   CLAPPER_APP_BUS_STRUCTURE_REFRESH_STREAMS,
   CLAPPER_APP_BUS_STRUCTURE_REFRESH_TIMELINE,
+  CLAPPER_APP_BUS_STRUCTURE_INSERT_PLAYLIST,
   CLAPPER_APP_BUS_STRUCTURE_SIMPLE_SIGNAL,
   CLAPPER_APP_BUS_STRUCTURE_OBJECT_DESC_SIGNAL,
   CLAPPER_APP_BUS_STRUCTURE_DESC_WITH_DETAILS_SIGNAL,
@@ -52,6 +54,7 @@ static ClapperBusQuark _structure_quarks[] = {
   {"prop-notify", 0},
   {"refresh-streams", 0},
   {"refresh-timeline", 0},
+  {"insert-playlist", 0},
   {"simple-signal", 0},
   {"object-desc-signal", 0},
   {"desc-with-details-signal", 0},
@@ -65,6 +68,7 @@ enum
   CLAPPER_APP_BUS_FIELD_PSPEC,
   CLAPPER_APP_BUS_FIELD_SIGNAL_ID,
   CLAPPER_APP_BUS_FIELD_OBJECT,
+  CLAPPER_APP_BUS_FIELD_OTHER_OBJECT,
   CLAPPER_APP_BUS_FIELD_DESC,
   CLAPPER_APP_BUS_FIELD_DETAILS,
   CLAPPER_APP_BUS_FIELD_ERROR,
@@ -76,6 +80,7 @@ static ClapperBusQuark _field_quarks[] = {
   {"pspec", 0},
   {"signal-id", 0},
   {"object", 0},
+  {"other-object", 0},
   {"desc", 0},
   {"details", 0},
   {"error", 0},
@@ -160,6 +165,36 @@ _handle_refresh_timeline_msg (GstMessage *msg, const GstStructure *structure)
   clapper_timeline_refresh (timeline);
 }
 
+void
+clapper_app_bus_post_insert_playlist (ClapperAppBus *self, GstObject *src,
+    GstObject *playlist_item, GObject *playlist)
+{
+  GstStructure *structure = gst_structure_new_id (_STRUCTURE_QUARK (INSERT_PLAYLIST),
+      _FIELD_QUARK (OBJECT), GST_TYPE_OBJECT, playlist_item,
+      _FIELD_QUARK (OTHER_OBJECT), G_TYPE_OBJECT, playlist,
+      NULL);
+  gst_bus_post (GST_BUS_CAST (self), gst_message_new_application (src, structure));
+}
+
+static inline void
+_handle_insert_playlist_msg (GstMessage *msg, const GstStructure *structure)
+{
+  ClapperPlayer *player = CLAPPER_PLAYER_CAST (GST_MESSAGE_SRC (msg));
+  ClapperQueue *queue = clapper_player_get_queue (player);
+  GstObject *playlist_item;
+  GObject *playlist;
+
+  gst_structure_id_get (structure,
+      _FIELD_QUARK (OBJECT), GST_TYPE_OBJECT, &playlist_item,
+      _FIELD_QUARK (OTHER_OBJECT), G_TYPE_OBJECT, &playlist,
+      NULL);
+  clapper_queue_handle_playlist (queue,
+      CLAPPER_MEDIA_ITEM (playlist_item), G_LIST_STORE (playlist));
+
+  gst_object_unref (playlist_item);
+  g_object_unref (playlist);
+}
+
 void
 clapper_app_bus_post_simple_signal (ClapperAppBus *self, GstObject *src, guint signal_id)
 {
@@ -285,6 +320,8 @@ clapper_app_bus_message_func (GstBus *bus, GstMessage *msg, gpointer user_data G
       _handle_refresh_streams_msg (msg, structure);
     else if (quark == _STRUCTURE_QUARK (REFRESH_TIMELINE))
       _handle_refresh_timeline_msg (msg, structure);
+    else if (quark == _STRUCTURE_QUARK (INSERT_PLAYLIST))
+      _handle_insert_playlist_msg (msg, structure);
     else if (quark == _STRUCTURE_QUARK (SIMPLE_SIGNAL))
       _handle_simple_signal_msg (msg, structure);
     else if (quark == _STRUCTURE_QUARK (OBJECT_DESC_SIGNAL))

src/lib/clapper/clapper-media-item-private.h

@@ -33,6 +33,9 @@ void clapper_media_item_update_from_tag_list (ClapperMediaItem *item, const GstT
 G_GNUC_INTERNAL
 void clapper_media_item_update_from_discoverer_info (ClapperMediaItem *self, GstDiscovererInfo *info);
 
+G_GNUC_INTERNAL
+gboolean clapper_media_item_update_from_item (ClapperMediaItem *item, ClapperMediaItem *other_item, ClapperPlayer *player);
+
 G_GNUC_INTERNAL
 gboolean clapper_media_item_set_duration (ClapperMediaItem *item, gdouble duration, ClapperAppBus *app_bus);
 

src/lib/clapper/clapper-media-item.c

@@ -51,6 +51,10 @@ struct _ClapperMediaItem
   gchar *container_format;
   gdouble duration;
 
+  /* Whether using title from URI */
+  gboolean title_is_parsed;
+
+  GSList *redirects;
   gchar *cache_uri;
 
   /* For shuffle */
@@ -295,11 +299,11 @@ clapper_media_item_get_title (ClapperMediaItem *self)
 
 static inline gboolean
 _refresh_tag_prop_unlocked (ClapperMediaItem *self, const gchar *tag,
-    gboolean from_user, gchar **tag_ptr)
+    gboolean allow_overwrite, gchar **tag_ptr)
 {
   const gchar *string;
 
-  if ((*tag_ptr && from_user) // if already set, user cannot modify it
+  if ((*tag_ptr && !allow_overwrite)
       || !gst_tag_list_peek_string_index (self->tags, tag, 0, &string) // guarantees non-empty string
       || (g_strcmp0 (*tag_ptr, string) == 0))
     return FALSE;
@@ -488,11 +492,12 @@ clapper_media_item_insert_tags_internal (ClapperMediaItem *self, const GstTagLis
     *flags |= CLAPPER_REACTABLE_ITEM_UPDATED_TAGS;
 
     if ((title_changed = _refresh_tag_prop_unlocked (self, GST_TAG_TITLE,
-        from_user, &self->title))) {
+        (!from_user || self->title_is_parsed), &self->title))) {
+      self->title_is_parsed = FALSE;
       *flags |= CLAPPER_REACTABLE_ITEM_UPDATED_TITLE;
     }
     cont_changed = _refresh_tag_prop_unlocked (self, GST_TAG_CONTAINER_FORMAT,
-        from_user, &self->container_format);
+        !from_user, &self->container_format);
   }
 
   GST_OBJECT_UNLOCK (self);
@@ -668,6 +673,37 @@ clapper_media_item_update_from_discoverer_info (ClapperMediaItem *self, GstDisco
   gst_object_unref (player);
 }
 
+/* XXX: Must be set from player thread */
+static inline gboolean
+clapper_media_item_set_redirect_uri (ClapperMediaItem *self, const gchar *redirect_uri)
+{
+  /* Check if we did not already redirect into that URI (prevent endless loop) */
+  if (!redirect_uri || g_slist_find_custom (self->redirects, redirect_uri, (GCompareFunc) strcmp))
+    return FALSE;
+
+  self->redirects = g_slist_prepend (self->redirects, g_strdup (redirect_uri));
+  GST_DEBUG_OBJECT (self, "Set redirect URI: \"%s\"", (gchar *) self->redirects->data);
+
+  return TRUE;
+}
+
+gboolean
+clapper_media_item_update_from_item (ClapperMediaItem *self, ClapperMediaItem *other_item,
+    ClapperPlayer *player)
+{
+  if (!clapper_media_item_set_redirect_uri (self, clapper_media_item_get_uri (other_item)))
+    return FALSE;
+
+  GST_OBJECT_LOCK (other_item);
+
+  if (other_item->tags)
+    clapper_media_item_update_from_tag_list (self, other_item->tags, player);
+
+  GST_OBJECT_UNLOCK (other_item);
+
+  return TRUE;
+}
+
 /* XXX: Must be set from player thread or upon construction */
 void
 clapper_media_item_set_cache_location (ClapperMediaItem *self, const gchar *location)
@@ -682,7 +718,7 @@ clapper_media_item_set_cache_location (ClapperMediaItem *self, const gchar *loca
 }
 
 /* XXX: Can only be read from player thread.
- * Returns cache URI if available, item URI otherwise. */
+ * Returns cache URI if available, otherwise redirect or item URI. */
 inline const gchar *
 clapper_media_item_get_playback_uri (ClapperMediaItem *self)
 {
@@ -702,6 +738,9 @@ clapper_media_item_get_playback_uri (ClapperMediaItem *self)
     clapper_media_item_set_cache_location (self, NULL);
   }
 
+  if (self->redirects)
+    return self->redirects->data;
+
   return self->uri;
 }
 
@@ -745,6 +784,7 @@ clapper_media_item_constructed (GObject *object)
     self->uri = g_strdup ("file://");
 
   self->title = clapper_utils_title_from_uri (self->uri);
+  self->title_is_parsed = (self->title != NULL);
 
   G_OBJECT_CLASS (parent_class)->constructed (object);
 }
@@ -765,6 +805,7 @@ clapper_media_item_finalize (GObject *object)
   gst_object_unparent (GST_OBJECT_CAST (self->timeline));
   gst_object_unref (self->timeline);
 
+  g_slist_free_full (self->redirects, g_free);
   g_free (self->cache_uri);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -892,7 +933,8 @@ clapper_media_item_class_init (ClapperMediaItemClass *klass)
       G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
   /* FIXME: 1.0: Consider rename to e.g. "(menu/display)-title"
-   * and also make it non-nullable (return URI as final fallback) */
+   * and also make it non-nullable (return URI as final fallback).
+   * NOTE: It would probably need to work with redirect URI */
   /**
    * ClapperMediaItem:title:
    *

src/lib/clapper/clapper-playbin-bus.c

@@ -831,6 +831,59 @@ _handle_element_msg (GstMessage *msg, ClapperPlayer *player)
 
     g_free (name);
     g_free (details);
+  } else if (gst_message_has_name (msg, "ClapperPlaylistParsed")) {
+    ClapperMediaItem *playlist_item = NULL;
+    GListStore *playlist = NULL;
+    const GstStructure *structure = gst_message_get_structure (msg);
+    guint n_items;
+
+    /* If message contains item, use that.
+     * Otherwise assume pending item was parsed. */
+    if (gst_structure_has_field (structure, "item")) {
+      gst_structure_get (structure,
+          "item", CLAPPER_TYPE_MEDIA_ITEM, &playlist_item, NULL);
+    } else {
+      GST_OBJECT_LOCK (player);
+
+      /* Playlist is always parsed before playback starts */
+      if (player->pending_item)
+        playlist_item = gst_object_ref (player->pending_item);
+
+      GST_OBJECT_UNLOCK (player);
+    }
+
+    if (G_UNLIKELY (playlist_item == NULL)) {
+      GST_WARNING_OBJECT (player, "Playlist parsed without media item set");
+      return;
+    }
+
+    GST_INFO_OBJECT (player, "Received parsed playlist of %" GST_PTR_FORMAT
+        "(%s)", playlist_item, clapper_media_item_get_uri (playlist_item));
+
+    gst_structure_get (structure,
+        "playlist", G_TYPE_LIST_STORE, &playlist, NULL);
+
+    n_items = g_list_model_get_n_items (G_LIST_MODEL (playlist));
+
+    if (G_LIKELY (n_items > 0)) {
+      ClapperMediaItem *active_item = g_list_model_get_item (G_LIST_MODEL (playlist), 0);
+      gboolean updated;
+
+      /* Update redirect URI (must be done from player thread) */
+      updated = clapper_media_item_update_from_item (playlist_item, active_item, player);
+      gst_object_unref (active_item);
+
+      /* Forward to append remaining items (must be done from main thread) */
+      if (updated && n_items > 1) {
+        clapper_app_bus_post_insert_playlist (player->app_bus,
+            GST_OBJECT_CAST (player),
+            GST_OBJECT_CAST (playlist_item),
+            G_OBJECT (playlist));
+      }
+    }
+
+    gst_object_unref (playlist_item);
+    g_object_unref (playlist);
   } else if (gst_message_has_name (msg, "GstCacheDownloadComplete")) {
     ClapperMediaItem *downloaded_item = NULL;
     const GstStructure *structure;

src/lib/clapper/clapper-player.c

@@ -826,7 +826,8 @@ _element_setup_cb (GstElement *playbin, GstElement *element, ClapperPlayer *self
   factory_name = g_intern_static_string (GST_OBJECT_NAME (factory));
   GST_INFO_OBJECT (self, "Element setup: %s", factory_name);
 
-  if (factory_name == g_intern_static_string ("clapperextractablesrc")) {
+  if (factory_name == g_intern_static_string ("clapperextractablesrc")
+      || factory_name == g_intern_static_string ("clapperplaylistdemux")) {
     g_object_set (element,
         "enhancer-proxies", self->enhancer_proxies,
         NULL);

src/lib/clapper/clapper-queue-private.h

@@ -19,6 +19,7 @@
 #pragma once
 
 #include <glib.h>
+#include <gio/gio.h>
 
 #include "clapper-queue.h"
 #include "clapper-media-item.h"
@@ -31,6 +32,8 @@ ClapperQueue * clapper_queue_new (void);
 
 void clapper_queue_handle_played_item_changed (ClapperQueue *queue, ClapperMediaItem *played_item, ClapperAppBus *app_bus);
 
+void clapper_queue_handle_playlist (ClapperQueue *queue, ClapperMediaItem *playlist_item, GListStore *playlist);
+
 void clapper_queue_handle_about_to_finish (ClapperQueue *queue, ClapperPlayer *player);
 
 gboolean clapper_queue_handle_eos (ClapperQueue *queue, ClapperPlayer *player);

src/lib/clapper/clapper-queue.c

@@ -337,6 +337,42 @@ _get_next_item_unlocked (ClapperQueue *self, ClapperQueueProgressionMode mode)
   return next_item;
 }
 
+static void
+_take_item_unlocked (ClapperQueue *self, ClapperMediaItem *item, gint index)
+{
+  guint prev_length = self->items->len;
+
+  g_ptr_array_insert (self->items, index, item);
+  gst_object_set_parent (GST_OBJECT_CAST (item), GST_OBJECT_CAST (self));
+
+  /* In append we inserted at array length */
+  if (index < 0)
+    index = prev_length;
+
+  _announce_model_update (self, index, 0, 1, item);
+
+  /* If has selection and inserting before it */
+  if (self->current_index != CLAPPER_QUEUE_INVALID_POSITION
+      && (guint) index <= self->current_index) {
+    self->current_index++;
+    _announce_current_index_change (self);
+  } else if (prev_length == 0 && _replace_current_item_unlocked (self, item, 0)) {
+    /* If queue was empty, auto select first item and announce it */
+    _announce_current_item_and_index_change (self);
+  } else if (self->current_index == prev_length - 1
+      && clapper_queue_get_progression_mode (self) == CLAPPER_QUEUE_PROGRESSION_CONSECUTIVE) {
+    ClapperPlayer *player = clapper_player_get_from_ancestor (GST_OBJECT_CAST (self));
+    gboolean after_eos = (gboolean) g_atomic_int_get (&player->eos);
+
+    /* In consecutive progression automatically select next item
+     * if we were after EOS of last queue item */
+    if (after_eos && _replace_current_item_unlocked (self, item, index))
+      _announce_current_item_and_index_change (self);
+
+    gst_object_unref (player);
+  }
+}
+
 /*
  * For gapless we need to manually replace current item in queue when it starts
  * playing and emit notify about change, this function will do that if necessary
@@ -366,6 +402,31 @@ clapper_queue_handle_played_item_changed (ClapperQueue *self, ClapperMediaItem *
   }
 }
 
+/* Must be called from main thread */
+void
+clapper_queue_handle_playlist (ClapperQueue *self, ClapperMediaItem *playlist_item,
+    GListStore *playlist)
+{
+  GListModel *playlist_model = G_LIST_MODEL (playlist);
+  guint i, index, n_items = g_list_model_get_n_items (playlist_model);
+
+  CLAPPER_QUEUE_REC_LOCK (self);
+
+  /* If playlist item is still in the queue, insert
+   * remaining items after it, otherwise append */
+  if (G_LIKELY (g_ptr_array_find (self->items, playlist_item, &index)))
+    index++;
+  else
+    index = self->items->len;
+
+  for (i = 1; i < n_items; ++i) {
+    ClapperMediaItem *item = g_list_model_get_item (playlist_model, i);
+    _take_item_unlocked (self, item, index++);
+  }
+
+  CLAPPER_QUEUE_REC_UNLOCK (self);
+}
+
 void
 clapper_queue_handle_about_to_finish (ClapperQueue *self, ClapperPlayer *player)
 {
@@ -481,39 +542,8 @@ clapper_queue_insert_item (ClapperQueue *self, ClapperMediaItem *item, gint inde
 
   CLAPPER_QUEUE_REC_LOCK (self);
 
-  if (!g_ptr_array_find (self->items, item, NULL)) {
-    guint prev_length = self->items->len;
-
-    g_ptr_array_insert (self->items, index, gst_object_ref (item));
-    gst_object_set_parent (GST_OBJECT_CAST (item), GST_OBJECT_CAST (self));
-
-    /* In append we inserted at array length */
-    if (index < 0)
-      index = prev_length;
-
-    _announce_model_update (self, index, 0, 1, item);
-
-    /* If has selection and inserting before it */
-    if (self->current_index != CLAPPER_QUEUE_INVALID_POSITION
-        && (guint) index <= self->current_index) {
-      self->current_index++;
-      _announce_current_index_change (self);
-    } else if (prev_length == 0 && _replace_current_item_unlocked (self, item, 0)) {
-      /* If queue was empty, auto select first item and announce it */
-      _announce_current_item_and_index_change (self);
-    } else if (self->current_index == prev_length - 1
-        && clapper_queue_get_progression_mode (self) == CLAPPER_QUEUE_PROGRESSION_CONSECUTIVE) {
-      ClapperPlayer *player = clapper_player_get_from_ancestor (GST_OBJECT_CAST (self));
-      gboolean after_eos = (gboolean) g_atomic_int_get (&player->eos);
-
-      /* In consecutive progression automatically select next item
-       * if we were after EOS of last queue item */
-      if (after_eos && _replace_current_item_unlocked (self, item, index))
-        _announce_current_item_and_index_change (self);
-
-      gst_object_unref (player);
-    }
-  }
+  if (!g_ptr_array_find (self->items, item, NULL))
+    _take_item_unlocked (self, gst_object_ref (item), index);
 
   CLAPPER_QUEUE_REC_UNLOCK (self);
 }

src/lib/clapper/gst/clapper-harvest-uri-demux-private.h

@@ -1,5 +1,5 @@
 /* Clapper Playback Library
- * Copyright (C) 2024 Rafał Dzięgiel <rafostar.github@gmail.com>
+ * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,12 +26,12 @@
 
 G_BEGIN_DECLS
 
-#define CLAPPER_TYPE_URI_LIST_DEMUX (clapper_uri_list_demux_get_type())
-#define CLAPPER_URI_LIST_DEMUX_CAST(obj) ((ClapperUriListDemux *)(obj))
+#define CLAPPER_TYPE_HARVEST_URI_DEMUX (clapper_harvest_uri_demux_get_type())
+#define CLAPPER_HARVEST_URI_DEMUX_CAST(obj) ((ClapperHarvestUriDemux *)(obj))
 
 G_GNUC_INTERNAL
-G_DECLARE_FINAL_TYPE (ClapperUriListDemux, clapper_uri_list_demux, CLAPPER, URI_LIST_DEMUX, ClapperUriBaseDemux)
+G_DECLARE_FINAL_TYPE (ClapperHarvestUriDemux, clapper_harvest_uri_demux, CLAPPER, HARVEST_URI_DEMUX, ClapperUriBaseDemux)
 
-GST_ELEMENT_REGISTER_DECLARE (clapperurilistdemux)
+GST_ELEMENT_REGISTER_DECLARE (clapperharvesturidemux)
 
 G_END_DECLS

src/lib/clapper/gst/clapper-harvest-uri-demux.c

@@ -1,5 +1,5 @@
 /* Clapper Playback Library
- * Copyright (C) 2024 Rafał Dzięgiel <rafostar.github@gmail.com>
+ * Copyright (C) 2025 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,12 +16,12 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-#include "clapper-uri-list-demux-private.h"
+#include "clapper-harvest-uri-demux-private.h"
 
-#define GST_CAT_DEFAULT clapper_uri_list_demux_debug
+#define GST_CAT_DEFAULT clapper_harvest_uri_demux_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
-struct _ClapperUriListDemux
+struct _ClapperHarvestUriDemux
 {
   ClapperUriBaseDemux parent;
 
@@ -32,12 +32,12 @@ struct _ClapperUriListDemux
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("text/uri-list, source=(string)clapper-harvest"));
+    GST_STATIC_CAPS ("text/x-uri, source=(string)clapper-harvest"));
 
-#define parent_class clapper_uri_list_demux_parent_class
-G_DEFINE_TYPE (ClapperUriListDemux, clapper_uri_list_demux, CLAPPER_TYPE_URI_BASE_DEMUX);
-GST_ELEMENT_REGISTER_DEFINE (clapperurilistdemux, "clapperurilistdemux",
-    512, CLAPPER_TYPE_URI_LIST_DEMUX);
+#define parent_class clapper_harvest_uri_demux_parent_class
+G_DEFINE_TYPE (ClapperHarvestUriDemux, clapper_harvest_uri_demux, CLAPPER_TYPE_URI_BASE_DEMUX);
+GST_ELEMENT_REGISTER_DEFINE (clapperharvesturidemux, "clapperharvesturidemux",
+    512, CLAPPER_TYPE_HARVEST_URI_DEMUX);
 
 static void
 _set_property (GstObject *obj, const gchar *prop_name, gpointer value)
@@ -93,10 +93,10 @@ configure_deep_element (GQuark field_id, const GValue *value, GstElement *child)
 }
 
 static void
-clapper_uri_list_demux_deep_element_added (GstBin *bin, GstBin *sub_bin, GstElement *child)
+clapper_harvest_uri_demux_deep_element_added (GstBin *bin, GstBin *sub_bin, GstElement *child)
 {
   if (GST_OBJECT_FLAG_IS_SET (child, GST_ELEMENT_FLAG_SOURCE)) {
-    ClapperUriListDemux *self = CLAPPER_URI_LIST_DEMUX_CAST (bin);
+    ClapperHarvestUriDemux *self = CLAPPER_HARVEST_URI_DEMUX_CAST (bin);
 
     g_mutex_lock (&self->lock);
 
@@ -110,7 +110,7 @@ clapper_uri_list_demux_deep_element_added (GstBin *bin, GstBin *sub_bin, GstElem
 }
 
 static gboolean
-clapper_uri_list_demux_process_buffer (ClapperUriBaseDemux *uri_bd,
+clapper_harvest_uri_demux_process_buffer (ClapperUriBaseDemux *uri_bd,
     GstBuffer *buffer, GCancellable *cancellable)
 {
   GstMemory *mem = gst_buffer_peek_memory (buffer, 0);
@@ -127,12 +127,12 @@ clapper_uri_list_demux_process_buffer (ClapperUriBaseDemux *uri_bd,
 }
 
 static void
-clapper_uri_list_demux_handle_custom_event (ClapperUriBaseDemux *uri_bd, GstEvent *event)
+clapper_harvest_uri_demux_handle_custom_event (ClapperUriBaseDemux *uri_bd, GstEvent *event)
 {
   const GstStructure *structure = gst_event_get_structure (event);
 
   if (structure && gst_structure_has_name (structure, "http-headers")) {
-    ClapperUriListDemux *self = CLAPPER_URI_LIST_DEMUX_CAST (uri_bd);
+    ClapperHarvestUriDemux *self = CLAPPER_HARVEST_URI_DEMUX_CAST (uri_bd);
 
     GST_DEBUG_OBJECT (self, "Received \"http-headers\" custom event");
 
@@ -146,15 +146,15 @@ clapper_uri_list_demux_handle_custom_event (ClapperUriBaseDemux *uri_bd, GstEven
 }
 
 static void
-clapper_uri_list_demux_init (ClapperUriListDemux *self)
+clapper_harvest_uri_demux_init (ClapperHarvestUriDemux *self)
 {
   g_mutex_init (&self->lock);
 }
 
 static void
-clapper_uri_list_demux_finalize (GObject *object)
+clapper_harvest_uri_demux_finalize (GObject *object)
 {
-  ClapperUriListDemux *self = CLAPPER_URI_LIST_DEMUX_CAST (object);
+  ClapperHarvestUriDemux *self = CLAPPER_HARVEST_URI_DEMUX_CAST (object);
 
   GST_TRACE_OBJECT (self, "Finalize");
 
@@ -165,26 +165,26 @@ clapper_uri_list_demux_finalize (GObject *object)
 }
 
 static void
-clapper_uri_list_demux_class_init (ClapperUriListDemuxClass *klass)
+clapper_harvest_uri_demux_class_init (ClapperHarvestUriDemuxClass *klass)
 {
   GObjectClass *gobject_class = (GObjectClass *) klass;
   GstElementClass *gstelement_class = (GstElementClass *) klass;
   GstBinClass *gstbin_class = (GstBinClass *) klass;
   ClapperUriBaseDemuxClass *clapperuribd_class = (ClapperUriBaseDemuxClass *) klass;
 
-  GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "clapperurilistdemux", 0,
-      "Clapper URI List Demux");
+  GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "clapperharvesturidemux", 0,
+      "Clapper Harvest URI Demux");
 
-  gobject_class->finalize = clapper_uri_list_demux_finalize;
+  gobject_class->finalize = clapper_harvest_uri_demux_finalize;
 
-  gstbin_class->deep_element_added = clapper_uri_list_demux_deep_element_added;
+  gstbin_class->deep_element_added = clapper_harvest_uri_demux_deep_element_added;
 
-  clapperuribd_class->process_buffer = clapper_uri_list_demux_process_buffer;
-  clapperuribd_class->handle_custom_event = clapper_uri_list_demux_handle_custom_event;
+  clapperuribd_class->process_buffer = clapper_harvest_uri_demux_process_buffer;
+  clapperuribd_class->handle_custom_event = clapper_harvest_uri_demux_handle_custom_event;
 
   gst_element_class_add_static_pad_template (gstelement_class, &sink_template);
 
-  gst_element_class_set_static_metadata (gstelement_class, "Clapper URI List Demux",
-      "Demuxer", "A custom demuxer for URI lists",
+  gst_element_class_set_static_metadata (gstelement_class, "Clapper Harvest URI Demux",
+      "Demuxer", "A custom demuxer for harvested URI",
       "Rafał Dzięgiel <rafostar.github@gmail.com>");
 }

src/lib/clapper/gst/clapper-plugin.c

@@ -28,8 +28,8 @@
 
 #include "clapper-plugin-private.h"
 #include "clapper-extractable-src-private.h"
+#include "clapper-harvest-uri-demux-private.h"
 #include "clapper-playlist-demux-private.h"
-#include "clapper-uri-list-demux-private.h"
 
 gboolean
 clapper_gst_plugin_init (GstPlugin *plugin)
@@ -46,7 +46,7 @@ clapper_gst_plugin_init (GstPlugin *plugin)
   /* Avoid registering an URI handler without schemes */
   if (clapper_enhancer_proxy_list_has_proxy_with_interface (global_proxies, CLAPPER_TYPE_EXTRACTABLE)) {
     res &= (GST_ELEMENT_REGISTER (clapperextractablesrc, plugin)
-        && GST_ELEMENT_REGISTER (clapperurilistdemux, plugin));
+        && GST_ELEMENT_REGISTER (clapperharvesturidemux, plugin));
   }
 
   /* Type find will only register if there are playlistable enhancers */

src/lib/clapper/meson.build

@@ -163,7 +163,7 @@ clapper_sources = [
   'gst/clapper-extractable-src.c',
   'gst/clapper-enhancer-director.c',
   'gst/clapper-uri-base-demux.c',
-  'gst/clapper-uri-list-demux.c',
+  'gst/clapper-harvest-uri-demux.c',
   'gst/clapper-playlist-demux.c',
   '../shared/clapper-shared-utils.c',
 ]