[rygel] gst-launch: Make use of nested namespaces
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] gst-launch: Make use of nested namespaces
- Date: Fri, 9 Jul 2010 14:44:50 +0000 (UTC)
commit 1de7f572393f54c52bee2291ce635fdaad725ef2
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Fri Jul 9 17:19:03 2010 +0300
gst-launch: Make use of nested namespaces
.../gst-launch/rygel-gst-launch-content-dir.vala | 4 ++--
src/plugins/gst-launch/rygel-gst-launch-item.vala | 12 ++++++------
.../gst-launch/rygel-gst-launch-plugin.vala | 2 +-
.../rygel-gst-launch-root-container.vala | 14 +++++++-------
4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/plugins/gst-launch/rygel-gst-launch-content-dir.vala b/src/plugins/gst-launch/rygel-gst-launch-content-dir.vala
index 015f1ad..34686c3 100644
--- a/src/plugins/gst-launch/rygel-gst-launch-content-dir.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-content-dir.vala
@@ -24,11 +24,11 @@ using Rygel;
using GUPnP;
using Gee;
-public class Rygel.GstLaunchContentDir : ContentDirectory {
+public class Rygel.GstLaunch.ContentDir : ContentDirectory {
/* Pubic methods */
public override MediaContainer? create_root_container () {
string friendly_name = this.root_device.get_friendly_name ();
- return new GstLaunchRootContainer (friendly_name);
+ return new RootContainer (friendly_name);
}
}
diff --git a/src/plugins/gst-launch/rygel-gst-launch-item.vala b/src/plugins/gst-launch/rygel-gst-launch-item.vala
index ba515c6..cf25d59 100644
--- a/src/plugins/gst-launch/rygel-gst-launch-item.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-item.vala
@@ -28,14 +28,14 @@ using Gst;
/**
* Represents Test audio item.
*/
-public class Rygel.GstLaunchItem : Rygel.MediaItem {
+public class Rygel.GstLaunch.Item : Rygel.MediaItem {
string launch_line;
- public GstLaunchItem (string id,
- MediaContainer parent,
- string title,
- string mime_type,
- string launch_line) {
+ public Item (string id,
+ MediaContainer parent,
+ string title,
+ string mime_type,
+ string launch_line) {
base (id,
parent,
title,
diff --git a/src/plugins/gst-launch/rygel-gst-launch-plugin.vala b/src/plugins/gst-launch/rygel-gst-launch-plugin.vala
index 0af87b7..335d284 100644
--- a/src/plugins/gst-launch/rygel-gst-launch-plugin.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-plugin.vala
@@ -26,7 +26,7 @@ using Gee;
public void module_init (PluginLoader loader) {
var plugin = new Plugin.MediaServer ("GstLaunch",
"Gst Launch",
- typeof (GstLaunchContentDir));
+ typeof (GstLaunch.ContentDir));
loader.add_plugin (plugin);
}
diff --git a/src/plugins/gst-launch/rygel-gst-launch-root-container.vala b/src/plugins/gst-launch/rygel-gst-launch-root-container.vala
index d24eadd..91f484f 100644
--- a/src/plugins/gst-launch/rygel-gst-launch-root-container.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-root-container.vala
@@ -28,13 +28,13 @@ using Gst;
/**
* Represents the root container for GstLaunch content hierarchy.
*/
-public class Rygel.GstLaunchRootContainer : SimpleContainer {
+public class Rygel.GstLaunch.RootContainer : SimpleContainer {
const string CONFIG_GROUP = "GstLaunch";
const string ITEM_NAMES = "launch_items";
MetaConfig config;
- public GstLaunchRootContainer (string title) {
+ public RootContainer (string title) {
base.root (title);
try {
@@ -58,11 +58,11 @@ public class Rygel.GstLaunchRootContainer : SimpleContainer {
var launch_line = config.get_string (CONFIG_GROUP,
"%s_launch".printf (name));
- this.add_child (new GstLaunchItem (name,
- this,
- title,
- mime_type,
- launch_line));
+ this.add_child (new Item (name,
+ this,
+ title,
+ mime_type,
+ launch_line));
} catch (GLib.Error err) {
debug ("GstLaunch failed item '%s': %s", name, err.message);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]