GNOME.org
 

[rygel-gst-0-10-plugins] Remove the media-export D-Bus API.

commit ddfb37873b557d9f299326c5ef12b0fa9f6bd2cf
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 17 11:39:42 2013 +0100

    Remove the media-export D-Bus API.
    
    This has also been removed from the version in Rygel master,
    because it is not used by anything, and does not need to
    be used by anything.

 src/media-export/Makefile.am                       |    1 -
 src/media-export/rygel-media-export-dbus-service.c |  373 --------------------
 src/media-export/rygel-media-export-dbus-service.h |   55 ---
 .../rygel-media-export-root-container.c            |  173 +---------
 4 files changed, 2 insertions(+), 600 deletions(-)
---
diff --git a/src/media-export/Makefile.am b/src/media-export/Makefile.am
index 6c49854..2f4f443 100644
--- a/src/media-export/Makefile.am
+++ b/src/media-export/Makefile.am
@@ -8,7 +8,6 @@ librygel_media_export_gst_0_10_la_SOURCES = \
 	rygel-media-export-database.c \
 	rygel-media-export-database-cursor.c \
 	rygel-media-export-db-container.c \
-	rygel-media-export-dbus-service.c \
 	rygel-media-export-dummy-container.c \
 	rygel-media-export-harvester.c \
 	rygel-media-export-harvesting-task.c \
