[rygel] core,engine-gst: Remove external definitions



commit 7c94302218f2ba6f944674ae80b1b3f32af23632
Author: Jens Georg <mail jensge org>
Date:   Sat May 23 07:17:56 2015 +0200

    core,engine-gst: Remove external definitions
    
    We've moved to GStreamer 1.0 long ago
    
    Signed-off-by: Jens Georg <mail jensge org>

 src/librygel-core/rygel-build-config.vapi          |    3 +++
 .../gstreamer/rygel-gst-media-engine.vala          |    9 +--------
 2 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/src/librygel-core/rygel-build-config.vapi b/src/librygel-core/rygel-build-config.vapi
index 8e3549c..23927ed 100644
--- a/src/librygel-core/rygel-build-config.vapi
+++ b/src/librygel-core/rygel-build-config.vapi
@@ -63,4 +63,7 @@ public class Rygel.BuildConfig {
 
     [CCode (cname = "ENGINE_DIR")]
     public static const string ENGINE_DIR;
+
+    [CCode (cname = "PRESET_DIR")]
+    public static const string PRESET_DIR;
 }
diff --git a/src/media-engines/gstreamer/rygel-gst-media-engine.vala 
b/src/media-engines/gstreamer/rygel-gst-media-engine.vala
index 211d131..e4704b6 100644
--- a/src/media-engines/gstreamer/rygel-gst-media-engine.vala
+++ b/src/media-engines/gstreamer/rygel-gst-media-engine.vala
@@ -27,13 +27,6 @@ using Gst;
 using Gee;
 using GUPnP;
 
-// Remove for GStreamer 1.0
-[CCode (cname = "PRESET_DIR")]
-internal extern static const string PRESET_DIR;
-
-[CCode (cname="gst_preset_set_app_dir")]
-extern bool gst_preset_set_app_dir (string app_dir);
-
 public class Rygel.GstMediaEngine : Rygel.MediaEngine {
     private GLib.List<DLNAProfile> dlna_profiles = null;
     private GLib.List<GstTranscoder> transcoders = null;
@@ -42,7 +35,7 @@ public class Rygel.GstMediaEngine : Rygel.MediaEngine {
         unowned string[] args = null;
 
         Gst.init (ref args);
-        gst_preset_set_app_dir (PRESET_DIR);
+        Gst.preset_set_app_dir (BuildConfig.PRESET_DIR);
 
         /* Get the possible DLNA profiles
          * to add to the list of DLNA profiles supported by


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