renderer-gst,playbin: Move plugin class

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3375943..b236597 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,6 +38,7 @@ src/plugins/mpris/rygel-mpris-player.vala
 src/plugins/mpris/rygel-mpris-plugin.vala
 src/plugins/mpris/rygel-mpris-plugin-factory.vala
 src/plugins/mpris/rygel-mpris-interfaces.vala
+src/plugins/playbin/rygel-playbin-plugin.vala
 src/plugins/tracker/rygel-tracker-category-all-container.vala
 src/plugins/tracker/rygel-tracker-category-container.vala
 src/plugins/tracker/rygel-tracker-insertion-query.vala
@@ -77,7 +78,6 @@ src/librygel-core/rygel-resource-info.vala
 src/librygel-core/rygel-root-device-factory.vala
 src/librygel-core/rygel-root-device.vala
 src/librygel-core/rygel-state-machine.vala
-src/librygel-renderer-gst/rygel-playbin-plugin.vala
 src/librygel-renderer-gst/rygel-playbin-renderer.vala
 src/librygel-renderer/rygel-av-transport.vala
 src/librygel-renderer/rygel-changelog.vala

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index b74bbc9..62e3488 100644 (file)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -33,7 +33,6 @@ src/librygel-core/rygel-root-device-factory.c
 src/librygel-core/rygel-state-machine.c
 src/librygel-core/rygel-xml-utils.c
 src/librygel-renderer-gst/rygel-playbin-player.c
-src/librygel-renderer-gst/rygel-playbin-plugin.c
 src/librygel-renderer-gst/rygel-playbin-renderer.c
 src/librygel-renderer/rygel-av-transport.c
 src/librygel-renderer/rygel-changelog.c
@@ -175,7 +174,8 @@ src/plugins/mpris/rygel-mpris-interfaces.c
 src/plugins/mpris/rygel-mpris-player.c
 src/plugins/mpris/rygel-mpris-plugin.c
 src/plugins/mpris/rygel-mpris-plugin-factory.c
-src/plugins/playbin/rygel-module.c
+src/plugins/playbin/rygel-playbin-module.c
+src/plugins/playbin/rygel-playbin-plugin.c
 src/plugins/tracker/rygel-tracker-albums.c
 src/plugins/tracker/rygel-tracker-artists.c
 src/plugins/tracker/rygel-tracker-category-all-container.c

diff --git a/src/librygel-renderer-gst/filelist.am b/src/librygel-renderer-gst/filelist.am
index 379a9be..351a37b 100644 (file)
--- a/src/librygel-renderer-gst/filelist.am
+++ b/src/librygel-renderer-gst/filelist.am
@@ -1,6 +1,5 @@
 LIBRYGEL_RENDERER_GST_VAPI_SOURCE_FILES = \
        rygel-playbin-player.vala \
-       rygel-playbin-plugin.vala \
        rygel-playbin-renderer.vala
 
 LIBRYGEL_RENDERER_GST_NONVAPI_SOURCE_FILES = 

diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index cb1c0d0..8fbd26e 100644 (file)
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS += -DG_LOG_DOMAIN='"Playbin"' \
        -I$(top_srcdir)/src/librygel-renderer-gst \
        $(LIBGSTREAMER_CFLAGS)
 
-librygel_playbin_la_SOURCES = rygel-module.vala
+librygel_playbin_la_SOURCES = rygel-playbin-module.vala rygel-playbin-plugin.vala
 librygel_playbin_la_VALAFLAGS = \
        --pkg rygel-renderer-gst-2.0 \
        --vapidir $(top_srcdir)/src/librygel-renderer-gst \

diff --git a/src/plugins/playbin/rygel-module.vala b/src/plugins/playbin/rygel-playbin-module.vala
similarity index 100%
rename from src/plugins/playbin/rygel-module.vala
rename to src/plugins/playbin/rygel-playbin-module.vala

diff --git a/src/librygel-renderer-gst/rygel-playbin-plugin.vala b/src/plugins/playbin/rygel-playbin-plugin.vala
similarity index 87%
rename from src/librygel-renderer-gst/rygel-playbin-plugin.vala
rename to src/plugins/playbin/rygel-playbin-plugin.vala
index ce556af..1f73db0 100644 (file)
--- a/src/librygel-renderer-gst/rygel-playbin-plugin.vala
+++ b/src/plugins/playbin/rygel-playbin-plugin.vala
@@ -28,12 +28,7 @@
 using Rygel;
 using Gee;
 
-/**
- * Implementation of RygelMediaRendererPlugin for GStreamer.
- *
- * This class is useful only when implementing Rygel plugins.
- */
-public class Rygel.Playbin.Plugin : Rygel.MediaRendererPlugin {
+internal class Rygel.Playbin.Plugin : Rygel.MediaRendererPlugin {
     public const string NAME = "Playbin";
 
     public Plugin () {