[rygel] gst-renderer: Put all classes under a namespace

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit baa29ba0d4ed8b98f36ce79c26a19b0fd6f45010
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Jul 12 16:28:21 2010 +0300

    gst-renderer: Put all classes under a namespace
    
    Put all classes under "Rygel.GstRenderer" namespace.

 .../gst-renderer/rygel-gst-av-transport.vala       |   12 ++++----
 src/plugins/gst-renderer/rygel-gst-changelog.vala  |    6 ++--
 .../gst-renderer/rygel-gst-connection-manager.vala |    2 +-
 src/plugins/gst-renderer/rygel-gst-player.vala     |   12 ++++----
 src/plugins/gst-renderer/rygel-gst-plugin.vala     |   29 +++++++++++--------
 .../gst-renderer/rygel-gst-rendering-control.vala  |   14 +++++-----
 6 files changed, 40 insertions(+), 35 deletions(-)
---
diff --git a/src/plugins/gst-renderer/rygel-gst-av-transport.vala b/src/plugins/gst-renderer/rygel-gst-av-transport.vala
index 1d71e82..cb4ba3c 100644
--- a/src/plugins/gst-renderer/rygel-gst-av-transport.vala
+++ b/src/plugins/gst-renderer/rygel-gst-av-transport.vala
@@ -23,7 +23,7 @@
 
 using GUPnP;
 
