[rygel] gst-launch: Use - instead of _ in options



commit 186da535210afeea212414a9bc51b1dc606321f6
Author: Jens Georg <mail jensge org>
Date:   Fri Aug 20 21:58:57 2010 +0300

    gst-launch: Use - instead of _ in options

 data/rygel-default.conf                            |   20 ++++++++++----------
 data/rygel-maemo.conf                              |   20 ++++++++++----------
 .../rygel-gst-launch-root-container.vala           |    8 ++++----
 3 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/data/rygel-default.conf b/data/rygel-default.conf
index 286b15d..674672e 100644
--- a/data/rygel-default.conf
+++ b/data/rygel-default.conf
@@ -83,13 +83,13 @@ rss=508
 
 [GstLaunch]
 enabled=false
-launch_items=audiotestsrc;videotestsrc;videotestoverlay
-audiotestsrc_title=Audiotestsrc
-audiotestsrc_mime=audio/x-wav
-audiotestsrc_launch=audiotestsrc ! wavenc
-videotestsrc_title=Videotestsrc
-videotestsrc_mime=video/mpeg
-videotestsrc_launch=videotestsrc ! ffenc_mpeg2video ! mpegtsmux
-videotestoverlay_title=Videotestsrc with timeoverlay 2
-videotestoverlay_mime=video/mpeg
-videotestoverlay_launch=videotestsrc ! timeoverlay ! ffenc_mpeg2video ! mpegtsmux
+launch-items=audiotestsrc;videotestsrc;videotestoverlay
+audiotestsrc-title=Audiotestsrc
+audiotestsrc-mime=audio/x-wav
+audiotestsrc-launch=audiotestsrc ! wavenc
+videotestsrc-title=Videotestsrc
+videotestsrc-mime=video/mpeg
+videotestsrc-launch=videotestsrc ! ffenc_mpeg2video ! mpegtsmux
+videotestoverlay-title=Videotestsrc with timeoverlay 2
+videotestoverlay-mime=video/mpeg
+videotestoverlay-launch=videotestsrc ! timeoverlay ! ffenc_mpeg2video ! mpegtsmux
diff --git a/data/rygel-maemo.conf b/data/rygel-maemo.conf
index 044e8f2..99aa3ab 100644
--- a/data/rygel-maemo.conf
+++ b/data/rygel-maemo.conf
@@ -83,13 +83,13 @@ rss=508
 
 [GstLaunch]
 enabled=false
-launch_items=audiotestsrc;videotestsrc;videotestoverlay
-audiotestsrc_title=Audiotestsrc
-audiotestsrc_mime=audio/x-wav
-audiotestsrc_launch=audiotestsrc ! wavenc
-videotestsrc_title=Videotestsrc
-videotestsrc_mime=video/mpeg
-videotestsrc_launch=videotestsrc ! ffenc_mpeg2video ! mpegtsmux
-videotestoverlay_title=Videotestsrc with timeoverlay 2
-videotestoverlay_mime=video/mpeg
-videotestoverlay_launch=videotestsrc ! timeoverlay ! ffenc_mpeg2video ! mpegtsmux
+launch-items=audiotestsrc;videotestsrc;videotestoverlay
+audiotestsrc-title=Audiotestsrc
+audiotestsrc-mime=audio/x-wav
+audiotestsrc-launch=audiotestsrc ! wavenc
+videotestsrc-title=Videotestsrc
+videotestsrc-mime=video/mpeg
+videotestsrc-launch=videotestsrc ! ffenc_mpeg2video ! mpegtsmux
+videotestoverlay-title=Videotestsrc with timeoverlay 2
+videotestoverlay-mime=video/mpeg
+videotestoverlay-launch=videotestsrc ! timeoverlay ! ffenc_mpeg2video ! mpegtsmux
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 91f484f..59643a7 100644
--- a/src/plugins/gst-launch/rygel-gst-launch-root-container.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-root-container.vala
@@ -30,7 +30,7 @@ using Gst;
  */
 public class Rygel.GstLaunch.RootContainer : SimpleContainer {
     const string CONFIG_GROUP = "GstLaunch";
-    const string ITEM_NAMES = "launch_items";
+    const string ITEM_NAMES = "launch-items";
 
     MetaConfig config;
 
@@ -52,11 +52,11 @@ public class Rygel.GstLaunch.RootContainer : SimpleContainer {
     void add_launch_item (string name) {
         try {
             var title = config.get_string (CONFIG_GROUP,
-                                           "%s_title".printf (name));
+                                           "%s-title".printf (name));
             var mime_type = config.get_string (CONFIG_GROUP,
-                                               "%s_mime".printf (name));
+                                               "%s-mime".printf (name));
             var launch_line = config.get_string (CONFIG_GROUP,
-                                                 "%s_launch".printf (name));
+                                                 "%s-launch".printf (name));
 
             this.add_child (new Item (name,
                                       this,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]