[rygel-gst-0-10-plugins] Whitespace cleanup.
- From: Krzesimir Nowak <krnowak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-gst-0-10-plugins] Whitespace cleanup.
- Date: Tue, 5 Feb 2013 15:22:16 +0000 (UTC)
commit 17f4334e07a49e06513e0986b8eaf7aad8328a73
Author: Krzesimir Nowak <krnowak openismus com>
Date: Tue Feb 5 16:20:39 2013 +0100
Whitespace cleanup.
Tabs to spaces, removed trailing whitespace and so on.
src/media-export/rygel-media-export-database.c | 129 +++---
src/media-export/rygel-media-export-db-container.c | 6 +-
.../rygel-media-export-dummy-container.c | 4 +-
src/media-export/rygel-media-export-harvester.c | 304 ++++++------
src/media-export/rygel-media-export-harvester.h | 10 +-
.../rygel-media-export-harvesting-task.c | 350 +++++++-------
.../rygel-media-export-harvesting-task.h | 8 +-
src/media-export/rygel-media-export-item-factory.c | 83 ++--
src/media-export/rygel-media-export-item-factory.h | 50 +-
src/media-export/rygel-media-export-jpeg-writer.c | 36 +-
src/media-export/rygel-media-export-jpeg-writer.h | 4 +-
.../rygel-media-export-leaf-query-container.c | 4 +-
.../rygel-media-export-media-cache-upgrader.c | 376 ++++++++--------
.../rygel-media-export-media-cache-upgrader.h | 10 +-
src/media-export/rygel-media-export-media-cache.c | 488 ++++++++++----------
src/media-export/rygel-media-export-media-cache.h | 124 +++---
.../rygel-media-export-metadata-extractor.c | 138 +++---
.../rygel-media-export-metadata-extractor.h | 2 +-
src/media-export/rygel-media-export-music-item.h | 6 +-
.../rygel-media-export-null-container.c | 4 +-
.../rygel-media-export-object-factory.c | 32 +-
src/media-export/rygel-media-export-photo-item.h | 6 +-
src/media-export/rygel-media-export-plugin.c | 10 +-
.../rygel-media-export-query-container-factory.c | 96 ++--
.../rygel-media-export-query-container-factory.h | 12 +-
.../rygel-media-export-recursive-file-monitor.c | 25 +-
.../rygel-media-export-recursive-file-monitor.h | 8 +-
.../rygel-media-export-root-container.c | 348 +++++++-------
.../rygel-media-export-root-container.h | 6 +-
src/media-export/rygel-media-export-sql-factory.h | 2 +-
src/media-export/rygel-media-export-string-utils.c | 4 +-
src/media-export/rygel-media-export-string-utils.h | 10 +-
src/media-export/rygel-media-export-video-item.h | 6 +-
.../rygel-media-export-writable-db-container.c | 81 ++--
.../rygel-media-export-writable-db-container.h | 2 +-
35 files changed, 1387 insertions(+), 1397 deletions(-)
---
diff --git a/src/media-export/rygel-media-export-database.c b/src/media-export/rygel-media-export-database.c
index 8f97c75..fc7625f 100644
--- a/src/media-export/rygel-media-export-database.c
+++ b/src/media-export/rygel-media-export-database.c
@@ -35,8 +35,8 @@
*/
G_DEFINE_TYPE (RygelMediaExportDatabase,
- rygel_media_export_database,
- RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER)
+ rygel_media_export_database,
+ RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER)
static void rygel_media_export_database_utf8_contains (sqlite3_context* context, sqlite3_value** args, int args_length1);
static gint rygel_media_export_database_utf8_collate (gint alen, gconstpointer a, gint blen, gconstpointer b);
@@ -72,7 +72,6 @@ void rygel_media_export_database_utf8_contains (sqlite3_context *context,
g_free (pattern);
}
-
/**
* Function to implement the custom SQLite collation 'CASEFOLD'.
*
@@ -80,25 +79,25 @@ void rygel_media_export_database_utf8_contains (sqlite3_context *context,
*/
static gint
rygel_media_export_database_utf8_collate (gint alen G_GNUC_UNUSED,
- gconstpointer a,
- gint blen G_GNUC_UNUSED,
- gconstpointer b) {
+ gconstpointer a,
+ gint blen G_GNUC_UNUSED,
+ gconstpointer b) {
return rygel_media_export_utf8_collate_str (a, b);
}
static void
rygel_media_export_database_utf8_contains_sqlite_user_func_callback (sqlite3_context *context,
- int values_length,
- sqlite3_value **values) {
- rygel_media_export_database_utf8_contains (context, values, values_length);
+ int values_length,
+ sqlite3_value **values) {
+ rygel_media_export_database_utf8_contains (context, values, values_length);
}
static gint rygel_media_export_database_utf8_collate_sqlite_compare_callback (gpointer self G_GNUC_UNUSED,
- gint alen,
- gconstpointer a,
- gint blen,
- gconstpointer b) {
- return rygel_media_export_database_utf8_collate (alen, a, blen, b);
+ gint alen,
+ gconstpointer a,
+ gint blen,
+ gconstpointer b) {
+ return rygel_media_export_database_utf8_collate (alen, a, blen, b);
}
/**
@@ -109,7 +108,7 @@ static gint rygel_media_export_database_utf8_collate_sqlite_compare_callback (gp
*/
RygelMediaExportDatabase*
rygel_media_export_database_new (const gchar *name,
- GError **error) {
+ GError **error) {
RygelMediaExportDatabase *self;
gchar *dirname;
gchar *dbname;
@@ -130,12 +129,12 @@ rygel_media_export_database_new (const gchar *name,
g_free (db_file);
sqlite3_extended_result_codes (db, 1);
self = RYGEL_MEDIA_EXPORT_DATABASE (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_DATABASE,
- "db", db,
- "own-db", db,
- NULL));
+ "db", db,
+ "own-db", db,
+ NULL));
inner_error = NULL;
rygel_media_export_sqlite_wrapper_throw_if_db_has_error (RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (self),
- &inner_error);
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
g_object_unref (self);
@@ -161,18 +160,18 @@ rygel_media_export_database_new (const gchar *name,
return NULL;
}
sqlite3_create_function (db,
- "contains",
- 2,
- SQLITE_UTF8,
- NULL,
- rygel_media_export_database_utf8_contains_sqlite_user_func_callback,
- NULL,
- NULL);
+ "contains",
+ 2,
+ SQLITE_UTF8,
+ NULL,
+ rygel_media_export_database_utf8_contains_sqlite_user_func_callback,
+ NULL,
+ NULL);
sqlite3_create_collation (db,
- "CASEFOLD",
- SQLITE_UTF8,
- NULL,
- rygel_media_export_database_utf8_collate_sqlite_compare_callback);
+ "CASEFOLD",
+ SQLITE_UTF8,
+ NULL,
+ rygel_media_export_database_utf8_collate_sqlite_compare_callback);
return self;
}
@@ -188,23 +187,23 @@ rygel_media_export_database_new (const gchar *name,
*/
RygelMediaExportDatabaseCursor*
rygel_media_export_database_exec_cursor (RygelMediaExportDatabase *self,
- const gchar *sql,
- GValue *arguments,
- int arguments_length,
- GError **error) {
- RygelMediaExportDatabaseCursor* result = NULL;
- sqlite3* db;
- GError * inner_error = NULL;
+ const gchar *sql,
+ GValue *arguments,
+ int arguments_length,
+ GError **error) {
+ RygelMediaExportDatabaseCursor *result = NULL;
+ sqlite3 *db;
+ GError *inner_error = NULL;
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_DATABASE (self), NULL);
g_return_val_if_fail (sql != NULL, NULL);
db = rygel_media_export_sqlite_wrapper_get_db (RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (self));
result = rygel_media_export_database_cursor_new (db,
- sql,
- arguments,
- arguments_length,
- &inner_error);
+ sql,
+ arguments,
+ arguments_length,
+ &inner_error);
if (inner_error != NULL) {
g_propagate_error (error, inner_error);
return NULL;
@@ -224,12 +223,12 @@ rygel_media_export_database_exec_cursor (RygelMediaExportDatabase *self,
*/
void
rygel_media_export_database_exec (RygelMediaExportDatabase *self,
- const gchar *sql,
- GValue *arguments,
- int arguments_length,
- GError **error) {
- RygelMediaExportDatabaseCursor* cursor;
- GError * inner_error;
+ const gchar *sql,
+ GValue *arguments,
+ int arguments_length,
+ GError **error) {
+ RygelMediaExportDatabaseCursor *cursor;
+ GError *inner_error;
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_DATABASE (self));
g_return_if_fail (sql != NULL);
@@ -240,18 +239,18 @@ rygel_media_export_database_exec (RygelMediaExportDatabase *self,
sqlite3* db = rygel_media_export_sqlite_wrapper_get_db (self_wrapper);
rygel_media_export_sqlite_wrapper_throw_if_code_is_error (self_wrapper,
- sqlite3_exec (db, sql, NULL, NULL, NULL),
- &inner_error);
+ sqlite3_exec (db, sql, NULL, NULL, NULL),
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
}
return;
}
cursor = rygel_media_export_database_exec_cursor (self,
- sql,
- arguments,
- arguments_length,
- &inner_error);
+ sql,
+ arguments,
+ arguments_length,
+ &inner_error);
if (inner_error != NULL) {
g_propagate_error (error, inner_error);
return;
@@ -278,10 +277,10 @@ rygel_media_export_database_exec (RygelMediaExportDatabase *self,
*/
gint
rygel_media_export_database_query_value (RygelMediaExportDatabase *self,
- const gchar *sql,
- GValue *args,
- int args_length,
- GError **error) {
+ const gchar *sql,
+ GValue *args,
+ int args_length,
+ GError **error) {
gint result;
RygelMediaExportDatabaseCursor* cursor;
sqlite3_stmt* statement;
@@ -316,10 +315,10 @@ rygel_media_export_database_analyze (RygelMediaExportDatabase *self) {
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_DATABASE (self));
sqlite3_exec (rygel_media_export_sqlite_wrapper_get_db (RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (self)),
- "ANALYZE",
- NULL,
- NULL,
- NULL);
+ "ANALYZE",
+ NULL,
+ NULL,
+ NULL);
}
@@ -359,10 +358,10 @@ void rygel_media_export_database_commit (RygelMediaExportDatabase* self, GError*
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_DATABASE (self));
rygel_media_export_database_exec (self,
- "COMMIT",
- NULL,
- 0,
- &inner_error);
+ "COMMIT",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
}
diff --git a/src/media-export/rygel-media-export-db-container.c b/src/media-export/rygel-media-export-db-container.c
index d141c95..b99a2ce 100644
--- a/src/media-export/rygel-media-export-db-container.c
+++ b/src/media-export/rygel-media-export-db-container.c
@@ -62,8 +62,8 @@ rygel_media_export_db_container_real_count_children (RygelMediaExportDBContainer
const gchar *id = rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (self));
GError *inner_error = NULL;
gint count = rygel_media_export_media_cache_get_child_count (self->priv->media_db,
- id,
- &inner_error);
+ id,
+ &inner_error);
if (inner_error) {
g_debug ("Could not get child count from database: %s", inner_error->message);
@@ -109,7 +109,7 @@ rygel_media_export_db_container_constructed (GObject *object)
self,
0);
rygel_media_container_set_child_count (RYGEL_MEDIA_CONTAINER (self),
- rygel_media_export_db_container_count_children (self));
+ rygel_media_export_db_container_count_children (self));
}
RygelMediaExportDBContainer *
diff --git a/src/media-export/rygel-media-export-dummy-container.c b/src/media-export/rygel-media-export-dummy-container.c
index 284e273..1b0c479 100644
--- a/src/media-export/rygel-media-export-dummy-container.c
+++ b/src/media-export/rygel-media-export-dummy-container.c
@@ -63,8 +63,8 @@ rygel_media_export_dummy_container_new (GFile *file,
inner_error = NULL;
media_db = rygel_media_export_media_cache_get_default ();
child_ids = rygel_media_export_media_cache_get_child_ids (media_db,
- id,
- &inner_error);
+ id,
+ &inner_error);
g_object_unref (media_db);
if (inner_error)
{
diff --git a/src/media-export/rygel-media-export-harvester.c b/src/media-export/rygel-media-export-harvester.c
index e29d158..d9b6d5f 100644
--- a/src/media-export/rygel-media-export-harvester.c
+++ b/src/media-export/rygel-media-export-harvester.c
@@ -58,8 +58,8 @@ struct _Block3Data {
#define RYGEL_MEDIA_EXPORT_HARVESTER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- RYGEL_MEDIA_EXPORT_TYPE_HARVESTER, \
- RygelMediaExportHarvesterPrivate))
+ RYGEL_MEDIA_EXPORT_TYPE_HARVESTER, \
+ RygelMediaExportHarvesterPrivate))
enum {
RYGEL_MEDIA_EXPORT_HARVESTER_DUMMY_PROPERTY,
@@ -80,14 +80,14 @@ static guint signals [RYGEL_MEDIA_EXPORT_HARVESTER_SIGNALS_COUNT];
gboolean
rygel_media_export_harvester_is_eligible (GFileInfo *info) {
return (g_str_has_prefix (g_file_info_get_content_type (info), "image/") ||
- g_str_has_prefix (g_file_info_get_content_type (info), "video/") ||
- g_str_has_prefix (g_file_info_get_content_type (info), "audio/") ||
- g_strcmp0 (g_file_info_get_content_type (info), "application/ogg"));
+ g_str_has_prefix (g_file_info_get_content_type (info), "video/") ||
+ g_str_has_prefix (g_file_info_get_content_type (info), "audio/") ||
+ g_strcmp0 (g_file_info_get_content_type (info), "application/ogg"));
}
static void
rygel_media_export_harvester_on_file_added (RygelMediaExportHarvester *self,
- GFile *file) {
+ GFile *file) {
gchar *uri;
GError *error = NULL;
RygelMediaExportMediaCache *cache;
@@ -103,10 +103,10 @@ rygel_media_export_harvester_on_file_added (RygelMediaExportHarvester *self,
cache = rygel_media_export_media_cache_get_default ();
priv = self->priv;
info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- G_FILE_QUERY_INFO_NONE,
- priv->cancellable,
- &error);
+ G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ G_FILE_QUERY_INFO_NONE,
+ priv->cancellable,
+ &error);
if (error) {
g_warning ("Failed to query file: %s", error->message);
g_error_free (error);
@@ -126,48 +126,48 @@ rygel_media_export_harvester_on_file_added (RygelMediaExportHarvester *self,
RygelMediaObject *tmp_object = rygel_media_export_media_cache_get_object (cache, id, &error);
if (error) {
- g_warning (_("Error fetching object '%s' from database: %s"),
- id,
- error->message);
- g_free (id);
- g_object_unref (parent);
+ g_warning (_("Error fetching object '%s' from database: %s"),
+ id,
+ error->message);
+ g_free (id);
+ g_object_unref (parent);
- g_error_free (error);
- error = NULL;
+ g_error_free (error);
+ error = NULL;
- goto inner_out;
+ goto inner_out;
}
g_free (id);
if (parent_container) {
- g_object_unref (parent_container);
- parent_container = NULL;
+ g_object_unref (parent_container);
+ parent_container = NULL;
}
if (RYGEL_IS_MEDIA_CONTAINER (tmp_object)) {
- parent_container = RYGEL_MEDIA_CONTAINER (tmp_object);
+ parent_container = RYGEL_MEDIA_CONTAINER (tmp_object);
} else {
- g_object_unref (tmp_object);
+ g_object_unref (tmp_object);
}
if (!parent_container) {
- g_object_ref (parent);
- g_object_unref (current);
- current = parent;
+ g_object_ref (parent);
+ g_object_unref (current);
+ current = parent;
}
g_object_unref (parent);
if (gee_abstract_collection_contains (abstract_locations, current)) {
- RygelMediaObject* another_object = rygel_media_export_media_cache_get_object (cache,
- RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID,
- &error);
-
- if (error) {
- goto inner_out;
- }
- if (parent_container) {
- g_object_unref (parent_container);
- parent_container = NULL;
- }
- if (RYGEL_IS_MEDIA_CONTAINER (another_object)) {
- parent_container = RYGEL_MEDIA_CONTAINER (another_object);
- }
+ RygelMediaObject* another_object = rygel_media_export_media_cache_get_object (cache,
+ RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID,
+ &error);
+
+ if (error) {
+ goto inner_out;
+ }
+ if (parent_container) {
+ g_object_unref (parent_container);
+ parent_container = NULL;
+ }
+ if (RYGEL_IS_MEDIA_CONTAINER (another_object)) {
+ parent_container = RYGEL_MEDIA_CONTAINER (another_object);
+ }
}
} while (!parent_container);
rygel_media_export_harvester_schedule (self, current, parent_container, NULL);
@@ -208,8 +208,8 @@ block3_data_free (gpointer user_data) {
static void
rygel_media_export_harvester_on_changes_done (RygelMediaExportHarvester *self,
- GFile *file,
- GError **error G_GNUC_UNUSED) {
+ GFile *file,
+ GError **error G_GNUC_UNUSED) {
Block3Data* data3;
GeeAbstractMap *abstract_grace_timers;
guint timeout;
@@ -232,17 +232,17 @@ rygel_media_export_harvester_on_changes_done (RygelMediaExportHarvester *self,
}
timeout = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
- RYGEL_MEDIA_EXPORT_HARVESTER_FILE_CHANGE_DEFAULT_GRACE_PERIOD,
- grace_period_gsource_func,
- data3,
- block3_data_free);
+ RYGEL_MEDIA_EXPORT_HARVESTER_FILE_CHANGE_DEFAULT_GRACE_PERIOD,
+ grace_period_gsource_func,
+ data3,
+ block3_data_free);
gee_abstract_map_set (abstract_grace_timers, file, (gpointer) ((guintptr) timeout));
}
static void
rygel_media_export_harvester_on_file_removed (RygelMediaExportHarvester *self,
- GFile *file,
- GError **error G_GNUC_UNUSED) {
+ GFile *file,
+ GError **error G_GNUC_UNUSED) {
RygelMediaExportMediaCache *cache;
GError *inner_error;
GeeAbstractMap *abstract_grace_timers;
@@ -266,8 +266,8 @@ rygel_media_export_harvester_on_file_removed (RygelMediaExportHarvester *self,
if (inner_error) {
g_warning ("Failed to get an object with id %s from database: %s",
- id,
- inner_error->message);
+ id,
+ inner_error->message);
g_error_free (inner_error);
goto out;
}
@@ -286,11 +286,11 @@ rygel_media_export_harvester_on_file_removed (RygelMediaExportHarvester *self,
rygel_media_export_media_cache_remove_object (cache, object, &inner_error);
if (inner_error) {
if (parent) {
- g_object_unref (parent);
+ g_object_unref (parent);
}
g_object_unref (object);
g_warning (_("Error removing object from database: %s"),
- inner_error->message);
+ inner_error->message);
g_error_free (inner_error);
goto out;
@@ -322,9 +322,9 @@ rygel_media_export_harvester_on_file_removed (RygelMediaExportHarvester *self,
static void
rygel_media_export_harvester_on_file_changed (RygelMediaExportHarvester *self,
- GFile *file,
- GFile *other G_GNUC_UNUSED,
- GFileMonitorEvent event) {
+ GFile *file,
+ GFile *other G_GNUC_UNUSED,
+ GFileMonitorEvent event) {
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_HARVESTER (self));
g_return_if_fail (G_IS_FILE (file));
@@ -345,23 +345,23 @@ rygel_media_export_harvester_on_file_changed (RygelMediaExportHarvester *self,
static void
rygel_media_export_harvester_on_file_changed_rygel_media_export_recursive_file_monitor_changed (RygelMediaExportRecursiveFileMonitor *sender G_GNUC_UNUSED,
- GFile *file,
- GFile *other_file,
- GFileMonitorEvent event_type,
- gpointer user_data) {
+ GFile *file,
+ GFile *other_file,
+ GFileMonitorEvent event_type,
+ gpointer user_data) {
rygel_media_export_harvester_on_file_changed (RYGEL_MEDIA_EXPORT_HARVESTER (user_data), file, other_file, event_type);
}
RygelMediaExportHarvester *
rygel_media_export_harvester_new (GCancellable *cancellable,
- GeeArrayList *locations) {
+ GeeArrayList *locations) {
g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
g_return_val_if_fail (GEE_IS_ARRAY_LIST (locations), NULL);
return RYGEL_MEDIA_EXPORT_HARVESTER (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_HARVESTER,
- "cancellable", cancellable,
- "locations", locations,
- NULL));
+ "cancellable", cancellable,
+ "locations", locations,
+ NULL));
}
static void
@@ -375,41 +375,41 @@ rygel_media_export_harvester_constructed (GObject *object)
priv->extractor = rygel_media_export_metadata_extractor_new ();
priv->monitor = rygel_media_export_recursive_file_monitor_new (priv->cancellable);
g_signal_connect_object (priv->monitor,
- "changed",
- G_CALLBACK (rygel_media_export_harvester_on_file_changed_rygel_media_export_recursive_file_monitor_changed),
- self,
- 0);
+ "changed",
+ G_CALLBACK (rygel_media_export_harvester_on_file_changed_rygel_media_export_recursive_file_monitor_changed),
+ self,
+ 0);
self->priv->tasks = gee_hash_map_new (G_TYPE_FILE,
- (GBoxedCopyFunc)
- g_object_ref,
- g_object_unref,
- RYGEL_MEDIA_EXPORT_TYPE_HARVESTING_TASK,
- (GBoxedCopyFunc) g_object_ref,
- g_object_unref,
- (GeeHashDataFunc) g_file_hash,
- NULL,
- NULL,
- (GeeEqualDataFunc) g_file_equal,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ (GBoxedCopyFunc)
+ g_object_ref,
+ g_object_unref,
+ RYGEL_MEDIA_EXPORT_TYPE_HARVESTING_TASK,
+ (GBoxedCopyFunc) g_object_ref,
+ g_object_unref,
+ (GeeHashDataFunc) g_file_hash,
+ NULL,
+ NULL,
+ (GeeEqualDataFunc) g_file_equal,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
self->priv->extraction_grace_timers = gee_hash_map_new (G_TYPE_FILE,
- (GBoxedCopyFunc) g_object_ref,
- g_object_unref,
- G_TYPE_UINT,
- NULL,
- NULL,
- (GeeHashDataFunc) g_file_hash,
- NULL,
- NULL,
- (GeeEqualDataFunc) g_file_equal,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ (GBoxedCopyFunc) g_object_ref,
+ g_object_unref,
+ G_TYPE_UINT,
+ NULL,
+ NULL,
+ (GeeHashDataFunc) g_file_hash,
+ NULL,
+ NULL,
+ (GeeEqualDataFunc) g_file_equal,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
}
/**
@@ -420,7 +420,7 @@ rygel_media_export_harvester_constructed (GObject *object)
*/
static void
rygel_media_export_harvester_on_file_harvested (RygelMediaExportHarvester *self,
- RygelStateMachine *state_machine) {
+ RygelStateMachine *state_machine) {
RygelMediaExportHarvestingTask *task;
gchar *uri;
GFile *file;
@@ -444,7 +444,7 @@ rygel_media_export_harvester_on_file_harvested (RygelMediaExportHarvester *self,
static void
rygel_media_export_harvester_on_file_harvested_rygel_state_machine_completed (RygelStateMachine *sender,
- gpointer user_data) {
+ gpointer user_data) {
rygel_media_export_harvester_on_file_harvested (RYGEL_MEDIA_EXPORT_HARVESTER (user_data), sender);
}
@@ -457,9 +457,9 @@ rygel_media_export_harvester_on_file_harvested_rygel_state_machine_completed (Ry
*/
void
rygel_media_export_harvester_schedule (RygelMediaExportHarvester *self,
- GFile *file,
- RygelMediaContainer *parent,
- const gchar *flag) {
+ GFile *file,
+ RygelMediaContainer *parent,
+ const gchar *flag) {
RygelMediaExportHarvesterPrivate *priv;
RygelMediaExportMetadataExtractor *extractor;
RygelMediaExportHarvestingTask *task;
@@ -479,18 +479,18 @@ rygel_media_export_harvester_schedule (RygelMediaExportHarvester *self,
rygel_media_export_harvester_cancel (self, file);
extractor = rygel_media_export_metadata_extractor_new ();
task = rygel_media_export_harvesting_task_new (extractor,
- priv->monitor,
- file,
- parent,
- flag);
+ priv->monitor,
+ file,
+ parent,
+ flag);
g_object_unref (extractor);
state_task = RYGEL_STATE_MACHINE (task);
rygel_state_machine_set_cancellable (state_task, priv->cancellable);
g_signal_connect_object (state_task,
- "completed",
- G_CALLBACK (rygel_media_export_harvester_on_file_harvested_rygel_state_machine_completed),
- self,
- 0);
+ "completed",
+ G_CALLBACK (rygel_media_export_harvester_on_file_harvested_rygel_state_machine_completed),
+ self,
+ 0);
gee_abstract_map_set (GEE_ABSTRACT_MAP (priv->tasks), file, task);
rygel_state_machine_run (state_task, NULL, NULL);
g_object_unref (task);
@@ -504,7 +504,7 @@ rygel_media_export_harvester_schedule (RygelMediaExportHarvester *self,
*/
void
rygel_media_export_harvester_cancel (RygelMediaExportHarvester *self,
- GFile *file) {
+ GFile *file) {
RygelMediaExportHarvesterPrivate *priv;
GeeAbstractMap *abstract_tasks;
@@ -520,11 +520,11 @@ rygel_media_export_harvester_cancel (RygelMediaExportHarvester *self,
task = RYGEL_MEDIA_EXPORT_HARVESTING_TASK (gee_abstract_map_get (abstract_tasks, file));
g_signal_parse_name ("completed", RYGEL_TYPE_STATE_MACHINE, &signal_id, NULL, FALSE);
g_signal_handlers_disconnect_matched (RYGEL_STATE_MACHINE (task),
- G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
- signal_id,
- 0,
- NULL, G_CALLBACK (rygel_media_export_harvester_on_file_harvested_rygel_state_machine_completed),
- self);
+ G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
+ signal_id,
+ 0,
+ NULL, G_CALLBACK (rygel_media_export_harvester_on_file_harvested_rygel_state_machine_completed),
+ self);
gee_abstract_map_unset (abstract_tasks, file, NULL);
rygel_media_export_harvesting_task_cancel (task);
g_object_unref (task);
@@ -540,7 +540,7 @@ rygel_media_export_harvester_get_locations (RygelMediaExportHarvester *self) {
static void
rygel_media_export_harvester_set_locations (RygelMediaExportHarvester *self,
- GeeArrayList *value) {
+ GeeArrayList *value) {
RygelMediaExportHarvesterPrivate *priv;
GeeArrayList *new_locations;
GeeAbstractCollection *abstract_new_locations;
@@ -622,9 +622,9 @@ rygel_media_export_harvester_dispose (GObject *object) {
static void
rygel_media_export_harvester_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec) {
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec) {
RygelMediaExportHarvester *self = RYGEL_MEDIA_EXPORT_HARVESTER (object);
switch (property_id) {
@@ -644,9 +644,9 @@ rygel_media_export_harvester_get_property (GObject *object,
static void
rygel_media_export_harvester_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec) {
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec) {
RygelMediaExportHarvester *self = RYGEL_MEDIA_EXPORT_HARVESTER (object);
switch (property_id) {
@@ -675,42 +675,42 @@ rygel_media_export_harvester_class_init (RygelMediaExportHarvesterClass *harvest
object_class->dispose = rygel_media_export_harvester_dispose;
object_class->constructed = rygel_media_export_harvester_constructed;
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTER_LOCATIONS,
- g_param_spec_object ("locations",
- "locations",
- "locations",
- GEE_TYPE_ARRAY_LIST,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_HARVESTER_LOCATIONS,
+ g_param_spec_object ("locations",
+ "locations",
+ "locations",
+ GEE_TYPE_ARRAY_LIST,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTER_CANCELLABLE,
- g_param_spec_object ("cancellable",
- "cancellable",
- "cancellable",
- G_TYPE_CANCELLABLE,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_HARVESTER_CANCELLABLE,
+ g_param_spec_object ("cancellable",
+ "cancellable",
+ "cancellable",
+ G_TYPE_CANCELLABLE,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
signals[RYGEL_MEDIA_EXPORT_HARVESTER_SIGNAL_DONE] = g_signal_new ("done",
- RYGEL_MEDIA_EXPORT_TYPE_HARVESTER,
- G_SIGNAL_RUN_LAST,
- 0,
- NULL,
- NULL,
- NULL, /* generic marshaller */
- G_TYPE_NONE,
- 0);
+ RYGEL_MEDIA_EXPORT_TYPE_HARVESTER,
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL,
+ NULL,
+ NULL, /* generic marshaller */
+ G_TYPE_NONE,
+ 0);
g_type_class_add_private (harvester_class,
- sizeof (RygelMediaExportHarvesterPrivate));
+ sizeof (RygelMediaExportHarvesterPrivate));
}
static void
diff --git a/src/media-export/rygel-media-export-harvester.h b/src/media-export/rygel-media-export-harvester.h
index bf1f632..f426cd3 100644
--- a/src/media-export/rygel-media-export-harvester.h
+++ b/src/media-export/rygel-media-export-harvester.h
@@ -55,20 +55,20 @@ rygel_media_export_harvester_get_type (void) G_GNUC_CONST;
RygelMediaExportHarvester *
rygel_media_export_harvester_new (GCancellable *cancellable,
- GeeArrayList *locations);
+ GeeArrayList *locations);
GeeArrayList *
rygel_media_export_harvester_get_locations (RygelMediaExportHarvester *self);
void
rygel_media_export_harvester_schedule (RygelMediaExportHarvester *self,
- GFile *file,
- RygelMediaContainer *parent,
- const gchar *flag);
+ GFile *file,
+ RygelMediaContainer *parent,
+ const gchar *flag);
void
rygel_media_export_harvester_cancel (RygelMediaExportHarvester *self,
- GFile *file);
+ GFile *file);
gboolean
rygel_media_export_harvester_is_eligible (GFileInfo *info);
diff --git a/src/media-export/rygel-media-export-harvesting-task.c b/src/media-export/rygel-media-export-harvesting-task.c
index bdca24e..122c66d 100644
--- a/src/media-export/rygel-media-export-harvesting-task.c
+++ b/src/media-export/rygel-media-export-harvesting-task.c
@@ -33,10 +33,10 @@ static void
rygel_media_export_harvesting_task_rygel_state_machine_interface_init (RygelStateMachineIface *iface);
G_DEFINE_TYPE_WITH_CODE (RygelMediaExportHarvestingTask,
- rygel_media_export_harvesting_task,
- G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (RYGEL_TYPE_STATE_MACHINE,
- rygel_media_export_harvesting_task_rygel_state_machine_interface_init))
+ rygel_media_export_harvesting_task,
+ G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (RYGEL_TYPE_STATE_MACHINE,
+ rygel_media_export_harvesting_task_rygel_state_machine_interface_init))
typedef struct _RygelMediaExportHarvestingTaskRunData RygelMediaExportHarvestingTaskRunData;
typedef struct _RygelMediaExportHarvestingTaskEnumerateDirectoryData RygelMediaExportHarvestingTaskEnumerateDirectoryData;
@@ -122,8 +122,8 @@ rygel_media_export_harvesting_task_cleanup_database (RygelMediaExportHarvestingT
g_free (child);
if (error) {
g_warning (_("Failed to get children of container %s: %s"),
- rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (container)),
- error->message);
+ rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (container)),
+ error->message);
g_error_free (error);
}
}
@@ -147,10 +147,10 @@ cleanup_database_and_do_update (RygelMediaExportHarvestingTaskEnumerateDirectory
static void
failed_to_enumerate_folder (RygelMediaExportHarvestingTaskEnumerateDirectoryData *data,
- GError *error)
+ GError *error)
{
g_warning (_("Failed to enumerate folder: %s"),
- error->message);
+ error->message);
g_error_free (error);
cleanup_database_and_do_update (data);
}
@@ -169,8 +169,8 @@ failed_to_enumerate_folder (RygelMediaExportHarvestingTaskEnumerateDirectoryData
*/
static gboolean
rygel_media_export_harvesting_task_push_if_changed_or_unknown (RygelMediaExportHarvestingTask *self,
- GFile *file,
- GFileInfo *info) {
+ GFile *file,
+ GFileInfo *info) {
GError *inner_error;
RygelMediaExportHarvestingTaskPrivate *priv;
gboolean exists;
@@ -194,7 +194,7 @@ rygel_media_export_harvesting_task_push_if_changed_or_unknown (RygelMediaExportH
gint64 mtime = (gint64) g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
if (mtime > timestamp ||
- g_file_info_get_size (info) != size) {
+ g_file_info_get_size (info) != size) {
gee_queue_offer (priv->files, file);
return TRUE;
}
@@ -208,9 +208,9 @@ rygel_media_export_harvesting_task_push_if_changed_or_unknown (RygelMediaExportH
static gboolean
rygel_media_export_harvesting_task_process_file (RygelMediaExportHarvestingTask *self,
- GFile *file,
- GFileInfo *info,
- RygelMediaContainer *parent) {
+ GFile *file,
+ GFileInfo *info,
+ RygelMediaContainer *parent) {
GError *inner_error;
RygelMediaExportHarvestingTaskPrivate *priv;
@@ -232,11 +232,11 @@ rygel_media_export_harvesting_task_process_file (RygelMediaExportHarvestingTask
container = rygel_media_export_dummy_container_new (file, parent);
g_queue_push_tail (priv->containers, container); /* takes ownership */
rygel_media_export_media_cache_save_container (priv->cache,
- RYGEL_MEDIA_CONTAINER (container),
- &inner_error);
+ RYGEL_MEDIA_CONTAINER (container),
+ &inner_error);
if (inner_error) {
g_warning (_("Failed to update database: %s"),
- inner_error->message);
+ inner_error->message);
g_error_free (inner_error);
return FALSE;
}
@@ -245,8 +245,8 @@ rygel_media_export_harvesting_task_process_file (RygelMediaExportHarvestingTask
} else {
if (rygel_media_export_harvester_is_eligible (info)) {
return rygel_media_export_harvesting_task_push_if_changed_or_unknown (self,
- file,
- info);
+ file,
+ info);
}
}
@@ -255,7 +255,7 @@ rygel_media_export_harvesting_task_process_file (RygelMediaExportHarvestingTask
static gboolean
rygel_media_export_harvesting_task_process_children (RygelMediaExportHarvestingTask *self,
- GList *list) {
+ GList *list) {
RygelMediaExportDummyContainer* container;
GList* iter;
GFile *file;
@@ -287,8 +287,8 @@ get_next_files (RygelMediaExportHarvestingTaskEnumerateDirectoryData *data);
static void
rygel_media_export_harvesting_task_enumerator_close_ready (GObject *source_object G_GNUC_UNUSED,
- GAsyncResult *res,
- gpointer user_data)
+ GAsyncResult *res,
+ gpointer user_data)
{
GError *error = NULL;
RygelMediaExportHarvestingTaskEnumerateDirectoryData *data = (RygelMediaExportHarvestingTaskEnumerateDirectoryData *) user_data;
@@ -303,14 +303,14 @@ rygel_media_export_harvesting_task_enumerator_close_ready (GObject *source_
static void
rygel_media_export_harvesting_task_next_files_ready (GObject *source_object G_GNUC_UNUSED,
- GAsyncResult *res,
- gpointer user_data)
+ GAsyncResult *res,
+ gpointer user_data)
{
RygelMediaExportHarvestingTaskEnumerateDirectoryData *data = (RygelMediaExportHarvestingTaskEnumerateDirectoryData *) user_data;
GError *error = NULL;
GList *list = g_file_enumerator_next_files_finish (data->enumerator,
- res,
- &error);
+ res,
+ &error);
if (error) {
failed_to_enumerate_folder (data, error);
@@ -324,10 +324,10 @@ rygel_media_export_harvesting_task_next_files_ready (GObject *source_object
get_next_files (data);
} else {
g_file_enumerator_close_async (data->enumerator,
- G_PRIORITY_DEFAULT,
- data->self->priv->cancellable,
- rygel_media_export_harvesting_task_enumerator_close_ready,
- data);
+ G_PRIORITY_DEFAULT,
+ data->self->priv->cancellable,
+ rygel_media_export_harvesting_task_enumerator_close_ready,
+ data);
}
}
}
@@ -336,17 +336,17 @@ static void
get_next_files (RygelMediaExportHarvestingTaskEnumerateDirectoryData *data)
{
g_file_enumerator_next_files_async (data->enumerator,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_BATCH_SIZE,
- G_PRIORITY_DEFAULT,
- data->self->priv->cancellable,
- rygel_media_export_harvesting_task_next_files_ready,
- data);
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_BATCH_SIZE,
+ G_PRIORITY_DEFAULT,
+ data->self->priv->cancellable,
+ rygel_media_export_harvesting_task_next_files_ready,
+ data);
}
static void
rygel_media_export_harvesting_task_enumerate_children_ready (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data) {
+ GAsyncResult *res,
+ gpointer user_data) {
RygelMediaExportHarvestingTaskEnumerateDirectoryData *data = (RygelMediaExportHarvestingTaskEnumerateDirectoryData *) user_data;
GError *error = NULL;
@@ -361,8 +361,8 @@ rygel_media_export_harvesting_task_enumerate_children_ready (GObject *sourc
static void
rygel_media_export_harvesting_task_enumerate_directory (RygelMediaExportHarvestingTask *self,
- GAsyncReadyCallback callback,
- gpointer user_data) {
+ GAsyncReadyCallback callback,
+ gpointer user_data) {
RygelMediaExportHarvestingTaskPrivate *priv;
RygelMediaExportHarvestingTaskEnumerateDirectoryData *data;
@@ -374,17 +374,17 @@ rygel_media_export_harvesting_task_enumerate_directory (RygelMediaExportHarvesti
data->directory = g_object_ref (rygel_media_export_dummy_container_get_g_file (data->container));
data->self = g_object_ref (self);
data->simple = g_simple_async_result_new (G_OBJECT (self),
- callback,
- user_data,
- rygel_media_export_harvesting_task_enumerate_directory);
+ callback,
+ user_data,
+ rygel_media_export_harvesting_task_enumerate_directory);
g_file_enumerate_children_async (data->directory,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_HARVESTER_ATTRIBUTES,
- G_FILE_QUERY_INFO_NONE,
- G_PRIORITY_DEFAULT,
- priv->cancellable,
- rygel_media_export_harvesting_task_enumerate_children_ready,
- data);
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_HARVESTER_ATTRIBUTES,
+ G_FILE_QUERY_INFO_NONE,
+ G_PRIORITY_DEFAULT,
+ priv->cancellable,
+ rygel_media_export_harvesting_task_enumerate_children_ready,
+ data);
}
static gboolean
@@ -439,8 +439,8 @@ rygel_media_export_harvesting_task_do_update (RygelMediaExportHarvestingTask *se
RygelMediaContainer* container = RYGEL_MEDIA_CONTAINER (g_queue_peek_head (priv->containers));
GError *error = NULL;
gint size = rygel_media_export_media_cache_get_child_count (priv->cache,
- rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (container)),
- &error);
+ rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (container)),
+ &error);
if (error) {
goto out;
@@ -450,7 +450,7 @@ rygel_media_export_harvesting_task_do_update (RygelMediaExportHarvestingTask *se
} else {
rygel_media_export_media_cache_remove_by_id (priv->cache, rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (container)), &error);
if (error) {
- goto out;
+ goto out;
}
}
out:
@@ -466,9 +466,9 @@ rygel_media_export_harvesting_task_do_update (RygelMediaExportHarvestingTask *se
static void
rygel_media_export_harvesting_task_on_extracted_cb (RygelMediaExportHarvestingTask *self,
- GFile *file,
- GUPnPDLNAInformation *dlna,
- GFileInfo *file_info) {
+ GFile *file,
+ GUPnPDLNAInformation *dlna,
+ GFileInfo *file_info) {
RygelMediaExportHarvestingTaskPrivate *priv;
gboolean ignore;
GFile *top_file;
@@ -515,17 +515,17 @@ rygel_media_export_harvesting_task_on_extracted_cb (RygelMediaExportHarvestingTa
static void
rygel_media_export_harvesting_task_on_extracted_cb_rygel_media_export_metadata_extractor_extraction_done (RygelMediaExportMetadataExtractor *sender G_GNUC_UNUSED,
- GFile *file,
- GUPnPDLNAInformation *dlna,
- GFileInfo *file_info,
- gpointer self) {
+ GFile *file,
+ GUPnPDLNAInformation *dlna,
+ GFileInfo *file_info,
+ gpointer self) {
rygel_media_export_harvesting_task_on_extracted_cb (self, file, dlna, file_info);
}
static void
rygel_media_export_harvesting_task_on_extractor_error_cb (RygelMediaExportHarvestingTask *self,
- GFile *file,
- GError *error) {
+ GFile *file,
+ GError *error) {
RygelMediaExportHarvestingTaskPrivate *priv;
gboolean ignore;
gchar *uri;
@@ -553,18 +553,18 @@ rygel_media_export_harvesting_task_on_extractor_error_cb (RygelMediaExportHarves
static void
rygel_media_export_harvesting_task_on_extractor_error_cb_rygel_media_export_metadata_extractor_error (RygelMediaExportMetadataExtractor *sender G_GNUC_UNUSED,
- GFile *file,
- GError *err,
- gpointer self) {
+ GFile *file,
+ GError *err,
+ gpointer self) {
rygel_media_export_harvesting_task_on_extractor_error_cb (self, file, err);
}
RygelMediaExportHarvestingTask *
rygel_media_export_harvesting_task_new (RygelMediaExportMetadataExtractor *extractor,
- RygelMediaExportRecursiveFileMonitor *monitor,
- GFile *file,
- RygelMediaContainer *parent,
- const gchar *flag) {
+ RygelMediaExportRecursiveFileMonitor *monitor,
+ GFile *file,
+ RygelMediaContainer *parent,
+ const gchar *flag) {
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_METADATA_EXTRACTOR (extractor), NULL);
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_RECURSIVE_FILE_MONITOR (monitor), NULL);
g_return_val_if_fail (G_IS_FILE (file), NULL);
@@ -572,12 +572,12 @@ rygel_media_export_harvesting_task_new (RygelMediaExportMetadataExtractor *ex
/* flag can be NULL */
return RYGEL_MEDIA_EXPORT_HARVESTING_TASK (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_HARVESTING_TASK,
- "extractor", extractor,
- "monitor", monitor,
- "origin", file,
- "parent", parent,
- "flag", flag,
- NULL));
+ "extractor", extractor,
+ "monitor", monitor,
+ "origin", file,
+ "parent", parent,
+ "flag", flag,
+ NULL));
}
void
@@ -599,8 +599,8 @@ rygel_media_export_harvesting_task_real_run_data_free (RygelMediaExportHarvestin
static void
rygel_media_export_harvesting_task_run_ready (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data) {
+ GAsyncResult *res,
+ gpointer user_data) {
RygelMediaExportHarvestingTaskRunData *data = (RygelMediaExportHarvestingTaskRunData *) user_data;
RygelMediaExportHarvestingTask *self = data->self;
RygelMediaExportHarvestingTaskPrivate *priv = self->priv;
@@ -610,12 +610,12 @@ rygel_media_export_harvesting_task_run_ready (GObject *source_object,
if (!inner_error) {
if (rygel_media_export_harvesting_task_process_file (self,
- origin,
- info,
- priv->parent)) {
+ origin,
+ info,
+ priv->parent)) {
if (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY) {
- g_queue_push_tail (priv->containers,
- g_object_ref (priv->parent));
+ g_queue_push_tail (priv->containers,
+ g_object_ref (priv->parent));
}
rygel_media_export_harvesting_task_on_idle (self);
} else {
@@ -629,8 +629,8 @@ rygel_media_export_harvesting_task_run_ready (GObject *source_object,
g_debug ("Harvesting of uri %s was cancelled", uri);
} else {
g_warning (_("Failed to harvest file %s: %s"),
- uri,
- inner_error->message);
+ uri,
+ inner_error->message);
}
g_free (uri);
@@ -659,30 +659,30 @@ rygel_media_export_harvesting_task_run_ready (GObject *source_object,
*/
static void
rygel_media_export_harvesting_task_real_run (RygelStateMachine *base,
- GAsyncReadyCallback callback,
- gpointer user_data) {
+ GAsyncReadyCallback callback,
+ gpointer user_data) {
RygelMediaExportHarvestingTask *self = RYGEL_MEDIA_EXPORT_HARVESTING_TASK (base);
RygelMediaExportHarvestingTaskPrivate *priv = self->priv;
RygelMediaExportHarvestingTaskRunData *data = g_slice_new0 (RygelMediaExportHarvestingTaskRunData);
data->simple = g_simple_async_result_new (G_OBJECT (self),
- callback,
- user_data,
- rygel_media_export_harvesting_task_real_run);
+ callback,
+ user_data,
+ rygel_media_export_harvesting_task_real_run);
data->self = g_object_ref (self);
g_file_query_info_async (priv->origin,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_HARVESTER_ATTRIBUTES,
- G_FILE_QUERY_INFO_NONE,
- G_PRIORITY_DEFAULT,
- priv->cancellable,
- rygel_media_export_harvesting_task_run_ready,
- data);
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_HARVESTER_ATTRIBUTES,
+ G_FILE_QUERY_INFO_NONE,
+ G_PRIORITY_DEFAULT,
+ priv->cancellable,
+ rygel_media_export_harvesting_task_run_ready,
+ data);
}
static void
rygel_media_export_harvesting_task_real_run_finish (RygelStateMachine *base G_GNUC_UNUSED,
- GAsyncResult *res G_GNUC_UNUSED) {
+ GAsyncResult *res G_GNUC_UNUSED) {
}
static GCancellable *
@@ -694,7 +694,7 @@ rygel_media_export_harvesting_task_real_get_cancellable (RygelStateMachine *base
static void
rygel_media_export_harvesting_task_real_set_cancellable (RygelStateMachine *base,
- GCancellable *value) {
+ GCancellable *value) {
RygelMediaExportHarvestingTask *self = RYGEL_MEDIA_EXPORT_HARVESTING_TASK (base);
RygelMediaExportHarvestingTaskPrivate *priv = self->priv;
@@ -711,9 +711,9 @@ rygel_media_export_harvesting_task_real_set_cancellable (RygelStateMachine *base
static void
rygel_media_export_harvesting_task_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec) {
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec) {
RygelMediaExportHarvestingTask *self = RYGEL_MEDIA_EXPORT_HARVESTING_TASK (object);
RygelMediaExportHarvestingTaskPrivate *priv = self->priv;
@@ -750,9 +750,9 @@ rygel_media_export_harvesting_task_get_property (GObject *object,
static void
rygel_media_export_harvesting_task_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec) {
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec) {
RygelMediaExportHarvestingTask *self = RYGEL_MEDIA_EXPORT_HARVESTING_TASK (object);
RygelMediaExportHarvestingTaskPrivate *priv = self->priv;
@@ -867,15 +867,15 @@ rygel_media_export_harvesting_task_constructed (GObject *object) {
priv->cache = rygel_media_export_media_cache_get_default ();
g_signal_connect_object (priv->extractor,
- "extraction-done",
- G_CALLBACK (rygel_media_export_harvesting_task_on_extracted_cb_rygel_media_export_metadata_extractor_extraction_done),
- self,
- 0);
+ "extraction-done",
+ G_CALLBACK (rygel_media_export_harvesting_task_on_extracted_cb_rygel_media_export_metadata_extractor_extraction_done),
+ self,
+ 0);
g_signal_connect_object (priv->extractor,
- "error",
- G_CALLBACK (rygel_media_export_harvesting_task_on_extractor_error_cb_rygel_media_export_metadata_extractor_error),
- self,
- 0);
+ "error",
+ G_CALLBACK (rygel_media_export_harvesting_task_on_extractor_error_cb_rygel_media_export_metadata_extractor_error),
+ self,
+ 0);
priv->files = GEE_QUEUE (gee_linked_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL));
priv->containers = g_queue_new ();
}
@@ -891,77 +891,77 @@ rygel_media_export_harvesting_task_class_init (RygelMediaExportHarvestingTaskCla
object_class->constructed = rygel_media_export_harvesting_task_constructed;
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_CANCELLABLE,
- g_param_spec_object ("cancellable",
- "cancellable",
- "cancellable",
- G_TYPE_CANCELLABLE,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT));
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_CANCELLABLE,
+ g_param_spec_object ("cancellable",
+ "cancellable",
+ "cancellable",
+ G_TYPE_CANCELLABLE,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_EXTRACTOR,
- g_param_spec_object ("extractor",
- "extractor",
- "extractor",
- RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_EXTRACTOR,
+ g_param_spec_object ("extractor",
+ "extractor",
+ "extractor",
+ RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_MONITOR,
- g_param_spec_object ("monitor",
- "monitor",
- "monitor",
- RYGEL_MEDIA_EXPORT_TYPE_RECURSIVE_FILE_MONITOR,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_MONITOR,
+ g_param_spec_object ("monitor",
+ "monitor",
+ "monitor",
+ RYGEL_MEDIA_EXPORT_TYPE_RECURSIVE_FILE_MONITOR,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_ORIGIN,
- g_param_spec_object ("origin",
- "origin",
- "origin",
- G_TYPE_FILE,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_ORIGIN,
+ g_param_spec_object ("origin",
+ "origin",
+ "origin",
+ G_TYPE_FILE,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_PARENT,
- g_param_spec_object ("parent",
- "parent",
- "parent",
- RYGEL_TYPE_MEDIA_CONTAINER,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_PARENT,
+ g_param_spec_object ("parent",
+ "parent",
+ "parent",
+ RYGEL_TYPE_MEDIA_CONTAINER,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_HARVESTING_TASK_FLAG,
- g_param_spec_string ("flag",
- "flag",
- "flag",
- NULL,
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_HARVESTING_TASK_FLAG,
+ g_param_spec_string ("flag",
+ "flag",
+ "flag",
+ NULL,
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (task_class, sizeof (RygelMediaExportHarvestingTaskPrivate));
}
diff --git a/src/media-export/rygel-media-export-harvesting-task.h b/src/media-export/rygel-media-export-harvesting-task.h
index 50aa35f..89085d4 100644
--- a/src/media-export/rygel-media-export-harvesting-task.h
+++ b/src/media-export/rygel-media-export-harvesting-task.h
@@ -57,10 +57,10 @@ rygel_media_export_harvesting_task_get_type (void) G_GNUC_CONST;
RygelMediaExportHarvestingTask *
rygel_media_export_harvesting_task_new (RygelMediaExportMetadataExtractor *extractor,
- RygelMediaExportRecursiveFileMonitor *monitor,
- GFile *file,
- RygelMediaContainer *parent,
- const gchar *flag);
+ RygelMediaExportRecursiveFileMonitor *monitor,
+ GFile *file,
+ RygelMediaContainer *parent,
+ const gchar *flag);
void
rygel_media_export_harvesting_task_cancel (RygelMediaExportHarvestingTask *self);
diff --git a/src/media-export/rygel-media-export-item-factory.c b/src/media-export/rygel-media-export-item-factory.c
index 7613585..b9a9e2b 100644
--- a/src/media-export/rygel-media-export-item-factory.c
+++ b/src/media-export/rygel-media-export-item-factory.c
@@ -160,7 +160,7 @@ rygel_media_export_item_factory_fill_audio_item (RygelAudioItem *item, GUPnPDLNA
}
rygel_audio_item_set_channels (item,
- (gint) gst_discoverer_audio_info_get_channels (audio_info));
+ (gint) gst_discoverer_audio_info_get_channels (audio_info));
rygel_audio_item_set_sample_freq (item,
(gint) gst_discoverer_audio_info_get_sample_rate (audio_info));
}
@@ -197,10 +197,10 @@ rygel_media_export_item_factory_fill_photo_item (RygelMediaExportPhotoItem *item
g_return_val_if_fail (dlna_info, NULL);
g_return_val_if_fail (video_info, NULL);
g_return_val_if_fail (file_info, NULL);
-
+
rygel_media_export_item_factory_fill_media_item (RYGEL_MEDIA_ITEM (item),
file, dlna_info, file_info);
-
+
rygel_visual_item_set_width (RYGEL_VISUAL_ITEM (item),
(gint) gst_discoverer_video_info_get_width (video_info));
rygel_visual_item_set_height (RYGEL_VISUAL_ITEM (item),
@@ -209,7 +209,7 @@ rygel_media_export_item_factory_fill_photo_item (RygelMediaExportPhotoItem *item
gint color_depth = gst_discoverer_video_info_get_depth (video_info);
rygel_visual_item_set_color_depth (RYGEL_VISUAL_ITEM (item),
color_depth == 0 ? -1 : color_depth );
-
+
return RYGEL_MEDIA_ITEM (item);
}
@@ -230,7 +230,7 @@ RygelMediaItem *rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
const GstTagList *tags = gst_discoverer_stream_info_get_tags ((GstDiscovererStreamInfo*) audio_info);
if (!tags)
return result;
-
+
gchar *artist = NULL;
gst_tag_list_get_string (tags, GST_TAG_ARTIST, &artist);
rygel_music_item_set_artist (RYGEL_MUSIC_ITEM (item), artist);
@@ -245,54 +245,54 @@ RygelMediaItem *rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
gst_tag_list_get_string (tags, GST_TAG_GENRE, &genre);
rygel_music_item_set_album (RYGEL_MUSIC_ITEM (item), genre);
g_free (genre);
-
+
guint volume_number = 0U;
- gst_tag_list_get_uint (tags, GST_TAG_ALBUM_VOLUME_NUMBER, &volume_number);
+ gst_tag_list_get_uint (tags, GST_TAG_ALBUM_VOLUME_NUMBER, &volume_number);
item->disc = volume_number;
guint track_number = 0U;
- gst_tag_list_get_uint (tags, GST_TAG_TRACK_NUMBER, &track_number);
- rygel_music_item_set_track_number (RYGEL_MUSIC_ITEM (item), track_number);
+ gst_tag_list_get_uint (tags, GST_TAG_TRACK_NUMBER, &track_number);
+ rygel_music_item_set_track_number (RYGEL_MUSIC_ITEM (item), track_number);
rygel_audio_item_set_sample_freq (RYGEL_AUDIO_ITEM (item),
(gint) gst_discoverer_audio_info_get_sample_rate ((GstDiscovererAudioInfo *) audio_info));
-
+
GstBuffer* buffer = NULL;
- gst_tag_list_get_buffer (tags, GST_TAG_IMAGE, &buffer);
+ gst_tag_list_get_buffer (tags, GST_TAG_IMAGE, &buffer);
if (!buffer || !buffer->caps)
return result;
GstStructure *structure = gst_caps_get_structure (buffer->caps, 0);
if (!structure)
return result;
-
+
gint image_type = 0;
gst_structure_get_enum (structure, "image-type",
GST_TYPE_TAG_IMAGE_TYPE, &image_type);
switch (image_type) {
case GST_TAG_IMAGE_TYPE_UNDEFINED:
case GST_TAG_IMAGE_TYPE_FRONT_COVER:
- {
- RygelMediaArtStore *store = rygel_media_art_store_get_default ();
- GFile* thumb = rygel_media_art_store_get_media_art_file (store,
- "album", RYGEL_MUSIC_ITEM (item), TRUE);
-
+ {
+ RygelMediaArtStore *store = rygel_media_art_store_get_default ();
+ GFile* thumb = rygel_media_art_store_get_media_art_file (store,
+ "album", RYGEL_MUSIC_ITEM (item), TRUE);
+
RygelMediaExportJPEGWriter *writer =
rygel_media_export_jpeg_writer_new (NULL);
if (writer) {
rygel_media_export_jpeg_writer_write (writer, buffer, thumb);
g_object_unref (writer);
}
-
+
g_object_unref (thumb);
g_object_unref (store); /* TODO: Did get_default() return a reference()? */
}
default:
break;
}
-
+
gst_structure_free (structure);
-
+
return result;
}
@@ -306,7 +306,7 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem *item, GFil
const GstDiscovererInfo *info = gupnp_dlna_information_get_info (dlna_info);
if (!info)
return;
-
+
const GstTagList *tags = gst_discoverer_stream_info_get_tags ((GstDiscovererStreamInfo*) info);
gchar *title = NULL;
if (!tags || !gst_tag_list_get_string (tags, GST_TAG_TITLE, &title)) {
@@ -315,43 +315,43 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem *item, GFil
rygel_media_object_set_title (RYGEL_MEDIA_OBJECT (item), title);
g_free (title);
-
+
GDate* date = NULL;
if (tags) {
- if (gst_tag_list_get_date (tags, GST_TAG_DATE, &date)) {
- gint datestr_length = 30;
- gchar *datestr = g_new0 (gchar, datestr_length);
- g_date_strftime (datestr, datestr_length, "%F", date);
-
- rygel_media_item_set_date (item, datestr);
- g_free (datestr);
- }
+ if (gst_tag_list_get_date (tags, GST_TAG_DATE, &date)) {
+ gint datestr_length = 30;
+ gchar *datestr = g_new0 (gchar, datestr_length);
+ g_date_strftime (datestr, datestr_length, "%F", date);
+
+ rygel_media_item_set_date (item, datestr);
+ g_free (datestr);
+ }
}
-
+
// use mtime if no time tag was available
guint64 mtime = g_file_info_get_attribute_uint64 (file_info,
G_FILE_ATTRIBUTE_TIME_MODIFIED);
if (!date) {
GTimeVal tv = {0};
- tv.tv_sec = (glong) mtime;
- tv.tv_usec = (glong) 0;
+ tv.tv_sec = (glong) mtime;
+ tv.tv_usec = (glong) 0;
- gchar* datestr = g_time_val_to_iso8601 (&tv);
- rygel_media_item_set_date (item, datestr);
- g_free (datestr);
+ gchar* datestr = g_time_val_to_iso8601 (&tv);
+ rygel_media_item_set_date (item, datestr);
+ g_free (datestr);
}
-
+
g_date_free (date);
- rygel_media_item_set_size (item,
- (gint64) g_file_info_get_size (file_info));
+ rygel_media_item_set_size (item,
+ (gint64) g_file_info_get_size (file_info));
rygel_media_object_set_modified (RYGEL_MEDIA_OBJECT (item), (guint64) mtime);
const gchar *name = gupnp_dlna_information_get_name (dlna_info);
if (name) {
rygel_media_item_set_dlna_profile (item, name);
-
+
rygel_media_item_set_mime_type (item,
gupnp_dlna_information_get_mime (dlna_info));
} else {
@@ -365,6 +365,3 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem *item, GFil
rygel_media_item_add_uri (item, uri);
g_free (uri);
}
-
-
-
diff --git a/src/media-export/rygel-media-export-item-factory.h b/src/media-export/rygel-media-export-item-factory.h
index 60c3687..da11fc6 100644
--- a/src/media-export/rygel-media-export-item-factory.h
+++ b/src/media-export/rygel-media-export-item-factory.h
@@ -35,55 +35,55 @@ G_BEGIN_DECLS
RygelMediaItem *
rygel_media_export_item_factory_create_simple (RygelMediaContainer *parent,
- GFile *file,
- GFileInfo *info);
+ GFile *file,
+ GFileInfo *info);
gchar *
rygel_media_export_media_cache_get_id (GFile *file);
RygelMediaItem *
rygel_media_export_item_factory_create_playlist_item (GFile *file,
- RygelMediaContainer *parent,
- const gchar *fallback_title);
+ RygelMediaContainer *parent,
+ const gchar *fallback_title);
RygelMediaItem *
rygel_media_export_item_factory_create_from_info (RygelMediaContainer *parent,
- GFile *file,
- GUPnPDLNAInformation *dlna_info,
- GFileInfo *file_info);
+ GFile *file,
+ GUPnPDLNAInformation *dlna_info,
+ GFileInfo *file_info);
RygelMediaItem *
rygel_media_export_item_factory_fill_photo_item (RygelMediaExportPhotoItem *item,
- GFile *file,
- GUPnPDLNAInformation *dlna_info,
- GstDiscovererVideoInfo *video_info,
- GFileInfo *file_info);
+ GFile *file,
+ GUPnPDLNAInformation *dlna_info,
+ GstDiscovererVideoInfo *video_info,
+ GFileInfo *file_info);
RygelMediaItem *
rygel_media_export_item_factory_fill_video_item (RygelMediaExportVideoItem *item,
- GFile *file,
- GUPnPDLNAInformation *dlna_info,
- GstDiscovererVideoInfo *video_info,
- GstDiscovererAudioInfo *audio_info,
- GFileInfo *file_info);
+ GFile *file,
+ GUPnPDLNAInformation *dlna_info,
+ GstDiscovererVideoInfo *video_info,
+ GstDiscovererAudioInfo *audio_info,
+ GFileInfo *file_info);
RygelMediaItem *
rygel_media_export_item_factory_fill_music_item (RygelMediaExportMusicItem *item,
- GFile *file,
- GUPnPDLNAInformation *dlna_info,
- GstDiscovererAudioInfo *audio_info,
- GFileInfo *file_info);
+ GFile *file,
+ GUPnPDLNAInformation *dlna_info,
+ GstDiscovererAudioInfo *audio_info,
+ GFileInfo *file_info);
void
rygel_media_export_item_factory_fill_audio_item (RygelAudioItem *item,
- GUPnPDLNAInformation *dlna_info,
- GstDiscovererAudioInfo *audio_info);
+ GUPnPDLNAInformation *dlna_info,
+ GstDiscovererAudioInfo *audio_info);
void
rygel_media_export_item_factory_fill_media_item (RygelMediaItem *item,
- GFile *file,
- GUPnPDLNAInformation *dlna_info,
- GFileInfo *file_info);
+ GFile *file,
+ GUPnPDLNAInformation *dlna_info,
+ GFileInfo *file_info);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-jpeg-writer.c b/src/media-export/rygel-media-export-jpeg-writer.c
index cb56e3d..70e6a15 100644
--- a/src/media-export/rygel-media-export-jpeg-writer.c
+++ b/src/media-export/rygel-media-export-jpeg-writer.c
@@ -41,10 +41,10 @@ struct _RygelMediaExportJPEGWriterPrivate {
GstElement *sink;
};
-#define RYGEL_MEDIA_EXPORT_JPEG_WRITER_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- RYGEL_MEDIA_EXPORT_TYPE_JPEG_WRITER, \
- RygelMediaExportJPEGWriterPrivate))
+#define RYGEL_MEDIA_EXPORT_JPEG_WRITER_GET_PRIVATE(o) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+ RYGEL_MEDIA_EXPORT_TYPE_JPEG_WRITER, \
+ RygelMediaExportJPEGWriterPrivate))
enum {
RYGEL_MEDIA_EXPORT_JPEG_WRITER_DUMMY_PROPERTY,
@@ -53,8 +53,8 @@ enum {
static void
quit_loop (GstBus *sender G_GNUC_UNUSED,
- GstMessage *message G_GNUC_UNUSED,
- gpointer user_data) {
+ GstMessage *message G_GNUC_UNUSED,
+ gpointer user_data) {
RygelMediaExportJPEGWriter *self = RYGEL_MEDIA_EXPORT_JPEG_WRITER (user_data);
g_main_loop_quit (self->priv->loop);
@@ -77,8 +77,8 @@ rygel_media_export_jpeg_writer_new (GError **error) {
}
return RYGEL_MEDIA_EXPORT_JPEG_WRITER (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_JPEG_WRITER,
- "bin", GST_BIN (element),
- NULL));}
+ "bin", GST_BIN (element),
+ NULL));}
/**
* Write a Gst.Buffer as retrieved from the Gst.TagList to disk.
@@ -90,8 +90,8 @@ rygel_media_export_jpeg_writer_new (GError **error) {
*/
void
rygel_media_export_jpeg_writer_write (RygelMediaExportJPEGWriter *self,
- GstBuffer *buffer,
- GFile *file) {
+ GstBuffer *buffer,
+ GFile *file) {
RygelMediaExportJPEGWriterPrivate *priv;
GstElement* element;
@@ -167,14 +167,14 @@ rygel_media_export_jpeg_writer_class_init (RygelMediaExportJPEGWriterClass *writ
object_class->dispose = rygel_media_export_jpeg_writer_dispose;
object_class->constructed = rygel_media_export_jpeg_writer_constructed;
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_JPEG_WRITER_BIN,
- g_param_spec_object ("bin",
- "bin",
- "bin",
- GST_TYPE_BIN,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_JPEG_WRITER_BIN,
+ g_param_spec_object ("bin",
+ "bin",
+ "bin",
+ GST_TYPE_BIN,
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (writer_class, sizeof (RygelMediaExportJPEGWriterPrivate));
}
diff --git a/src/media-export/rygel-media-export-jpeg-writer.h b/src/media-export/rygel-media-export-jpeg-writer.h
index 7f8792a..3260756 100644
--- a/src/media-export/rygel-media-export-jpeg-writer.h
+++ b/src/media-export/rygel-media-export-jpeg-writer.h
@@ -57,8 +57,8 @@ rygel_media_export_jpeg_writer_new (GError **error);
void
rygel_media_export_jpeg_writer_write (RygelMediaExportJPEGWriter *self,
- GstBuffer *buffer,
- GFile *file);
+ GstBuffer *buffer,
+ GFile *file);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-leaf-query-container.c b/src/media-export/rygel-media-export-leaf-query-container.c
index 4d60aed..d20848c 100644
--- a/src/media-export/rygel-media-export-leaf-query-container.c
+++ b/src/media-export/rygel-media-export-leaf-query-container.c
@@ -22,8 +22,8 @@
#include "rygel-media-export-leaf-query-container.h"
G_DEFINE_TYPE (RygelMediaExportLeafQueryContainer,
- rygel_media_export_leaf_query_container,
- RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER);
+ rygel_media_export_leaf_query_container,
+ RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER);
RygelMediaExportLeafQueryContainer*
rygel_media_export_leaf_query_container_new (RygelSearchExpression *expression,
diff --git a/src/media-export/rygel-media-export-media-cache-upgrader.c b/src/media-export/rygel-media-export-media-cache-upgrader.c
index af3e47d..4598e8c 100644
--- a/src/media-export/rygel-media-export-media-cache-upgrader.c
+++ b/src/media-export/rygel-media-export-media-cache-upgrader.c
@@ -50,14 +50,14 @@ enum {
RygelMediaExportMediaCacheUpgrader *
rygel_media_export_media_cache_upgrader_new (RygelMediaExportDatabase *database,
- RygelMediaExportSQLFactory *sql) {
+ RygelMediaExportSQLFactory *sql) {
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_DATABASE (database), NULL);
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_SQL_FACTORY (sql), NULL);
return RYGEL_MEDIA_EXPORT_MEDIA_CACHE_UPGRADER (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_MEDIA_CACHE_UPGRADER,
- "database", database,
- "sql-factory", sql,
- NULL));
+ "database", database,
+ "sql-factory", sql,
+ NULL));
}
gboolean
@@ -85,7 +85,7 @@ rygel_media_export_media_cache_upgrader_needs_upgrade (RygelMediaExportMediaCach
void
rygel_media_export_media_cache_upgrader_fix_schema (RygelMediaExportMediaCacheUpgrader *self,
- GError **error) {
+ GError **error) {
RygelMediaExportMediaCacheUpgraderPrivate *priv;
gint matching_schema_count;
GError *inner_error;
@@ -95,10 +95,10 @@ rygel_media_export_media_cache_upgrader_fix_schema (RygelMediaExportMediaCacheUp
priv = self->priv;
inner_error = NULL;
matching_schema_count = rygel_media_export_database_query_value (priv->database,
- "SELECT count(*) FROM sqlite_master WHERE sql LIKE 'CREATE TABLE Meta_Data%object_fk TEXT UNIQUE%'",
- NULL,
- 0,
- &inner_error);
+ "SELECT count(*) FROM sqlite_master WHERE sql LIKE 'CREATE TABLE Meta_Data%object_fk TEXT UNIQUE%'",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return;
@@ -110,27 +110,27 @@ rygel_media_export_media_cache_upgrader_fix_schema (RygelMediaExportMediaCacheUp
goto out;
}
rygel_media_export_database_exec (priv->database,
- "DELETE FROM Object WHERE upnp_id IN (SELECT DISTINCT object_fk FROM meta_data)",
- NULL,
- 0,
- &inner_error);
+ "DELETE FROM Object WHERE upnp_id IN (SELECT DISTINCT object_fk FROM meta_data)",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- "DROP TABLE Meta_Data",
- NULL,
- 0,
- &inner_error);
+ "DROP TABLE Meta_Data",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_METADATA),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_METADATA),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -162,11 +162,11 @@ rygel_media_export_media_cache_upgrader_ensure_indices (RygelMediaExportMediaCac
inner_error = NULL;
priv = self->priv;
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
g_warning ("Failed to create indices: %s", inner_error->message);
g_error_free (inner_error);
@@ -177,7 +177,7 @@ rygel_media_export_media_cache_upgrader_ensure_indices (RygelMediaExportMediaCac
static void
rygel_media_export_media_cache_upgrader_force_reindex (RygelMediaExportMediaCacheUpgrader *self,
- GError **error) {
+ GError **error) {
GError *inner_error;
RygelMediaExportMediaCacheUpgraderPrivate *priv;
@@ -186,10 +186,10 @@ rygel_media_export_media_cache_upgrader_force_reindex (RygelMediaExportMediaCach
priv = self->priv;
inner_error = NULL;
rygel_media_export_database_exec (priv->database,
- "UPDATE Object SET timestamp = 0",
- NULL,
- 0,
- &inner_error);
+ "UPDATE Object SET timestamp = 0",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return;
@@ -210,30 +210,30 @@ rygel_media_export_media_cache_upgrader_update_v3_v4 (RygelMediaExportMediaCache
goto out;
}
rygel_media_export_database_exec (priv->database,
- "ALTER TABLE Meta_Data RENAME TO _Meta_Data",
- NULL,
- 0,
- &inner_error);
+ "ALTER TABLE Meta_Data RENAME TO _Meta_Data",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_METADATA),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_METADATA),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- "INSERT INTO meta_data (size, mime_type, duration, width, height, class, author, album, date, bitrate, "
- "sample_freq, bits_per_sample, channels, track, color_depth, object_fk) SELECT size, mime_type, duration, "
- "width, height, class, author, album, date, bitrate, sample_freq, bits_per_sample, channels, track, "
- "color_depth, o.upnp_id FROM _Meta_Data JOIN object o ON id = o.metadata_fk",
- NULL,
- 0,
- &inner_error);
+ "INSERT INTO meta_data (size, mime_type, duration, width, height, class, author, album, date, bitrate, "
+ "sample_freq, bits_per_sample, channels, track, color_depth, object_fk) SELECT size, mime_type, duration, "
+ "width, height, class, author, album, date, bitrate, sample_freq, bits_per_sample, channels, track, "
+ "color_depth, o.upnp_id FROM _Meta_Data JOIN object o ON id = o.metadata_fk",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -250,11 +250,11 @@ rygel_media_export_media_cache_upgrader_update_v3_v4 (RygelMediaExportMediaCache
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_COMMON),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_COMMON),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -296,11 +296,11 @@ rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExportMediaCache
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -317,27 +317,27 @@ rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExportMediaCache
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- "INSERT INTO _Object (upnp_id, type_fk, title, timestamp) VALUES ('0', 0, 'Root', 0)",
- NULL,
- 0,
- &inner_error);
+ "INSERT INTO _Object (upnp_id, type_fk, title, timestamp) VALUES ('0', 0, 'Root', 0)",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- "INSERT INTO Object (upnp_id, type_fk, title, timestamp) VALUES ('0', 0, 'Root', 0)",
- NULL,
- 0,
- &inner_error);
+ "INSERT INTO Object (upnp_id, type_fk, title, timestamp) VALUES ('0', 0, 'Root', 0)",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -353,10 +353,10 @@ rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExportMediaCache
g_value_take_string (&value, gee_queue_poll (queue));
cursor = rygel_media_export_database_exec_cursor (priv->database,
- "SELECT upnp_id FROM _Object WHERE parent = ?",
- &value,
- 1,
- &inner_error);
+ "SELECT upnp_id FROM _Object WHERE parent = ?",
+ &value,
+ 1,
+ &inner_error);
if (inner_error) {
g_value_unset (&value);
goto out;
@@ -366,17 +366,17 @@ rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExportMediaCache
sqlite3_stmt *stmt = rygel_media_export_database_cursor_next (cursor, &inner_error);
if (inner_error) {
- g_value_unset (&value);
- goto out;
+ g_value_unset (&value);
+ goto out;
}
gee_queue_offer (queue, sqlite3_column_text (stmt, 0));
}
g_object_unref (cursor);
rygel_media_export_database_exec (priv->database,
- "INSERT INTO Object SELECT * FROM _OBJECT WHERE parent = ?",
- &value,
- 1,
- &inner_error);
+ "INSERT INTO Object SELECT * FROM _OBJECT WHERE parent = ?",
+ &value,
+ 1,
+ &inner_error);
g_value_unset (&value);
if (inner_error) {
goto out;
@@ -393,20 +393,20 @@ rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExportMediaCache
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -610,11 +610,11 @@ rygel_media_export_media_cache_upgrader_update_v8_v9 (RygelMediaExportMediaCache
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -623,11 +623,11 @@ rygel_media_export_media_cache_upgrader_update_v8_v9 (RygelMediaExportMediaCache
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -707,25 +707,25 @@ rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExportMediaCach
goto out;
}
sql_string = g_strconcat ("INSERT OR REPLACE INTO Object (parent, upnp_id, type_fk, title, timestamp) VALUES ('0', '"
- RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID
- "', 0, '",
- _(RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_NAME),
- "', 0)",
- NULL);
+ RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID
+ "', 0, '",
+ _(RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_NAME),
+ "', 0)",
+ NULL);
rygel_media_export_database_exec (priv->database, sql_string, NULL, 0, &inner_error);
g_free (sql_string);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- "UPDATE Object SET parent = '"
- RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID
- "' WHERE parent = '0' AND upnp_id NOT LIKE 'virtual-%' AND upnp_id <> '"
- RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID
- "'",
- NULL,
- 0,
- &inner_error);
+ "UPDATE Object SET parent = '"
+ RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID
+ "' WHERE parent = '0' AND upnp_id NOT LIKE 'virtual-%' AND upnp_id <> '"
+ RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID
+ "'",
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -742,20 +742,20 @@ rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExportMediaCach
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -783,18 +783,18 @@ rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExportMediaCach
sqlite3_stmt* statement = rygel_media_export_database_cursor_next (cursor, &inner_error);
if (inner_error) {
- g_object_unref (cursor);
- g_value_unset (&value);
- goto out;
+ g_object_unref (cursor);
+ g_value_unset (&value);
+ goto out;
}
gee_queue_offer (queue, sqlite3_column_text (statement, 0));
}
g_object_unref (cursor);
rygel_media_export_database_exec (priv->database,
- "INSERT INTO Object SELECT * FROM _Object WHERE parent = ?",
- &value,
- 1,
- &inner_error);
+ "INSERT INTO Object SELECT * FROM _Object WHERE parent = ?",
+ &value,
+ 1,
+ &inner_error);
g_value_unset (&value);
if (inner_error) {
goto out;
@@ -811,29 +811,29 @@ rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExportMediaCach
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_COMMON),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_COMMON),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->database,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -907,7 +907,7 @@ rygel_media_export_media_cache_upgrader_update_v10_v11 (RygelMediaExportMediaCac
void
rygel_media_export_media_cache_upgrader_upgrade (RygelMediaExportMediaCacheUpgrader *self,
- gint old_version) {
+ gint old_version) {
gint current_version;
RygelMediaExportMediaCacheUpgraderPrivate *priv;
@@ -924,49 +924,49 @@ rygel_media_export_media_cache_upgrader_upgrade (RygelMediaExportMediaCacheUpgra
switch (old_version) {
case 3:
{
- rygel_media_export_media_cache_upgrader_update_v3_v4 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v3_v4 (self);
+ break;
}
case 4:
{
- rygel_media_export_media_cache_upgrader_update_v4_v5 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v4_v5 (self);
+ break;
}
case 5:
{
- rygel_media_export_media_cache_upgrader_update_v5_v6 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v5_v6 (self);
+ break;
}
case 6:
{
- rygel_media_export_media_cache_upgrader_update_v6_v7 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v6_v7 (self);
+ break;
}
case 7:
{
- rygel_media_export_media_cache_upgrader_update_v7_v8 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v7_v8 (self);
+ break;
}
case 8:
{
- rygel_media_export_media_cache_upgrader_update_v8_v9 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v8_v9 (self);
+ break;
}
case 9:
{
- rygel_media_export_media_cache_upgrader_update_v9_v10 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v9_v10 (self);
+ break;
}
case 10:
{
- rygel_media_export_media_cache_upgrader_update_v10_v11 (self);
- break;
+ rygel_media_export_media_cache_upgrader_update_v10_v11 (self);
+ break;
}
default:
{
- g_warning ("Cannot upgrade");
- priv->database = NULL;
- break;
+ g_warning ("Cannot upgrade");
+ priv->database = NULL;
+ break;
}
}
++old_version;
@@ -975,9 +975,9 @@ rygel_media_export_media_cache_upgrader_upgrade (RygelMediaExportMediaCacheUpgra
static void
rygel_media_export_media_cache_upgrader_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec) {
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec) {
RygelMediaExportMediaCacheUpgrader *self = RYGEL_MEDIA_EXPORT_MEDIA_CACHE_UPGRADER (object);
RygelMediaExportMediaCacheUpgraderPrivate *priv = self->priv;
@@ -998,9 +998,9 @@ rygel_media_export_media_cache_upgrader_get_property (GObject *object,
static void
rygel_media_export_media_cache_upgrader_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec) {
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec) {
RygelMediaExportMediaCacheUpgrader *self = RYGEL_MEDIA_EXPORT_MEDIA_CACHE_UPGRADER (object);
RygelMediaExportMediaCacheUpgraderPrivate *priv = self->priv;
@@ -1029,23 +1029,23 @@ rygel_media_export_media_cache_upgrader_class_init (RygelMediaExportMediaCacheUp
object_class->set_property = rygel_media_export_media_cache_upgrader_set_property;
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_UPGRADER_DATABASE,
- g_param_spec_object ("database",
- "database",
- "database",
- RYGEL_MEDIA_EXPORT_TYPE_DATABASE,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_UPGRADER_DATABASE,
+ g_param_spec_object ("database",
+ "database",
+ "database",
+ RYGEL_MEDIA_EXPORT_TYPE_DATABASE,
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_UPGRADER_SQL_FACTORY,
- g_param_spec_object ("sql-factory",
- "sql-factory",
- "sql-factory",
- RYGEL_MEDIA_EXPORT_TYPE_SQL_FACTORY,
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY));
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_UPGRADER_SQL_FACTORY,
+ g_param_spec_object ("sql-factory",
+ "sql-factory",
+ "sql-factory",
+ RYGEL_MEDIA_EXPORT_TYPE_SQL_FACTORY,
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE |
+ G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (upgrader_class, sizeof (RygelMediaExportMediaCacheUpgraderPrivate));
}
diff --git a/src/media-export/rygel-media-export-media-cache-upgrader.h b/src/media-export/rygel-media-export-media-cache-upgrader.h
index a9bb95c..2019a5b 100644
--- a/src/media-export/rygel-media-export-media-cache-upgrader.h
+++ b/src/media-export/rygel-media-export-media-cache-upgrader.h
@@ -55,23 +55,23 @@ rygel_media_export_media_cache_upgrader_get_type (void) G_GNUC_CONST;
RygelMediaExportMediaCacheUpgrader *
rygel_media_export_media_cache_upgrader_new (RygelMediaExportDatabase *database,
- RygelMediaExportSQLFactory *sql);
+ RygelMediaExportSQLFactory *sql);
gboolean
rygel_media_export_media_cache_upgrader_needs_upgrade (RygelMediaExportMediaCacheUpgrader *self,
- gint *current_version,
- GError **error);
+ gint *current_version,
+ GError **error);
void
rygel_media_export_media_cache_upgrader_fix_schema (RygelMediaExportMediaCacheUpgrader *self,
- GError **error);
+ GError **error);
void
rygel_media_export_media_cache_upgrader_ensure_indices (RygelMediaExportMediaCacheUpgrader *self);
void
rygel_media_export_media_cache_upgrader_upgrade (RygelMediaExportMediaCacheUpgrader *self,
- gint old_version);
+ gint old_version);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-media-cache.c b/src/media-export/rygel-media-export-media-cache.c
index 0712243..510eaec 100644
--- a/src/media-export/rygel-media-export-media-cache.c
+++ b/src/media-export/rygel-media-export-media-cache.c
@@ -43,8 +43,8 @@
*/
G_DEFINE_TYPE (RygelMediaExportMediaCache,
- rygel_media_export_media_cache,
- G_TYPE_OBJECT)
+ rygel_media_export_media_cache,
+ G_TYPE_OBJECT)
@@ -140,8 +140,8 @@ rygel_media_export_exists_cache_entry_get_type (void) {
if (g_once_init_enter (&rygel_media_export_exists_cache_entry_type_id__volatile)) {
GType rygel_media_export_exists_cache_entry_type_id = g_boxed_type_register_static ("RygelMediaExportExistsCacheEntry",
- (GBoxedCopyFunc) rygel_media_export_exists_cache_entry_dup,
- (GBoxedFreeFunc) rygel_media_export_exists_cache_entry_free);
+ (GBoxedCopyFunc) rygel_media_export_exists_cache_entry_dup,
+ (GBoxedFreeFunc) rygel_media_export_exists_cache_entry_free);
g_once_init_leave (&rygel_media_export_exists_cache_entry_type_id__volatile, rygel_media_export_exists_cache_entry_type_id);
}
@@ -217,8 +217,8 @@ rygel_media_export_media_cache_get_default (void) {
void
rygel_media_export_media_cache_remove_by_id (RygelMediaExportMediaCache *self,
- const gchar *id,
- GError **error) {
+ const gchar *id,
+ GError **error) {
GValue value = G_VALUE_INIT;
RygelMediaExportMediaCachePrivate *priv;
GError *inner_error;
@@ -232,11 +232,11 @@ rygel_media_export_media_cache_remove_by_id (RygelMediaExportMediaCache *self,
inner_error = NULL;
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql,
- RYGEL_MEDIA_EXPORT_SQL_STRING_DELETE),
- &value,
- 1,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql,
+ RYGEL_MEDIA_EXPORT_SQL_STRING_DELETE),
+ &value,
+ 1,
+ &inner_error);
g_value_unset (&value);
if (inner_error) {
g_propagate_error (error, inner_error);
@@ -245,8 +245,8 @@ rygel_media_export_media_cache_remove_by_id (RygelMediaExportMediaCache *self,
void
rygel_media_export_media_cache_remove_object (RygelMediaExportMediaCache *self,
- RygelMediaObject *object,
- GError **error) {
+ RygelMediaObject *object,
+ GError **error) {
GError *inner_error;
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_MEDIA_CACHE (self));
@@ -261,8 +261,8 @@ rygel_media_export_media_cache_remove_object (RygelMediaExportMediaCache *self,
void
rygel_media_export_media_cache_save_container (RygelMediaExportMediaCache *self,
- RygelMediaContainer *container,
- GError **error) {
+ RygelMediaContainer *container,
+ GError **error) {
GError *inner_error;
RygelMediaExportMediaCachePrivate *priv;
@@ -289,8 +289,8 @@ rygel_media_export_media_cache_save_container (RygelMediaExportMediaCache *self
void
rygel_media_export_media_cache_save_item (RygelMediaExportMediaCache *self,
- RygelMediaItem *item,
- GError **error) {
+ RygelMediaItem *item,
+ GError **error) {
GError *inner_error;
RygelMediaExportMediaCachePrivate *priv;
@@ -315,8 +315,8 @@ rygel_media_export_media_cache_save_item (RygelMediaExportMediaCache *self,
out:
if (inner_error) {
g_warning (_("Failed to add item with ID %s: %s"),
- rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (item)),
- inner_error->message);
+ rygel_media_object_get_id (RYGEL_MEDIA_OBJECT (item)),
+ inner_error->message);
rygel_media_export_database_rollback (priv->db);
g_propagate_error (error, inner_error);
}
@@ -324,8 +324,8 @@ rygel_media_export_media_cache_save_item (RygelMediaExportMediaCache *self,
RygelMediaObject *
rygel_media_export_media_cache_get_object (RygelMediaExportMediaCache *self,
- const gchar *object_id,
- GError **error) {
+ const gchar *object_id,
+ GError **error) {
RygelMediaObject *parent;
RygelMediaExportDatabaseCursor *cursor;
GError *inner_error;
@@ -372,8 +372,8 @@ rygel_media_export_media_cache_get_object (RygelMediaExportMediaCache *self,
RygelMediaContainer *
rygel_media_export_media_cache_get_container (RygelMediaExportMediaCache *self,
- const gchar *container_id,
- GError **error) {
+ const gchar *container_id,
+ GError **error) {
RygelMediaObject *object;
GError *inner_error;
@@ -389,10 +389,10 @@ rygel_media_export_media_cache_get_container (RygelMediaExportMediaCache *self,
if (object) {
if (!RYGEL_IS_MEDIA_CONTAINER (object)) {
g_set_error (error,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_INVALID_TYPE,
- "Object with id %s is not a MediaContainer",
- container_id);
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_INVALID_TYPE,
+ "Object with id %s is not a MediaContainer",
+ container_id);
g_object_unref (object);
return NULL;
}
@@ -405,8 +405,8 @@ rygel_media_export_media_cache_get_container (RygelMediaExportMediaCache *self,
gint
rygel_media_export_media_cache_get_child_count (RygelMediaExportMediaCache *self,
- const gchar *container_id,
- GError **error) {
+ const gchar *container_id,
+ GError **error) {
GValue value = G_VALUE_INIT;
GError *inner_error;
gint count;
@@ -419,7 +419,7 @@ rygel_media_export_media_cache_get_child_count (RygelMediaExportMediaCache *sel
inner_error = NULL;
count = rygel_media_export_media_cache_query_value (self, RYGEL_MEDIA_EXPORT_SQL_STRING_CHILD_COUNT, &value, 1, &inner_error);
g_value_unset (&value);
- if (inner_error != NULL) {
+ if (inner_error) {
g_propagate_error (error, inner_error);
return 0;
}
@@ -428,10 +428,10 @@ rygel_media_export_media_cache_get_child_count (RygelMediaExportMediaCache *sel
gboolean
rygel_media_export_media_cache_exists (RygelMediaExportMediaCache *self,
- GFile *file,
- gint64 *timestamp,
- gint64 *size,
- GError **error) {
+ GFile *file,
+ gint64 *timestamp,
+ gint64 *size,
+ GError **error) {
gboolean result;
gchar *uri;
RygelMediaExportDatabaseCursor *cursor;
@@ -492,11 +492,11 @@ rygel_media_export_media_cache_exists (RygelMediaExportMediaCache *self,
RygelMediaObjects *
rygel_media_export_media_cache_get_children (RygelMediaExportMediaCache *self,
- RygelMediaContainer *container,
- const gchar *sort_criteria,
- glong offset,
- glong max_count,
- GError **error) {
+ RygelMediaContainer *container,
+ const gchar *sort_criteria,
+ glong offset,
+ glong max_count,
+ GError **error) {
GeeAbstractCollection *abstract_children;
GValue values [] = {G_VALUE_INIT, G_VALUE_INIT, G_VALUE_INIT};
guint iter;
@@ -521,7 +521,7 @@ rygel_media_export_media_cache_get_children (RygelMediaExportMediaCache *self,
sort_order = rygel_media_export_media_cache_translate_sort_criteria (sort_criteria);
priv = self->priv;
sql = g_strdup_printf (rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_GET_CHILDREN),
- sort_order);
+ sort_order);
g_free (sort_order);
inner_error = NULL;
cursor = rygel_media_export_database_exec_cursor (priv->db, sql, values, G_N_ELEMENTS (values), &inner_error);
@@ -544,10 +544,10 @@ rygel_media_export_media_cache_get_children (RygelMediaExportMediaCache *self,
RygelMediaObject *object;
if (inner_error) {
- g_propagate_error (error, inner_error);
- g_object_unref (cursor);
- g_object_unref (children);
- return NULL;
+ g_propagate_error (error, inner_error);
+ g_object_unref (cursor);
+ g_object_unref (children);
+ return NULL;
}
object = rygel_media_export_media_cache_get_object_from_statement (self, container, statement);
gee_abstract_collection_add (abstract_children, object);
@@ -561,13 +561,13 @@ rygel_media_export_media_cache_get_children (RygelMediaExportMediaCache *self,
RygelMediaObjects *
rygel_media_export_media_cache_get_objects_by_search_expression (RygelMediaExportMediaCache *self,
- RygelSearchExpression *expression,
- const gchar *container_id,
- const gchar *sort_criteria,
- guint offset,
- guint max_count,
- guint *total_matches,
- GError **error) {
+ RygelSearchExpression *expression,
+ const gchar *container_id,
+ const gchar *sort_criteria,
+ guint offset,
+ guint max_count,
+ guint *total_matches,
+ GError **error) {
guint matches;
RygelMediaObjects *objects;
GArray *args;
@@ -595,20 +595,20 @@ rygel_media_export_media_cache_get_objects_by_search_expression (RygelMediaExpor
}
max_objects = rygel_media_export_media_cache_modify_limit (max_count);
matches = (guint) rygel_media_export_media_cache_get_object_count_by_filter (self, filter, args, container_id, &inner_error);
- if (inner_error != NULL) {
+ if (inner_error) {
g_propagate_error (error, inner_error);
g_free (filter);
g_array_unref (args);
return NULL;
}
objects = rygel_media_export_media_cache_get_objects_by_filter (self,
- filter,
- args,
- container_id,
- sort_criteria,
- (glong) offset,
- (glong) max_objects,
- &inner_error);
+ filter,
+ args,
+ container_id,
+ sort_criteria,
+ (glong) offset,
+ (glong) max_objects,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
g_free (filter);
@@ -625,9 +625,9 @@ rygel_media_export_media_cache_get_objects_by_search_expression (RygelMediaExpor
glong
rygel_media_export_media_cache_get_object_count_by_search_expression (RygelMediaExportMediaCache *self,
- RygelSearchExpression *expression,
- const gchar *container_id,
- GError **error) {
+ RygelSearchExpression *expression,
+ const gchar *container_id,
+ GError **error) {
glong count;
GArray *args;
gchar *filter;
@@ -680,10 +680,10 @@ rygel_media_export_media_cache_get_object_count_by_search_expression (RygelMedia
glong
rygel_media_export_media_cache_get_object_count_by_filter (RygelMediaExportMediaCache *self,
- const gchar *filter,
- GArray *args,
- const gchar *container_id,
- GError **error) {
+ const gchar *filter,
+ GArray *args,
+ const gchar *container_id,
+ GError **error) {
glong count;
gchar *sql;
RygelMediaExportSQLString string_id;
@@ -721,13 +721,13 @@ rygel_media_export_media_cache_get_object_count_by_filter (RygelMediaExportMedia
RygelMediaObjects *
rygel_media_export_media_cache_get_objects_by_filter (RygelMediaExportMediaCache *self,
- const gchar *filter,
- GArray *args,
- const gchar *container_id,
- const gchar *sort_criteria,
- glong offset,
- glong max_count,
- GError **error) {
+ const gchar *filter,
+ GArray *args,
+ const gchar *container_id,
+ const gchar *sort_criteria,
+ glong offset,
+ glong max_count,
+ GError **error) {
RygelMediaExportSQLString string_id;
RygelMediaObjects *children;
GValue v;
@@ -816,8 +816,8 @@ rygel_media_export_media_cache_get_objects_by_filter (RygelMediaExportMediaCache
g_object_unref (object);
} else {
g_warning ("Inconsistent database: item %s has no parent %s",
- (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_ID),
- parent_id);
+ (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_ID),
+ parent_id);
}
}
@@ -847,8 +847,8 @@ rygel_media_export_media_cache_debug_statistics (RygelMediaExportMediaCache *sel
goto out;
}
g_debug ("%s: %d",
- (const gchar *) sqlite3_column_text (statement, 0),
- sqlite3_column_int (statement, 1));
+ (const gchar *) sqlite3_column_text (statement, 0),
+ sqlite3_column_int (statement, 1));
}
g_object_unref (cursor);
out:
@@ -860,8 +860,8 @@ rygel_media_export_media_cache_debug_statistics (RygelMediaExportMediaCache *sel
GeeArrayList *
rygel_media_export_media_cache_get_child_ids (RygelMediaExportMediaCache *self,
- const gchar *container_id,
- GError **error) {
+ const gchar *container_id,
+ GError **error) {
GeeArrayList *children;
GeeAbstractCollection *abstract_children;
GValue value = G_VALUE_INIT;
@@ -903,12 +903,12 @@ rygel_media_export_media_cache_get_child_ids (RygelMediaExportMediaCache *self,
GeeList *
rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMediaExportMediaCache *self,
- const gchar *column,
- const gchar *filter,
- GArray *args,
- glong offset,
- glong max_count,
- GError **error) {
+ const gchar *column,
+ const gchar *filter,
+ GArray *args,
+ glong offset,
+ glong max_count,
+ GError **error) {
GValue v = G_VALUE_INIT;
GeeArrayList *data;
GeeAbstractCollection *abstract_data;
@@ -933,8 +933,8 @@ rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMediaExportM
priv = self->priv;
sql = g_strdup_printf (rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_GET_META_DATA_COLUMN),
- column,
- filter);
+ column,
+ filter);
inner_error = NULL;
cursor = rygel_media_export_database_exec_cursor (priv->db, sql, (GValue *) args->data, (gint) args->len, &inner_error);
g_free (sql);
@@ -948,7 +948,7 @@ rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMediaExportM
while (rygel_media_export_database_cursor_has_next (cursor)) {
sqlite3_stmt *statement = rygel_media_export_database_cursor_next (cursor, &inner_error);
- if (inner_error != NULL) {
+ if (inner_error) {
g_propagate_error (error, inner_error);
g_object_unref (cursor);
g_object_unref (data);
@@ -963,11 +963,11 @@ rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMediaExportM
GeeList *
rygel_media_export_media_cache_get_object_attribute_by_search_expression (RygelMediaExportMediaCache *self,
- const gchar *attribute,
- RygelSearchExpression *expression,
- glong offset,
- guint max_count,
- GError **error) {
+ const gchar *attribute,
+ RygelSearchExpression *expression,
+ glong offset,
+ guint max_count,
+ GError **error) {
GeeList *attributes;
GArray *args;
gchar *filter;
@@ -1008,9 +1008,9 @@ rygel_media_export_media_cache_get_object_attribute_by_search_expression (RygelM
void
rygel_media_export_media_cache_flag_object (RygelMediaExportMediaCache *self,
- GFile *file,
- const gchar *flag,
- GError **error) {
+ GFile *file,
+ const gchar *flag,
+ GError **error) {
GValue values[] = {G_VALUE_INIT, G_VALUE_INIT};
guint iter;
GError *inner_error;
@@ -1038,8 +1038,8 @@ rygel_media_export_media_cache_flag_object (RygelMediaExportMediaCache *self,
GeeList *
rygel_media_export_media_cache_get_flagged_uris (RygelMediaExportMediaCache *self,
- const gchar *flag,
- GError **error) {
+ const gchar *flag,
+ GError **error) {
GValue value = G_VALUE_INIT;
GeeArrayList *uris;
GeeAbstractCollection *abstract_uris;
@@ -1057,7 +1057,7 @@ rygel_media_export_media_cache_get_flagged_uris (RygelMediaExportMediaCache *se
priv = self->priv;
cursor = rygel_media_export_database_exec_cursor (priv->db, "SELECT uri FROM object WHERE flags = ?", &value, 1, &inner_error);
g_value_unset (&value);
- if (inner_error != NULL) {
+ if (inner_error) {
g_propagate_error (error, inner_error);
return NULL;
}
@@ -1081,7 +1081,7 @@ rygel_media_export_media_cache_get_flagged_uris (RygelMediaExportMediaCache *se
static void
rygel_media_export_media_cache_get_exists_cache (RygelMediaExportMediaCache *self,
- GError **error) {
+ GError **error) {
RygelMediaExportDatabaseCursor *cursor;
GError *inner_error;
RygelMediaExportMediaCachePrivate *priv;
@@ -1097,12 +1097,12 @@ rygel_media_export_media_cache_get_exists_cache (RygelMediaExportMediaCache *se
}
priv = self->priv;
priv->exists_cache = gee_hash_map_new (G_TYPE_STRING,
- (GBoxedCopyFunc) g_strdup,
- g_free,
- RYGEL_MEDIA_EXPORT_TYPE_EXISTS_CACHE_ENTRY,
- (GBoxedCopyFunc) rygel_media_export_exists_cache_entry_dup,
- (GDestroyNotify) rygel_media_export_exists_cache_entry_free,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ (GBoxedCopyFunc) g_strdup,
+ g_free,
+ RYGEL_MEDIA_EXPORT_TYPE_EXISTS_CACHE_ENTRY,
+ (GBoxedCopyFunc) rygel_media_export_exists_cache_entry_dup,
+ (GDestroyNotify) rygel_media_export_exists_cache_entry_free,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
abstract_cache = GEE_ABSTRACT_MAP (priv->exists_cache);
while (rygel_media_export_database_cursor_has_next (cursor)) {
sqlite3_stmt *statement = rygel_media_export_database_cursor_next (cursor, &inner_error);
@@ -1131,8 +1131,8 @@ rygel_media_export_media_cache_modify_limit (guint max_count) {
static void
rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache *self,
- const gchar *name,
- GError **error) {
+ const gchar *name,
+ GError **error) {
RygelMediaExportMediaCacheUpgrader *upgrader;
gboolean needs_update;
gint old_version;
@@ -1171,14 +1171,14 @@ rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache *self,
}
} else {
g_warning ("The version \"%d\" of the detected database is newer than our supported version \"%d\"",
- old_version,
- current_version);
+ old_version,
+ current_version);
g_object_unref (priv->db);
priv->db = NULL;
g_set_error_literal (error,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_GENERAL_ERROR,
- "Database format not supported");
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_GENERAL_ERROR,
+ "Database format not supported");
g_object_unref (upgrader);
return;
}
@@ -1198,7 +1198,7 @@ rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache *self,
rows = rygel_media_export_database_query_value (priv->db, "SELECT count(type) FROM sqlite_master WHERE rowid=1", NULL, 0, &inner_error);
if (inner_error) {
if (inner_error->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
- goto db_error;
+ goto db_error;
}
g_propagate_error (error, inner_error);
return;
@@ -1206,9 +1206,9 @@ rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache *self,
if (!rows) {
g_debug ("Empty database, creating new schema version %s", RYGEL_MEDIA_EXPORT_SQL_FACTORY_SCHEMA_VERSION);
if (!rygel_media_export_media_cache_create_schema (self)) {
- g_object_unref (priv->db);
- priv->db = NULL;
- return;
+ g_object_unref (priv->db);
+ priv->db = NULL;
+ return;
}
} else {
g_warning ("Incompatible schema... cannot proceed");
@@ -1223,36 +1223,36 @@ rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache *self,
g_object_unref (priv->db);
priv->db = NULL;
g_set_error_literal (error,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_GENERAL_ERROR,
- "Invalid database");
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_GENERAL_ERROR,
+ "Invalid database");
}
}
}
static void
rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaCache *self,
- RygelMediaItem *item,
- GError **error) {
+ RygelMediaItem *item,
+ GError **error) {
GValue values [] = {G_VALUE_INIT, /* item size */
- G_VALUE_INIT, /* item mime type */
- G_VALUE_INIT, /* visual item width */
- G_VALUE_INIT, /* visual item height */
- G_VALUE_INIT, /* item upnp class */
- G_VALUE_INIT, /* music item artist / video item author / playlist item creator */
- G_VALUE_INIT, /* music item album */
- G_VALUE_INIT, /* item date */
- G_VALUE_INIT, /* audio item bitrate */
- G_VALUE_INIT, /* audio item sample frequency */
- G_VALUE_INIT, /* audio item bits per sample */
- G_VALUE_INIT, /* audio item channels */
- G_VALUE_INIT, /* music item track number */
- G_VALUE_INIT, /* visual item color depth */
- G_VALUE_INIT, /* audio item duration */
- G_VALUE_INIT, /* item id */
- G_VALUE_INIT, /* item dlna profile */
- G_VALUE_INIT, /* music item genre */
- G_VALUE_INIT}; /* music item disc */
+ G_VALUE_INIT, /* item mime type */
+ G_VALUE_INIT, /* visual item width */
+ G_VALUE_INIT, /* visual item height */
+ G_VALUE_INIT, /* item upnp class */
+ G_VALUE_INIT, /* music item artist / video item author / playlist item creator */
+ G_VALUE_INIT, /* music item album */
+ G_VALUE_INIT, /* item date */
+ G_VALUE_INIT, /* audio item bitrate */
+ G_VALUE_INIT, /* audio item sample frequency */
+ G_VALUE_INIT, /* audio item bits per sample */
+ G_VALUE_INIT, /* audio item channels */
+ G_VALUE_INIT, /* music item track number */
+ G_VALUE_INIT, /* visual item color depth */
+ G_VALUE_INIT, /* audio item duration */
+ G_VALUE_INIT, /* item id */
+ G_VALUE_INIT, /* item dlna profile */
+ G_VALUE_INIT, /* music item genre */
+ G_VALUE_INIT}; /* music item disc */
GError *inner_error;
RygelMediaObject *object;
guint iter;
@@ -1343,7 +1343,7 @@ rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaCache *self,
g_value_set_int (&(values[12]), rygel_music_item_get_track_number (music_item));
if (RYGEL_MEDIA_EXPORT_IS_MUSIC_ITEM (item)) {
- g_value_set_int (&(values[18]), RYGEL_MEDIA_EXPORT_MUSIC_ITEM (item)->disc);
+ g_value_set_int (&(values[18]), RYGEL_MEDIA_EXPORT_MUSIC_ITEM (item)->disc);
}
}
}
@@ -1362,10 +1362,10 @@ rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaCache *self,
}
inner_error = NULL;
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_SAVE_METADATA),
- values,
- G_N_ELEMENTS (values),
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_SAVE_METADATA),
+ values,
+ G_N_ELEMENTS (values),
+ &inner_error);
for (iter = 0; iter < G_N_ELEMENTS (values); ++iter) {
g_value_unset (&(values[iter]));
}
@@ -1376,14 +1376,14 @@ rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaCache *self,
static void
rygel_media_export_media_cache_create_object (RygelMediaExportMediaCache *self,
- RygelMediaObject *object,
- GError **error) {
+ RygelMediaObject *object,
+ GError **error) {
GValue values[] = {G_VALUE_INIT, /* object id */
- G_VALUE_INIT, /* object title */
- G_VALUE_INIT, /* type */
- G_VALUE_INIT, /* parent */
- G_VALUE_INIT, /* object modified */
- G_VALUE_INIT}; /* object uris */
+ G_VALUE_INIT, /* object title */
+ G_VALUE_INIT, /* type */
+ G_VALUE_INIT, /* parent */
+ G_VALUE_INIT, /* object modified */
+ G_VALUE_INIT}; /* object uri */
gint type;
GError *inner_error;
RygelMediaObject *object_parent;
@@ -1431,10 +1431,10 @@ rygel_media_export_media_cache_create_object (RygelMediaExportMediaCache *self,
inner_error = NULL;
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_INSERT),
- values,
- G_N_ELEMENTS (values),
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_INSERT),
+ values,
+ G_N_ELEMENTS (values),
+ &inner_error);
for (iter = 0; iter < G_N_ELEMENTS (values); ++iter) {
g_value_unset (&(values[iter]));
}
@@ -1467,46 +1467,46 @@ rygel_media_export_media_cache_create_schema (RygelMediaExportMediaCache *self)
}
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_SCHEMA),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_SCHEMA),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_COMMON),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_COMMON),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
rygel_media_export_database_exec (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
- NULL,
- 0,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE),
+ NULL,
+ 0,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -1529,8 +1529,8 @@ rygel_media_export_media_cache_create_schema (RygelMediaExportMediaCache *self)
static RygelMediaObject *
rygel_media_export_media_cache_get_object_from_statement (RygelMediaExportMediaCache *self,
- RygelMediaContainer *parent,
- sqlite3_stmt *statement) {
+ RygelMediaContainer *parent,
+ sqlite3_stmt *statement) {
RygelMediaObject *object;
const gchar *title;
const gchar *object_id;
@@ -1547,10 +1547,10 @@ rygel_media_export_media_cache_get_object_from_statement (RygelMediaExportMediaC
switch (sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_TYPE)) {
case 0: { /* container */
object = RYGEL_MEDIA_OBJECT (rygel_media_export_object_factory_get_container (priv->factory,
- object_id,
- title,
- (guint) 0,
- uri));
+ object_id,
+ title,
+ (guint) 0,
+ uri));
if (uri) {
gee_abstract_collection_add (GEE_ABSTRACT_COLLECTION (object->uris), uri);
}
@@ -1559,10 +1559,10 @@ rygel_media_export_media_cache_get_object_from_statement (RygelMediaExportMediaC
case 1: { /* item */
RygelMediaItem *item = rygel_media_export_object_factory_get_item (priv->factory,
- parent,
- object_id,
- title,
- (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_CLASS));
+ parent,
+ object_id,
+ title,
+ (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_CLASS));
object = RYGEL_MEDIA_OBJECT (item);
rygel_media_export_media_cache_fill_item (self, statement, item);
@@ -1579,7 +1579,7 @@ rygel_media_export_media_cache_get_object_from_statement (RygelMediaExportMediaC
guint64 modified;
rygel_media_object_set_modified (object,
- (guint64) sqlite3_column_int64 (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_TIMESTAMP));
+ (guint64) sqlite3_column_int64 (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_TIMESTAMP));
modified = rygel_media_object_get_modified (object);
if ((modified == G_MAXINT64) && RYGEL_IS_MEDIA_ITEM (object)) {
rygel_media_object_set_modified (object, 0);
@@ -1592,30 +1592,30 @@ rygel_media_export_media_cache_get_object_from_statement (RygelMediaExportMediaC
static void
rygel_media_export_media_cache_fill_item (RygelMediaExportMediaCache *self,
- sqlite3_stmt *statement,
- RygelMediaItem *item) {
+ sqlite3_stmt *statement,
+ RygelMediaItem *item) {
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_MEDIA_CACHE (self));
g_return_if_fail (statement != NULL);
g_return_if_fail (RYGEL_IS_MEDIA_ITEM (item));
rygel_media_item_set_date (item,
- (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_DATE));
+ (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_DATE));
rygel_media_item_set_mime_type (item,
- (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_MIME_TYPE));
+ (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_MIME_TYPE));
rygel_media_item_set_dlna_profile (item, (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_DLNA_PROFILE));
rygel_media_item_set_size (item,
- sqlite3_column_int64 (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_SIZE));
+ sqlite3_column_int64 (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_SIZE));
if (RYGEL_IS_AUDIO_ITEM (item)) {
RygelAudioItem *audio_item = RYGEL_AUDIO_ITEM (item);
rygel_audio_item_set_duration (audio_item,
- (glong) sqlite3_column_int64 (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_DURATION));
+ (glong) sqlite3_column_int64 (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_DURATION));
rygel_audio_item_set_bitrate (audio_item,
- sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_BITRATE));
+ sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_BITRATE));
rygel_audio_item_set_sample_freq (audio_item,
- sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_SAMPLE_FREQ));
+ sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_SAMPLE_FREQ));
rygel_audio_item_set_bits_per_sample (audio_item,
- sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_BITS_PER_SAMPLE));
+ sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_BITS_PER_SAMPLE));
rygel_audio_item_set_channels (audio_item, sqlite3_column_int (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_CHANNELS));
if (RYGEL_IS_MUSIC_ITEM (item)) {
RygelMusicItem *music_item = RYGEL_MUSIC_ITEM (item);
@@ -1638,16 +1638,16 @@ rygel_media_export_media_cache_fill_item (RygelMediaExportMediaCache *self,
RygelVideoItem *video_item = RYGEL_VIDEO_ITEM (item);
rygel_video_item_set_author (video_item,
- (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_AUTHOR));
+ (const gchar *) sqlite3_column_text (statement, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_AUTHOR));
}
}
}
static gchar *
rygel_media_export_media_cache_translate_search_expression (RygelSearchExpression *expression,
- GArray *args,
- const gchar *prefix,
- GError **error) {
+ GArray *args,
+ const gchar *prefix,
+ GError **error) {
gchar *str;
gchar* filter;
GError *inner_error;
@@ -1672,8 +1672,8 @@ rygel_media_export_media_cache_translate_search_expression (RygelSearchExpressio
static gchar *
rygel_media_export_media_cache_search_expression_to_sql (RygelSearchExpression *expression,
- GArray *args,
- GError **error) {
+ GArray *args,
+ GError **error) {
GError *inner_error;
g_return_val_if_fail (args != NULL, NULL);
@@ -1687,8 +1687,8 @@ rygel_media_export_media_cache_search_expression_to_sql (RygelSearchExpression
inner_error = NULL;
str = rygel_media_export_media_cache_logical_expression_to_sql (RYGEL_LOGICAL_EXPRESSION (expression),
- args,
- &inner_error);
+ args,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return NULL;
@@ -1699,8 +1699,8 @@ rygel_media_export_media_cache_search_expression_to_sql (RygelSearchExpression
gchar *str;
str = rygel_media_export_media_cache_relational_expression_to_sql (RYGEL_RELATIONAL_EXPRESSION (expression),
- args,
- &inner_error);
+ args,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return NULL;
@@ -1711,8 +1711,8 @@ rygel_media_export_media_cache_search_expression_to_sql (RygelSearchExpression
static gchar *
rygel_media_export_media_cache_logical_expression_to_sql (RygelLogicalExpression *expression,
- GArray *args,
- GError **error) {
+ GArray *args,
+ GError **error) {
RygelSearchExpression *search_expression;
gchar *str;
gchar *left_sql_string;
@@ -1726,16 +1726,16 @@ rygel_media_export_media_cache_logical_expression_to_sql (RygelLogicalExpression
search_expression = RYGEL_SEARCH_EXPRESSION (expression);
inner_error = NULL;
left_sql_string = rygel_media_export_media_cache_search_expression_to_sql (RYGEL_SEARCH_EXPRESSION (search_expression->operand1),
- args,
- &inner_error);
+ args,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return NULL;
}
right_sql_string = rygel_media_export_media_cache_search_expression_to_sql (RYGEL_SEARCH_EXPRESSION (search_expression->operand2),
- args,
- &inner_error);
+ args,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
g_free (left_sql_string);
@@ -1756,8 +1756,8 @@ rygel_media_export_media_cache_logical_expression_to_sql (RygelLogicalExpression
static gchar *
rygel_media_export_media_cache_map_operand_to_column (const gchar *operand,
- gchar **collate,
- GError **error) {
+ gchar **collate,
+ GError **error) {
const gchar *column;
gboolean use_collation;
@@ -1798,10 +1798,10 @@ rygel_media_export_media_cache_map_operand_to_column (const gchar *operand,
column = "m.disc";
} else {
g_set_error (error,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
- RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_UNSUPPORTED_SEARCH,
- "Unsupported column %s",
- operand);
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR,
+ RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_UNSUPPORTED_SEARCH,
+ "Unsupported column %s",
+ operand);
return NULL;
}
if (collate) {
@@ -1812,8 +1812,8 @@ rygel_media_export_media_cache_map_operand_to_column (const gchar *operand,
static gchar *
rygel_media_export_media_cache_relational_expression_to_sql (RygelRelationalExpression *exp,
- GArray *args,
- GError **error) {
+ GArray *args,
+ GError **error) {
RygelSearchExpression *search_expression;
gchar *str;
GValue v = G_VALUE_INIT;
@@ -1858,8 +1858,8 @@ rygel_media_export_media_cache_relational_expression_to_sql (RygelRelationalExpr
case GUPNP_SEARCH_CRITERIA_OP_GREATER:
case GUPNP_SEARCH_CRITERIA_OP_GEQ: {
if (!g_strcmp0 (column, "m.class") &&
- ((GUPnPSearchCriteriaOp) ((gintptr) search_expression->op) == GUPNP_SEARCH_CRITERIA_OP_EQ) &&
- !g_strcmp0 ((const gchar *) search_expression->operand2, "object.container")) {
+ ((GUPnPSearchCriteriaOp) ((gintptr) search_expression->op) == GUPNP_SEARCH_CRITERIA_OP_EQ) &&
+ !g_strcmp0 ((const gchar *) search_expression->operand2, "object.container")) {
g_value_init (&v, G_TYPE_INT);
g_value_set_int (&v, (gint) RYGEL_MEDIA_EXPORT_OBJECT_TYPE_CONTAINER);
} else {
@@ -1883,7 +1883,7 @@ rygel_media_export_media_cache_relational_expression_to_sql (RygelRelationalExpr
}
case GUPNP_SEARCH_CRITERIA_OP_DERIVED_FROM: {
if (!g_strcmp0 (column, "m.class") &&
- g_str_has_prefix ((const gchar *) search_expression->operand2, "object.container")) {
+ g_str_has_prefix ((const gchar *) search_expression->operand2, "object.container")) {
operator = rygel_media_export_sql_operator_new ("=", "o.type_fk", "");
g_value_init (&v, G_TYPE_INT);
g_value_set_int (&v, (gint) RYGEL_MEDIA_EXPORT_OBJECT_TYPE_CONTAINER);
@@ -1896,7 +1896,7 @@ rygel_media_export_media_cache_relational_expression_to_sql (RygelRelationalExpr
}
default:
g_warning ("Unsupported op %d",
- (gint) ((GUPnPSearchCriteriaOp) ((gintptr) search_expression->op)));
+ (gint) ((GUPnPSearchCriteriaOp) ((gintptr) search_expression->op)));
g_free (column);
g_free (collate);
return NULL;
@@ -1912,10 +1912,10 @@ rygel_media_export_media_cache_relational_expression_to_sql (RygelRelationalExpr
static RygelMediaExportDatabaseCursor *
rygel_media_export_media_cache_exec_cursor (RygelMediaExportMediaCache *self,
- RygelMediaExportSQLString id,
- GValue *values,
- int values_length,
- GError **error) {
+ RygelMediaExportSQLString id,
+ GValue *values,
+ int values_length,
+ GError **error) {
RygelMediaExportDatabaseCursor *cursor;
GError *inner_error;
RygelMediaExportMediaCachePrivate *priv;
@@ -1925,10 +1925,10 @@ rygel_media_export_media_cache_exec_cursor (RygelMediaExportMediaCache *self,
priv = self->priv;
inner_error = NULL;
cursor = rygel_media_export_database_exec_cursor (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, id),
- values,
- values_length,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, id),
+ values,
+ values_length,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return NULL;
@@ -1939,10 +1939,10 @@ rygel_media_export_media_cache_exec_cursor (RygelMediaExportMediaCache *self,
static gint
rygel_media_export_media_cache_query_value (RygelMediaExportMediaCache *self,
- RygelMediaExportSQLString id,
- GValue *values,
- gint values_length,
- GError **error) {
+ RygelMediaExportSQLString id,
+ GValue *values,
+ gint values_length,
+ GError **error) {
gint value;
GError *inner_error;
RygelMediaExportMediaCachePrivate *priv;
@@ -1952,10 +1952,10 @@ rygel_media_export_media_cache_query_value (RygelMediaExportMediaCache *self,
priv = self->priv;
inner_error = NULL;
value = rygel_media_export_database_query_value (priv->db,
- rygel_media_export_sql_factory_make (priv->sql, id),
- values,
- values_length,
- &inner_error);
+ rygel_media_export_sql_factory_make (priv->sql, id),
+ values,
+ values_length,
+ &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
@@ -1985,8 +1985,8 @@ rygel_media_export_media_cache_translate_sort_criteria (const gchar *sort_criter
gchar *collate = NULL;
GError *inner_error = NULL;
gchar *column = rygel_media_export_media_cache_map_operand_to_column (slice,
- &collate,
- &inner_error);
+ &collate,
+ &inner_error);
g_free (slice);
if (inner_error) {
@@ -2001,7 +2001,7 @@ rygel_media_export_media_cache_translate_sort_criteria (const gchar *sort_criter
}
g_ptr_array_add (order_list,
- g_strdup_printf ("%s %s %s ", column, collate, order));
+ g_strdup_printf ("%s %s %s ", column, collate, order));
g_free (column);
g_free (collate);
}
@@ -2021,7 +2021,7 @@ rygel_media_export_media_cache_class_init (RygelMediaExportMediaCacheClass *cach
object_class->dispose = rygel_media_export_media_cache_dispose;
g_type_class_add_private (cache_class,
- sizeof (RygelMediaExportMediaCachePrivate));
+ sizeof (RygelMediaExportMediaCachePrivate));
}
static void
diff --git a/src/media-export/rygel-media-export-media-cache.h b/src/media-export/rygel-media-export-media-cache.h
index 109d063..7201e3a 100644
--- a/src/media-export/rygel-media-export-media-cache.h
+++ b/src/media-export/rygel-media-export-media-cache.h
@@ -67,122 +67,122 @@ rygel_media_export_media_cache_get_default (void);
void
rygel_media_export_media_cache_remove_by_id (RygelMediaExportMediaCache *self,
- const gchar *id,
- GError **error);
+ const gchar *id,
+ GError **error);
void
rygel_media_export_media_cache_remove_object (RygelMediaExportMediaCache *self,
- RygelMediaObject *object,
- GError **error);
+ RygelMediaObject *object,
+ GError **error);
void
rygel_media_export_media_cache_save_container (RygelMediaExportMediaCache *self,
- RygelMediaContainer *container,
- GError **error);
+ RygelMediaContainer *container,
+ GError **error);
void
rygel_media_export_media_cache_save_item (RygelMediaExportMediaCache *self,
- RygelMediaItem *item,
- GError **error);
+ RygelMediaItem *item,
+ GError **error);
RygelMediaObject *
rygel_media_export_media_cache_get_object (RygelMediaExportMediaCache *self,
- const gchar *object_id,
- GError **error);
+ const gchar *object_id,
+ GError **error);
RygelMediaContainer *
rygel_media_export_media_cache_get_container (RygelMediaExportMediaCache *self,
- const gchar *container_id,
- GError **error);
+ const gchar *container_id,
+ GError **error);
gint
rygel_media_export_media_cache_get_child_count (RygelMediaExportMediaCache *self,
- const gchar *container_id,
- GError **error);
+ const gchar *container_id,
+ GError **error);
gboolean
rygel_media_export_media_cache_exists (RygelMediaExportMediaCache *self,
- GFile *file,
- gint64 *timestamp,
- gint64 *size,
- GError **error);
+ GFile *file,
+ gint64 *timestamp,
+ gint64 *size,
+ GError **error);
RygelMediaObjects *
rygel_media_export_media_cache_get_children (RygelMediaExportMediaCache *self,
- RygelMediaContainer *container,
- const gchar *sort_criteria,
- glong offset,
- glong max_count,
- GError **error);
+ RygelMediaContainer *container,
+ const gchar *sort_criteria,
+ glong offset,
+ glong max_count,
+ GError **error);
RygelMediaObjects *
rygel_media_export_media_cache_get_objects_by_search_expression (RygelMediaExportMediaCache *self,
- RygelSearchExpression *expression,
- const gchar *container_id,
- const gchar *sort_criteria,
- guint offset,
- guint max_count,
- guint *total_matches,
- GError **error);
+ RygelSearchExpression *expression,
+ const gchar *container_id,
+ const gchar *sort_criteria,
+ guint offset,
+ guint max_count,
+ guint *total_matches,
+ GError **error);
glong
rygel_media_export_media_cache_get_object_count_by_filter (RygelMediaExportMediaCache *self,
- const gchar *filter,
- GArray *args,
- const gchar *container_id,
- GError **error);
+ const gchar *filter,
+ GArray *args,
+ const gchar *container_id,
+ GError **error);
RygelMediaObjects *
rygel_media_export_media_cache_get_objects_by_filter (RygelMediaExportMediaCache *self,
- const gchar *filter,
- GArray *args,
- const gchar *container_id,
- const gchar *sort_criteria,
- glong offset,
- glong max_count,
- GError **error);
+ const gchar *filter,
+ GArray *args,
+ const gchar *container_id,
+ const gchar *sort_criteria,
+ glong offset,
+ glong max_count,
+ GError **error);
glong
rygel_media_export_media_cache_get_object_count_by_search_expression (RygelMediaExportMediaCache *self,
- RygelSearchExpression *expression,
- const gchar *container_id,
- GError **error);
+ RygelSearchExpression *expression,
+ const gchar *container_id,
+ GError **error);
void
rygel_media_export_media_cache_debug_statistics (RygelMediaExportMediaCache *self);
GeeArrayList *
rygel_media_export_media_cache_get_child_ids (RygelMediaExportMediaCache *self,
- const gchar *container_id,
- GError **error);
+ const gchar *container_id,
+ GError **error);
GeeList *
rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMediaExportMediaCache *self,
- const gchar *column,
- const gchar *filter,
- GArray *args,
- glong offset,
- glong max_count,
- GError **error);
+ const gchar *column,
+ const gchar *filter,
+ GArray *args,
+ glong offset,
+ glong max_count,
+ GError **error);
GeeList *
rygel_media_export_media_cache_get_object_attribute_by_search_expression (RygelMediaExportMediaCache *self,
- const gchar *attribute,
- RygelSearchExpression *expression,
- glong offset,
- guint max_count,
- GError **error);
+ const gchar *attribute,
+ RygelSearchExpression *expression,
+ glong offset,
+ guint max_count,
+ GError **error);
void
rygel_media_export_media_cache_flag_object (RygelMediaExportMediaCache *self,
- GFile *file,
- const gchar *flag,
- GError **error);
+ GFile *file,
+ const gchar *flag,
+ GError **error);
GeeList *
rygel_media_export_media_cache_get_flagged_uris (RygelMediaExportMediaCache *self,
- const gchar *flag,
- GError **error);
+ const gchar *flag,
+ GError **error);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-metadata-extractor.c b/src/media-export/rygel-media-export-metadata-extractor.c
index a5b282e..a5c28b7 100644
--- a/src/media-export/rygel-media-export-metadata-extractor.c
+++ b/src/media-export/rygel-media-export-metadata-extractor.c
@@ -49,17 +49,17 @@ static guint signals [SIGNALS_COUNT];
#define RYGEL_MEDIA_EXPORT_METADATA_EXTRACTOR_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR, \
- RygelMediaExportMetadataExtractorPrivate))
+ RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR, \
+ RygelMediaExportMetadataExtractorPrivate))
#define EXTRACTOR_OPTION "extract-metadata"
#define EXTRACTOR_TIMEOUT G_GUINT64_CONSTANT(10)
static void
on_config_changed (RygelConfiguration *config,
- const gchar *section,
- const gchar *key,
- gpointer user_data) {
+ const gchar *section,
+ const gchar *key,
+ gpointer user_data) {
RygelMediaExportMetadataExtractor *self;
GError *error;
gboolean option;
@@ -89,14 +89,14 @@ rygel_media_export_metadata_extractor_new (void) {
*/
static void
rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done (GUPnPDLNADiscoverer *sender G_GNUC_UNUSED,
- GUPnPDLNAInformation *dlna,
- GError *err,
- gpointer self);
+ GUPnPDLNAInformation *dlna,
+ GError *err,
+ gpointer self);
static void
rygel_media_export_metadata_extractor_extract_basic_information (RygelMediaExportMetadataExtractor *self,
- GFile *file,
- GUPnPDLNAInformation *dlna) {
+ GFile *file,
+ GUPnPDLNAInformation *dlna) {
GError *error;
GFileInfo *file_info;
@@ -106,13 +106,13 @@ rygel_media_export_metadata_extractor_extract_basic_information (RygelMediaExpor
error = NULL;
file_info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","
- G_FILE_ATTRIBUTE_STANDARD_SIZE ","
- G_FILE_ATTRIBUTE_TIME_MODIFIED ","
- G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
- G_FILE_QUERY_INFO_NONE,
- NULL,
- &error);
+ G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","
+ G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+ G_FILE_ATTRIBUTE_TIME_MODIFIED ","
+ G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &error);
if (error) {
gchar *uri = g_file_get_uri (file);
@@ -128,8 +128,8 @@ rygel_media_export_metadata_extractor_extract_basic_information (RygelMediaExpor
static void
rygel_media_export_metadata_extractor_on_done (RygelMediaExportMetadataExtractor *self,
- GUPnPDLNAInformation *dlna,
- GError *err) {
+ GUPnPDLNAInformation *dlna,
+ GError *err) {
RygelMediaExportMetadataExtractorPrivate *priv;
guint signal_id;
const GstDiscovererInfo *gst_info;
@@ -145,13 +145,13 @@ rygel_media_export_metadata_extractor_on_done (RygelMediaExportMetadataExtractor
signal_id = 0;
g_signal_parse_name ("done", GUPNP_TYPE_DLNA_DISCOVERER, &signal_id, NULL, FALSE);
g_signal_handlers_disconnect_matched (priv->discoverer,
- G_SIGNAL_MATCH_ID |
- G_SIGNAL_MATCH_FUNC |
- G_SIGNAL_MATCH_DATA, signal_id,
- 0,
- NULL,
- G_CALLBACK (rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done),
- self);
+ G_SIGNAL_MATCH_ID |
+ G_SIGNAL_MATCH_FUNC |
+ G_SIGNAL_MATCH_DATA, signal_id,
+ 0,
+ NULL,
+ G_CALLBACK (rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done),
+ self);
g_object_unref (priv->discoverer);
priv->discoverer = NULL;
@@ -184,15 +184,15 @@ rygel_media_export_metadata_extractor_on_done (RygelMediaExportMetadataExtractor
static void
rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done (GUPnPDLNADiscoverer *sender G_GNUC_UNUSED,
- GUPnPDLNAInformation *dlna,
- GError *err,
- gpointer self) {
+ GUPnPDLNAInformation *dlna,
+ GError *err,
+ gpointer self) {
rygel_media_export_metadata_extractor_on_done (self, dlna, err);
}
void
rygel_media_export_metadata_extractor_extract (RygelMediaExportMetadataExtractor *self,
- GFile *file) {
+ GFile *file) {
RygelMediaExportMetadataExtractorPrivate *priv;
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_METADATA_EXTRACTOR (self));
@@ -214,10 +214,10 @@ rygel_media_export_metadata_extractor_extract (RygelMediaExportMetadataExtractor
}
priv->discoverer = discoverer;
g_signal_connect_object (discoverer,
- "done",
- G_CALLBACK (rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done),
- self,
- 0);
+ "done",
+ G_CALLBACK (rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done),
+ self,
+ 0);
gupnp_dlna_discoverer_start (discoverer);
gupnp_dlna_discoverer_discover_uri (discoverer, uri);
g_free (uri);
@@ -256,20 +256,20 @@ rygel_media_export_metadata_extractor_constructed (GObject *object) {
G_OBJECT_CLASS (rygel_media_export_metadata_extractor_parent_class)->constructed (object);
priv->file_hash = gee_hash_map_new (G_TYPE_STRING,
- (GBoxedCopyFunc) g_strdup,
- g_free,
- G_TYPE_FILE,
- (GBoxedCopyFunc) g_object_ref,
- g_object_unref,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
+ (GBoxedCopyFunc) g_strdup,
+ g_free,
+ G_TYPE_FILE,
+ (GBoxedCopyFunc) g_object_ref,
+ g_object_unref,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
config = RYGEL_CONFIGURATION (rygel_meta_config_get_default ());
g_signal_connect (config, "setting-changed", G_CALLBACK (on_config_changed), self);
on_config_changed (config, RYGEL_MEDIA_EXPORT_PLUGIN_NAME, EXTRACTOR_OPTION, self);
@@ -283,31 +283,31 @@ rygel_media_export_metadata_extractor_class_init (RygelMediaExportMetadataExtrac
object_class->dispose = rygel_media_export_metadata_extractor_dispose;
object_class->constructed = rygel_media_export_metadata_extractor_constructed;
signals[EXTRACTION_DONE] = g_signal_new ("extraction_done",
- RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR,
- G_SIGNAL_RUN_LAST,
- 0,
- NULL,
- NULL,
- NULL, /* libffi based marshaller */
- G_TYPE_NONE,
- 3,
- G_TYPE_FILE,
- GUPNP_TYPE_DLNA_INFORMATION,
- G_TYPE_FILE_INFO);
+ RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR,
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL,
+ NULL,
+ NULL, /* libffi based marshaller */
+ G_TYPE_NONE,
+ 3,
+ G_TYPE_FILE,
+ GUPNP_TYPE_DLNA_INFORMATION,
+ G_TYPE_FILE_INFO);
/**
* Signalize that an error occured during metadata extraction
*/
signals[ERROR] = g_signal_new ("error",
- RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR,
- G_SIGNAL_RUN_LAST,
- 0,
- NULL,
- NULL,
- NULL, /* libffi based marshaller */
- G_TYPE_NONE,
- 2,
- G_TYPE_FILE,
- G_TYPE_ERROR);
+ RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR,
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL,
+ NULL,
+ NULL, /* libffi based marshaller */
+ G_TYPE_NONE,
+ 2,
+ G_TYPE_FILE,
+ G_TYPE_ERROR);
g_type_class_add_private (extractor_class, sizeof (RygelMediaExportMetadataExtractorPrivate));
}
diff --git a/src/media-export/rygel-media-export-metadata-extractor.h b/src/media-export/rygel-media-export-metadata-extractor.h
index af4c3e4..8b6e1ce 100644
--- a/src/media-export/rygel-media-export-metadata-extractor.h
+++ b/src/media-export/rygel-media-export-metadata-extractor.h
@@ -56,7 +56,7 @@ RygelMediaExportMetadataExtractor *rygel_media_export_metadata_extractor_new (vo
void
rygel_media_export_metadata_extractor_extract (RygelMediaExportMetadataExtractor *self,
- GFile *file);
+ GFile *file);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-music-item.h b/src/media-export/rygel-media-export-music-item.h
index 0cbe783..cc44f66 100644
--- a/src/media-export/rygel-media-export-music-item.h
+++ b/src/media-export/rygel-media-export-music-item.h
@@ -54,9 +54,9 @@ rygel_media_export_music_item_get_type (void) G_GNUC_CONST;
RygelMediaExportMusicItem *
rygel_media_export_music_item_new (const gchar *id,
- RygelMediaContainer *parent,
- const gchar *title,
- const gchar *upnp_class);
+ RygelMediaContainer *parent,
+ const gchar *title,
+ const gchar *upnp_class);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-null-container.c b/src/media-export/rygel-media-export-null-container.c
index ad17452..af401e5 100644
--- a/src/media-export/rygel-media-export-null-container.c
+++ b/src/media-export/rygel-media-export-null-container.c
@@ -54,8 +54,8 @@ rygel_media_export_null_container_real_get_children (RygelMediaContainer *base,
rygel_media_export_null_container_real_get_children);
g_simple_async_result_set_op_res_gpointer (simple,
- rygel_media_objects_new (),
- g_object_unref);
+ rygel_media_objects_new (),
+ g_object_unref);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
}
diff --git a/src/media-export/rygel-media-export-object-factory.c b/src/media-export/rygel-media-export-object-factory.c
index 580b19f..8575a22 100644
--- a/src/media-export/rygel-media-export-object-factory.c
+++ b/src/media-export/rygel-media-export-object-factory.c
@@ -45,10 +45,10 @@ static RygelMediaItem* rygel_media_export_object_factory_real_get_item (RygelMed
*/
static RygelMediaExportDBContainer *
rygel_media_export_object_factory_real_get_container (RygelMediaExportObjectFactory *self G_GNUC_UNUSED,
- const gchar *id,
- const gchar *title,
- guint child_count G_GNUC_UNUSED,
- const gchar *uri) {
+ const gchar *id,
+ const gchar *title,
+ guint child_count G_GNUC_UNUSED,
+ const gchar *uri) {
g_return_val_if_fail (id != NULL, NULL);
g_return_val_if_fail (title != NULL, NULL);
@@ -81,10 +81,10 @@ rygel_media_export_object_factory_real_get_container (RygelMediaExportObjectFact
RygelMediaExportDBContainer *
rygel_media_export_object_factory_get_container (RygelMediaExportObjectFactory *self,
- const gchar *id,
- const gchar *title,
- guint child_count,
- const gchar *uri) {
+ const gchar *id,
+ const gchar *title,
+ guint child_count,
+ const gchar *uri) {
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_OBJECT_FACTORY (self), NULL);
return RYGEL_MEDIA_EXPORT_OBJECT_FACTORY_GET_CLASS (self)->get_container (self, id, title, child_count, uri);
@@ -99,10 +99,10 @@ rygel_media_export_object_factory_get_container (RygelMediaExportObjectFactory *
*/
static RygelMediaItem *
rygel_media_export_object_factory_real_get_item (RygelMediaExportObjectFactory *self G_GNUC_UNUSED,
- RygelMediaContainer *parent,
- const gchar *id,
- const gchar *title,
- const gchar *upnp_class) {
+ RygelMediaContainer *parent,
+ const gchar *id,
+ const gchar *title,
+ const gchar *upnp_class) {
g_return_val_if_fail (RYGEL_IS_MEDIA_CONTAINER (parent), NULL);
g_return_val_if_fail (id != NULL, NULL);
g_return_val_if_fail (title != NULL, NULL);
@@ -122,10 +122,10 @@ rygel_media_export_object_factory_real_get_item (RygelMediaExportObjectFactory *
RygelMediaItem *
rygel_media_export_object_factory_get_item (RygelMediaExportObjectFactory *self,
- RygelMediaContainer *parent,
- const gchar *id,
- const gchar *title,
- const gchar *upnp_class) {
+ RygelMediaContainer *parent,
+ const gchar *id,
+ const gchar *title,
+ const gchar *upnp_class) {
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_OBJECT_FACTORY (self), NULL);
return RYGEL_MEDIA_EXPORT_OBJECT_FACTORY_GET_CLASS (self)->get_item (self, parent, id, title, upnp_class);
diff --git a/src/media-export/rygel-media-export-photo-item.h b/src/media-export/rygel-media-export-photo-item.h
index f1a8796..3d13c7a 100644
--- a/src/media-export/rygel-media-export-photo-item.h
+++ b/src/media-export/rygel-media-export-photo-item.h
@@ -53,9 +53,9 @@ rygel_media_export_photo_item_get_type (void) G_GNUC_CONST;
RygelMediaExportPhotoItem *
rygel_media_export_photo_item_new (const gchar *id,
- RygelMediaContainer *parent,
- const gchar *title,
- const gchar *upnp_class);
+ RygelMediaContainer *parent,
+ const gchar *title,
+ const gchar *upnp_class);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-plugin.c b/src/media-export/rygel-media-export-plugin.c
index 7c64c86..fb71196 100644
--- a/src/media-export/rygel-media-export-plugin.c
+++ b/src/media-export/rygel-media-export-plugin.c
@@ -45,7 +45,7 @@ void module_init (RygelPluginLoader *loader) {
if (error) {
g_warning ("Failed to initialize plugin '" RYGEL_MEDIA_EXPORT_PLUGIN_NAME "': %s. Ignoring...",
- error->message);
+ error->message);
g_error_free (error);
return;
}
@@ -67,10 +67,10 @@ rygel_media_export_plugin_new (GError **error) {
}
root = rygel_media_export_root_container_get_instance ();
plugin = RYGEL_MEDIA_EXPORT_PLUGIN (rygel_media_server_plugin_construct (RYGEL_MEDIA_EXPORT_TYPE_PLUGIN,
- root,
- RYGEL_MEDIA_EXPORT_PLUGIN_NAME,
- NULL,
- RYGEL_PLUGIN_CAPABILITIES_UPLOAD));
+ root,
+ RYGEL_MEDIA_EXPORT_PLUGIN_NAME,
+ NULL,
+ RYGEL_PLUGIN_CAPABILITIES_UPLOAD));
g_object_unref (root);
return plugin;
}
diff --git a/src/media-export/rygel-media-export-query-container-factory.c b/src/media-export/rygel-media-export-query-container-factory.c
index 42f9d12..d35a4cb 100644
--- a/src/media-export/rygel-media-export-query-container-factory.c
+++ b/src/media-export/rygel-media-export-query-container-factory.c
@@ -25,8 +25,8 @@
#include "rygel-media-export-string-utils.h"
G_DEFINE_TYPE (RygelMediaExportQueryContainerFactory,
- rygel_media_export_query_container_factory,
- G_TYPE_OBJECT)
+ rygel_media_export_query_container_factory,
+ G_TYPE_OBJECT)
#define rygel_search_expression_unref(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
@@ -38,8 +38,8 @@ static RygelMediaExportQueryContainerFactory* rygel_media_export_query_container
#define RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_FACTORY_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY, \
- RygelMediaExportQueryContainerFactoryPrivate))
+ RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY, \
+ RygelMediaExportQueryContainerFactoryPrivate))
static RygelMediaExportQueryContainerFactory* rygel_media_export_query_container_factory_new (void);
static RygelSearchExpression* rygel_media_export_query_container_factory_parse_description (const gchar* description, gchar** pattern, gchar** attribute, gchar** upnp_class, gchar** name);
@@ -58,7 +58,7 @@ rygel_media_export_query_container_factory_get_default (void) {
static RygelMediaExportQueryContainerFactory *
rygel_media_export_query_container_factory_new (void) {
return RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_FACTORY (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY,
- NULL));
+ NULL));
}
/**
@@ -70,7 +70,7 @@ rygel_media_export_query_container_factory_new (void) {
*/
void
rygel_media_export_query_container_factory_register_id (RygelMediaExportQueryContainerFactory *self,
- gchar **id) {
+ gchar **id) {
gchar *md5;
gchar *tmp;
GeeAbstractMap *abstract_virtuals;
@@ -104,7 +104,7 @@ rygel_media_export_query_container_factory_register_id (RygelMediaExportQueryCon
*/
gchar *
rygel_media_export_query_container_factory_get_virtual_container_definition (RygelMediaExportQueryContainerFactory *self,
- const gchar *hash) {
+ const gchar *hash) {
gchar *definition;
gchar *id;
GError *inner_error;
@@ -116,13 +116,13 @@ rygel_media_export_query_container_factory_get_virtual_container_definition (Ryg
priv = self->priv;
inner_error = NULL;
id = rygel_media_export_string_replace (hash,
- RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
- "",
- &inner_error);
+ RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
+ "",
+ &inner_error);
if (inner_error) {
g_warning ("Failed to remove " RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX " from %s: %s",
- hash,
- inner_error->message);
+ hash,
+ inner_error->message);
g_error_free (inner_error);
return NULL;
}
@@ -145,8 +145,8 @@ rygel_media_export_query_container_factory_get_virtual_container_definition (Ryg
*/
RygelMediaExportQueryContainer *
rygel_media_export_query_container_factory_create_from_id (RygelMediaExportQueryContainerFactory *self,
- const gchar *id,
- const gchar *name) {
+ const gchar *id,
+ const gchar *name) {
RygelMediaExportQueryContainer *container;
gchar *definition;
@@ -178,8 +178,8 @@ rygel_media_export_query_container_factory_create_from_id (RygelMediaExportQuery
*/
RygelMediaExportQueryContainer *
rygel_media_export_query_container_factory_create_from_description (RygelMediaExportQueryContainerFactory *self,
- const gchar *definition,
- const gchar *name) {
+ const gchar *definition,
+ const gchar *name) {
gchar *title;
gchar *attribute;
gchar *pattern;
@@ -200,10 +200,10 @@ rygel_media_export_query_container_factory_create_from_description (RygelMediaEx
id = g_strdup (definition);
rygel_media_export_query_container_factory_register_id (self, &id);
expression = rygel_media_export_query_container_factory_parse_description (definition,
- &pattern,
- &attribute,
- &upnp_class,
- &title);
+ &pattern,
+ &attribute,
+ &upnp_class,
+ &title);
if (!pattern || pattern[0] == '\0') {
container = RYGEL_MEDIA_EXPORT_QUERY_CONTAINER (rygel_media_export_leaf_query_container_new (expression, id, title));
} else {
@@ -214,7 +214,7 @@ rygel_media_export_query_container_factory_create_from_description (RygelMediaEx
rygel_media_object_set_upnp_class (RYGEL_MEDIA_OBJECT (container), upnp_class);
if (!g_strcmp0 (upnp_class, RYGEL_MEDIA_CONTAINER_MUSIC_ALBUM)) {
rygel_media_container_set_sort_criteria (RYGEL_MEDIA_CONTAINER (container),
- RYGEL_MEDIA_CONTAINER_ALBUM_SORT_CRITERIA);
+ RYGEL_MEDIA_CONTAINER_ALBUM_SORT_CRITERIA);
}
}
rygel_search_expression_unref (expression);
@@ -269,10 +269,10 @@ rygel_media_export_query_container_factory_map_upnp_class (const gchar *attribut
*/
static RygelSearchExpression *
rygel_media_export_query_container_factory_parse_description (const gchar *description,
- gchar **pattern,
- gchar **attribute,
- gchar **upnp_class,
- gchar **name) {
+ gchar **pattern,
+ gchar **attribute,
+ gchar **upnp_class,
+ gchar **name) {
gchar *local_pattern;
gchar *local_attribute;
gchar *local_upnp_class;
@@ -297,14 +297,14 @@ rygel_media_export_query_container_factory_parse_description (const gchar *desc
gchar *previous_attribute = g_strdup (local_attribute);
GError *error = NULL;
gchar *tmp_attribute = rygel_media_export_string_replace (args[i],
- RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
- "",
- &error);
+ RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
+ "",
+ &error);
if (error) {
g_warning ("Failed to remove " RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX " from %s: %s",
- args[i],
- error->message);
+ args[i],
+ error->message);
g_error_free (error);
}
g_free (local_attribute);
@@ -313,7 +313,7 @@ rygel_media_export_query_container_factory_parse_description (const gchar *desc
if (g_strcmp0 (args[i + 1], "?")) {
rygel_media_export_query_container_factory_update_search_expression (&expression, args[i], args[i + 1]);
if ((i + 2) == args_length) {
- local_upnp_class = rygel_media_export_query_container_factory_map_upnp_class (local_attribute);
+ local_upnp_class = rygel_media_export_query_container_factory_map_upnp_class (local_attribute);
}
} else {
g_free (args[i]);
@@ -323,8 +323,8 @@ rygel_media_export_query_container_factory_parse_description (const gchar *desc
local_upnp_class = rygel_media_export_query_container_factory_map_upnp_class (previous_attribute);
if (*name[0] == '\0' && i > 0) {
- g_free (*name);
- *name = g_uri_unescape_string (args[i - 1], NULL);
+ g_free (*name);
+ *name = g_uri_unescape_string (args[i - 1], NULL);
}
g_free (previous_attribute);
@@ -366,8 +366,8 @@ rygel_media_export_query_container_factory_parse_description (const gchar *desc
*/
static void
rygel_media_export_query_container_factory_update_search_expression (RygelSearchExpression **expression,
- const gchar *key,
- const gchar *value) {
+ const gchar *key,
+ const gchar *value) {
RygelSearchExpression *search_sub;
RygelRelationalExpression *subexpression;
gchar *clean_key;
@@ -381,13 +381,13 @@ rygel_media_export_query_container_factory_update_search_expression (RygelSearch
search_sub = RYGEL_SEARCH_EXPRESSION (subexpression);
error = NULL;
clean_key = rygel_media_export_string_replace (key,
- RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
- "",
- &error);
+ RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
+ "",
+ &error);
if (error) {
g_warning ("Failed to remove " " from %s: %s",
- key,
- error->message);
+ key,
+ error->message);
g_error_free (error);
}
search_sub->operand1 = g_uri_unescape_string (clean_key, NULL);
@@ -428,13 +428,13 @@ rygel_media_export_query_container_factory_constructed (GObject *object) {
G_OBJECT_CLASS (rygel_media_export_query_container_factory_parent_class)->constructed (object);
self->priv->virtual_container_map = gee_hash_map_new (G_TYPE_STRING,
- (GBoxedCopyFunc) g_strdup,
- g_free,
- G_TYPE_STRING,
- (GBoxedCopyFunc) g_strdup,
- g_free,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL);
+ (GBoxedCopyFunc) g_strdup,
+ g_free,
+ G_TYPE_STRING,
+ (GBoxedCopyFunc) g_strdup,
+ g_free,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL);
}
static void
@@ -444,7 +444,7 @@ rygel_media_export_query_container_factory_class_init (RygelMediaExportQueryCont
object_class->dispose = rygel_media_export_query_container_factory_dispose;
object_class->constructed = rygel_media_export_query_container_factory_constructed;
g_type_class_add_private (factory_class,
- sizeof (RygelMediaExportQueryContainerFactoryPrivate));
+ sizeof (RygelMediaExportQueryContainerFactoryPrivate));
}
static void
diff --git a/src/media-export/rygel-media-export-query-container-factory.h b/src/media-export/rygel-media-export-query-container-factory.h
index 71bda91..39addb0 100644
--- a/src/media-export/rygel-media-export-query-container-factory.h
+++ b/src/media-export/rygel-media-export-query-container-factory.h
@@ -58,21 +58,21 @@ rygel_media_export_query_container_factory_get_default (void);
RygelMediaExportQueryContainer *
rygel_media_export_query_container_factory_create_from_id (RygelMediaExportQueryContainerFactory *self,
- const gchar *id,
- const gchar *name);
+ const gchar *id,
+ const gchar *name);
RygelMediaExportQueryContainer *
rygel_media_export_query_container_factory_create_from_description (RygelMediaExportQueryContainerFactory *self,
- const gchar *definition,
- const gchar *name);
+ const gchar *definition,
+ const gchar *name);
void
rygel_media_export_query_container_factory_register_id (RygelMediaExportQueryContainerFactory *self,
- gchar **id);
+ gchar **id);
gchar *
rygel_media_export_query_container_factory_get_virtual_container_definition (RygelMediaExportQueryContainerFactory *self,
- const gchar *hash);
+ const gchar *hash);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-recursive-file-monitor.c b/src/media-export/rygel-media-export-recursive-file-monitor.c
index 419c136..6650b3c 100644
--- a/src/media-export/rygel-media-export-recursive-file-monitor.c
+++ b/src/media-export/rygel-media-export-recursive-file-monitor.c
@@ -61,16 +61,16 @@ rygel_media_export_recursive_file_monitor_on_config_changed (RygelConfiguration
g_return_if_fail (config);
g_return_if_fail (section);
g_return_if_fail (key);
-
+
if ((g_strcmp0 (section, RYGEL_MEDIA_EXPORT_PLUGIN_NAME) != 0) ||
(g_strcmp0 (key, "monitor-changes") != 0)) {
return;
}
setting = rygel_configuration_get_bool (config,
- RYGEL_MEDIA_EXPORT_PLUGIN_NAME,
- "monitor-changes",
- &inner_error);
+ RYGEL_MEDIA_EXPORT_PLUGIN_NAME,
+ "monitor-changes",
+ &inner_error);
if (inner_error) {
setting = TRUE;
g_error_free (inner_error);
@@ -85,11 +85,11 @@ rygel_media_export_recursive_file_monitor_construct (GType object_type, GCancell
RygelMetaConfig *config;
GError *inner_error;
gboolean setting;
-
+
self = RYGEL_MEDIA_EXPORT_RECURSIVE_FILE_MONITOR (g_object_new (object_type, NULL));
-
+
config = rygel_meta_config_get_default ();
-
+
g_signal_connect_object (RYGEL_CONFIGURATION (config), "setting-changed",
(GCallback)rygel_media_export_recursive_file_monitor_on_config_changed,
self, 0);
@@ -98,9 +98,9 @@ rygel_media_export_recursive_file_monitor_construct (GType object_type, GCancell
inner_error = NULL;
setting = rygel_configuration_get_bool (RYGEL_CONFIGURATION (config),
- "MediaExport",
- "monitor-changes",
- &inner_error);
+ "MediaExport",
+ "monitor-changes",
+ &inner_error);
if (inner_error) {
setting = TRUE;
@@ -113,7 +113,6 @@ rygel_media_export_recursive_file_monitor_construct (GType object_type, GCancell
self->priv->monitor_changes = setting;
-
self->priv->monitors = gee_hash_map_new (G_TYPE_FILE,
(GBoxedCopyFunc) g_object_ref, g_object_unref,
g_file_monitor_get_type (),
@@ -122,11 +121,11 @@ rygel_media_export_recursive_file_monitor_construct (GType object_type, GCancell
NULL, NULL,
(GeeEqualDataFunc) g_file_equal,
NULL, NULL, NULL, NULL, NULL);
-
+
if (cancellable) {
self->priv->cancellable = cancellable;
g_object_ref (self->priv->cancellable);
-
+
g_signal_connect_object (self->priv->cancellable, "cancelled",
(GCallback) rygel_media_export_recursive_file_monitor_on_cancelled,
self, 0);
diff --git a/src/media-export/rygel-media-export-recursive-file-monitor.h b/src/media-export/rygel-media-export-recursive-file-monitor.h
index 594bd77..39b4c27 100644
--- a/src/media-export/rygel-media-export-recursive-file-monitor.h
+++ b/src/media-export/rygel-media-export-recursive-file-monitor.h
@@ -60,13 +60,13 @@ rygel_media_export_recursive_file_monitor_new (GCancellable *cancellable);
void
rygel_media_export_recursive_file_monitor_add (RygelMediaExportRecursiveFileMonitor *self,
- GFile *file,
- GAsyncReadyCallback callback,
- gpointer user_data);
+ GFile *file,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
void
rygel_media_export_recursive_file_monitor_add_finish (RygelMediaExportRecursiveFileMonitor *self,
- GAsyncResult *res);
+ GAsyncResult *res);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-root-container.c b/src/media-export/rygel-media-export-root-container.c
index 021a72d..3a6ac4f 100644
--- a/src/media-export/rygel-media-export-root-container.c
+++ b/src/media-export/rygel-media-export-root-container.c
@@ -37,10 +37,10 @@ static void
rygel_media_export_root_container_rygel_searchable_container_interface_init (RygelSearchableContainerIface *iface);
G_DEFINE_TYPE_WITH_CODE (RygelMediaExportRootContainer,
- rygel_media_export_root_container,
- RYGEL_MEDIA_EXPORT_TYPE_DB_CONTAINER,
- G_IMPLEMENT_INTERFACE (RYGEL_TYPE_SEARCHABLE_CONTAINER,
- rygel_media_export_root_container_rygel_searchable_container_interface_init))
+ rygel_media_export_root_container,
+ RYGEL_MEDIA_EXPORT_TYPE_DB_CONTAINER,
+ G_IMPLEMENT_INTERFACE (RYGEL_TYPE_SEARCHABLE_CONTAINER,
+ rygel_media_export_root_container_rygel_searchable_container_interface_init))
typedef struct _RygelMediaExportFolderDefinition RygelMediaExportFolderDefinition;
typedef struct _RygelMediaExportRootContainerFindObjectData RygelMediaExportRootContainerFindObjectData;
@@ -77,8 +77,8 @@ static RygelSearchableContainerIface *parent_searchable_container_iface = NULL;
#define RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER, \
- RygelMediaExportRootContainerPrivate))
+ RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER, \
+ RygelMediaExportRootContainerPrivate))
#define RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_SEARCH_CONTAINER_PREFIX RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX "upnp:class," RYGEL_MUSIC_ITEM_UPNP_CLASS ","
@@ -88,11 +88,11 @@ const RygelMediaExportFolderDefinition VIRTUAL_FOLDERS_MUSIC[3] = {{"Artist", "u
static RygelMediaExportRootContainer *
rygel_media_export_root_container_new (void) {
return RYGEL_MEDIA_EXPORT_ROOT_CONTAINER (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER,
- "id", "0",
- "parent", NULL,
- "title", _("@REALNAME@'s media"),
- "child-count", 0,
- NULL));
+ "id", "0",
+ "parent", NULL,
+ "title", _("@REALNAME@'s media"),
+ "child-count", 0,
+ NULL));
}
gboolean
@@ -149,34 +149,34 @@ rygel_media_export_root_container_real_find_object_data_free (RygelMediaExportRo
static void
rygel_media_export_root_container_find_object_ready (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data) {
+ GAsyncResult *res,
+ gpointer user_data) {
GError *error = NULL;
RygelMediaExportRootContainerFindObjectData *data = (RygelMediaExportRootContainerFindObjectData *) user_data;
RygelMediaObject *object = RYGEL_MEDIA_CONTAINER_CLASS (rygel_media_export_root_container_parent_class)->find_object_finish (RYGEL_MEDIA_CONTAINER (source_object),
- res,
- &error);
+ res,
+ &error);
if (error) {
g_simple_async_result_take_error (data->simple, error);
} else {
if (!object &&
- g_str_has_prefix (data->id, RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX)) {
+ g_str_has_prefix (data->id, RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX)) {
RygelMediaExportQueryContainerFactory *factory = rygel_media_export_query_container_factory_get_default ();
RygelMediaExportQueryContainer *container = rygel_media_export_query_container_factory_create_from_id (factory,
- data->id,
- "");
+ data->id,
+ "");
if (container) {
- object = RYGEL_MEDIA_OBJECT (container);
- rygel_media_object_set_parent (object, RYGEL_MEDIA_CONTAINER (source_object));
+ object = RYGEL_MEDIA_OBJECT (container);
+ rygel_media_object_set_parent (object, RYGEL_MEDIA_CONTAINER (source_object));
}
g_object_unref (factory);
}
if (object) {
g_simple_async_result_set_op_res_gpointer (data->simple,
- object,
- g_object_unref);
+ object,
+ g_object_unref);
}
}
g_simple_async_result_complete (data->simple);
@@ -186,28 +186,28 @@ rygel_media_export_root_container_find_object_ready (GObject *source_object
static void
rygel_media_export_root_container_real_find_object (RygelMediaContainer *base,
- const gchar *id,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data) {
+ const gchar *id,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data) {
RygelMediaExportRootContainerFindObjectData *data = g_slice_new0 (RygelMediaExportRootContainerFindObjectData);
data->simple = g_simple_async_result_new (G_OBJECT (base),
- callback,
- user_data,
- rygel_media_export_root_container_real_find_object);
+ callback,
+ user_data,
+ rygel_media_export_root_container_real_find_object);
data->id = g_strdup (id);
RYGEL_MEDIA_CONTAINER_CLASS (rygel_media_export_root_container_parent_class)->find_object (base,
- id,
- cancellable,
- rygel_media_export_root_container_find_object_ready,
- data);
+ id,
+ cancellable,
+ rygel_media_export_root_container_find_object_ready,
+ data);
}
static RygelMediaObject *
rygel_media_export_root_container_real_find_object_finish (RygelMediaContainer *base G_GNUC_UNUSED,
- GAsyncResult *res,
- GError **error) {
+ GAsyncResult *res,
+ GError **error) {
RygelMediaObject* result;
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
@@ -238,15 +238,15 @@ rygel_media_export_root_container_real_search_data_free (gpointer user_data) {
static void
rygel_media_export_root_container_base_class_search_ready (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data) {
+ GAsyncResult *res,
+ gpointer user_data) {
GError *error = NULL;
RygelMediaExportRootContainerSearchData *data = (RygelMediaExportRootContainerSearchData *) user_data;
guint total_matches = 0;
RygelMediaObjects *objects = parent_searchable_container_iface->search_finish (RYGEL_SEARCHABLE_CONTAINER (source_object),
- res,
- &total_matches,
- &error);
+ res,
+ &total_matches,
+ &error);
if (error) {
g_simple_async_result_take_error (data->simple, error);
@@ -260,14 +260,14 @@ rygel_media_export_root_container_base_class_search_ready (GObject *source
static void
rygel_media_export_root_container_get_children_from_container_ready (GObject *source_object G_GNUC_UNUSED,
- GAsyncResult *res,
- gpointer user_data) {
+ GAsyncResult *res,
+ gpointer user_data) {
GError *error = NULL;
RygelMediaExportRootContainerSearchData *data = (RygelMediaExportRootContainerSearchData *) user_data;
guint total_matches = 0;
RygelMediaObjects *objects = rygel_media_container_get_children_finish (data->query_container,
- res,
- &error);
+ res,
+ &error);
if (error) {
g_simple_async_result_take_error (data->simple, error);
@@ -279,12 +279,12 @@ rygel_media_export_root_container_get_children_from_container_ready (GObject
gint iter;
for (iter = 0; iter < size; ++iter) {
- RygelMediaObject *object = RYGEL_MEDIA_OBJECT (gee_abstract_list_get (list, iter));
+ RygelMediaObject *object = RYGEL_MEDIA_OBJECT (gee_abstract_list_get (list, iter));
- if (object) {
- rygel_media_object_set_upnp_class (object, data->upnp_class);
- g_object_unref (object);
- }
+ if (object) {
+ rygel_media_object_set_upnp_class (object, data->upnp_class);
+ g_object_unref (object);
+ }
}
}
@@ -301,7 +301,7 @@ rygel_media_export_root_container_get_children_from_container_ready (GObject
static RygelMediaExportQueryContainer *
rygel_media_export_root_container_search_to_virtual_container (RygelMediaExportRootContainer *self,
- RygelRelationalExpression *expression) {
+ RygelRelationalExpression *expression) {
RygelSearchExpression *search_expression;
g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_ROOT_CONTAINER (self), NULL);
@@ -351,8 +351,8 @@ rygel_media_export_root_container_search_to_virtual_container (RygelMediaExportR
*/
static gboolean
rygel_media_export_root_container_is_search_in_virtual_container (RygelMediaExportRootContainer *self,
- RygelSearchExpression *expression,
- RygelMediaContainer **container) {
+ RygelSearchExpression *expression,
+ RygelMediaContainer **container) {
RygelMediaExportQueryContainer *query_container;
RygelSearchExpression *virtual_expression;
RygelMediaExportQueryContainerFactory *factory;
@@ -373,16 +373,16 @@ rygel_media_export_root_container_is_search_in_virtual_container (RygelMediaExpo
}
if (!(RYGEL_IS_RELATIONAL_EXPRESSION (expression->operand1) &&
- RYGEL_IS_RELATIONAL_EXPRESSION (expression->operand2) &&
- (expression->op == RYGEL_LOGICAL_OPERATOR_AND))) {
+ RYGEL_IS_RELATIONAL_EXPRESSION (expression->operand2) &&
+ (expression->op == RYGEL_LOGICAL_OPERATOR_AND))) {
return FALSE;
}
query_container = rygel_media_export_root_container_search_to_virtual_container (self,
- RYGEL_RELATIONAL_EXPRESSION (expression->operand1));
+ RYGEL_RELATIONAL_EXPRESSION (expression->operand1));
if (!query_container) {
query_container = rygel_media_export_root_container_search_to_virtual_container (self,
- RYGEL_RELATIONAL_EXPRESSION (expression->operand2));
+ RYGEL_RELATIONAL_EXPRESSION (expression->operand2));
if (query_container) {
virtual_expression = expression->operand1;
} else {
@@ -398,27 +398,27 @@ rygel_media_export_root_container_is_search_in_virtual_container (RygelMediaExpo
plaintext_id = rygel_media_export_query_container_factory_get_virtual_container_definition (factory, id);
g_object_unref (query_container);
last_argument = rygel_media_export_string_replace (plaintext_id,
- RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
- "",
- &error);
+ RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
+ "",
+ &error);
if (error) {
g_warning ("Could not remove %s from %s: %s",
- RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
- plaintext_id,
- error->message);
+ RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
+ plaintext_id,
+ error->message);
g_error_free (error);
result = FALSE;
goto error_out;
}
escaped_detail = g_uri_escape_string (virtual_expression->operand2, "", TRUE);
new_id = g_strdup_printf ("%s%s,%s,%s",
- RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
- (const gchar *) virtual_expression->operand1,
- escaped_detail,
- last_argument);
+ RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX,
+ (const gchar *) virtual_expression->operand1,
+ escaped_detail,
+ last_argument);
temp_container = RYGEL_MEDIA_CONTAINER (rygel_media_export_query_container_factory_create_from_description (factory,
- new_id,
- ""));
+ new_id,
+ ""));
if (container) {
*container = temp_container;
} else if (temp_container) {
@@ -438,70 +438,70 @@ rygel_media_export_root_container_is_search_in_virtual_container (RygelMediaExpo
static void
rygel_media_export_root_container_real_search (RygelSearchableContainer *base,
- RygelSearchExpression *expression,
- guint offset,
- guint max_count,
- const gchar *sort_criteria,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data) {
+ RygelSearchExpression *expression,
+ guint offset,
+ guint max_count,
+ const gchar *sort_criteria,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data) {
RygelMediaExportRootContainer *self = RYGEL_MEDIA_EXPORT_ROOT_CONTAINER (base);
RygelMediaExportRootContainerSearchData *data = g_slice_new0 (RygelMediaExportRootContainerSearchData);
data->simple = g_simple_async_result_new (G_OBJECT (self),
- callback,
- user_data,
- rygel_media_export_root_container_real_search);
+ callback,
+ user_data,
+ rygel_media_export_root_container_real_search);
g_simple_async_result_set_op_res_gpointer (data->simple,
- data,
- rygel_media_export_root_container_real_search_data_free);
+ data,
+ rygel_media_export_root_container_real_search_data_free);
if (!expression) {
parent_searchable_container_iface->search (base,
- expression,
- offset,
- max_count,
- sort_criteria,
- cancellable,
- rygel_media_export_root_container_base_class_search_ready,
- data);
+ expression,
+ offset,
+ max_count,
+ sort_criteria,
+ cancellable,
+ rygel_media_export_root_container_base_class_search_ready,
+ data);
} else {
data->query_container = NULL;
data->upnp_class = NULL;
if (RYGEL_IS_RELATIONAL_EXPRESSION (expression)) {
data->query_container = RYGEL_MEDIA_CONTAINER (rygel_media_export_root_container_search_to_virtual_container (self,
- RYGEL_RELATIONAL_EXPRESSION (expression)));
+ RYGEL_RELATIONAL_EXPRESSION (expression)));
data->upnp_class = g_strdup (expression->operand2);
} else {
rygel_media_export_root_container_is_search_in_virtual_container (self,
- expression,
- &data->query_container);
+ expression,
+ &data->query_container);
}
if (data->query_container) {
rygel_media_container_get_children (data->query_container,
- offset,
- max_count,
- sort_criteria,
- cancellable,
- rygel_media_export_root_container_get_children_from_container_ready,
- data);
+ offset,
+ max_count,
+ sort_criteria,
+ cancellable,
+ rygel_media_export_root_container_get_children_from_container_ready,
+ data);
} else {
parent_searchable_container_iface->search (base,
- expression,
- offset,
- max_count,
- sort_criteria,
- cancellable,
- rygel_media_export_root_container_base_class_search_ready,
- data);
+ expression,
+ offset,
+ max_count,
+ sort_criteria,
+ cancellable,
+ rygel_media_export_root_container_base_class_search_ready,
+ data);
}
}
}
static RygelMediaObjects *
rygel_media_export_root_container_real_search_finish (RygelSearchableContainer *base G_GNUC_UNUSED,
- GAsyncResult *res,
- guint *total_matches,
- GError **error) {
+ GAsyncResult *res,
+ guint *total_matches,
+ GError **error) {
RygelMediaObjects *result;
RygelMediaExportRootContainerSearchData *data;
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
@@ -520,8 +520,8 @@ rygel_media_export_root_container_real_search_finish (RygelSearchableContainer
static void
replace_in_string (gchar **self,
- const gchar *old_part,
- const gchar *new_part)
+ const gchar *old_part,
+ const gchar *new_part)
{
g_return_if_fail (self != NULL && *self != NULL);
g_return_if_fail (old_part != NULL);
@@ -534,10 +534,10 @@ replace_in_string (gchar **self,
if (error) {
*self = temp_uri;
g_warning ("Could not replace %s in %s with %s: %s",
- old_part,
- *self,
- new_part,
- error->message);
+ old_part,
+ *self,
+ new_part,
+ error->message);
g_error_free (error);
} else {
g_free (temp_uri);
@@ -565,9 +565,9 @@ rygel_media_export_root_container_get_shared_uris (RygelMediaExportRootContainer
error = NULL;
config = RYGEL_CONFIGURATION (rygel_meta_config_get_default ());
uris = rygel_configuration_get_string_list (config,
- "MediaExport",
- "uris",
- &error);
+ "MediaExport",
+ "uris",
+ &error);
if (error) {
g_error_free (error);
error = NULL;
@@ -597,7 +597,7 @@ rygel_media_export_root_container_get_shared_uris (RygelMediaExportRootContainer
g_object_unref (file);
file = g_file_new_for_commandline_arg (actual_uri);
if (g_file_equal (file, home_dir)) {
- add = FALSE;
+ add = FALSE;
}
g_free (actual_uri);
}
@@ -618,10 +618,10 @@ rygel_media_export_root_container_get_shared_uris (RygelMediaExportRootContainer
static void
rygel_media_export_root_container_add_folder_definition (RygelMediaExportRootContainer *self,
- RygelMediaContainer *container,
- const gchar *item_class,
- const RygelMediaExportFolderDefinition *definition,
- GError **error) {
+ RygelMediaContainer *container,
+ const gchar *item_class,
+ const RygelMediaExportFolderDefinition *definition,
+ GError **error) {
gchar *id;
RygelMediaExportQueryContainerFactory *factory;
RygelMediaContainer *query_container;
@@ -640,7 +640,7 @@ rygel_media_export_root_container_add_folder_definition (RygelMediaExportRootCon
id = rygel_media_export_string_slice (tmp, 0, -1);
if (!id) {
g_warning ("Failed to remove the last character from '%s'.",
- tmp);
+ tmp);
}
g_free (tmp);
if (!id) {
@@ -649,8 +649,8 @@ rygel_media_export_root_container_add_folder_definition (RygelMediaExportRootCon
}
factory = rygel_media_export_query_container_factory_get_default ();
query_container = RYGEL_MEDIA_CONTAINER (rygel_media_export_query_container_factory_create_from_description (factory,
- id,
- _(definition->title)));
+ id,
+ _(definition->title)));
db = rygel_media_export_db_container_get_media_db (RYGEL_MEDIA_EXPORT_DB_CONTAINER (self));
inner_error = NULL;
if (rygel_media_container_get_child_count (query_container) > 0) {
@@ -669,11 +669,11 @@ rygel_media_export_root_container_add_folder_definition (RygelMediaExportRootCon
static void
rygel_media_export_root_container_add_virtual_containers_for_class (RygelMediaExportRootContainer *self,
- const gchar *parent,
- const gchar *item_class,
- const RygelMediaExportFolderDefinition *definitions,
- guint definitions_length,
- GError **error) {
+ const gchar *parent,
+ const gchar *item_class,
+ const RygelMediaExportFolderDefinition *definitions,
+ guint definitions_length,
+ GError **error) {
RygelMediaContainer *container;
RygelMediaObject *object;
gchar *new_id;
@@ -712,15 +712,15 @@ rygel_media_export_root_container_add_virtual_containers_for_class (RygelMediaEx
for (iter = 0; iter < definitions_length; ++iter) {
rygel_media_export_root_container_add_folder_definition (self, container, item_class, &(definitions[iter]), &inner_error);
if (inner_error) {
- goto out;
+ goto out;
}
}
}
id = rygel_media_object_get_id (object);
child_count = rygel_media_export_media_cache_get_child_count (db,
- id,
- &inner_error);
+ id,
+ &inner_error);
if (inner_error) {
goto out;
}
@@ -748,29 +748,29 @@ rygel_media_export_root_container_add_default_virtual_folders (RygelMediaExportR
g_return_if_fail (RYGEL_MEDIA_EXPORT_IS_ROOT_CONTAINER (self));
rygel_media_export_root_container_add_virtual_containers_for_class (self,
- _("Music"),
- RYGEL_MUSIC_ITEM_UPNP_CLASS,
- VIRTUAL_FOLDERS_MUSIC,
- G_N_ELEMENTS (VIRTUAL_FOLDERS_MUSIC),
- &error);
+ _("Music"),
+ RYGEL_MUSIC_ITEM_UPNP_CLASS,
+ VIRTUAL_FOLDERS_MUSIC,
+ G_N_ELEMENTS (VIRTUAL_FOLDERS_MUSIC),
+ &error);
if (error) {
goto out;
}
rygel_media_export_root_container_add_virtual_containers_for_class (self,
- _("Pictures"),
- RYGEL_PHOTO_ITEM_UPNP_CLASS,
- NULL,
- 0,
- &error);
+ _("Pictures"),
+ RYGEL_PHOTO_ITEM_UPNP_CLASS,
+ NULL,
+ 0,
+ &error);
if (error) {
goto out;
}
rygel_media_export_root_container_add_virtual_containers_for_class (self,
- _("Videos"),
- RYGEL_VIDEO_ITEM_UPNP_CLASS,
- NULL,
- 0,
- &error);
+ _("Videos"),
+ RYGEL_VIDEO_ITEM_UPNP_CLASS,
+ NULL,
+ 0,
+ &error);
out:
if (error) {
g_error_free (error);
@@ -779,11 +779,11 @@ rygel_media_export_root_container_add_default_virtual_folders (RygelMediaExportR
static void
on_filesystem_container_updated (RygelMediaContainer *sender G_GNUC_UNUSED,
- RygelMediaContainer *container G_GNUC_UNUSED,
- RygelMediaObject *object G_GNUC_UNUSED,
- RygelObjectEventType event_type G_GNUC_UNUSED,
- gboolean sub_tree_update G_GNUC_UNUSED,
- gpointer user_data) {
+ RygelMediaContainer *container G_GNUC_UNUSED,
+ RygelMediaObject *object G_GNUC_UNUSED,
+ RygelObjectEventType event_type G_GNUC_UNUSED,
+ gboolean sub_tree_update G_GNUC_UNUSED,
+ gpointer user_data) {
RygelMediaExportRootContainer *self = RYGEL_MEDIA_EXPORT_ROOT_CONTAINER (user_data);
rygel_media_export_root_container_add_default_virtual_folders (self);
@@ -799,15 +799,15 @@ rygel_media_export_root_container_on_initial_harvesting_done (RygelMediaExportRo
rygel_media_export_root_container_add_default_virtual_folders (self);
rygel_media_container_updated (RYGEL_MEDIA_CONTAINER (self), NULL, RYGEL_OBJECT_EVENT_TYPE_MODIFIED, FALSE);
g_signal_connect_object (self->priv->filesystem_container,
- "container-updated",
- G_CALLBACK (on_filesystem_container_updated),
- self,
- 0);
+ "container-updated",
+ G_CALLBACK (on_filesystem_container_updated),
+ self,
+ 0);
}
static void
rygel_media_export_root_container_on_initial_harvesting_done_rygel_media_export_harvester_done (RygelMediaExportHarvester *sender G_GNUC_UNUSED,
- gpointer self) {
+ gpointer self) {
rygel_media_export_root_container_on_initial_harvesting_done (self);
}
@@ -834,19 +834,19 @@ rygel_media_export_root_container_constructed (GObject *object) {
rygel_media_export_media_cache_save_container (db, media_container, &error);
if (error) {
g_warning ("Failed to save root container into db: %s",
- error->message);
+ error->message);
g_error_free (error);
error = NULL;
}
priv->filesystem_container = RYGEL_MEDIA_CONTAINER (rygel_media_export_db_container_new (RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID,
- _(RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_NAME)));
+ _(RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_NAME)));
rygel_media_object_set_parent (RYGEL_MEDIA_OBJECT (priv->filesystem_container),
- media_container);
+ media_container);
rygel_media_export_media_cache_save_container (db, RYGEL_MEDIA_CONTAINER (priv->filesystem_container), &error);
if (error) {
g_warning ("Failed to save filesystem container into db: %s",
- error->message);
+ error->message);
g_error_free (error);
error = NULL;
}
@@ -854,8 +854,8 @@ rygel_media_export_root_container_constructed (GObject *object) {
ids = rygel_media_export_media_cache_get_child_ids (db, RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID, &error);
if (error) {
g_warning ("Failed to get child ids of %s from db: %s",
- RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID,
- error->message);
+ RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID,
+ error->message);
g_error_free (error);
error = NULL;
ids = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
@@ -868,10 +868,10 @@ rygel_media_export_root_container_constructed (GObject *object) {
g_object_unref (shared_uris);
}
priv->harvester_signal_id = g_signal_connect_object (priv->harvester,
- "done",
- G_CALLBACK (rygel_media_export_root_container_on_initial_harvesting_done_rygel_media_export_harvester_done),
- self,
- 0);
+ "done",
+ G_CALLBACK (rygel_media_export_root_container_on_initial_harvesting_done_rygel_media_export_harvester_done),
+ self,
+ 0);
locations = rygel_media_export_harvester_get_locations (priv->harvester);
abstract_locations = GEE_ABSTRACT_LIST (locations);
@@ -883,9 +883,9 @@ rygel_media_export_root_container_constructed (GObject *object) {
gee_abstract_collection_remove (abstract_ids, file_id);
rygel_media_export_harvester_schedule (priv->harvester,
- file,
- priv->filesystem_container,
- NULL);
+ file,
+ priv->filesystem_container,
+ NULL);
g_free (file_id);
g_object_unref (file);
}
@@ -899,17 +899,17 @@ rygel_media_export_root_container_constructed (GObject *object) {
rygel_media_export_media_cache_remove_by_id (db, id, &error);
if (error) {
g_warning ("Failed to remove entry %s: %s",
- id,
- error->message);
+ id,
+ error->message);
g_error_free (error);
error = NULL;
}
g_free (id);
}
rygel_media_container_updated (media_container,
- NULL,
- RYGEL_OBJECT_EVENT_TYPE_MODIFIED,
- FALSE);
+ NULL,
+ RYGEL_OBJECT_EVENT_TYPE_MODIFIED,
+ FALSE);
g_object_unref (ids);
}
diff --git a/src/media-export/rygel-media-export-root-container.h b/src/media-export/rygel-media-export-root-container.h
index 3e765b8..166c006 100644
--- a/src/media-export/rygel-media-export-root-container.h
+++ b/src/media-export/rygel-media-export-root-container.h
@@ -68,15 +68,15 @@ rygel_media_export_root_container_shutdown (RygelMediaExportRootContainer *self)
void
rygel_media_export_root_container_add_uri (RygelMediaExportRootContainer *self,
- const gchar *uri);
+ const gchar *uri);
void
rygel_media_export_root_container_remove_uri (RygelMediaExportRootContainer *self,
- const gchar *uri);
+ const gchar *uri);
gchar **
rygel_media_export_root_container_get_dynamic_uris (RygelMediaExportRootContainer *self,
- int *result_length);
+ int *result_length);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-sql-factory.h b/src/media-export/rygel-media-export-sql-factory.h
index 6fb3599..504c1b7 100644
--- a/src/media-export/rygel-media-export-sql-factory.h
+++ b/src/media-export/rygel-media-export-sql-factory.h
@@ -108,7 +108,7 @@ rygel_media_export_sql_factory_new (void);
const gchar *
rygel_media_export_sql_factory_make (RygelMediaExportSQLFactory *self,
- RygelMediaExportSQLString query);
+ RygelMediaExportSQLString query);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-string-utils.c b/src/media-export/rygel-media-export-string-utils.c
index 05a11bb..26595a3 100644
--- a/src/media-export/rygel-media-export-string-utils.c
+++ b/src/media-export/rygel-media-export-string-utils.c
@@ -58,8 +58,8 @@ rygel_media_export_string_replace (const gchar *self,
gchar *
rygel_media_export_string_slice (const gchar *self,
- glong start,
- glong end) {
+ glong start,
+ glong end) {
glong string_length;
gboolean outside;
diff --git a/src/media-export/rygel-media-export-string-utils.h b/src/media-export/rygel-media-export-string-utils.h
index c8d52ca..6fa8617 100644
--- a/src/media-export/rygel-media-export-string-utils.h
+++ b/src/media-export/rygel-media-export-string-utils.h
@@ -28,14 +28,14 @@ G_BEGIN_DECLS
gchar *
rygel_media_export_string_replace (const gchar *self,
- const gchar *old,
- const gchar *replacement,
- GError **error);
+ const gchar *old,
+ const gchar *replacement,
+ GError **error);
gchar *
rygel_media_export_string_slice (const gchar *self,
- glong start,
- glong end);
+ glong start,
+ glong end);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-video-item.h b/src/media-export/rygel-media-export-video-item.h
index 02039bc..f8ab8b1 100644
--- a/src/media-export/rygel-media-export-video-item.h
+++ b/src/media-export/rygel-media-export-video-item.h
@@ -53,9 +53,9 @@ rygel_media_export_video_item_get_type (void) G_GNUC_CONST;
RygelMediaExportVideoItem *
rygel_media_export_video_item_new (const gchar *id,
- RygelMediaContainer *parent,
- const gchar *title,
- const gchar *upnp_class);
+ RygelMediaContainer *parent,
+ const gchar *title,
+ const gchar *upnp_class);
G_END_DECLS
diff --git a/src/media-export/rygel-media-export-writable-db-container.c b/src/media-export/rygel-media-export-writable-db-container.c
index a48b18d..1b3004b 100644
--- a/src/media-export/rygel-media-export-writable-db-container.c
+++ b/src/media-export/rygel-media-export-writable-db-container.c
@@ -27,10 +27,10 @@ static void
rygel_media_export_writable_db_container_rygel_writable_container_interface_init (RygelWritableContainerIface * iface);
G_DEFINE_TYPE_WITH_CODE (RygelMediaExportWritableDbContainer,
- rygel_media_export_writable_db_container,
- RYGEL_MEDIA_EXPORT_TYPE_DB_CONTAINER,
- G_IMPLEMENT_INTERFACE (RYGEL_TYPE_WRITABLE_CONTAINER,
- rygel_media_export_writable_db_container_rygel_writable_container_interface_init));
+ rygel_media_export_writable_db_container,
+ RYGEL_MEDIA_EXPORT_TYPE_DB_CONTAINER,
+ G_IMPLEMENT_INTERFACE (RYGEL_TYPE_WRITABLE_CONTAINER,
+ rygel_media_export_writable_db_container_rygel_writable_container_interface_init));
struct _RygelMediaExportWritableDbContainerPrivate {
GeeArrayList* create_classes;
@@ -38,29 +38,29 @@ struct _RygelMediaExportWritableDbContainerPrivate {
#define RYGEL_MEDIA_EXPORT_WRITABLE_DB_CONTAINER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- RYGEL_MEDIA_EXPORT_TYPE_WRITABLE_DB_CONTAINER, \
- RygelMediaExportWritableDbContainerPrivate))
+ RYGEL_MEDIA_EXPORT_TYPE_WRITABLE_DB_CONTAINER, \
+ RygelMediaExportWritableDbContainerPrivate))
RygelMediaExportWritableDbContainer*
rygel_media_export_writable_db_container_new (const gchar *id,
- const gchar *title) {
+ const gchar *title) {
g_return_val_if_fail (id != NULL, NULL);
g_return_val_if_fail (title != NULL, NULL);
return RYGEL_MEDIA_EXPORT_WRITABLE_DB_CONTAINER (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_WRITABLE_DB_CONTAINER,
- "id", id,
- "parent", NULL,
- "title", title,
- "child-count", 0,
- NULL));
+ "id", id,
+ "parent", NULL,
+ "title", title,
+ "child-count", 0,
+ NULL));
}
static void
rygel_media_export_writable_db_container_real_add_item (RygelWritableContainer *base,
- RygelMediaItem *item,
- GCancellable *cancellable G_GNUC_UNUSED,
- GAsyncReadyCallback callback,
- gpointer user_data) {
+ RygelMediaItem *item,
+ GCancellable *cancellable G_GNUC_UNUSED,
+ GAsyncReadyCallback callback,
+ gpointer user_data) {
RygelMediaObject *object = RYGEL_MEDIA_OBJECT (item);
gchar *uri;
GFile *file;
@@ -85,14 +85,14 @@ rygel_media_export_writable_db_container_real_add_item (RygelWritableContainer *
if (error) {
simple = g_simple_async_result_new_take_error (G_OBJECT (base),
- callback,
- user_data,
- error);
+ callback,
+ user_data,
+ error);
} else {
simple = g_simple_async_result_new (G_OBJECT (base),
- callback,
- user_data,
- rygel_media_export_writable_db_container_real_add_item);
+ callback,
+ user_data,
+ rygel_media_export_writable_db_container_real_add_item);
}
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
@@ -100,17 +100,17 @@ rygel_media_export_writable_db_container_real_add_item (RygelWritableContainer *
static void
rygel_media_export_writable_db_container_real_add_item_finish (RygelWritableContainer *base G_GNUC_UNUSED,
- GAsyncResult *res,
- GError **error) {
+ GAsyncResult *res,
+ GError **error) {
g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
}
static void
rygel_media_export_writable_db_container_real_remove_item (RygelWritableContainer *base,
- const gchar *id,
- GCancellable *cancellable G_GNUC_UNUSED,
- GAsyncReadyCallback callback,
- gpointer user_data) {
+ const gchar *id,
+ GCancellable *cancellable G_GNUC_UNUSED,
+ GAsyncReadyCallback callback,
+ gpointer user_data) {
RygelMediaExportDBContainer *db_container = RYGEL_MEDIA_EXPORT_DB_CONTAINER (base);
RygelMediaExportMediaCache *cache = rygel_media_export_db_container_get_media_db (db_container);
GError *error = NULL;
@@ -120,14 +120,14 @@ rygel_media_export_writable_db_container_real_remove_item (RygelWritableContaine
if (error) {
simple = g_simple_async_result_new_take_error (G_OBJECT (base),
- callback,
- user_data,
- error);
+ callback,
+ user_data,
+ error);
} else {
simple = g_simple_async_result_new (G_OBJECT (base),
- callback,
- user_data,
- rygel_media_export_writable_db_container_real_remove_item);
+ callback,
+ user_data,
+ rygel_media_export_writable_db_container_real_remove_item);
}
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
@@ -135,8 +135,8 @@ rygel_media_export_writable_db_container_real_remove_item (RygelWritableContaine
static void
rygel_media_export_writable_db_container_real_remove_item_finish (RygelWritableContainer *base G_GNUC_UNUSED,
- GAsyncResult *res,
- GError **error) {
+ GAsyncResult *res,
+ GError **error) {
g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
}
@@ -147,10 +147,9 @@ rygel_media_export_writable_db_container_real_get_create_classes (RygelWritableC
return RYGEL_MEDIA_EXPORT_WRITABLE_DB_CONTAINER (base)->priv->create_classes;
}
-
static void
rygel_media_export_writable_db_container_real_set_create_classes (RygelWritableContainer *base,
- GeeArrayList *value) {
+ GeeArrayList *value) {
RygelMediaExportWritableDbContainer *self;
RygelMediaExportWritableDbContainerPrivate *priv;
GeeArrayList *old;
@@ -171,7 +170,6 @@ rygel_media_export_writable_db_container_real_set_create_classes (RygelWritableC
g_object_notify (G_OBJECT (self), "create-classes");
}
-
static void
rygel_media_export_writable_db_container_dispose (GObject *object) {
RygelMediaExportWritableDbContainer *self = RYGEL_MEDIA_EXPORT_WRITABLE_DB_CONTAINER (object);
@@ -187,7 +185,6 @@ rygel_media_export_writable_db_container_dispose (GObject *object) {
G_OBJECT_CLASS (rygel_media_export_writable_db_container_parent_class)->dispose (object);
}
-
static void
rygel_media_export_writable_db_container_constructed (GObject *object) {
GeeArrayList *create_classes;
@@ -216,10 +213,9 @@ rygel_media_export_writable_db_container_class_init (RygelMediaExportWritableDbC
object_class->constructed = rygel_media_export_writable_db_container_constructed;
g_type_class_add_private (writable_db_container_class,
- sizeof (RygelMediaExportWritableDbContainerPrivate));
+ sizeof (RygelMediaExportWritableDbContainerPrivate));
}
-
static void
rygel_media_export_writable_db_container_rygel_writable_container_interface_init (RygelWritableContainerIface *iface) {
iface->add_item = rygel_media_export_writable_db_container_real_add_item;
@@ -230,7 +226,6 @@ rygel_media_export_writable_db_container_rygel_writable_container_interface_init
iface->set_create_classes = rygel_media_export_writable_db_container_real_set_create_classes;
}
-
static void
rygel_media_export_writable_db_container_init (RygelMediaExportWritableDbContainer *self) {
self->priv = RYGEL_MEDIA_EXPORT_WRITABLE_DB_CONTAINER_GET_PRIVATE (self);
diff --git a/src/media-export/rygel-media-export-writable-db-container.h b/src/media-export/rygel-media-export-writable-db-container.h
index 797a20c..bb257b2 100644
--- a/src/media-export/rygel-media-export-writable-db-container.h
+++ b/src/media-export/rygel-media-export-writable-db-container.h
@@ -56,7 +56,7 @@ rygel_media_export_writable_db_container_get_type (void) G_GNUC_CONST;
RygelMediaExportWritableDbContainer *
rygel_media_export_writable_db_container_new (const gchar *id,
- const gchar *title);
+ const gchar *title);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