-public class Rygel.GstAVTransport : Service {
+public class Rygel.GstRenderer.AVTransport : Service {
     public const string UPNP_ID = "urn:upnp-org:serviceId:AVTransport";
     public const string UPNP_TYPE =
                     "urn:schemas-upnp-org:service:AVTransport:2";
@@ -131,12 +131,12 @@ public class Rygel.GstAVTransport : Service {
         }
     }
 
-    private GstChangeLog changelog;
-    private GstPlayer player;
+    private ChangeLog changelog;
+    private Player player;
 
     public override void constructed () {
-        this.changelog = new GstChangeLog (this, LAST_CHANGE_NS);
-        this.player = GstPlayer.get_default ();
+        this.changelog = new ChangeLog (this, LAST_CHANGE_NS);
+        this.player = Player.get_default ();
 
         query_variable["LastChange"].connect (this.query_last_change_cb);
 
@@ -164,7 +164,7 @@ public class Rygel.GstAVTransport : Service {
                                        string         variable,
                                        ref Value      value) {
         // Send current state
-        GstChangeLog log = new GstChangeLog (null, LAST_CHANGE_NS);
+        ChangeLog log = new ChangeLog (null, LAST_CHANGE_NS);
 
         log.log ("TransportState",               this.player.playback_state);
         log.log ("TransportStatus",              this.status);
diff --git a/src/plugins/gst-renderer/rygel-gst-changelog.vala b/src/plugins/gst-renderer/rygel-gst-changelog.vala
index 454d606..65ade9e 100644
--- a/src/plugins/gst-renderer/rygel-gst-changelog.vala
+++ b/src/plugins/gst-renderer/rygel-gst-changelog.vala
@@ -25,7 +25,7 @@ using GUPnP;
 using Gee;
 
 // Helper class for building LastChange messages
-public class Rygel.GstChangeLog : Object {
+public class Rygel.GstRenderer.ChangeLog : Object {
     public unowned Service service { get; set; }
 
     private string service_ns;
@@ -36,14 +36,14 @@ public class Rygel.GstChangeLog : Object {
 
     private uint timeout_id = 0;
 
-    public GstChangeLog (Service? service, string service_ns) {
+    public ChangeLog (Service? service, string service_ns) {
         this.service = service;
         this.service_ns = service_ns;
         this.str = new StringBuilder ();
         this.hash = new HashMap<string, string> ();
     }
 
-    ~GstChangeLog () {
+    ~ChangeLog () {
         if (this.timeout_id != 0) {
             Source.remove (this.timeout_id);
         }
diff --git a/src/plugins/gst-renderer/rygel-gst-connection-manager.vala b/src/plugins/gst-renderer/rygel-gst-connection-manager.vala
index 46915e0..85f3b4a 100644
--- a/src/plugins/gst-renderer/rygel-gst-connection-manager.vala
+++ b/src/plugins/gst-renderer/rygel-gst-connection-manager.vala
@@ -23,7 +23,7 @@
 
 using GUPnP;
 
-public class Rygel.GstConnectionManager : Rygel.ConnectionManager {
+public class Rygel.GstRenderer.ConnectionManager : Rygel.ConnectionManager {
     // Creates a list of supported sink protocols based on GStreamer's
     // registry. We don't use this because of the spam it generates ..
     /*
diff --git a/src/plugins/gst-renderer/rygel-gst-player.vala b/src/plugins/gst-renderer/rygel-gst-player.vala
index a0f2c60..bb6e808 100644
--- a/src/plugins/gst-renderer/rygel-gst-player.vala
+++ b/src/plugins/gst-renderer/rygel-gst-player.vala
@@ -23,8 +23,8 @@
 
 using Gst;
 
-public class Rygel.GstPlayer : GLib.Object {
-    private static GstPlayer player;
+public class Rygel.GstRenderer.Player : GLib.Object {
+    private static Player player;
 
     private dynamic Element playbin;
 
@@ -102,7 +102,7 @@ public class Rygel.GstPlayer : GLib.Object {
         }
     }
 
-    private GstPlayer () {
+    private Player () {
         this.playbin = ElementFactory.make ("playbin2", null);
         assert (this.playbin != null);
 
@@ -111,9 +111,9 @@ public class Rygel.GstPlayer : GLib.Object {
         bus.add_watch (this.bus_handler);
     }
 
-    public static GstPlayer get_default () {
+    public static Player get_default () {
         if (player == null) {
-            player = new GstPlayer ();
+            player = new Player ();
         }
 
         return player;
@@ -143,7 +143,7 @@ public class Rygel.GstPlayer : GLib.Object {
 
 // Helper class for converting between Gstreamer time units and string
 // representations of time.
-private class Time {
+private class Rygel.GstRenderer.Time {
     public static ClockTime from_string (string str) {
         uint64 hours, minutes, seconds;
 
diff --git a/src/plugins/gst-renderer/rygel-gst-plugin.vala b/src/plugins/gst-renderer/rygel-gst-plugin.vala
index 0051af1..49398ca 100644
--- a/src/plugins/gst-renderer/rygel-gst-plugin.vala
+++ b/src/plugins/gst-renderer/rygel-gst-plugin.vala
@@ -33,18 +33,23 @@ public void module_init (PluginLoader loader) {
                              "GstRenderer",
                              _("GStreamer Renderer"));
 
-    plugin.add_resource (new ResourceInfo (ConnectionManager.UPNP_ID,
-                                           ConnectionManager.UPNP_TYPE,
-                                           ConnectionManager.DESCRIPTION_PATH,
-                                           typeof (GstConnectionManager)));
-    plugin.add_resource (new ResourceInfo (GstAVTransport.UPNP_ID,
-                                           GstAVTransport.UPNP_TYPE,
-                                           GstAVTransport.DESCRIPTION_PATH,
-                                           typeof (GstAVTransport)));
-    plugin.add_resource (new ResourceInfo (GstRenderingControl.UPNP_ID,
-                                           GstRenderingControl.UPNP_TYPE,
-                                           GstRenderingControl.DESCRIPTION_PATH,
-                                           typeof (GstRenderingControl)));
+    var resource = new ResourceInfo (ConnectionManager.UPNP_ID,
+                                     ConnectionManager.UPNP_TYPE,
+                                     ConnectionManager.DESCRIPTION_PATH,
+                                     typeof (GstRenderer.ConnectionManager));
+    plugin.add_resource (resource);
+
+    resource = new ResourceInfo (GstRenderer.AVTransport.UPNP_ID,
+                                 GstRenderer.AVTransport.UPNP_TYPE,
+                                 GstRenderer.AVTransport.DESCRIPTION_PATH,
+                                 typeof (GstRenderer.AVTransport));
+    plugin.add_resource (resource);
+
+    resource = new ResourceInfo (GstRenderer.RenderingControl.UPNP_ID,
+                                 GstRenderer.RenderingControl.UPNP_TYPE,
+                                 GstRenderer.RenderingControl.DESCRIPTION_PATH,
+                                 typeof (GstRenderer.RenderingControl));
+    plugin.add_resource (resource);
 
     loader.add_plugin (plugin);
 }
diff --git a/src/plugins/gst-renderer/rygel-gst-rendering-control.vala b/src/plugins/gst-renderer/rygel-gst-rendering-control.vala
index 0a12768..01f7719 100644
--- a/src/plugins/gst-renderer/rygel-gst-rendering-control.vala
+++ b/src/plugins/gst-renderer/rygel-gst-rendering-control.vala
@@ -24,7 +24,7 @@
 using GUPnP;
 using Rygel;
 
-public class Rygel.GstRenderingControl : Service {
+public class Rygel.GstRenderer.RenderingControl : Service {
     public const string UPNP_ID = "urn:upnp-org:serviceId:RenderingControl";
     public const string UPNP_TYPE =
                     "urn:schemas-upnp-org:service:RenderingControl:2";
@@ -74,12 +74,12 @@ public class Rygel.GstRenderingControl : Service {
 
     private string preset_name_list = "";
 
-    private GstChangeLog changelog;
-    private GstPlayer player;
+    private ChangeLog changelog;
+    private Player player;
 
     public override void constructed () {
-        this.changelog = new GstChangeLog (this, LAST_CHANGE_NS);
-        this.player = GstPlayer.get_default ();
+        this.changelog = new ChangeLog (this, LAST_CHANGE_NS);
+        this.player = Player.get_default ();
 
         query_variable["LastChange"].connect (this.query_last_change_cb);
 
@@ -97,7 +97,7 @@ public class Rygel.GstRenderingControl : Service {
                                        string         variable,
                                        ref GLib.Value value) {
         // Send current state
-        var log = new GstChangeLog (null, LAST_CHANGE_NS);
+        var log = new ChangeLog (null, LAST_CHANGE_NS);
 
         log.log_with_channel ("Mute", this.mute ? "1" : "0", "Master");
         log.log_with_channel ("Volume", this.volume.to_string (), "Master");
@@ -241,7 +241,7 @@ public class Rygel.GstRenderingControl : Service {
 
 // Helper class for converting between double and percentage representations
 // of volume.
-private class Volume {
+private class Rygel.GstRenderer.Volume {
     public static double from_percentage (uint percentage) {
         return (double) percentage / 100.0;
     }