burstcache: add error quark

This commit is contained in:
Wim Taymans 2016-04-27 12:16:15 +02:00
parent c8f34750e2
commit 45c5e4c47f
2 changed files with 16 additions and 5 deletions

View file

@ -110,6 +110,14 @@ enum
PROP_LAST PROP_LAST
}; };
GQuark gst_burst_cache_error_quark (void)
{
static GQuark quark;
if (!quark)
quark = g_quark_from_static_string ("gst-burst-cache-error-quark");
return quark;
}
GST_DEBUG_CATEGORY_STATIC (burstcache_debug); GST_DEBUG_CATEGORY_STATIC (burstcache_debug);
#define GST_CAT_DEFAULT (burstcache_debug) #define GST_CAT_DEFAULT (burstcache_debug)
@ -983,7 +991,7 @@ gst_burst_cache_remove_reader (GstBurstCache * cache,
} }
} else { } else {
gst_burst_cache_remove_reader_link (cache, reader, TRUE, gst_burst_cache_remove_reader_link (cache, reader, TRUE,
g_error_new (0, GST_BURST_CACHE_ERROR_NONE, "User requested remove")); g_error_new (GST_BURST_CACHE_ERROR, GST_BURST_CACHE_ERROR_NONE, "User requested remove"));
} }
CACHE_UNLOCK (cache); CACHE_UNLOCK (cache);
@ -1023,7 +1031,7 @@ gst_burst_cache_error_reader (GstBurstCache * cache,
goto not_valid; goto not_valid;
if (error == NULL) if (error == NULL)
error = g_error_new (0, GST_BURST_CACHE_ERROR_ERROR, "Unknown error"); error = g_error_new (GST_BURST_CACHE_ERROR, GST_BURST_CACHE_ERROR_ERROR, "Unknown error");
GST_WARNING_OBJECT (cache, "%s reader %p error, removing: %s", GST_WARNING_OBJECT (cache, "%s reader %p error, removing: %s",
reader->debug, reader, error->message); reader->debug, reader, error->message);
@ -1046,7 +1054,7 @@ static gboolean
remove_hook (GstBurstCacheReader * reader, GstBurstCache * cache) remove_hook (GstBurstCacheReader * reader, GstBurstCache * cache)
{ {
gst_burst_cache_remove_reader_link (cache, reader, FALSE, gst_burst_cache_remove_reader_link (cache, reader, FALSE,
g_error_new (0, GST_BURST_CACHE_ERROR_NONE, "User requested clear")); g_error_new (GST_BURST_CACHE_ERROR, GST_BURST_CACHE_ERROR_NONE, "User requested clear"));
/* FALSE to remove */ /* FALSE to remove */
return FALSE; return FALSE;
@ -1194,7 +1202,7 @@ hit_limit:
GST_WARNING_OBJECT (cache, "%s reader %p is too slow, removing", GST_WARNING_OBJECT (cache, "%s reader %p is too slow, removing",
reader->debug, reader); reader->debug, reader);
gst_burst_cache_remove_reader_link (cache, reader, FALSE, gst_burst_cache_remove_reader_link (cache, reader, FALSE,
g_error_new (0, GST_BURST_CACHE_ERROR_SLOW, "Reader is too slow")); g_error_new (GST_BURST_CACHE_ERROR, GST_BURST_CACHE_ERROR_SLOW, "Reader is too slow"));
/* remove reader */ /* remove reader */
return FALSE; return FALSE;
} }
@ -1203,7 +1211,7 @@ timeout:
GST_WARNING_OBJECT (cache, "%s reader %p timeout, removing", GST_WARNING_OBJECT (cache, "%s reader %p timeout, removing",
reader->debug, reader); reader->debug, reader);
gst_burst_cache_remove_reader_link (cache, reader, FALSE, gst_burst_cache_remove_reader_link (cache, reader, FALSE,
g_error_new (0, GST_BURST_CACHE_ERROR_SLOW, "Reader timed out")); g_error_new (GST_BURST_CACHE_ERROR, GST_BURST_CACHE_ERROR_SLOW, "Reader timed out"));
/* remove reader */ /* remove reader */
return FALSE; return FALSE;
} }

View file

@ -101,6 +101,9 @@ typedef enum
GST_BURST_CACHE_ERROR_DUPLICATE = 3, GST_BURST_CACHE_ERROR_DUPLICATE = 3,
} GstBurstCacheError; } GstBurstCacheError;
GQuark gst_burst_cache_error_quark (void);
#define GST_BURST_CACHE_ERROR gst_burst_cache_error_quark()
/** /**
* GstBurstCacheResult: * GstBurstCacheResult:
* @GST_BURST_CACHE_RESULT_ERROR : An error occured * @GST_BURST_CACHE_RESULT_ERROR : An error occured