[rygel] all: Move Rygel.DLNAProfile into core



commit e4a87003f4d9550020bb743d38299600a1806fe8
Author: Jens Georg <mail jensge org>
Date:   Sat Feb 8 07:32:00 2014 +0100

    all: Move Rygel.DLNAProfile into core
    
    Signed-off-by: Jens Georg <mail jensge org>

 .../librygel-core/gtkdoc/librygel-core-docs.xml    |    1 +
 .../vala/example-renderer-plugin-vala.vala         |    6 +-
 src/librygel-core/filelist.am                      |    1 +
 .../rygel-dlna-profile.vala                        |    0
 .../rygel-playbin-player.vala                      |    1 -
 src/librygel-renderer/filelist.am                  |    1 -
 src/librygel-renderer/rygel-dlna-profile.vala      |   44 --------------------
 .../rygel-media-renderer-plugin.vala               |    2 -
 src/librygel-server/filelist.am                    |    1 -
 9 files changed, 5 insertions(+), 52 deletions(-)
---
diff --git a/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml 
b/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml
index 41d3f08..3b73135 100644
--- a/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml
+++ b/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml
@@ -40,6 +40,7 @@
     <xi:include href="xml/rygel-meta-config.xml"/>
     <xi:include href="xml/rygel-xml-utils.xml"/>
     <xi:include href="xml/rygel-state-machine.xml"/>
+    <xi:include href="xml/rygel-dlna-profile.xml"/>
   </chapter>
   
   <chapter id="api-main-list-dbus">
diff --git a/examples/renderer-plugins/vala/example-renderer-plugin-vala.vala 
b/examples/renderer-plugins/vala/example-renderer-plugin-vala.vala
index 53f6303..d02cfe7 100644
--- a/examples/renderer-plugins/vala/example-renderer-plugin-vala.vala
+++ b/examples/renderer-plugins/vala/example-renderer-plugin-vala.vala
@@ -61,9 +61,9 @@ public class Rygel.Example.RendererPluginVala : Rygel.MediaRendererPlugin {
 
     public override void constructed () {
         base.constructed ();
-        var l = new List<Rygel.Renderer.DLNAProfile> ();
-        l.prepend (new Rygel.Renderer.DLNAProfile ("JPEG_SM", "image/jpeg"));
-        l.prepend (new Rygel.Renderer.DLNAProfile ("MP3", "audio/mpeg"));
+        var l = new List<DLNAProfile> ();
+        l.prepend (new DLNAProfile ("JPEG_SM", "image/jpeg"));
+        l.prepend (new DLNAProfile ("MP3", "audio/mpeg"));
 
         this.supported_profiles = l;
     }
diff --git a/src/librygel-core/filelist.am b/src/librygel-core/filelist.am
index 94f2caf..70c00ec 100644
--- a/src/librygel-core/filelist.am
+++ b/src/librygel-core/filelist.am
@@ -6,6 +6,7 @@ LIBRYGEL_CORE_VAPI_SOURCE_FILES = \
        rygel-basic-management-test-nslookup.vala \
        rygel-basic-management-test-traceroute.vala \
        rygel-description-file.vala \
+       rygel-dlna-profile.vala \
        rygel-root-device.vala \
        rygel-root-device-factory.vala \
        rygel-dbus-interface.vala \
diff --git a/src/librygel-server/rygel-dlna-profile.vala b/src/librygel-core/rygel-dlna-profile.vala
similarity index 100%
rename from src/librygel-server/rygel-dlna-profile.vala
rename to src/librygel-core/rygel-dlna-profile.vala
diff --git a/src/librygel-renderer-gst/rygel-playbin-player.vala 
b/src/librygel-renderer-gst/rygel-playbin-player.vala
index defae5e..3582013 100644
--- a/src/librygel-renderer-gst/rygel-playbin-player.vala
+++ b/src/librygel-renderer-gst/rygel-playbin-player.vala
@@ -29,7 +29,6 @@
 
 using Gst;
 using GUPnP;
-using Rygel.Renderer;
 
 /**
  * Implementation of RygelMediaPlayer for GStreamer.
diff --git a/src/librygel-renderer/filelist.am b/src/librygel-renderer/filelist.am
index def56e5..3f5cb08 100644
--- a/src/librygel-renderer/filelist.am
+++ b/src/librygel-renderer/filelist.am
@@ -1,7 +1,6 @@
 LIBRYGEL_RENDERER_VAPI_SOURCE_FILES = \
        rygel-media-renderer-plugin.vala \
        rygel-media-player.vala \
-       rygel-dlna-profile.vala \
        rygel-media-renderer.vala
 
 LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES = \
diff --git a/src/librygel-renderer/rygel-media-renderer-plugin.vala 
b/src/librygel-renderer/rygel-media-renderer-plugin.vala
index ebb0ebe..c6abf2c 100644
--- a/src/librygel-renderer/rygel-media-renderer-plugin.vala
+++ b/src/librygel-renderer/rygel-media-renderer-plugin.vala
@@ -22,8 +22,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-using Rygel.Renderer;
-
 /**
  * This is the base class for every Rygel UPnP renderer plugin.
  *
diff --git a/src/librygel-server/filelist.am b/src/librygel-server/filelist.am
index 4aa3fb9..f40d699 100644
--- a/src/librygel-server/filelist.am
+++ b/src/librygel-server/filelist.am
@@ -1,7 +1,6 @@
 
 LIBRYGEL_SERVER_VAPI_SOURCE_FILES = \
        rygel-audio-item.vala \
-       rygel-dlna-profile.vala \
        rygel-image-item.vala \
        rygel-logical-expression.vala \
        rygel-media-art-store.vala \


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