From e33fd41c9044b7bcbf702db3970ac2caa79f1b18 Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Mon, 2 Aug 2010 14:57:30 +0300 Subject: [PATCH] core,gst-renderer,i18n: GstRenderer -> Playbin Rename GstRenderer plugin to Playbin. --- configure.ac | 14 ++++---- po/POTFILES.in | 4 +-- po/POTFILES.skip | 4 +-- src/plugins/Makefile.am | 6 ++-- src/plugins/gst-renderer/Makefile.am | 38 ---------------------- src/plugins/playbin/Makefile.am | 38 ++++++++++++++++++++++ .../rygel-playbin-player.vala} | 2 +- .../rygel-playbin-plugin.vala} | 8 ++--- .../rygel-playbin-time.vala} | 2 +- 9 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 src/plugins/gst-renderer/Makefile.am create mode 100644 src/plugins/playbin/Makefile.am rename src/plugins/{gst-renderer/rygel-gst-renderer-player.vala => playbin/rygel-playbin-player.vala} (98%) rename src/plugins/{gst-renderer/rygel-gst-renderer-plugin.vala => playbin/rygel-playbin-plugin.vala} (84%) rename src/plugins/{gst-renderer/rygel-gst-renderer-time.vala => playbin/rygel-playbin-time.vala} (97%) diff --git a/configure.ac b/configure.ac index d02a04a..2a71350 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ fi if test ! -e src/rygel/rygel_vala.stamp -o \ ! -e src/rygel/librygel_configuration_a_vala.stamp -o \ ! -e src/ui/rygel_preferences_vala.stamp -o \ - ! -e src/plugins/gst-renderer/librygel_gst_renderer_la_vala.stamp -o \ + ! -e src/plugins/playbin/librygel_playbin_la_vala.stamp -o \ ! -e src/plugins/tracker/librygel_media_tracker_la_vala.stamp -o \ ! -e src/plugins/test/librygel_test_la_vala.stamp -o \ ! -e src/plugins/media-export/librygel_media_export_la_vala.stamp -o \ @@ -247,9 +247,9 @@ AC_ARG_ENABLE(external-plugin, enable_external_plugin=yes) # Build GstRenderer plugin -AC_ARG_ENABLE(gst-renderer-plugin, - [ --enable-gst-renderer_plugin build Gstreamer Renderer plugin],, - enable_gst_renderer_plugin=yes) +AC_ARG_ENABLE(playbin-plugin, + [ --enable-playbin_plugin build Gstreamer Playbin plugin],, + enable_playbin_plugin=yes) # Build Mediathek plugin AC_ARG_ENABLE(mediathek-plugin, @@ -272,7 +272,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_GST_RENDERER_PLUGIN], [test "x$enable_gst_renderer_plugin" = "xyes"]) +AM_CONDITIONAL([BUILD_PLAYBIN_PLUGIN], [test "x$enable_playbin_plugin" = "xyes"]) AM_CONDITIONAL([BUILD_GST_LAUNCH_PLUGIN], [test "x$enable_gst_launch_plugin" = "xyes"]) if test "x$enable_media_export_plugin" = "xyes"; @@ -305,7 +305,7 @@ src/plugins/external/Makefile src/plugins/gst-launch/Makefile src/plugins/mediathek/Makefile src/plugins/tracker/Makefile -src/plugins/gst-renderer/Makefile +src/plugins/playbin/Makefile src/plugins/test/Makefile data/Makefile data/xml/Makefile @@ -340,5 +340,5 @@ echo " media-export ${enable_media_export_plugin} external: ${enable_external_plugin} gst-launch: ${enable_gst_launch_plugin} - gst-renderer: ${enable_gst_renderer_plugin} + playbin: ${enable_playbin_plugin} " diff --git a/po/POTFILES.in b/po/POTFILES.in index d5adb57..abe3907 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -20,8 +20,8 @@ src/plugins/external/rygel-external-thumbnail-factory.vala src/plugins/gst-launch/rygel-gst-launch-item.vala src/plugins/gst-launch/rygel-gst-launch-plugin.vala src/plugins/gst-launch/rygel-gst-launch-root-container.vala -src/plugins/gst-renderer/rygel-gst-renderer-player.vala -src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala +src/plugins/playbin/rygel-playbin-player.vala +src/plugins/playbin/rygel-playbin-plugin.vala src/plugins/media-export/rygel-media-export-database.vala src/plugins/media-export/rygel-media-export-db-container.vala src/plugins/media-export/rygel-media-export-db-object-factory.vala diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 22aa5d7..2955877 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,5 +1,5 @@ -src/plugins/gst-renderer/rygel-gst-renderer-player.c -src/plugins/gst-renderer/rygel-gst-renderer-plugin.c +src/plugins/playbin/rygel-playbin-player.c +src/plugins/playbin/rygel-playbin-plugin.c src/plugins/media-export/rygel-media-export-database.c src/plugins/media-export/rygel-media-export-db.c src/plugins/media-export/rygel-media-export-media-cache.c diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index f0528e8..f6ed4a3 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -22,8 +22,8 @@ if BUILD_GST_LAUNCH_PLUGIN GST_LAUNCH_PLUGIN = gst-launch endif -if BUILD_GST_RENDERER_PLUGIN -GST_RENDERER = gst-renderer +if BUILD_PLAYBIN_PLUGIN +PLAYBIN = playbin endif SUBDIRS = $(TEST_PLUGIN) \ @@ -32,6 +32,6 @@ SUBDIRS = $(TEST_PLUGIN) \ $(MEDIA_EXPORT_PLUGIN) \ $(EXTERNAL_PLUGIN) \ $(GST_LAUNCH_PLUGIN) \ - $(GST_RENDERER) + $(PLAYBIN) MAINTAINERCLEANFILES = Makefile.in diff --git a/src/plugins/gst-renderer/Makefile.am b/src/plugins/gst-renderer/Makefile.am deleted file mode 100644 index b943da9..0000000 --- a/src/plugins/gst-renderer/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -if UNINSTALLED -shareddir = $(abs_top_builddir)/data -else -shareddir = $(datadir)/rygel -endif - -plugindir = $(libdir)/rygel-1.0 - -plugin_LTLIBRARIES = librygel-gst-renderer.la - -AM_CFLAGS = $(LIBGUPNP_CFLAGS) \ - $(LIBGUPNP_AV_CFLAGS) \ - $(GEE_CFLAGS) \ - $(LIBDBUS_GLIB_CFLAGS) \ - $(LIBGSTREAMER_CFLAGS) \ - $(UUID_CFLAGS) \ - -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"' \ - -include config.h - -librygel_gst_renderer_la_SOURCES = rygel-gst-renderer-player.vala \ - rygel-gst-renderer-plugin.vala \ - rygel-gst-renderer-time.vala - -librygel_gst_renderer_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \ - --vapidir=$(srcdir) \ - --pkg rygel-1.0 --pkg rygel-build-config \ - --pkg gupnp-1.0 --pkg gupnp-av-1.0 \ - --pkg gee-1.0 --pkg gstreamer-0.10 -g - -librygel_gst_renderer_la_LIBADD = $(LIBGUPNP_LIBS) \ - $(LIBGUPNP_AV_LIBS) \ - $(LIBGSTREAMER_LIBS) \ - $(LIBDBUS_GLIB_LIBS) \ - $(GEE_LIBS) \ - $(UUID_LIBS) -librygel_gst_renderer_la_LDFLAGS = -shared -fPIC -module -avoid-version - -MAINTAINERCLEANFILES = Makefile.in diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am new file mode 100644 index 0000000..f8e59d6 --- /dev/null +++ b/src/plugins/playbin/Makefile.am @@ -0,0 +1,38 @@ +if UNINSTALLED +shareddir = $(abs_top_builddir)/data +else +shareddir = $(datadir)/rygel +endif + +plugindir = $(libdir)/rygel-1.0 + +plugin_LTLIBRARIES = librygel-playbin.la + +AM_CFLAGS = $(LIBGUPNP_CFLAGS) \ + $(LIBGUPNP_AV_CFLAGS) \ + $(GEE_CFLAGS) \ + $(LIBDBUS_GLIB_CFLAGS) \ + $(LIBGSTREAMER_CFLAGS) \ + $(UUID_CFLAGS) \ + -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"' \ + -include config.h + +librygel_playbin_la_SOURCES = rygel-playbin-player.vala \ + rygel-playbin-plugin.vala \ + rygel-playbin-time.vala + +librygel_playbin_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \ + --vapidir=$(srcdir) \ + --pkg rygel-1.0 --pkg rygel-build-config \ + --pkg gupnp-1.0 --pkg gupnp-av-1.0 \ + --pkg gee-1.0 --pkg gstreamer-0.10 -g + +librygel_playbin_la_LIBADD = $(LIBGUPNP_LIBS) \ + $(LIBGUPNP_AV_LIBS) \ + $(LIBGSTREAMER_LIBS) \ + $(LIBDBUS_GLIB_LIBS) \ + $(GEE_LIBS) \ + $(UUID_LIBS) +librygel_playbin_la_LDFLAGS = -shared -fPIC -module -avoid-version + +MAINTAINERCLEANFILES = Makefile.in diff --git a/src/plugins/gst-renderer/rygel-gst-renderer-player.vala b/src/plugins/playbin/rygel-playbin-player.vala similarity index 98% rename from src/plugins/gst-renderer/rygel-gst-renderer-player.vala rename to src/plugins/playbin/rygel-playbin-player.vala index 5b71509..a02c41a 100644 --- a/src/plugins/gst-renderer/rygel-gst-renderer-player.vala +++ b/src/plugins/playbin/rygel-playbin-player.vala @@ -23,7 +23,7 @@ using Gst; -public class Rygel.GstRenderer.Player : GLib.Object, Rygel.MediaPlayer { +public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer { private const string[] protocols = { "http-get", "rtsp" }; private const string[] mime_types = { "audio/mpeg", diff --git a/src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala b/src/plugins/playbin/rygel-playbin-plugin.vala similarity index 84% rename from src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala rename to src/plugins/playbin/rygel-playbin-plugin.vala index 981976a..0fd27ef 100644 --- a/src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala +++ b/src/plugins/playbin/rygel-playbin-plugin.vala @@ -26,18 +26,18 @@ using Rygel; using Gee; public void module_init (PluginLoader loader) { - var plugin = new GstRenderer.Plugin (); + var plugin = new Playbin.Plugin (); loader.add_plugin (plugin); } -public class Rygel.GstRenderer.Plugin : Rygel.MediaRendererPlugin { +public class Rygel.Playbin.Plugin : Rygel.MediaRendererPlugin { public Plugin () { - base ("GstRenderer", _("GStreamer Renderer")); + base ("Playbin", _("GStreamer Player")); } public override MediaPlayer? get_player () { - return GstRenderer.Player.get_default (); + return Playbin.Player.get_default (); } } diff --git a/src/plugins/gst-renderer/rygel-gst-renderer-time.vala b/src/plugins/playbin/rygel-playbin-time.vala similarity index 97% rename from src/plugins/gst-renderer/rygel-gst-renderer-time.vala rename to src/plugins/playbin/rygel-playbin-time.vala index 9e2ef30..80a46b6 100644 --- a/src/plugins/gst-renderer/rygel-gst-renderer-time.vala +++ b/src/plugins/playbin/rygel-playbin-time.vala @@ -25,7 +25,7 @@ using Gst; // Helper class for converting between Gstreamer time units and string // representations of time. -private class Rygel.GstRenderer.Time { +private class Rygel.Playbin.Time { public static ClockTime from_string (string str) { uint64 hours, minutes, seconds; -- 2.7.4