diff --git a/src/media-export/rygel-media-export-root-container.c b/src/media-export/rygel-media-export-root-container.c
index de4c12f..4662972 100644
--- a/src/media-export/rygel-media-export-root-container.c
+++ b/src/media-export/rygel-media-export-root-container.c
@@ -30,16 +30,6 @@ G_DEFINE_TYPE (RygelMediaExportRootContainer, rygel_media_export_root_container,
 #define RYGEL_MEDIA_EXPORT_TYPE_FOLDER_DEFINITION (rygel_media_export_folder_definition_get_type ())
 typedef struct _RygelMediaExportFolderDefinition RygelMediaExportFolderDefinition;
 
-#define RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE (rygel_media_export_dbus_service_get_type ())
-#define RYGEL_MEDIA_EXPORT_DBUS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE, RygelMediaExportDBusService))
-#define RYGEL_MEDIA_EXPORT_DBUS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE, RygelMediaExportDBusServiceClass))
-#define RYGEL_MEDIA_EXPORT_IS_DBUS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE))
-#define RYGEL_MEDIA_EXPORT_IS_DBUS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE))
-#define RYGEL_MEDIA_EXPORT_DBUS_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE, RygelMediaExportDBusServiceClass))
-
-typedef struct _RygelMediaExportDBusService RygelMediaExportDBusService;
-typedef struct _RygelMediaExportDBusServiceClass RygelMediaExportDBusServiceClass;
-
 #define RYGEL_MEDIA_EXPORT_TYPE_HARVESTER (rygel_media_export_harvester_get_type ())
 #define RYGEL_MEDIA_EXPORT_HARVESTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_HARVESTER, RygelMediaExportHarvester))
 #define RYGEL_MEDIA_EXPORT_HARVESTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RYGEL_MEDIA_EXPORT_TYPE_HARVESTER, RygelMediaExportHarvesterClass))
@@ -91,7 +81,6 @@ struct _RygelMediaExportFolderDefinition {
 
 
 struct _RygelMediaExportRootContainerPrivate {
-	RygelMediaExportDBusService* service;
 	RygelMediaExportHarvester* harvester;
 	GCancellable* cancellable;
 	RygelMediaContainer* filesystem_container;
@@ -217,8 +206,6 @@ void rygel_media_export_folder_definition_destroy (RygelMediaExportFolderDefinit
 GType rygel_media_export_db_container_get_type (void) G_GNUC_CONST;
 GType rygel_media_export_media_cache_get_type (void) G_GNUC_CONST;
 GType rygel_media_export_root_container_get_type (void) G_GNUC_CONST;
-GType rygel_media_export_dbus_service_get_type (void) G_GNUC_CONST;
-guint rygel_media_export_dbus_service_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
 GType rygel_media_export_harvester_get_type (void) G_GNUC_CONST;
 #define RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER, RygelMediaExportRootContainerPrivate))
 enum  {
@@ -264,8 +251,6 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
 RygelMediaExportQueryContainer* rygel_media_export_query_container_factory_create_from_description (RygelMediaExportQueryContainerFactory* self, RygelMediaExportMediaCache* cache, const gchar* definition, const gchar* name);
 gchar* rygel_media_export_query_container_factory_get_virtual_container_definition (RygelMediaExportQueryContainerFactory* self, const gchar* hash);
 
-RygelMediaExportDBusService* rygel_media_export_dbus_service_new (RygelMediaExportRootContainer* root_container, GError** error);
-RygelMediaExportDBusService* rygel_media_export_dbus_service_construct (GType object_type, RygelMediaExportRootContainer* root_container, GError** error);
 void rygel_media_export_media_cache_save_container (RygelMediaExportMediaCache* self, RygelMediaContainer* container, GError** error);
 GeeArrayList* rygel_media_export_media_cache_get_child_ids (RygelMediaExportMediaCache* self, const gchar* container_id, GError** error);
 RygelMediaExportHarvester* rygel_media_export_harvester_new (GCancellable* cancellable, GeeArrayList* locations);
@@ -412,134 +397,6 @@ void rygel_media_export_root_container_shutdown (RygelMediaExportRootContainer*
 	g_cancellable_cancel (_tmp0_);
 }
 
-
-void rygel_media_export_root_container_add_uri (RygelMediaExportRootContainer* self, const gchar* uri) {
-	const gchar* _tmp0_;
-	GFile* _tmp1_ = NULL;
-	GFile* file;
-	RygelMediaExportHarvester* _tmp2_;
-	RygelMediaContainer* _tmp3_;
-	g_return_if_fail (self != NULL);
-	g_return_if_fail (uri != NULL);
-	_tmp0_ = uri;
-	_tmp1_ = g_file_new_for_commandline_arg (_tmp0_);
-	file = _tmp1_;
-	_tmp2_ = self->priv->harvester;
-	_tmp3_ = self->priv->filesystem_container;
-	rygel_media_export_harvester_schedule (_tmp2_, file, _tmp3_, "DBUS");
-	g_object_unref (file);
-}
-
-
-void rygel_media_export_root_container_remove_uri (RygelMediaExportRootContainer* self, const gchar* uri) {
-	const gchar* _tmp0_;
-	GFile* _tmp1_ = NULL;
-	GFile* file;
-	gchar* _tmp2_ = NULL;
-	gchar* id;
-	RygelMediaExportHarvester* _tmp3_;
-	GError * _inner_error_ = NULL;
-	g_return_if_fail (self != NULL);
-	g_return_if_fail (uri != NULL);
-	_tmp0_ = uri;
-	_tmp1_ = g_file_new_for_commandline_arg (_tmp0_);
-	file = _tmp1_;
-	_tmp2_ = rygel_media_export_media_cache_get_id (file);
-	id = _tmp2_;
-	_tmp3_ = self->priv->harvester;
-	rygel_media_export_harvester_cancel (_tmp3_, file);
-	{
-		RygelMediaExportMediaCache* _tmp4_;
-		_tmp4_ = ((RygelMediaExportDBContainer*) self)->media_db;
-		rygel_media_export_media_cache_remove_by_id (_tmp4_, id, &_inner_error_);
-		if (_inner_error_ != NULL) {
-			goto __catch27_g_error;
-		}
-	}
-	goto __finally27;
-	__catch27_g_error:
-	{
-		GError* _error_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_;
-		const gchar* _tmp7_;
-		_error_ = _inner_error_;
-		_inner_error_ = NULL;
-		_tmp5_ = _ ("Failed to remove URI: %s");
-		_tmp6_ = _error_;
-		_tmp7_ = _tmp6_->message;
-		g_warning (_tmp5_, _tmp7_);
-		g_error_free (_error_);
-	}
-	__finally27:
-	if (_inner_error_ != NULL) {
-		g_free (id);
-		g_object_unref (file);
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return;
-	}
-	g_free (id);
-	g_object_unref (file);
-}
-
-
-gchar** rygel_media_export_root_container_get_dynamic_uris (RygelMediaExportRootContainer* self, int* result_length1) {
-	gchar** result = NULL;
-	gchar** _tmp5_ = NULL;
-	gchar** _tmp6_;
-	gint _tmp6__length1;
-	GError * _inner_error_ = NULL;
-	g_return_val_if_fail (self != NULL, NULL);
-	{
-		RygelMediaExportMediaCache* _tmp0_;
-		GeeList* _tmp1_ = NULL;
-		GeeList* uris;
-		gint _tmp2_ = 0;
-		gpointer* _tmp3_ = NULL;
-		gchar** _tmp4_;
-		gint _tmp4__length1;
-		_tmp0_ = ((RygelMediaExportDBContainer*) self)->media_db;
-		_tmp1_ = rygel_media_export_media_cache_get_flagged_uris (_tmp0_, "DBUS", &_inner_error_);
-		uris = _tmp1_;
-		if (_inner_error_ != NULL) {
-			goto __catch28_g_error;
-		}
-		_tmp3_ = gee_collection_to_array ((GeeCollection*) uris, &_tmp2_);
-		_tmp4_ = _tmp3_;
-		_tmp4__length1 = _tmp2_;
-		if (result_length1) {
-			*result_length1 = _tmp4__length1;
-		}
-		result = _tmp4_;
-		g_object_unref (uris);
-		return result;
-	}
-	goto __finally28;
-	__catch28_g_error:
-	{
-		GError* _error_ = NULL;
-		_error_ = _inner_error_;
-		_inner_error_ = NULL;
-		g_error_free (_error_);
-	}
-	__finally28:
-	if (_inner_error_ != NULL) {
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return NULL;
-	}
-	_tmp5_ = g_new0 (gchar*, 0 + 1);
-	_tmp6_ = _tmp5_;
-	_tmp6__length1 = 0;
-	if (result_length1) {
-		*result_length1 = _tmp6__length1;
-	}
-	result = _tmp6_;
-	return result;
-}
-
-
 static void rygel_media_export_root_container_real_find_object_data_free (gpointer _data) {
 	RygelMediaExportRootContainerFindObjectData* _data_;
 	_data_ = _data;
@@ -1090,23 +947,7 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
 		g_clear_error (&_inner_error_);
 		return NULL;
 	}
-	{
-		RygelMediaExportMediaCache* _tmp4_;
-		GeeList* _tmp5_ = NULL;
-		GeeList* _tmp6_;
-		GeeArrayList* _tmp7_;
-		GeeList* _tmp8_;
-		_tmp4_ = ((RygelMediaExportDBContainer*) self)->media_db;
-		_tmp5_ = rygel_media_export_media_cache_get_flagged_uris (_tmp4_, "DBUS", &_inner_error_);
-		_tmp6_ = _tmp5_;
-		if (_inner_error_ != NULL) {
-			goto __catch30_g_error;
-		}
-		_tmp7_ = uris;
-		_tmp8_ = _tmp6_;
-		gee_array_list_add_all (_tmp7_, (GeeCollection*) _tmp8_);
-		g_object_unref (_tmp8_);
-	}
+
 	goto __finally30;
 	__catch30_g_error:
 	{
@@ -1626,17 +1467,7 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
 	_tmp2_ = g_cancellable_new ();
 	g_object_unref (self->priv->cancellable);
 	self->priv->cancellable = _tmp2_;
-	{
-		RygelMediaExportDBusService* _tmp3_;
-		RygelMediaExportDBusService* _tmp4_;
-		_tmp3_ = rygel_media_export_dbus_service_new (self, &_inner_error_);
-		_tmp4_ = _tmp3_;
-		if (_inner_error_ != NULL) {
-			goto __catch32_g_error;
-		}
-		g_object_unref (self->priv->service);
-		self->priv->service = _tmp4_;
-	}
+
 	goto __finally32;
 	__catch32_g_error:
 	{
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]