dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 07:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

clapper: media-item: Fix construct with NULL as "cache-location"

Browse Source
This commit is contained in:
Rafał Dzięgiel
2024-06-28 19:47:07 +02:00
parent 2843a17879
commit 147399afd8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/clapper/clapper-media-item.c
View File

@@ -167,7 +167,7 @@ clapper_media_item_new_cached (const gchar *uri, const gchar *location)
{
ClapperMediaItem *item = clapper_media_item_new (uri);
if (G_LIKELY (item != NULL) && location)
if (location && G_LIKELY (item != NULL))
clapper_media_item_set_cache_location (item, location);
return item;
@@ -486,9 +486,13 @@ clapper_media_item_update_from_discoverer_info (ClapperMediaItem *self, GstDisco
void
clapper_media_item_set_cache_location (ClapperMediaItem *self, const gchar *location)
{
g_free (self->cache_uri);
self->cache_uri = g_filename_to_uri (location, NULL, NULL);
GST_DEBUG_OBJECT (self, "Set cache URI: \"%s\"", self->cache_uri);
g_clear_pointer (&self->cache_uri, g_free);
if (location)
self->cache_uri = g_filename_to_uri (location, NULL, NULL);
GST_DEBUG_OBJECT (self, "Set cache URI: \"%s\"",
GST_STR_NULL (self->cache_uri));
}
/* XXX: Can only be read from player thread.
@@ -509,9 +513,7 @@ clapper_media_item_get_playback_uri (ClapperMediaItem *self)
return self->cache_uri;
/* Do not test file existence next time */
GST_DEBUG_OBJECT (self, "Cleared cache URI for non-existing file: \"%s\"",
self->cache_uri);
g_clear_pointer (&self->cache_uri, g_free);
clapper_media_item_set_cache_location (self, NULL);
}
return self->uri;