diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-06-10 14:59:03 +0200 |
|---|---|---|
| committer | Regis Merlino <regis.merlino@intel.com> | 2013-06-10 14:59:03 +0200 |
| commit | a214f7f395fe3b23618607c618737f7dfb845311 (patch) | |
| tree | c7115d8217f95c759183a1edb0b99124804f3885 | |
| parent | 7d5232fe027428fbb8d8e453a4ac8d23dffcdcf6 (diff) | |
| download | GUPnP-AV-a214f7f395fe3b23618607c618737f7dfb845311.tar.gz GUPnP-AV-a214f7f395fe3b23618607c618737f7dfb845311.tar.bz2 GUPnP-AV-a214f7f395fe3b23618607c618737f7dfb845311.zip | |
Update gupnp-av to 0.12.2 (1a991fe)
43 files changed, 297 insertions, 141 deletions
@@ -1,3 +1,29 @@ +0.12.2 +====== + +Changes since 0.12.1: +- Fix VAPI generation if GObject-introspection version is >= 1.36. +- Fix vala bindings for LastChangeParser.parse_last_change. +- Small improvement to resource matching. +- Fix DIDLLiteContainer.get_total_deleted_child_count return value. +- Fix compiling with -Wall -Werror. +- Fix gtk-doc warnings. + +All contributors to this release: + Jens Georg <mail@jensge.org> + Ludovic Ferrandis <ludovic.ferrandis@intel.com> + +0.12.1 +====== + +Changes since 0.12.0: +- Fix compiler warnings. +- Update .gitignore. + +All contributors to this release: + Andreas Henriksson <andreas@fatal.se> + Krzesimir Nowak <qdlacz@gmail.com> + 0.12.0 ====== @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gupnp-av 0.12.0. +# Generated by GNU Autoconf 2.69 for gupnp-av 0.12.2. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=GUPnP>. # @@ -651,8 +651,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gupnp-av' PACKAGE_TARNAME='gupnp-av' -PACKAGE_VERSION='0.12.0' -PACKAGE_STRING='gupnp-av 0.12.0' +PACKAGE_VERSION='0.12.2' +PACKAGE_STRING='gupnp-av 0.12.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=GUPnP' PACKAGE_URL='http://www.gupnp.org/' @@ -1425,7 +1425,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gupnp-av 0.12.0 to adapt to many kinds of systems. +\`configure' configures gupnp-av 0.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1495,7 +1495,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gupnp-av 0.12.0:";; + short | recursive ) echo "Configuration of gupnp-av 0.12.2:";; esac cat <<\_ACEOF @@ -1621,7 +1621,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gupnp-av configure 0.12.0 +gupnp-av configure 0.12.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1899,7 +1899,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gupnp-av $as_me 0.12.0, which was +It was created by gupnp-av $as_me 0.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2723,7 +2723,7 @@ fi # Define the identity of the package. PACKAGE='gupnp-av' - VERSION='0.12.0' + VERSION='0.12.2' cat >>confdefs.h <<_ACEOF @@ -12451,8 +12451,23 @@ fi # vapigen +have_vapigen=no if test "x$found_introspection" = "xyes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether G-I is 1.36 or newer" >&5 +$as_echo_n "checking whether G-I is 1.36 or newer... " >&6; } + VAPIGEN_MIN_VERSION=0.14 + if pkg-config --atleast-version=1.36.0 gobject-introspection-1.0; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + VAPIGEN_MIN_VERSION=0.20 + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi # Extract the first word of "vapigen", so it can be a program name with args. set dummy vapigen; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -12497,11 +12512,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala API Generator found. You will not be able to generate .vapi files." >&5 $as_echo "$as_me: WARNING: No Vala API Generator found. You will not be able to generate .vapi files." >&2;} else - if test -n "0.14"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VAPIGEN is at least version 0.14" >&5 -$as_echo_n "checking $VAPIGEN is at least version 0.14... " >&6; } + if test -n "$VAPIGEN_MIN_VERSION"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VAPIGEN is at least version $VAPIGEN_MIN_VERSION" >&5 +$as_echo_n "checking $VAPIGEN is at least version $VAPIGEN_MIN_VERSION... " >&6; } am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` - as_arg_v1=0.14 + as_arg_v1=$VAPIGEN_MIN_VERSION as_arg_v2="$am__vapigen_version" awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( @@ -12514,8 +12529,10 @@ $as_echo "yes" >&6; } ;; #( 2) : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Vala API Generator 0.14 not found." >&5 -$as_echo "$as_me: WARNING: Vala API Generator 0.14 not found." >&2;} ;; #( + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Vala API Generator $VAPIGEN_MIN_VERSION not found." >&5 +$as_echo "$as_me: WARNING: Vala API Generator $VAPIGEN_MIN_VERSION not found." >&2;} + VAPIGEN="" + ;; #( *) : ;; esac @@ -12525,6 +12542,9 @@ fi fi +if test "x$VAPIGEN" != "x"; then : + have_vapigen=yes +fi if test "x$VAPIGEN" != "x"; then HAVE_VAPIGEN_TRUE= HAVE_VAPIGEN_FALSE='#' @@ -12537,7 +12557,6 @@ fi - # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -13413,7 +13432,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gupnp-av $as_me 0.12.0, which was +This file was extended by gupnp-av $as_me 0.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13480,7 +13499,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gupnp-av config.status 0.12.0 +gupnp-av config.status 0.12.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15262,3 +15281,12 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +echo " + ${PACKAGE} ${VERSION} + --------------------- + + Prefix: ${prefix} + GObject-Introspection: ${found_introspection} + VALA bindings: ${have_vapigen} +" diff --git a/configure.ac b/configure.ac index fc1af0c..7a559b3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([gupnp-av], - [0.12.0], + [0.12.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=GUPnP], [gupnp-av], [http://www.gupnp.org/]) @@ -44,14 +44,24 @@ fi GOBJECT_INTROSPECTION_CHECK([0.9.5]) # vapigen +have_vapigen=no AS_IF([test "x$found_introspection" = "xyes"], [ - VALA_PROG_VAPIGEN([0.14]) + dnl output of g-i >= 1.36.0 needs vapigen >= 0.20 to process + AC_MSG_CHECKING([whether G-I is 1.36 or newer]) + VAPIGEN_MIN_VERSION=0.14 + AS_IF([pkg-config --atleast-version=1.36.0 gobject-introspection-1.0], + [ + AC_MSG_RESULT([yes]) + VAPIGEN_MIN_VERSION=0.20 + ],[AC_MSG_RESULT([no])] + ) + GUPNP_PROG_VAPIGEN([$VAPIGEN_MIN_VERSION]) ] ) +AS_IF([test "x$VAPIGEN" != "x"], [have_vapigen=yes]) AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VAPIGEN" != "x"]) - GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) AC_CONFIG_FILES([ @@ -67,3 +77,12 @@ gupnp-av-1.0.pc gupnp-av-1.0-uninstalled.pc ]) AC_OUTPUT + +echo " + ${PACKAGE} ${VERSION} + --------------------- + + Prefix: ${prefix} + GObject-Introspection: ${found_introspection} + VALA bindings: ${have_vapigen} +" diff --git a/doc/Makefile.am b/doc/Makefile.am index e9091ab..9d1f9b1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -51,6 +51,8 @@ CFILE_GLOB=$(top_srcdir)/libgupnp-av/*.c # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES= \ xml-util.h \ + xsd-data.h \ + fragment-util.h \ gvalue-util.h \ gupnp-av-marshal.h \ gupnp-didl-lite-contributor-private.h \ diff --git a/doc/Makefile.in b/doc/Makefile.in index d9cb08e..c11da8a 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -272,6 +272,8 @@ CFILE_GLOB = $(top_srcdir)/libgupnp-av/*.c # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES = \ xml-util.h \ + xsd-data.h \ + fragment-util.h \ gvalue-util.h \ gupnp-av-marshal.h \ gupnp-didl-lite-contributor-private.h \ diff --git a/doc/gupnp-av-sections.txt b/doc/gupnp-av-sections.txt index e373bc6..79970f3 100644 --- a/doc/gupnp-av-sections.txt +++ b/doc/gupnp-av-sections.txt @@ -60,6 +60,7 @@ gupnp_didl_lite_object_get_title_xml_string gupnp_didl_lite_object_get_track_number_xml_string gupnp_didl_lite_object_get_update_id gupnp_didl_lite_object_get_upnp_class_xml_string +gupnp_didl_lite_object_get_xml_string gupnp_didl_lite_object_set_update_id gupnp_didl_lite_object_unset_artists gupnp_didl_lite_object_unset_update_id @@ -283,7 +284,6 @@ gupnp_didl_lite_contributor_get_type <SECTION> <FILE>gupnp-didl-lite-create-class</FILE> <TITLE>GUPnPDIDLLiteCreateClass</TITLE> -GUPnPDIDLLiteCreateClass gupnp_didl_lite_create_class_get_content gupnp_didl_lite_create_class_set_content gupnp_didl_lite_create_class_get_include_derived @@ -299,6 +299,7 @@ GUPNP_IS_DIDL_LITE_CREATE_CLASS GUPNP_IS_DIDL_LITE_CREATE_CLASS_CLASS GUPNP_TYPE_DIDL_LITE_CREATE_CLASS <SUBSECTION Private> +GUPnPDIDLLiteCreateClass GUPnPDIDLLiteCreateClassPrivate gupnp_didl_lite_create_class_get_type </SECTION> diff --git a/doc/html/GUPnPCDSLastChangeParser.html b/doc/html/GUPnPCDSLastChangeParser.html index e32f9f0..80867d8 100644 --- a/doc/html/GUPnPCDSLastChangeParser.html +++ b/doc/html/GUPnPCDSLastChangeParser.html @@ -100,6 +100,40 @@ CDS's LastChange state variable. GUPNP_CDS_LAST_CHANGE_EVENT_ST_DONE } GUPnPCDSLastChangeEvent; </pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="GUPNP-CDS-LAST-CHANGE-EVENT-INVALID:CAPS"></a><span class="term"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_INVALID</code></span></p></td> +<td>Invalid <a class="link" href="GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEntry"><span class="type">GUPnPCDSLastChangeEntry</span></a>. +</td> +</tr> +<tr> +<td><p><a name="GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-ADDED:CAPS"></a><span class="term"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED</code></span></p></td> +<td>The <a class="link" href="GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEntry"><span class="type">GUPnPCDSLastChangeEntry</span></a> is +an object added event. +</td> +</tr> +<tr> +<td><p><a name="GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-REMOVED:CAPS"></a><span class="term"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_REMOVED</code></span></p></td> +<td>The <a class="link" href="GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEntry"><span class="type">GUPnPCDSLastChangeEntry</span></a> +is an object removal event. +</td> +</tr> +<tr> +<td><p><a name="GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-MODIFIED:CAPS"></a><span class="term"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_MODIFIED</code></span></p></td> +<td>The <a class="link" href="GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEntry"><span class="type">GUPnPCDSLastChangeEntry</span></a> +is an object modification event. +</td> +</tr> +<tr> +<td><p><a name="GUPNP-CDS-LAST-CHANGE-EVENT-ST-DONE:CAPS"></a><span class="term"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_ST_DONE</code></span></p></td> +<td>The <a class="link" href="GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEntry"><span class="type">GUPnPCDSLastChangeEntry</span></a> is a +subtree update done event. +</td> +</tr> +</tbody> +</table></div> </div> <hr> <div class="refsect2"> @@ -224,7 +258,7 @@ Get the type of the last change entry as defined in <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td>An event from the <a class="link" href="GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEvent" title="enum GUPnPCDSLastChangeEvent"><span class="type">GUPnPCDSLastChangeEvent</span></a> or -<code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_INVALID</code> if the entry is not valid.</td> +<a class="link" href="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-INVALID:CAPS"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_INVALID</code></a> if the entry is not valid.</td> </tr> </tbody> </table></div> @@ -261,7 +295,7 @@ Get the ID of the object in this change entry. <p> Get the parent object id of the object in this change entry. This is only valid if <a class="link" href="GUPnPCDSLastChangeParser.html#gupnp-cds-last-change-entry-get-event" title="gupnp_cds_last_change_entry_get_event ()"><code class="function">gupnp_cds_last_change_entry_get_event()</code></a> returns -<code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED</code>. +<a class="link" href="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-ADDED:CAPS"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -287,7 +321,7 @@ valid if <a class="link" href="GUPnPCDSLastChangeParser.html#gupnp-cds-last-chan <p> Get the class of the object in this change entry. This is only valid if <a class="link" href="GUPnPCDSLastChangeParser.html#gupnp-cds-last-change-entry-get-event" title="gupnp_cds_last_change_entry_get_event ()"><code class="function">gupnp_cds_last_change_entry_get_event()</code></a> returns -<code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED</code>. +<a class="link" href="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-ADDED:CAPS"><code class="literal">GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff --git a/doc/html/GUPnPDIDLLiteContributor.html b/doc/html/GUPnPDIDLLiteContributor.html index d7a9ffd..e218b09 100644 --- a/doc/html/GUPnPDIDLLiteContributor.html +++ b/doc/html/GUPnPDIDLLiteContributor.html @@ -68,7 +68,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="GUPnP <pre class="synopsis"> "<a class="link" href="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--name" title='The "name" property'>name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write "<a class="link" href="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--role" title='The "role" property'>role</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only + "<a class="link" href="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only "<a class="link" href="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--xml-node" title='The "xml-node" property'>xml-node</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only </pre> </div> @@ -233,7 +233,7 @@ The role of this contributor. <hr> <div class="refsect2"> <a name="GUPnPDIDLLiteContributor--xml-doc"></a><h3>The <code class="literal">"xml-doc"</code> property</h3> -<pre class="programlisting"> "xml-doc" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only</pre> +<pre class="programlisting"> "xml-doc" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only</pre> <p> The reference to XML document containing this object. </p> diff --git a/doc/html/GUPnPDIDLLiteDescriptor.html b/doc/html/GUPnPDIDLLiteDescriptor.html index 589e0fd..0ffbafe 100644 --- a/doc/html/GUPnPDIDLLiteDescriptor.html +++ b/doc/html/GUPnPDIDLLiteDescriptor.html @@ -78,7 +78,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="GUPnP "<a class="link" href="GUPnPDIDLLiteDescriptor.html#GUPnPDIDLLiteDescriptor--id" title='The "id" property'>id</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write "<a class="link" href="GUPnPDIDLLiteDescriptor.html#GUPnPDIDLLiteDescriptor--metadata-type" title='The "metadata-type" property'>metadata-type</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write "<a class="link" href="GUPnPDIDLLiteDescriptor.html#GUPnPDIDLLiteDescriptor--name-space" title='The "name-space" property'>name-space</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="GUPnPDIDLLiteDescriptor.html#GUPnPDIDLLiteDescriptor--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only + "<a class="link" href="GUPnPDIDLLiteDescriptor.html#GUPnPDIDLLiteDescriptor--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only "<a class="link" href="GUPnPDIDLLiteDescriptor.html#GUPnPDIDLLiteDescriptor--xml-node" title='The "xml-node" property'>xml-node</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only </pre> </div> @@ -361,7 +361,7 @@ The name space associated with this descriptor. <hr> <div class="refsect2"> <a name="GUPnPDIDLLiteDescriptor--xml-doc"></a><h3>The <code class="literal">"xml-doc"</code> property</h3> -<pre class="programlisting"> "xml-doc" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only</pre> +<pre class="programlisting"> "xml-doc" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only</pre> <p> The reference to XML document containing this object. </p> diff --git a/doc/html/GUPnPDIDLLiteObject.html b/doc/html/GUPnPDIDLLiteObject.html index 544c527..42b9079 100644 --- a/doc/html/GUPnPDIDLLiteObject.html +++ b/doc/html/GUPnPDIDLLiteObject.html @@ -159,6 +159,8 @@ const <span class="returnvalue">char</span> * <a class="link" href="GUPnP (<em class="parameter"><code><a class="link" href="GUPnPDIDLLiteObject.html" title="GUPnPDIDLLiteObject"><span class="type">GUPnPDIDLLiteObject</span></a> *object</code></em>); <span class="returnvalue">char</span> * <a class="link" href="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-upnp-class-xml-string" title="gupnp_didl_lite_object_get_upnp_class_xml_string ()">gupnp_didl_lite_object_get_upnp_class_xml_string</a> (<em class="parameter"><code><a class="link" href="GUPnPDIDLLiteObject.html" title="GUPnPDIDLLiteObject"><span class="type">GUPnPDIDLLiteObject</span></a> *object</code></em>); +<span class="returnvalue">char</span> * <a class="link" href="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-xml-string" title="gupnp_didl_lite_object_get_xml_string ()">gupnp_didl_lite_object_get_xml_string</a> + (<em class="parameter"><code><a class="link" href="GUPnPDIDLLiteObject.html" title="GUPnPDIDLLiteObject"><span class="type">GUPnPDIDLLiteObject</span></a> *object</code></em>); <span class="returnvalue">void</span> <a class="link" href="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-set-update-id" title="gupnp_didl_lite_object_set_update_id ()">gupnp_didl_lite_object_set_update_id</a> (<em class="parameter"><code><a class="link" href="GUPnPDIDLLiteObject.html" title="GUPnPDIDLLiteObject"><span class="type">GUPnPDIDLLiteObject</span></a> *object</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> update_id</code></em>); @@ -202,7 +204,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="GUPnP "<a class="link" href="GUPnPDIDLLiteObject.html#GUPnPDIDLLiteObject--upnp-class" title='The "upnp-class" property'>upnp-class</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write "<a class="link" href="GUPnPDIDLLiteObject.html#GUPnPDIDLLiteObject--upnp-namespace" title='The "upnp-namespace" property'>upnp-namespace</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only "<a class="link" href="GUPnPDIDLLiteObject.html#GUPnPDIDLLiteObject--write-status" title='The "write-status" property'>write-status</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="GUPnPDIDLLiteObject.html#GUPnPDIDLLiteObject--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only + "<a class="link" href="GUPnPDIDLLiteObject.html#GUPnPDIDLLiteObject--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only "<a class="link" href="GUPnPDIDLLiteObject.html#GUPnPDIDLLiteObject--xml-node" title='The "xml-node" property'>xml-node</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only </pre> </div> @@ -1710,6 +1712,29 @@ object UPnP class. </div> <hr> <div class="refsect2"> +<a name="gupnp-didl-lite-object-get-xml-string"></a><h3>gupnp_didl_lite_object_get_xml_string ()</h3> +<pre class="programlisting"><span class="returnvalue">char</span> * gupnp_didl_lite_object_get_xml_string + (<em class="parameter"><code><a class="link" href="GUPnPDIDLLiteObject.html" title="GUPnPDIDLLiteObject"><span class="type">GUPnPDIDLLiteObject</span></a> *object</code></em>);</pre> +<p> +Get the representation of this object as an XML string. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td> +<td><a class="link" href="GUPnPDIDLLiteObject.html" title="GUPnPDIDLLiteObject"><span class="type">GUPnPDIDLLiteObject</span></a></td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>XML representation of this object as string. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> <a name="gupnp-didl-lite-object-set-update-id"></a><h3>gupnp_didl_lite_object_set_update_id ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gupnp_didl_lite_object_set_update_id (<em class="parameter"><code><a class="link" href="GUPnPDIDLLiteObject.html" title="GUPnPDIDLLiteObject"><span class="type">GUPnPDIDLLiteObject</span></a> *object</code></em>, @@ -1984,7 +2009,7 @@ The write status of this object. <hr> <div class="refsect2"> <a name="GUPnPDIDLLiteObject--xml-doc"></a><h3>The <code class="literal">"xml-doc"</code> property</h3> -<pre class="programlisting"> "xml-doc" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only</pre> +<pre class="programlisting"> "xml-doc" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only</pre> <p> The reference to XML document containing this object. </p> diff --git a/doc/html/GUPnPDIDLLiteResource.html b/doc/html/GUPnPDIDLLiteResource.html index dc29d40..c7371c8 100644 --- a/doc/html/GUPnPDIDLLiteResource.html +++ b/doc/html/GUPnPDIDLLiteResource.html @@ -140,7 +140,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="GUPnP "<a class="link" href="GUPnPDIDLLiteResource.html#GUPnPDIDLLiteResource--update-count" title='The "update-count" property'>update-count</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write "<a class="link" href="GUPnPDIDLLiteResource.html#GUPnPDIDLLiteResource--uri" title='The "uri" property'>uri</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write "<a class="link" href="GUPnPDIDLLiteResource.html#GUPnPDIDLLiteResource--width" title='The "width" property'>width</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> : Read / Write - "<a class="link" href="GUPnPDIDLLiteResource.html#GUPnPDIDLLiteResource--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only + "<a class="link" href="GUPnPDIDLLiteResource.html#GUPnPDIDLLiteResource--xml-doc" title='The "xml-doc" property'>xml-doc</a>" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only "<a class="link" href="GUPnPDIDLLiteResource.html#GUPnPDIDLLiteResource--xml-node" title='The "xml-node" property'>xml-node</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Read / Write / Construct Only </pre> </div> @@ -1142,7 +1142,7 @@ The width of this image/video resource. <hr> <div class="refsect2"> <a name="GUPnPDIDLLiteResource--xml-doc"></a><h3>The <code class="literal">"xml-doc"</code> property</h3> -<pre class="programlisting"> "xml-doc" <span class="type">GUPnPXMLDoc</span>* : Write / Construct Only</pre> +<pre class="programlisting"> "xml-doc" <a href="../gupnp/GUPnPXMLDoc.html"><span class="type">GUPnPXMLDoc</span></a>* : Write / Construct Only</pre> <p> The reference to XML document containing this object. </p> diff --git a/doc/html/GUPnPLastChangeParser.html b/doc/html/GUPnPLastChangeParser.html index 51bfd5a..d94bbb0 100644 --- a/doc/html/GUPnPLastChangeParser.html +++ b/doc/html/GUPnPLastChangeParser.html @@ -167,7 +167,7 @@ Parses the xml fragment from a LastChange event. <td>The location where to store any error, or NULL</td> </tr> <tr> -<td><p><span class="term"><em class="parameter"><code>Varargs</code></em> :</span></p></td> +<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td> <td>tuples of state variable name, state variable type, and state variable value location, terminated with NULL. The state variable values should be freed after use.</td> diff --git a/doc/html/ch01.html b/doc/html/ch01.html index 6d32cb3..feb5333 100644 --- a/doc/html/ch01.html +++ b/doc/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp982128"></a>GUPnP A/V</h2></div></div></div> +<a name="idp175408"></a>GUPnP A/V</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="GUPnPDIDLLiteParser.html">GUPnPDIDLLiteParser</a></span><span class="refpurpose"> — A/V DIDL-Lite XML parser</span> diff --git a/doc/html/ch02.html b/doc/html/ch02.html index 5a7d010..f433bfe 100644 --- a/doc/html/ch02.html +++ b/doc/html/ch02.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp4206528"></a>Error Codes</h2></div></div></div> +<a name="idp454544"></a>Error Codes</h2></div></div></div> <div class="toc"><dl><dt> <span class="refentrytitle"><a href="gupnp-av-Error-codes.html">Error codes</a></span><span class="refpurpose"> — Error domains and codes.</span> </dt></dl></div> diff --git a/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html b/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html index 5c86625..709bc51 100644 --- a/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html +++ b/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html @@ -37,48 +37,37 @@ </tr></table></div> <div class="refsynopsisdiv"> <a name="gupnp-av-GUPnPDIDLLiteCreateClass.synopsis"></a><h2>Synopsis</h2> -<pre class="synopsis"> <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass">GUPnPDIDLLiteCreateClass</a>; -const <span class="returnvalue">char</span> * <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-content" title="gupnp_didl_lite_create_class_get_content ()">gupnp_didl_lite_create_class_get_content</a> - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>); +<pre class="synopsis">const <span class="returnvalue">char</span> * <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-content" title="gupnp_didl_lite_create_class_get_content ()">gupnp_didl_lite_create_class_get_content</a> + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>); <span class="returnvalue">void</span> <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-set-content" title="gupnp_didl_lite_create_class_set_content ()">gupnp_didl_lite_create_class_set_content</a> - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>, + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>, <em class="parameter"><code>const <span class="type">char</span> *content</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-include-derived" title="gupnp_didl_lite_create_class_get_include_derived ()">gupnp_didl_lite_create_class_get_include_derived</a> - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>); + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>); <span class="returnvalue">void</span> <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-set-include-derived" title="gupnp_didl_lite_create_class_set_include_derived ()">gupnp_didl_lite_create_class_set_include_derived</a> - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>, + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> include_derived</code></em>); const <span class="returnvalue">char</span> * <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-friendly-name" title="gupnp_didl_lite_create_class_get_friendly_name ()">gupnp_didl_lite_create_class_get_friendly_name</a> - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>); + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>); <span class="returnvalue">void</span> <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-set-friendly-name" title="gupnp_didl_lite_create_class_set_friendly_name ()">gupnp_didl_lite_create_class_set_friendly_name</a> - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>, + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>, <em class="parameter"><code>const <span class="type">char</span> *friendly_name</code></em>); <span class="returnvalue">xmlNode</span> * <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-xml-node" title="gupnp_didl_lite_create_class_get_xml_node ()">gupnp_didl_lite_create_class_get_xml_node</a> - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>); + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>); </pre> </div> <div class="refsect1"> <a name="gupnp-av-GUPnPDIDLLiteCreateClass.description"></a><h2>Description</h2> <p> -<a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> respresents a DIDL-Lite create class element. +<span class="type">GUPnPDIDLLiteCreateClass</span> respresents a DIDL-Lite create class element. </p> </div> <div class="refsect1"> <a name="gupnp-av-GUPnPDIDLLiteCreateClass.details"></a><h2>Details</h2> <div class="refsect2"> -<a name="GUPnPDIDLLiteCreateClass"></a><h3>GUPnPDIDLLiteCreateClass</h3> -<pre class="programlisting">typedef struct { - GObject parent; - - GUPnPDIDLLiteCreateClassPrivate *priv; -} GUPnPDIDLLiteCreateClass; -</pre> -</div> -<hr> -<div class="refsect2"> <a name="gupnp-didl-lite-create-class-get-content"></a><h3>gupnp_didl_lite_create_class_get_content ()</h3> <pre class="programlisting">const <span class="returnvalue">char</span> * gupnp_didl_lite_create_class_get_content - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>);</pre> + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>);</pre> <p> Get the content of the <em class="parameter"><code>create_class</code></em>. </p> @@ -87,7 +76,7 @@ Get the content of the <em class="parameter"><code>create_class</code></em>. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>create_class</code></em> :</span></p></td> -<td><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a></td> +<td><span class="type">GUPnPDIDLLiteCreateClass</span></td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> @@ -100,7 +89,7 @@ Get the content of the <em class="parameter"><code>create_class</code></em>. <div class="refsect2"> <a name="gupnp-didl-lite-create-class-set-content"></a><h3>gupnp_didl_lite_create_class_set_content ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gupnp_didl_lite_create_class_set_content - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>, + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>, <em class="parameter"><code>const <span class="type">char</span> *content</code></em>);</pre> <p> Set the content of the <em class="parameter"><code>create_class</code></em>. @@ -110,7 +99,7 @@ Set the content of the <em class="parameter"><code>create_class</code></em>. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>create_class</code></em> :</span></p></td> -<td><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a></td> +<td><span class="type">GUPnPDIDLLiteCreateClass</span></td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>content</code></em> :</span></p></td> @@ -123,7 +112,7 @@ Set the content of the <em class="parameter"><code>create_class</code></em>. <div class="refsect2"> <a name="gupnp-didl-lite-create-class-get-include-derived"></a><h3>gupnp_didl_lite_create_class_get_include_derived ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gupnp_didl_lite_create_class_get_include_derived - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>);</pre> + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>);</pre> <p> Checks whether <em class="parameter"><code>create_class</code></em> can be derived. </p> @@ -132,7 +121,7 @@ Checks whether <em class="parameter"><code>create_class</code></em> can be deriv <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>create_class</code></em> :</span></p></td> -<td><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a></td> +<td><span class="type">GUPnPDIDLLiteCreateClass</span></td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> @@ -146,7 +135,7 @@ Checks whether <em class="parameter"><code>create_class</code></em> can be deriv <div class="refsect2"> <a name="gupnp-didl-lite-create-class-set-include-derived"></a><h3>gupnp_didl_lite_create_class_set_include_derived ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gupnp_didl_lite_create_class_set_include_derived - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>, + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> include_derived</code></em>);</pre> <p> (Un)set the derivability of create_class. @@ -156,7 +145,7 @@ Checks whether <em class="parameter"><code>create_class</code></em> can be deriv <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>create_class</code></em> :</span></p></td> -<td><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a></td> +<td><span class="type">GUPnPDIDLLiteCreateClass</span></td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>include_derived</code></em> :</span></p></td> @@ -169,7 +158,7 @@ Checks whether <em class="parameter"><code>create_class</code></em> can be deriv <div class="refsect2"> <a name="gupnp-didl-lite-create-class-get-friendly-name"></a><h3>gupnp_didl_lite_create_class_get_friendly_name ()</h3> <pre class="programlisting">const <span class="returnvalue">char</span> * gupnp_didl_lite_create_class_get_friendly_name - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>);</pre> + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>);</pre> <p> Get the friendly name of the <em class="parameter"><code>create_class</code></em>. </p> @@ -178,7 +167,7 @@ Get the friendly name of the <em class="parameter"><code>create_class</code></em <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>create_class</code></em> :</span></p></td> -<td><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a></td> +<td><span class="type">GUPnPDIDLLiteCreateClass</span></td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> @@ -191,7 +180,7 @@ Get the friendly name of the <em class="parameter"><code>create_class</code></em <div class="refsect2"> <a name="gupnp-didl-lite-create-class-set-friendly-name"></a><h3>gupnp_didl_lite_create_class_set_friendly_name ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gupnp_didl_lite_create_class_set_friendly_name - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>, + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>, <em class="parameter"><code>const <span class="type">char</span> *friendly_name</code></em>);</pre> <p> Set the friendly name of the <em class="parameter"><code>create_class</code></em>. @@ -201,7 +190,7 @@ Set the friendly name of the <em class="parameter"><code>create_class</code></em <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>create_class</code></em> :</span></p></td> -<td><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a></td> +<td><span class="type">GUPnPDIDLLiteCreateClass</span></td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>friendly_name</code></em> :</span></p></td> @@ -214,7 +203,7 @@ Set the friendly name of the <em class="parameter"><code>create_class</code></em <div class="refsect2"> <a name="gupnp-didl-lite-create-class-get-xml-node"></a><h3>gupnp_didl_lite_create_class_get_xml_node ()</h3> <pre class="programlisting"><span class="returnvalue">xmlNode</span> * gupnp_didl_lite_create_class_get_xml_node - (<em class="parameter"><code><a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> *create_class</code></em>);</pre> + (<em class="parameter"><code><span class="type">GUPnPDIDLLiteCreateClass</span> *create_class</code></em>);</pre> <p> Get the pointer to relevant node in XML document. </p> @@ -223,7 +212,7 @@ Get the pointer to relevant node in XML document. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>create_class</code></em> :</span></p></td> -<td>The <a class="link" href="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass" title="GUPnPDIDLLiteCreateClass"><span class="type">GUPnPDIDLLiteCreateClass</span></a> +<td>The <span class="type">GUPnPDIDLLiteCreateClass</span> </td> </tr> <tr> diff --git a/doc/html/gupnp-av.devhelp2 b/doc/html/gupnp-av.devhelp2 index 190c732..b0093a2 100644 --- a/doc/html/gupnp-av.devhelp2 +++ b/doc/html/gupnp-av.devhelp2 @@ -91,6 +91,7 @@ <keyword type="function" name="gupnp_didl_lite_object_get_track_number_xml_string ()" link="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-track-number-xml-string"/> <keyword type="function" name="gupnp_didl_lite_object_get_update_id ()" link="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-update-id"/> <keyword type="function" name="gupnp_didl_lite_object_get_upnp_class_xml_string ()" link="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-upnp-class-xml-string"/> + <keyword type="function" name="gupnp_didl_lite_object_get_xml_string ()" link="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-xml-string"/> <keyword type="function" name="gupnp_didl_lite_object_set_update_id ()" link="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-set-update-id"/> <keyword type="function" name="gupnp_didl_lite_object_unset_artists ()" link="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-unset-artists"/> <keyword type="function" name="gupnp_didl_lite_object_unset_update_id ()" link="GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-unset-update-id"/> @@ -239,7 +240,6 @@ <keyword type="property" name="The "role" property" link="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--role"/> <keyword type="property" name="The "xml-doc" property" link="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--xml-doc"/> <keyword type="property" name="The "xml-node" property" link="GUPnPDIDLLiteContributor.html#GUPnPDIDLLiteContributor--xml-node"/> - <keyword type="struct" name="GUPnPDIDLLiteCreateClass" link="gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass"/> <keyword type="function" name="gupnp_didl_lite_create_class_get_content ()" link="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-content"/> <keyword type="function" name="gupnp_didl_lite_create_class_set_content ()" link="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-set-content"/> <keyword type="function" name="gupnp_didl_lite_create_class_get_include_derived ()" link="gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-include-derived"/> @@ -349,6 +349,11 @@ <keyword type="constant" name="GUPNP_DIDL_LITE_FRAGMENT_RESULT_READONLY_TAG" link="GUPnPDIDLLiteObject.html#GUPNP-DIDL-LITE-FRAGMENT-RESULT-READONLY-TAG:CAPS"/> <keyword type="constant" name="GUPNP_DIDL_LITE_FRAGMENT_RESULT_MISMATCH" link="GUPnPDIDLLiteObject.html#GUPNP-DIDL-LITE-FRAGMENT-RESULT-MISMATCH:CAPS"/> <keyword type="constant" name="GUPNP_DIDL_LITE_FRAGMENT_RESULT_UNKNOWN_ERROR" link="GUPnPDIDLLiteObject.html#GUPNP-DIDL-LITE-FRAGMENT-RESULT-UNKNOWN-ERROR:CAPS"/> + <keyword type="constant" name="GUPNP_CDS_LAST_CHANGE_EVENT_INVALID" link="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-INVALID:CAPS"/> + <keyword type="constant" name="GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED" link="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-ADDED:CAPS"/> + <keyword type="constant" name="GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_REMOVED" link="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-REMOVED:CAPS"/> + <keyword type="constant" name="GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_MODIFIED" link="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-MODIFIED:CAPS"/> + <keyword type="constant" name="GUPNP_CDS_LAST_CHANGE_EVENT_ST_DONE" link="GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-ST-DONE:CAPS"/> <keyword type="constant" name="GUPNP_SEARCH_CRITERIA_OP_EQ" link="GUPnPSearchCriteriaParser.html#GUPNP-SEARCH-CRITERIA-OP-EQ:CAPS"/> <keyword type="constant" name="GUPNP_SEARCH_CRITERIA_OP_NEQ" link="GUPnPSearchCriteriaParser.html#GUPNP-SEARCH-CRITERIA-OP-NEQ:CAPS"/> <keyword type="constant" name="GUPNP_SEARCH_CRITERIA_OP_LESS" link="GUPnPSearchCriteriaParser.html#GUPNP-SEARCH-CRITERIA-OP-LESS:CAPS"/> diff --git a/doc/html/index.html b/doc/html/index.html index aef1106..8b5bd15 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -14,13 +14,13 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GUPnP A/V Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">Version 0.12.0 +<div><p class="releaseinfo">Version 0.12.2 </p></div> <div><p class="copyright">Copyright © 2007,2008 OpenedHand LTD</p></div> <div><p class="copyright">Copyright © 2007,2008 Zeeshan Ali <zeenix@gmail.com></p></div> <div><p class="copyright">Copyright © 2009,2010 Nokia Corporation</p></div> <div><div class="legalnotice"> -<a name="idp3804448"></a><p> +<a name="idp167184"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU Free Documentation License</em>, Version 1.1 or any later diff --git a/doc/html/index.sgml b/doc/html/index.sgml index 45af4ce..58a6a3d 100644 --- a/doc/html/index.sgml +++ b/doc/html/index.sgml @@ -91,6 +91,7 @@ <ANCHOR id="gupnp-didl-lite-object-get-track-number-xml-string" href="gupnp-av/GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-track-number-xml-string"> <ANCHOR id="gupnp-didl-lite-object-get-update-id" href="gupnp-av/GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-update-id"> <ANCHOR id="gupnp-didl-lite-object-get-upnp-class-xml-string" href="gupnp-av/GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-upnp-class-xml-string"> +<ANCHOR id="gupnp-didl-lite-object-get-xml-string" href="gupnp-av/GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-get-xml-string"> <ANCHOR id="gupnp-didl-lite-object-set-update-id" href="gupnp-av/GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-set-update-id"> <ANCHOR id="gupnp-didl-lite-object-unset-artists" href="gupnp-av/GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-unset-artists"> <ANCHOR id="gupnp-didl-lite-object-unset-update-id" href="gupnp-av/GUPnPDIDLLiteObject.html#gupnp-didl-lite-object-unset-update-id"> @@ -286,7 +287,6 @@ <ANCHOR id="gupnp-av-GUPnPDIDLLiteCreateClass.synopsis" href="gupnp-av/gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-av-GUPnPDIDLLiteCreateClass.synopsis"> <ANCHOR id="gupnp-av-GUPnPDIDLLiteCreateClass.description" href="gupnp-av/gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-av-GUPnPDIDLLiteCreateClass.description"> <ANCHOR id="gupnp-av-GUPnPDIDLLiteCreateClass.details" href="gupnp-av/gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-av-GUPnPDIDLLiteCreateClass.details"> -<ANCHOR id="GUPnPDIDLLiteCreateClass" href="gupnp-av/gupnp-av-GUPnPDIDLLiteCreateClass.html#GUPnPDIDLLiteCreateClass"> <ANCHOR id="gupnp-didl-lite-create-class-get-content" href="gupnp-av/gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-content"> <ANCHOR id="gupnp-didl-lite-create-class-set-content" href="gupnp-av/gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-set-content"> <ANCHOR id="gupnp-didl-lite-create-class-get-include-derived" href="gupnp-av/gupnp-av-GUPnPDIDLLiteCreateClass.html#gupnp-didl-lite-create-class-get-include-derived"> @@ -311,6 +311,11 @@ <ANCHOR id="GUPnPCDSLastChangeParser.details" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeParser.details"> <ANCHOR id="GUPnPCDSLastChangeParser-struct" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeParser-struct"> <ANCHOR id="GUPnPCDSLastChangeEvent" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEvent"> +<ANCHOR id="GUPNP-CDS-LAST-CHANGE-EVENT-INVALID:CAPS" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-INVALID:CAPS"> +<ANCHOR id="GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-ADDED:CAPS" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-ADDED:CAPS"> +<ANCHOR id="GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-REMOVED:CAPS" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-REMOVED:CAPS"> +<ANCHOR id="GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-MODIFIED:CAPS" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-OBJECT-MODIFIED:CAPS"> +<ANCHOR id="GUPNP-CDS-LAST-CHANGE-EVENT-ST-DONE:CAPS" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPNP-CDS-LAST-CHANGE-EVENT-ST-DONE:CAPS"> <ANCHOR id="GUPnPCDSLastChangeEntry-struct" href="gupnp-av/GUPnPCDSLastChangeParser.html#GUPnPCDSLastChangeEntry-struct"> <ANCHOR id="gupnp-cds-last-change-parser-new" href="gupnp-av/GUPnPCDSLastChangeParser.html#gupnp-cds-last-change-parser-new"> <ANCHOR id="gupnp-cds-last-change-parser-parse" href="gupnp-av/GUPnPCDSLastChangeParser.html#gupnp-cds-last-change-parser-parse"> diff --git a/doc/version.xml b/doc/version.xml index ac454c6..26acbf0 100644 --- a/doc/version.xml +++ b/doc/version.xml @@ -1 +1 @@ -0.12.0 +0.12.2 diff --git a/libgupnp-av/gupnp-cds-last-change-parser.c b/libgupnp-av/gupnp-cds-last-change-parser.c index d51d385..71dbbea 100644 --- a/libgupnp-av/gupnp-cds-last-change-parser.c +++ b/libgupnp-av/gupnp-cds-last-change-parser.c @@ -59,12 +59,12 @@ G_DEFINE_BOXED_TYPE (GUPnPCDSLastChangeEntry, gupnp_cds_last_change_entry_unref); static void -gupnp_cds_last_change_parser_init (GUPnPCDSLastChangeParser *parser) +gupnp_cds_last_change_parser_init (G_GNUC_UNUSED GUPnPCDSLastChangeParser *parser) { } static void -gupnp_cds_last_change_parser_class_init (GUPnPCDSLastChangeParserClass *klass) +gupnp_cds_last_change_parser_class_init (G_GNUC_UNUSED GUPnPCDSLastChangeParserClass *klass) { } diff --git a/libgupnp-av/gupnp-cds-last-change-parser.h b/libgupnp-av/gupnp-cds-last-change-parser.h index 8c29d4f..8e7483b 100644 --- a/libgupnp-av/gupnp-cds-last-change-parser.h +++ b/libgupnp-av/gupnp-cds-last-change-parser.h @@ -68,6 +68,18 @@ struct _GUPnPCDSLastChangeParserClass { GObjectClass parent_class; }; +/** + * GUPnPCDSLastChangeEvent: + * @GUPNP_CDS_LAST_CHANGE_EVENT_INVALID: Invalid #GUPnPCDSLastChangeEntry. + * @GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED: The #GUPnPCDSLastChangeEntry is + * an object added event. + * @GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_REMOVED: The #GUPnPCDSLastChangeEntry + * is an object removal event. + * @GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_MODIFIED: The #GUPnPCDSLastChangeEntry + * is an object modification event. + * @GUPNP_CDS_LAST_CHANGE_EVENT_ST_DONE: The #GUPnPCDSLastChangeEntry is a + * subtree update done event. + */ typedef enum GUPnPCDSLastChangeEvent { GUPNP_CDS_LAST_CHANGE_EVENT_INVALID, GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED, diff --git a/libgupnp-av/gupnp-didl-lite-container.c b/libgupnp-av/gupnp-didl-lite-container.c index 16a535a..b817863 100644 --- a/libgupnp-av/gupnp-didl-lite-container.c +++ b/libgupnp-av/gupnp-didl-lite-container.c @@ -53,7 +53,7 @@ enum { }; static void -gupnp_didl_lite_container_init (GUPnPDIDLLiteContainer *container) +gupnp_didl_lite_container_init (G_GNUC_UNUSED GUPnPDIDLLiteContainer *container) { /* Nothing to initialize, yay! */ } @@ -367,7 +367,7 @@ gupnp_didl_lite_container_get_total_deleted_child_count return xml_util_get_uint_child_element (xml_node, "totalDeletedChildCount", - 0); + -1); } /** diff --git a/libgupnp-av/gupnp-didl-lite-createclass.h b/libgupnp-av/gupnp-didl-lite-createclass.h index 7df5935..fd94093 100644 --- a/libgupnp-av/gupnp-didl-lite-createclass.h +++ b/libgupnp-av/gupnp-didl-lite-createclass.h @@ -57,9 +57,13 @@ gupnp_didl_lite_create_class_get_type (void) G_GNUC_CONST; typedef struct _GUPnPDIDLLiteCreateClassPrivate GUPnPDIDLLiteCreateClassPrivate; +/** + * GUPnPDIDLLiteCreateClass: + **/ typedef struct { GObject parent; + /*< private >*/ GUPnPDIDLLiteCreateClassPrivate *priv; } GUPnPDIDLLiteCreateClass; diff --git a/libgupnp-av/gupnp-didl-lite-item.c b/libgupnp-av/gupnp-didl-lite-item.c index ab38cb6..f007f9b 100644 --- a/libgupnp-av/gupnp-didl-lite-item.c +++ b/libgupnp-av/gupnp-didl-lite-item.c @@ -44,7 +44,7 @@ enum { }; static void -gupnp_didl_lite_item_init (GUPnPDIDLLiteItem *item) +gupnp_didl_lite_item_init (G_GNUC_UNUSED GUPnPDIDLLiteItem *item) { /* Nothing to initialize, yay! */ } diff --git a/libgupnp-av/gupnp-didl-lite-object.c b/libgupnp-av/gupnp-didl-lite-object.c index 5e527bc..35a55fd 100644 --- a/libgupnp-av/gupnp-didl-lite-object.c +++ b/libgupnp-av/gupnp-didl-lite-object.c @@ -790,13 +790,10 @@ gupnp_didl_lite_object_class_init (GUPnPDIDLLiteObjectClass *klass) static gboolean is_resource_compatible (GUPnPDIDLLiteResource *resource, - const char *sink_protocol_info) + char **protocols) { gboolean ret = FALSE; - char **protocols, **it; - - protocols = g_strsplit (sink_protocol_info, ",", 0); - + char **it; for (it = protocols; *it != NULL && !ret; it++) { GUPnPProtocolInfo *info; @@ -813,8 +810,6 @@ is_resource_compatible (GUPnPDIDLLiteResource *resource, g_object_unref (info); } - g_strfreev (protocols); - return ret; } @@ -1557,6 +1552,7 @@ gupnp_didl_lite_object_get_compat_resource GList *resources = NULL; GList *compat_resources = NULL; GList *res; + char **protocols = NULL; g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); g_return_val_if_fail (sink_protocol_info != NULL, NULL); @@ -1565,15 +1561,18 @@ gupnp_didl_lite_object_get_compat_resource if (resources == NULL) return NULL; + protocols = g_strsplit (sink_protocol_info, ",", -1); for (res = resources; res != NULL; res = res->next) { resource = (GUPnPDIDLLiteResource *) res->data; - if (is_resource_compatible (resource, sink_protocol_info)) + if (is_resource_compatible (resource, protocols)) compat_resources = g_list_append (compat_resources, resource); } + g_strfreev (protocols); + protocols = NULL; resource = NULL; diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c index 086c2cc..bbf5c25 100644 --- a/libgupnp-av/gupnp-didl-lite-parser.c +++ b/libgupnp-av/gupnp-didl-lite-parser.c @@ -87,7 +87,7 @@ parse_elements (GUPnPDIDLLiteParser *parser, GError **error); static void -gupnp_didl_lite_parser_init (GUPnPDIDLLiteParser *parser) +gupnp_didl_lite_parser_init (G_GNUC_UNUSED GUPnPDIDLLiteParser *parser) { } diff --git a/libgupnp-av/gupnp-didl-lite-resource.c b/libgupnp-av/gupnp-didl-lite-resource.c index 041976a..754548d 100644 --- a/libgupnp-av/gupnp-didl-lite-resource.c +++ b/libgupnp-av/gupnp-didl-lite-resource.c @@ -105,9 +105,9 @@ return_point: } static void -on_protocol_info_changed (GUPnPProtocolInfo *info, - GParamSpec *pspec, - gpointer user_data) +on_protocol_info_changed (GUPnPProtocolInfo *info, + G_GNUC_UNUSED GParamSpec *pspec, + gpointer user_data) { GUPnPDIDLLiteResource *resource = GUPNP_DIDL_LITE_RESOURCE (user_data); diff --git a/libgupnp-av/gupnp-didl-lite-writer.c b/libgupnp-av/gupnp-didl-lite-writer.c index 9ab0654..bd57138 100644 --- a/libgupnp-av/gupnp-didl-lite-writer.c +++ b/libgupnp-av/gupnp-didl-lite-writer.c @@ -184,8 +184,7 @@ is_standard_prop (const char *name, static void filter_attributes (xmlNode *node, - GList *allowed, - GUPnPDIDLLiteWriter *writer) + GList *allowed) { xmlAttr *attr; GList *forbidden = NULL; @@ -219,7 +218,7 @@ filter_node (xmlNode *node, const char *container_class = NULL; if (!tags_only) - filter_attributes (node, allowed, writer); + filter_attributes (node, allowed); if (strcmp ((const char *) node->name, "container") == 0) { is_container = TRUE; @@ -545,7 +544,6 @@ gupnp_didl_lite_writer_add_container_child_item { xmlNode *item_node, *container_node; GUPnPDIDLLiteObject *object; - GUPnPXMLDoc *doc; g_return_val_if_fail (GUPNP_IS_DIDL_LITE_CONTAINER (container), NULL); diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c index 0f69277..02d49c4 100644 --- a/libgupnp-av/gupnp-feature-list-parser.c +++ b/libgupnp-av/gupnp-feature-list-parser.c @@ -39,7 +39,7 @@ G_DEFINE_TYPE (GUPnPFeatureListParser, G_TYPE_OBJECT); static void -gupnp_feature_list_parser_init (GUPnPFeatureListParser *parser) +gupnp_feature_list_parser_init (G_GNUC_UNUSED GUPnPFeatureListParser *parser) { /* Nothing to do here */ } @@ -118,9 +118,10 @@ get_feature_object_ids (xmlNode *feature) * features or %NULL if an error occured. **/ GList * -gupnp_feature_list_parser_parse_text (GUPnPFeatureListParser *parser, - const char *text, - GError **error) +gupnp_feature_list_parser_parse_text + (G_GNUC_UNUSED GUPnPFeatureListParser *parser, + const char *text, + GError **error) { xmlDoc *doc; xmlNode *element; diff --git a/libgupnp-av/gupnp-last-change-parser.c b/libgupnp-av/gupnp-last-change-parser.c index cddddd8..c22bcaf 100644 --- a/libgupnp-av/gupnp-last-change-parser.c +++ b/libgupnp-av/gupnp-last-change-parser.c @@ -42,7 +42,7 @@ G_DEFINE_TYPE (GUPnPLastChangeParser, G_TYPE_OBJECT); static void -gupnp_last_change_parser_init (GUPnPLastChangeParser *parser) +gupnp_last_change_parser_init (G_GNUC_UNUSED GUPnPLastChangeParser *parser) { } @@ -147,11 +147,11 @@ gupnp_last_change_parser_new (void) **/ gboolean gupnp_last_change_parser_parse_last_change_valist - (GUPnPLastChangeParser *parser, - guint instance_id, - const char *last_change_xml, - GError **error, - va_list var_args) + (G_GNUC_UNUSED GUPnPLastChangeParser *parser, + guint instance_id, + const char *last_change_xml, + GError **error, + va_list var_args) { const char *variable_name; xmlDoc *doc; @@ -222,7 +222,7 @@ gupnp_last_change_parser_parse_last_change_valist * @instance_id: The ID of the AV instance caller is interested in * @last_change_xml: The xml from the "LastChange" event to parse * @error: The location where to store any error, or NULL - * @Varargs: tuples of state variable name, state variable type, and state + * @...: tuples of state variable name, state variable type, and state * variable value location, terminated with NULL. The state variable values * should be freed after use. * diff --git a/libgupnp-av/gupnp-media-collection.c b/libgupnp-av/gupnp-media-collection.c index e04931e..4385116 100644 --- a/libgupnp-av/gupnp-media-collection.c +++ b/libgupnp-av/gupnp-media-collection.c @@ -82,7 +82,7 @@ reparent_children (GUPnPMediaCollection *collection) static void on_container_available (GUPnPMediaCollection *self, GUPnPDIDLLiteContainer *container, - gpointer user_data) + G_GNUC_UNUSED gpointer user_data) { /* According to media format spec, there's only one container allowed; * We allow any number of containers, but only the last one wins. */ @@ -95,7 +95,7 @@ on_container_available (GUPnPMediaCollection *self, static void on_item_available (GUPnPMediaCollection *self, GUPnPDIDLLiteItem *item, - gpointer user_data) + G_GNUC_UNUSED gpointer user_data) { self->priv->items = g_list_prepend (self->priv->items, g_object_ref (item)); diff --git a/libgupnp-av/gupnp-protocol-info.c b/libgupnp-av/gupnp-protocol-info.c index 73975c7..d0d71c0 100644 --- a/libgupnp-av/gupnp-protocol-info.c +++ b/libgupnp-av/gupnp-protocol-info.c @@ -69,12 +69,9 @@ static void parse_additional_info (const char *additional_info, GUPnPProtocolInfo *info) { - GUPnPProtocolInfoPrivate *priv; char **tokens = NULL; short i; - priv = info->priv; - if (strcmp (additional_info, "*") == 0) return; diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 index df6395d..c909726 100644 --- a/m4/vapigen.m4 +++ b/m4/vapigen.m4 @@ -26,7 +26,7 @@ dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg <mail@jensge.org> # # VALA_PROG_VAPIGEN([MINIMUM-VERSION]) # ------------------------------------ -AC_DEFUN([VALA_PROG_VAPIGEN], +AC_DEFUN([GUPNP_PROG_VAPIGEN], [AC_PATH_PROG([VAPIGEN], [vapigen], []) AS_IF([test -z "$VAPIGEN"], [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], @@ -37,5 +37,7 @@ AC_DEFUN([VALA_PROG_VAPIGEN], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_WARN([Vala API Generator $1 not found.])])])]) + AC_MSG_WARN([Vala API Generator $1 not found.]) + VAPIGEN="" + ])])]) ]) diff --git a/packaging/GUPnP-AV.spec b/packaging/GUPnP-AV.spec index c7d27de..9ddd651 100644 --- a/packaging/GUPnP-AV.spec +++ b/packaging/GUPnP-AV.spec @@ -7,7 +7,7 @@ Name: gupnp-av Summary: GUPnP-AV is a collection of helpers for building UPnP AV applications -Version: 0.12.0 +Version: 0.12.2 Release: 0 Group: System/Libraries License: LGPLv2+ diff --git a/tests/Makefile.am b/tests/Makefile.am index de27f44..cac3776 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = gtest common_cflags = \ $(LIBGUPNP_CFLAGS) \ - -I$(top_srcdir) + -I$(top_srcdir) -Wno-unused-parameters common_ldadd = \ $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la \ $(LIBGUPNP_LIBS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 5fe1c7a..4986740 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -323,7 +323,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = gtest common_cflags = \ $(LIBGUPNP_CFLAGS) \ - -I$(top_srcdir) + -I$(top_srcdir) -Wno-unused-parameters common_ldadd = \ $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la \ diff --git a/tests/check-feature-list-parser.c b/tests/check-feature-list-parser.c index 990920d..06014ab 100644 --- a/tests/check-feature-list-parser.c +++ b/tests/check-feature-list-parser.c @@ -75,7 +75,7 @@ check_feature (GUPnPFeature *feature) } int -main (int argc, char **argv) +main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv) { GUPnPFeatureListParser *parser; GError *error; diff --git a/tests/check-search.c b/tests/check-search.c index 7916912..ebbf502 100644 --- a/tests/check-search.c +++ b/tests/check-search.c @@ -30,11 +30,11 @@ static const char * const searches[] = { }; int -main (int argc, char **argv) +main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv) { GUPnPSearchCriteriaParser *parser; GError *error; - int i; + guint i; #if !GLIB_CHECK_VERSION (2, 35, 0) g_type_init (); diff --git a/tests/gtest/test-cds-last-change-parser.c b/tests/gtest/test-cds-last-change-parser.c index 7ddf6cb..953f810 100644 --- a/tests/gtest/test-cds-last-change-parser.c +++ b/tests/gtest/test-cds-last-change-parser.c @@ -20,6 +20,7 @@ */ #include <stdio.h> +#include <string.h> #include <libgupnp-av/gupnp-cds-last-change-parser.h> @@ -395,7 +396,7 @@ TestReference test_reference_data[] = { static void compare_entries (const char *file, GList *entries) { - int reference_size, i, j; + guint reference_size, i, j; GList *it = entries; reference_size = G_N_ELEMENTS (test_reference_data); diff --git a/tests/gtest/test-media-collection.c b/tests/gtest/test-media-collection.c index 0979f0e..6e3df75 100644 --- a/tests/gtest/test-media-collection.c +++ b/tests/gtest/test-media-collection.c @@ -19,6 +19,8 @@ * Boston, MA 02110-1301, USA. */ +#include <string.h> + #include <libgupnp-av/gupnp-media-collection.h> /* Flat DIDL_S playlist */ @@ -275,10 +277,10 @@ test_didl_collection_parse_full () #define ERROR_MESSAGE "Failed to parse DIDL-Lite: No 'DIDL-Lite' node in the DIDL-Lite XML:" static gboolean -ignore_xml_parse_error (const gchar *log_domain, - GLogLevelFlags log_level, - const gchar *message, - gpointer user_data) +ignore_xml_parse_error (G_GNUC_UNUSED const gchar *log_domain, + G_GNUC_UNUSED GLogLevelFlags log_level, + const gchar *message, + G_GNUC_UNUSED gpointer user_data) { if (strncmp (message, ERROR_MESSAGE, diff --git a/tests/gtest/test-regression.c b/tests/gtest/test-regression.c index ed548e3..328d5dd 100644 --- a/tests/gtest/test-regression.c +++ b/tests/gtest/test-regression.c @@ -42,9 +42,9 @@ "</DIDL-Lite>" static void -test_bgo674319_on_object_available (GUPnPDIDLLiteParser *parser, - GUPnPDIDLLiteObject *object, - gpointer user_data) +test_bgo674319_on_object_available (G_GNUC_UNUSED GUPnPDIDLLiteParser *parser, + GUPnPDIDLLiteObject *object, + gpointer user_data) { GUPnPDIDLLiteObject **out = (GUPnPDIDLLiteObject **) user_data; *out = g_object_ref (object); diff --git a/tests/test-search-criteria-parser.c b/tests/test-search-criteria-parser.c index 7e49fba..101b4bd 100644 --- a/tests/test-search-criteria-parser.c +++ b/tests/test-search-criteria-parser.c @@ -23,40 +23,40 @@ #include <stdlib.h> static void -begin_parens_cb (GUPnPSearchCriteriaParser *parser, - gpointer user_data) +begin_parens_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser, + G_GNUC_UNUSED gpointer user_data) { g_print ("("); } static void -end_parens_cb (GUPnPSearchCriteriaParser *parser, - gpointer user_data) +end_parens_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser, + G_GNUC_UNUSED gpointer user_data) { g_print (")"); } static void -conjunction_cb (GUPnPSearchCriteriaParser *parser, - gpointer user_data) +conjunction_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser, + G_GNUC_UNUSED gpointer user_data) { g_print (" and "); } static void -disjunction_cb (GUPnPSearchCriteriaParser *parser, - gpointer user_data) +disjunction_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser, + G_GNUC_UNUSED gpointer user_data) { g_print (" or "); } static gboolean -expression_cb (GUPnPSearchCriteriaParser *parser, - const char *property, - GUPnPSearchCriteriaOp op, - const char *value, - GError **error, - gpointer user_data) +expression_cb (G_GNUC_UNUSED GUPnPSearchCriteriaParser *parser, + const char *property, + GUPnPSearchCriteriaOp op, + const char *value, + G_GNUC_UNUSED GError **error, + G_GNUC_UNUSED gpointer user_data) { g_print ("%s %d %s", property, op, value); diff --git a/vala/gupnp-av-1.0-custom.vala b/vala/gupnp-av-1.0-custom.vala index c26ee8a..b2078a5 100644 --- a/vala/gupnp-av-1.0-custom.vala +++ b/vala/gupnp-av-1.0-custom.vala @@ -48,4 +48,8 @@ namespace GUPnP { public class SearchCriteriaParser : GLib.Object { public virtual signal bool expression (string property, GUPnP.SearchCriteriaOp op, string value, GLib.Error error); } + + public class LastChangeParser : GLib.Object { + public bool parse_last_change (uint instance_id, string last_change_xml, ...) throws GLib.Error; + } } |