libgupnp-dlna: Use encoding-profile from plugins-base

- Give up on the local copy of gstprofile (from gst-convenience) and use
  the encoding-profile api from gst-plugins-base.

- Stop using GstEncodingProfile for in memory representation of the on
  disk XML profiles but rather create GstEncodingProfile on the fly.

- We now use a single GstCaps variable each for audio/video and container
  instead of a GList and merge them as they are processed from the XML file.

3 files changed, 13 insertions, 15 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 31b082a..122be05 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,10 +1,6 @@
 bin_PROGRAMS = gupnp-dlna-info gupnp-dlna-ls-profiles
 
-AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gst-convenience/gst-libs $(GST_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir) $(GST_CFLAGS) $(GST_PBU_CFLAGS)
 LIBS = $(GST_LIBS) \
+       $(GST_PBU_LIBS) \
        $(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.0.la
-
-gupnp_dlna_ls_profiles_LDADD = \
-	     $(top_builddir)/gst-convenience/gst-libs/gst/profile/.libs/libgstprofile-gupnp-dlna-@GST_MAJORMINOR@.la
-
-gupnp_dlna_info_LDADD = $(GST_PBU_LIBS)
diff --git a/tools/gupnp-dlna-info.c b/tools/gupnp-dlna-info.c
index adf291f..c26d56c 100644
--- a/tools/gupnp-dlna-info.c
+++ b/tools/gupnp-dlna-info.c
@@ -38,8 +38,7 @@
 #include <gio/gio.h>
 
 #include <gst/gst.h>
-#include <gst/profile/gstprofile.h>
-#include <gst/pbutils/gstdiscoverer.h>
+#include <gst/pbutils/pbutils.h>
 
 #include <libgupnp-dlna/gupnp-dlna-load.h>
 #include <libgupnp-dlna/gupnp-dlna-profile.h>
diff --git a/tools/gupnp-dlna-ls-profiles.c b/tools/gupnp-dlna-ls-profiles.c
index 7af361b..e6b1a9d 100644
--- a/tools/gupnp-dlna-ls-profiles.c
+++ b/tools/gupnp-dlna-ls-profiles.c
@@ -35,11 +35,11 @@
 #include <libgupnp-dlna/gupnp-dlna-profile.h>
 #include <libgupnp-dlna/gupnp-dlna-discoverer.h>
 
-#include <gst/profile/gstprofile.h>
+#include <gst/pbutils/pbutils.h>
 
 static gboolean verbose = FALSE, relaxed = FALSE;
 
-static void print_caps (GstCaps *caps)
+static void print_caps (const GstCaps *caps)
 {
         int i;
 
@@ -56,12 +56,13 @@ static void print_caps (GstCaps *caps)
 static void
 print_profile (GUPnPDLNAProfile *profile, gpointer unused)
 {
-        const GstEncodingProfile *enc_profile;
-        GList *tmp;
+        GstEncodingProfile *enc_profile;
+        const GList *tmp;
         gchar *caps_str;
 
         enc_profile = gupnp_dlna_profile_get_encoding_profile (profile);
-        tmp = enc_profile->encodingprofiles;
+        tmp = gst_encoding_container_profile_get_profiles
+                                        (GST_ENCODING_CONTAINER_PROFILE (enc_profile));
 
         g_print ("%s %-30s%-35s",
                  gupnp_dlna_profile_get_extended (profile) ? "*" : " ",
@@ -69,12 +70,14 @@ print_profile (GUPnPDLNAProfile *profile, gpointer unused)
                  gupnp_dlna_profile_get_mime (profile));
 
         if (verbose) {
-                caps_str = gst_caps_to_string (enc_profile->format);
+                caps_str = gst_caps_to_string
+                        (gst_encoding_profile_get_format (enc_profile));
                 g_print ("\n`- container: %s\n", caps_str);
                 g_free (caps_str);
 
                 while (tmp) {
-                        print_caps (((GstStreamEncodingProfile *) tmp->data)->format);
+                        print_caps (gst_encoding_profile_get_format
+                                        (GST_ENCODING_PROFILE (tmp->data)));
                         tmp = tmp->next;
                 }
         }