rygel r321 - trunk/src/rygel
- From: zeeshanak svn gnome org
- To: svn-commits-list gnome org
- Subject: rygel r321 - trunk/src/rygel
- Date: Mon, 1 Dec 2008 16:39:12 +0000 (UTC)
Author: zeeshanak
Date: Mon Dec 1 16:39:12 2008
New Revision: 321
URL: http://svn.gnome.org/viewvc/rygel?rev=321&view=rev
Log:
Refactor MediaServerFactory.
Put the creation of modified description xml into a separate method.
Modified:
trunk/src/rygel/rygel-media-server-factory.vala
Modified: trunk/src/rygel/rygel-media-server-factory.vala
==============================================================================
--- trunk/src/rygel/rygel-media-server-factory.vala (original)
+++ trunk/src/rygel/rygel-media-server-factory.vala Mon Dec 1 16:39:12 2008
@@ -56,6 +56,27 @@
string gconf_path = ROOT_GCONF_PATH + plugin.name + "/";
string modified_desc = DESC_PREFIX + "-" + plugin.name + ".xml";
+ /* We store a modified description.xml in the user's config dir */
+ string desc_path = Path.build_filename
+ (Environment.get_user_config_dir (),
+ modified_desc);
+
+ /* Create the description xml */
+ Xml.Doc *doc = this.create_desc (plugin, desc_path, gconf_path);
+
+ /* Host our modified file */
+ this.context.host_path (desc_path, "/" + modified_desc);
+
+ return new MediaServer (this.context,
+ plugin,
+ doc,
+ modified_desc);
+ }
+
+ /* FIXME: No need to create modified desc if it already exists */
+ private Xml.Doc * create_desc (Plugin plugin,
+ string desc_path,
+ string gconf_path) throws GLib.Error {
bool enable_xbox = false;
try {
enable_xbox = this.gconf.get_bool (gconf_path + "enable-xbox");
@@ -63,13 +84,7 @@
warning ("%s", error.message);
}
- /* We store a modified description.xml in the user's config dir */
- string desc_path = Path.build_filename
- (Environment.get_user_config_dir (),
- modified_desc);
-
string orig_desc_path;
-
if (enable_xbox)
/* Use Xbox 360 specific description */
orig_desc_path = Path.build_filename (BuildConfig.DATA_DIR,
@@ -110,13 +125,7 @@
throw new IOError.FAILED (message);
}
- /* Host our modified file */
- this.context.host_path (desc_path, "/" + modified_desc);
-
- return new MediaServer (this.context,
- plugin,
- doc,
- modified_desc);
+ return doc;
}
private GUPnP.Context create_upnp_context () throws GLib.Error {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]