gst-launch: Some cosmetic name changes

- gstlaunch = gst-launch
- GSTLAUNCH = GST_LAUNCH

diff --git a/autogen.sh b/autogen.sh
index a9344e4..1f0d8da 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,4 +4,4 @@ autoreconf -v --install || exit 1
 glib-gettextize --force --copy || exit 1
 ./configure --enable-vala --enable-maintainer-mode --enable-debug \
             --enable-test-plugin --enable-mediathek-plugin \
-           --enable-gstlaunch-plugin "$@"
+           --enable-gst-launch-plugin "$@"

diff --git a/configure.ac b/configure.ac
index a35a76d..b0cfc87 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -198,9 +198,9 @@ AC_ARG_ENABLE(mediathek-plugin,
         enable_mediathek_plugin=no)
 
 # Build GstLaunch plugin
-AC_ARG_ENABLE(gstlaunch-plugin,
-       [  --enable-gstlaunch-plugin          build Gstreamer launchline plugin],,
-        enable_gstlaunch_plugin=no)
+AC_ARG_ENABLE(gst-launch-plugin,
+       [  --enable-gst-launch-plugin          build Gstreamer launchline plugin],,
+        enable_gst_launch_plugin=no)
 
 
 AC_SUBST(abs_top_builddir)
@@ -213,7 +213,7 @@ AM_CONDITIONAL([BUILD_TRACKER_PLUGIN],
 AM_CONDITIONAL([BUILD_MEDIATHEK_PLUGIN], [test "x$enable_mediathek_plugin" = "xyes"])
 AM_CONDITIONAL([BUILD_MEDIA_EXPORT_PLUGIN], [test "x$enable_media_export_plugin" = "xyes"])
 AM_CONDITIONAL([BUILD_EXTERNAL_PLUGIN], [test "x$enable_external_plugin" = "xyes"])
-AM_CONDITIONAL([BUILD_GSTLAUNCH_PLUGIN], [test "x$enable_gstlaunch_plugin" = "xyes"])
+AM_CONDITIONAL([BUILD_GST_LAUNCH_PLUGIN], [test "x$enable_gst_launch_plugin" = "xyes"])
 
 # Gettext
 GETTEXT_PACKAGE=rygel
@@ -236,7 +236,7 @@ src/ui/Makefile
 src/plugins/Makefile
 src/plugins/media-export/Makefile
 src/plugins/external/Makefile
-src/plugins/gstlaunch/Makefile
+src/plugins/gst-launch/Makefile
 src/plugins/mediathek/Makefile
 src/plugins/tracker/Makefile
 src/plugins/test/Makefile
@@ -264,5 +264,5 @@ echo "
         mediathek:              ${enable_mediathek_plugin}
         media-export            ${enable_media_export_plugin}
         external:               ${enable_external_plugin}
-        gstlaunch:              ${enable_gstlaunch_plugin}
+        gst-launch:             ${enable_gst_launch_plugin}
 "

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 707d77f..e7affd8 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -18,8 +18,8 @@ if BUILD_EXTERNAL_PLUGIN
 EXTERNAL_PLUGIN = external
 endif
 
-if BUILD_GSTLAUNCH_PLUGIN
-GSTLAUNCH_PLUGIN = gstlaunch
+if BUILD_GST_LAUNCH_PLUGIN
+GST_LAUNCH_PLUGIN = gst-launch
 endif
 
 SUBDIRS = $(TEST_PLUGIN) \
@@ -27,6 +27,6 @@ SUBDIRS = $(TEST_PLUGIN) \
          $(MEDIATHEK_PLUGIN) \
          $(MEDIA_EXPORT_PLUGIN) \
          $(EXTERNAL_PLUGIN) \
-         $(GSTLAUNCH_PLUGIN)
+         $(GST_LAUNCH_PLUGIN)
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/gstlaunch/Makefile.am b/src/plugins/gst-launch/Makefile.am
similarity index 59%
rename from src/plugins/gstlaunch/Makefile.am
rename to src/plugins/gst-launch/Makefile.am
index 8060e63..0749f58 100644 (file)
--- a/src/plugins/gstlaunch/Makefile.am
+++ b/src/plugins/gst-launch/Makefile.am
@@ -1,6 +1,6 @@
 plugindir = $(libdir)/rygel-1.0
 
-plugin_LTLIBRARIES = librygel-gstlaunch.la
+plugin_LTLIBRARIES = librygel-gst-launch.la
 
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
                $(LIBGUPNP_AV_CFLAGS) \
@@ -10,22 +10,22 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
                -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"' \
                -DSYS_CONFIG_DIR='"$(sysconfdir)"'
 
-librygel_gstlaunch_la_SOURCES = rygel-gstlaunch-plugin.vala \
-                               rygel-gstlaunch-root-container.vala \
-                               rygel-gstlaunch-content-dir.vala \
-                               rygel-gstlaunch-item.vala
+librygel_gst_launch_la_SOURCES = rygel-gst-launch-plugin.vala \
+                               rygel-gst-launch-root-container.vala \
+                               rygel-gst-launch-content-dir.vala \
+                               rygel-gst-launch-item.vala
 
-librygel_gstlaunch_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
+librygel_gst_launch_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
                             --pkg rygel-1.0 --pkg cstuff --pkg gconf-2.0 \
                             --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
                             --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10
 
-librygel_gstlaunch_la_LIBADD = $(LIBGUPNP_LIBS) \
+librygel_gst_launch_la_LIBADD = $(LIBGUPNP_LIBS) \
                               $(LIBGUPNP_AV_LIBS) \
                               $(LIBDBUS_GLIB_LIBS) \
                               $(LIBGSTREAMER_LIBS) \
                               $(GEE_LIBS)
 
-librygel_gstlaunch_la_LDFLAGS = -shared -fPIC -module -avoid-version
+librygel_gst_launch_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/gstlaunch/rygel-gstlaunch-content-dir.vala b/src/plugins/gst-launch/rygel-gst-launch-content-dir.vala
similarity index 100%
rename from src/plugins/gstlaunch/rygel-gstlaunch-content-dir.vala
rename to src/plugins/gst-launch/rygel-gst-launch-content-dir.vala

diff --git a/src/plugins/gstlaunch/rygel-gstlaunch-item.vala b/src/plugins/gst-launch/rygel-gst-launch-item.vala
similarity index 100%
rename from src/plugins/gstlaunch/rygel-gstlaunch-item.vala
rename to src/plugins/gst-launch/rygel-gst-launch-item.vala

diff --git a/src/plugins/gstlaunch/rygel-gstlaunch-plugin.vala b/src/plugins/gst-launch/rygel-gst-launch-plugin.vala
similarity index 100%
rename from src/plugins/gstlaunch/rygel-gstlaunch-plugin.vala
rename to src/plugins/gst-launch/rygel-gst-launch-plugin.vala

diff --git a/src/plugins/gstlaunch/rygel-gstlaunch-root-container.vala b/src/plugins/gst-launch/rygel-gst-launch-root-container.vala
similarity index 100%
rename from src/plugins/gstlaunch/rygel-gstlaunch-root-container.vala
rename to src/plugins/gst-launch/rygel-gst-launch-root-container.vala