[rygel-gst-0-10-media-engine] Port to new gupnp-dlna API
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-gst-0-10-media-engine] Port to new gupnp-dlna API
- Date: Wed, 13 Feb 2013 15:25:00 +0000 (UTC)
commit a600b1a6aa4f11a6bb407cc10bd4b58855067cff
Author: Jens Georg <jensg openismus com>
Date: Wed Feb 13 13:30:06 2013 +0100
Port to new gupnp-dlna API
configure.ac | 4 ++--
src/rygel-gst-media-engine.c | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b0d6199..283c54a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,10 +28,10 @@ LT_INIT([dlopen disable-static])
dnl Required versions of library packages
LIBRYGEL_SERVER_REQUIRED=0.17.4
-GUPNP_DLNA_REQUIRED=0.5.0
+GUPNP_DLNA_REQUIRED=0.9.5
GSTREAMER_REQUIRED=0.10.36
GSTPBU_REQUIRED=0.10.35
-REQUIRED_MODULES='gio-2.0 rygel-server-2.0 >= $LIBRYGEL_SERVER_REQUIRED gupnp-dlna-1.0 >= $GUPNP_DLNA_REQUIRED gstreamer-0.10 >= $GSTREAMER_REQUIRED gstreamer-base-0.10 >= $GSTREAMER_REQUIRED gstreamer-pbutils-0.10 >= $GSTPBU_REQUIRED'
+REQUIRED_MODULES='gio-2.0 rygel-server-2.0 >= $LIBRYGEL_SERVER_REQUIRED gupnp-dlna-2.0 >= $GUPNP_DLNA_REQUIRED gstreamer-0.10 >= $GSTREAMER_REQUIRED gstreamer-base-0.10 >= $GSTREAMER_REQUIRED gstreamer-pbutils-0.10 >= $GSTPBU_REQUIRED'
PKG_CHECK_MODULES([DEPS], [$REQUIRED_MODULES])
dnl Debugging
diff --git a/src/rygel-gst-media-engine.c b/src/rygel-gst-media-engine.c
index 55f50b9..4fb7655 100644
--- a/src/rygel-gst-media-engine.c
+++ b/src/rygel-gst-media-engine.c
@@ -23,8 +23,7 @@
#include <gee.h>
#include <rygel-core.h>
#include <gst/gst.h>
-#include <libgupnp-dlna/gupnp-dlna-discoverer.h>
-#include <libgupnp-dlna/gupnp-dlna-profile.h>
+#include <libgupnp-dlna/gupnp-dlna.h>
#include "rygel-gst-data-source.h"
#include "rygel-gst-media-engine.h"
#include "rygel-aac-transcoder.h"
@@ -121,7 +120,7 @@ rygel_gst_media_engine_class_init (RygelGstMediaEngineClass *gst_media_engine_cl
static void
rygel_gst_media_engine_init (RygelGstMediaEngine *self) {
- GUPnPDLNADiscoverer *discoverer;
+ GUPnPDLNAProfileGuesser *guesser;
const GList *profile_collection;
GeeArrayList *transcoder_list = NULL;
RygelConfiguration *config;
@@ -139,8 +138,8 @@ rygel_gst_media_engine_init (RygelGstMediaEngine *self) {
* not supported as transcoding profiles - the transcoders
* report their own target DLNA profiles.
*/
- discoverer = gupnp_dlna_discoverer_new ((GstClockTime) GST_SECOND, TRUE, FALSE);
- profile_collection = gupnp_dlna_discoverer_list_profiles (discoverer);
+ guesser = gupnp_dlna_profile_guesser_new (TRUE, FALSE);
+ profile_collection = gupnp_dlna_profile_guesser_list_profiles (guesser);
for (profile_it = profile_collection; profile_it != NULL; profile_it = profile_it->next) {
GUPnPDLNAProfile *profile = GUPNP_DLNA_PROFILE (profile_it->data);
@@ -235,7 +234,7 @@ rygel_gst_media_engine_init (RygelGstMediaEngine *self) {
g_object_unref (config);
g_object_unref (transcoder_list);
- g_object_unref (discoverer);
+ g_object_unref (guesser);
}
RygelMediaEngine*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]