[rygel] external: Make use of nested namespaces
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] external: Make use of nested namespaces
- Date: Fri, 9 Jul 2010 14:44:40 +0000 (UTC)
commit a65d082adf4aa3d810b62b213bd241b73b0a54ad
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Fri Jul 9 16:02:45 2010 +0300
external: Make use of nested namespaces
src/plugins/external/rygel-external-container.vala | 82 ++++++++++----------
.../external/rygel-external-content-dir.vala | 18 ++--
.../external/rygel-external-dummy-container.vala | 10 +-
.../external/rygel-external-icon-factory.vala | 4 +-
.../external/rygel-external-interfaces.vala | 9 +-
.../external/rygel-external-item-factory.vala | 6 +-
.../external/rygel-external-plugin-factory.vala | 30 ++++----
src/plugins/external/rygel-external-plugin.vala | 16 ++--
.../external/rygel-external-thumbnail-factory.vala | 4 +-
9 files changed, 88 insertions(+), 91 deletions(-)
---
diff --git a/src/plugins/external/rygel-external-container.vala b/src/plugins/external/rygel-external-container.vala
index 2238826..879bcb8 100644
--- a/src/plugins/external/rygel-external-container.vala
+++ b/src/plugins/external/rygel-external-container.vala
@@ -30,31 +30,31 @@ using FreeDesktop;
/**
* Represents an external container.
*/
-public class Rygel.ExternalContainer : Rygel.MediaContainer {
- public ExternalMediaContainerProxy actual_container;
+public class Rygel.External.Container : Rygel.MediaContainer {
+ public MediaContainerProxy actual_container;
public string host_ip;
public string service_name;
- private ExternalItemFactory item_factory;
- private ArrayList<ExternalContainer> containers;
+ private ItemFactory item_factory;
+ private ArrayList<Container> containers;
private Connection connection;
private bool searchable;
- public ExternalContainer (string id,
- string title,
- uint child_count,
- bool searchable,
- string service_name,
- string host_ip,
- ExternalContainer? parent = null) {
+ public Container (string id,
+ string title,
+ uint child_count,
+ bool searchable,
+ string service_name,
+ string host_ip,
+ Container? parent = null) {
base (id, parent, title, (int) child_count);
this.service_name = service_name;
this.host_ip = host_ip;
- this.item_factory = new ExternalItemFactory ();
- this.containers = new ArrayList<ExternalContainer> ();
+ this.item_factory = new ItemFactory ();
+ this.containers = new ArrayList<Container> ();
try {
this.connection = DBus.Bus.get (DBus.BusType.SESSION);
@@ -65,7 +65,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
// Create proxy to MediaContainer iface
this.actual_container = this.connection.get_object (this.service_name,
id)
- as ExternalMediaContainerProxy;
+ as MediaContainerProxy;
this.update_container.begin (true);
}
@@ -77,11 +77,11 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
throws GLib.Error {
string[] filter = {};
- foreach (var object_prop in ExternalMediaObjectProxy.PROPERTIES) {
+ foreach (var object_prop in MediaObjectProxy.PROPERTIES) {
filter += object_prop;
}
- foreach (var item_prop in ExternalMediaItemProxy.PROPERTIES) {
+ foreach (var item_prop in MediaItemProxy.PROPERTIES) {
filter += item_prop;
}
@@ -110,15 +110,15 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
}
string[] filter = {};
- foreach (var object_prop in ExternalMediaObjectProxy.PROPERTIES) {
+ foreach (var object_prop in MediaObjectProxy.PROPERTIES) {
filter += object_prop;
}
- foreach (var container_prop in ExternalMediaContainerProxy.PROPERTIES) {
+ foreach (var container_prop in MediaContainerProxy.PROPERTIES) {
filter += container_prop;
}
- foreach (var item_prop in ExternalMediaItemProxy.PROPERTIES) {
+ foreach (var item_prop in MediaItemProxy.PROPERTIES) {
filter += item_prop;
}
@@ -140,7 +140,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
// Create proxy to MediaObject iface
var actual_object = this.connection.get_object (this.service_name, id)
- as ExternalMediaObjectProxy;
+ as MediaObjectProxy;
if (actual_object.object_type == "container") {
media_object = this.find_container_by_id (id);
@@ -157,7 +157,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
}
}
} else {
- var parent_container = new ExternalDummyContainer
+ var parent_container = new DummyContainer
((string) actual_object.parent,
"LaLaLa",
0,
@@ -166,8 +166,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
var props_iface = this.connection.get_object (this.service_name, id)
as Properties;
- var props = yield props_iface.get_all (
- ExternalMediaItemProxy.IFACE);
+ var props = yield props_iface.get_all (MediaItemProxy.IFACE);
// Its an item then
media_object = yield this.item_factory.create (
@@ -199,10 +198,10 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
} else {
var parent_id = props.lookup ("Parent").get_string ();
- parent_container = new ExternalDummyContainer (parent_id,
- "LaLaLa",
- 0,
- null);
+ parent_container = new DummyContainer (parent_id,
+ "LaLaLa",
+ 0,
+ null);
}
MediaObject media_object = null;
@@ -216,11 +215,10 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
if (type == "container") {
var child_count = props.lookup ("ChildCount").get_uint ();
- media_object = new ExternalDummyContainer (
- id,
- title,
- child_count,
- parent_container);
+ media_object = new DummyContainer (id,
+ title,
+ child_count,
+ parent_container);
} else {
// Its an item then
media_object = yield this.item_factory.create (
@@ -243,11 +241,11 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
private async void refresh_child_containers () throws GLib.Error {
string[] filter = {};
- foreach (var object_prop in ExternalMediaObjectProxy.PROPERTIES) {
+ foreach (var object_prop in MediaObjectProxy.PROPERTIES) {
filter += object_prop;
}
- foreach (var container_prop in ExternalMediaContainerProxy.PROPERTIES) {
+ foreach (var container_prop in MediaContainerProxy.PROPERTIES) {
filter += container_prop;
}
@@ -263,13 +261,13 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
var child_count = props.lookup ("ChildCount").get_uint ();
var searchable = props.lookup ("Searchable").get_boolean ();
- var container = new ExternalContainer (id,
- title,
- child_count,
- searchable,
- this.service_name,
- this.host_ip,
- this);
+ var container = new Container (id,
+ title,
+ child_count,
+ searchable,
+ this.service_name,
+ this.host_ip,
+ this);
this.containers.add (container);
}
}
@@ -292,7 +290,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
}
}
- private void on_updated (ExternalMediaContainerProxy actual_container) {
+ private void on_updated (MediaContainerProxy actual_container) {
this.update_container.begin ();
}
diff --git a/src/plugins/external/rygel-external-content-dir.vala b/src/plugins/external/rygel-external-content-dir.vala
index 99a03bc..ae80745 100644
--- a/src/plugins/external/rygel-external-content-dir.vala
+++ b/src/plugins/external/rygel-external-content-dir.vala
@@ -29,18 +29,18 @@ using Gee;
/**
* Implementation of External ContentDirectory service.
*/
-public class Rygel.ExternalContentDir : Rygel.ContentDirectory {
+public class Rygel.External.ContentDir : Rygel.ContentDirectory {
// Pubic methods
public override MediaContainer? create_root_container () {
- var plugin = (ExternalPlugin) this.root_device.resource_factory;
+ var plugin = (External.Plugin) this.root_device.resource_factory;
- return new ExternalContainer ("0",
- plugin.title,
- plugin.child_count,
- plugin.searchable,
- plugin.service_name,
- this.context.host_ip,
- null);
+ return new Container ("0",
+ plugin.title,
+ plugin.child_count,
+ plugin.searchable,
+ plugin.service_name,
+ this.context.host_ip,
+ null);
}
}
diff --git a/src/plugins/external/rygel-external-dummy-container.vala b/src/plugins/external/rygel-external-dummy-container.vala
index 397210a..a15de9d 100644
--- a/src/plugins/external/rygel-external-dummy-container.vala
+++ b/src/plugins/external/rygel-external-dummy-container.vala
@@ -30,11 +30,11 @@ using Gee;
* This is a dummy container used to satisfy rygel when creating objects for
* search resuts.
*/
-internal class Rygel.ExternalDummyContainer : MediaContainer {
- public ExternalDummyContainer (string id,
- string title,
- uint child_coult,
- MediaContainer? parent) {
+internal class Rygel.External.DummyContainer : MediaContainer {
+ public DummyContainer (string id,
+ string title,
+ uint child_coult,
+ MediaContainer? parent) {
base (id, parent, title, child_count);
}
diff --git a/src/plugins/external/rygel-external-icon-factory.vala b/src/plugins/external/rygel-external-icon-factory.vala
index a7e05af..c425bdf 100644
--- a/src/plugins/external/rygel-external-icon-factory.vala
+++ b/src/plugins/external/rygel-external-icon-factory.vala
@@ -24,12 +24,12 @@
using FreeDesktop;
-public class Rygel.ExternalIconFactory {
+public class Rygel.External.IconFactory {
private static string ITEM_IFACE = "org.gnome.UPnP.MediaItem1";
DBus.Connection connection;
- public ExternalIconFactory (DBus.Connection connection) {
+ public IconFactory (DBus.Connection connection) {
this.connection = connection;
}
diff --git a/src/plugins/external/rygel-external-interfaces.vala b/src/plugins/external/rygel-external-interfaces.vala
index 74f489b..d5fdbc6 100644
--- a/src/plugins/external/rygel-external-interfaces.vala
+++ b/src/plugins/external/rygel-external-interfaces.vala
@@ -24,7 +24,7 @@
using DBus;
[DBus (name = "org.gnome.UPnP.MediaObject2")]
-public interface Rygel.ExternalMediaObjectProxy : DBus.Object {
+public interface Rygel.External.MediaObjectProxy : DBus.Object {
public static const string IFACE = "org.gnome.UPnP.MediaObject2";
public static const string[] PROPERTIES = { "Parent",
"Type",
@@ -38,8 +38,8 @@ public interface Rygel.ExternalMediaObjectProxy : DBus.Object {
}
[DBus (name = "org.gnome.UPnP.MediaContainer2")]
-public interface Rygel.ExternalMediaContainerProxy : DBus.Object,
- ExternalMediaObjectProxy {
+public interface Rygel.External.MediaContainerProxy : DBus.Object,
+ MediaObjectProxy {
public static const string IFACE = "org.gnome.UPnP.MediaContainer2";
public static const string[] PROPERTIES = { "ChildCount", "Searchable" };
@@ -74,8 +74,7 @@ public interface Rygel.ExternalMediaContainerProxy : DBus.Object,
}
[DBus (name = "org.gnome.UPnP.MediaItem2")]
-public interface Rygel.ExternalMediaItemProxy : DBus.Object,
- ExternalMediaObjectProxy {
+public interface Rygel.External.MediaItemProxy : DBus.Object, MediaObjectProxy {
public static const string IFACE = "org.gnome.UPnP.MediaItem2";
public static const string[] PROPERTIES = { "URLs",
"MIMEType",
diff --git a/src/plugins/external/rygel-external-item-factory.vala b/src/plugins/external/rygel-external-item-factory.vala
index 16ac802..2b8f05c 100644
--- a/src/plugins/external/rygel-external-item-factory.vala
+++ b/src/plugins/external/rygel-external-item-factory.vala
@@ -29,7 +29,7 @@ using FreeDesktop;
/**
* Creates item for external plugins.
*/
-public class Rygel.ExternalItemFactory {
+public class Rygel.External.ItemFactory {
public async MediaItem create (string id,
string type,
string title,
@@ -59,7 +59,7 @@ public class Rygel.ExternalItemFactory {
// value = props.lookup ("URLs");
var connection = DBus.Bus.get (DBus.BusType.SESSION);
var item_iface = connection.get_object (service_name, id)
- as ExternalMediaItemProxy;
+ as MediaItemProxy;
string[] uris = item_iface.urls;
for (var i = 0; uris[i] != null; i++) {
@@ -152,7 +152,7 @@ public class Rygel.ExternalItemFactory {
value = props.lookup ("Thumbnail");
if (value != null) {
- var factory = new ExternalThumbnailFactory ();
+ var factory = new ThumbnailFactory ();
var thumbnail = yield factory.create (value.get_string (),
service_name,
host_ip);
diff --git a/src/plugins/external/rygel-external-plugin-factory.vala b/src/plugins/external/rygel-external-plugin-factory.vala
index 99f051b..6313c10 100644
--- a/src/plugins/external/rygel-external-plugin-factory.vala
+++ b/src/plugins/external/rygel-external-plugin-factory.vala
@@ -26,18 +26,18 @@ using Rygel;
using Gee;
using FreeDesktop;
-private ExternalPluginFactory plugin_factory;
+private External.PluginFactory plugin_factory;
public void module_init (PluginLoader loader) {
try {
- plugin_factory = new ExternalPluginFactory (loader);
+ plugin_factory = new External.PluginFactory (loader);
} catch (DBus.Error error) {
critical ("Failed to fetch list of external services: %s\n",
error.message);
}
}
-public class Rygel.ExternalPluginFactory {
+public class Rygel.External.PluginFactory {
private const string DBUS_SERVICE = "org.freedesktop.DBus";
private const string DBUS_OBJECT = "/org/freedesktop/DBus";
@@ -47,14 +47,14 @@ public class Rygel.ExternalPluginFactory {
private const string SERVICE_PREFIX = "org.gnome.UPnP.MediaServer2.";
private const string GRILO_UPNP_PREFIX = SERVICE_PREFIX + "grl_upnp";
- DBusObject dbus_obj;
- DBus.Connection connection;
- PluginLoader loader;
- ExternalIconFactory icon_factory;
+ DBusObject dbus_obj;
+ DBus.Connection connection;
+ PluginLoader loader;
+ IconFactory icon_factory;
- public ExternalPluginFactory (PluginLoader loader) throws DBus.Error {
+ public PluginFactory (PluginLoader loader) throws DBus.Error {
this.connection = DBus.Bus.get (DBus.BusType.SESSION);
- this.icon_factory = new ExternalIconFactory (this.connection);
+ this.icon_factory = new IconFactory (this.connection);
this.dbus_obj = this.connection.get_object (DBUS_SERVICE,
DBUS_OBJECT)
@@ -154,12 +154,12 @@ public class Rygel.ExternalPluginFactory {
var child_count = container_props.lookup ("ChildCount").get_uint ();
var searchable = container_props.lookup ("Searchable").get_boolean ();
- var plugin = new ExternalPlugin (service_name,
- title,
- child_count,
- searchable,
- root_object,
- icon);
+ var plugin = new External.Plugin (service_name,
+ title,
+ child_count,
+ searchable,
+ root_object,
+ icon);
this.loader.add_plugin (plugin);
}
diff --git a/src/plugins/external/rygel-external-plugin.vala b/src/plugins/external/rygel-external-plugin.vala
index cddd53c..1c4a2ab 100644
--- a/src/plugins/external/rygel-external-plugin.vala
+++ b/src/plugins/external/rygel-external-plugin.vala
@@ -24,7 +24,7 @@
using FreeDesktop;
-public class Rygel.ExternalPlugin : Rygel.Plugin {
+public class Rygel.External.Plugin : Rygel.Plugin {
public string service_name;
public string root_object;
@@ -32,15 +32,15 @@ public class Rygel.ExternalPlugin : Rygel.Plugin {
public uint child_count;
public bool searchable;
- public ExternalPlugin (string service_name,
- string title,
- uint child_count,
- bool searchable,
- string root_object,
- IconInfo? icon) {
+ public Plugin (string service_name,
+ string title,
+ uint child_count,
+ bool searchable,
+ string root_object,
+ IconInfo? icon) {
base.MediaServer (service_name,
title,
- typeof (ExternalContentDir),
+ typeof (ContentDir),
"Rygel External " + title);
this.service_name = service_name;
diff --git a/src/plugins/external/rygel-external-thumbnail-factory.vala b/src/plugins/external/rygel-external-thumbnail-factory.vala
index f35e3e3..46650fe 100644
--- a/src/plugins/external/rygel-external-thumbnail-factory.vala
+++ b/src/plugins/external/rygel-external-thumbnail-factory.vala
@@ -28,7 +28,7 @@ using FreeDesktop;
/**
* Factory for thumbnail from external plugins.
*/
-public class Rygel.ExternalThumbnailFactory {
+public class Rygel.External.ThumbnailFactory {
public async Thumbnail create (string service_name,
string object_path,
string host_ip)
@@ -39,7 +39,7 @@ public class Rygel.ExternalThumbnailFactory {
object_path)
as Properties;
- var item_props = yield props.get_all (ExternalMediaItemProxy.IFACE);
+ var item_props = yield props.get_all (MediaItemProxy.IFACE);
var thumbnail = new Thumbnail ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
