diff -Nru gupnp-av-0.5.6/configure gupnp-av-0.5.9/configure --- gupnp-av-0.5.6/configure 2010-06-09 10:59:43.000000000 -0700 +++ gupnp-av-0.5.9/configure 2010-08-05 15:16:47.000000000 -0700 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for gupnp-av 0.5.6. +# Generated by GNU Autoconf 2.65 for gupnp-av 0.5.9. # # Report bugs to . # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='gupnp-av' PACKAGE_TARNAME='gupnp-av' -PACKAGE_VERSION='0.5.6' -PACKAGE_STRING='gupnp-av 0.5.6' +PACKAGE_VERSION='0.5.9' +PACKAGE_STRING='gupnp-av 0.5.9' PACKAGE_BUGREPORT='http://www.gupnp.org/' PACKAGE_URL='' @@ -1453,7 +1453,7 @@ # 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.5.6 to adapt to many kinds of systems. +\`configure' configures gupnp-av 0.5.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1523,7 +1523,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gupnp-av 0.5.6:";; + short | recursive ) echo "Configuration of gupnp-av 0.5.9:";; esac cat <<\_ACEOF @@ -1636,7 +1636,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gupnp-av configure 0.5.6 +gupnp-av configure 0.5.9 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1914,7 +1914,7 @@ 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.5.6, which was +It was created by gupnp-av $as_me 0.5.9, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2725,7 +2725,7 @@ # Define the identity of the package. PACKAGE='gupnp-av' - VERSION='0.5.6' + VERSION='0.5.9' cat >>confdefs.h <<_ACEOF @@ -6188,11 +6188,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8374,7 +8374,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -8823,6 +8823,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -8844,6 +8847,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -8935,7 +8939,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -9005,7 +9009,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9180,6 +9184,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9506,7 +9511,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10396,7 +10401,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -10451,6 +10456,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11071,7 +11088,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11074 "configure" +#line 11091 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11167,7 +11184,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11170 "configure" +#line 11187 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12688,7 +12705,7 @@ # 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.5.6, which was +This file was extended by gupnp-av $as_me 0.5.9, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12754,7 +12771,7 @@ 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.5.6 +gupnp-av config.status 0.5.9 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru gupnp-av-0.5.6/configure.ac gupnp-av-0.5.9/configure.ac --- gupnp-av-0.5.6/configure.ac 2010-06-09 10:58:58.000000000 -0700 +++ gupnp-av-0.5.9/configure.ac 2010-08-05 15:13:55.000000000 -0700 @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT(gupnp-av, 0.5.6, http://www.gupnp.org/) +AC_INIT(gupnp-av, 0.5.9, http://www.gupnp.org/) AM_INIT_AUTOMAKE() AC_CONFIG_SRCDIR(libgupnp-av/gupnp-av.h) AM_CONFIG_HEADER(config.h) diff -Nru gupnp-av-0.5.6/debian/changelog gupnp-av-0.5.9/debian/changelog --- gupnp-av-0.5.6/debian/changelog 2010-09-12 14:45:14.000000000 -0700 +++ gupnp-av-0.5.9/debian/changelog 2010-09-12 14:45:14.000000000 -0700 @@ -1,3 +1,22 @@ +gupnp-av (0.5.9-1) experimental; urgency=low + + * Imported Upstream version 0.5.9 + * debian/control: Bump to policy version 3.9.1 + + -- Andreas Henriksson Sun, 22 Aug 2010 09:55:53 +0200 + +gupnp-av (0.5.8-1) unstable; urgency=low + + * Imported Upstream version 0.5.8 + + -- Andreas Henriksson Mon, 02 Aug 2010 22:20:22 +0200 + +gupnp-av (0.5.7-1) unstable; urgency=low + + * Imported Upstream version 0.5.7 + + -- Andreas Henriksson Thu, 24 Jun 2010 14:41:24 +0200 + gupnp-av (0.5.6-1) unstable; urgency=low * Imported Upstream version 0.5.6 diff -Nru gupnp-av-0.5.6/debian/control gupnp-av-0.5.9/debian/control --- gupnp-av-0.5.6/debian/control 2010-09-12 14:45:14.000000000 -0700 +++ gupnp-av-0.5.9/debian/control 2010-09-12 14:45:14.000000000 -0700 @@ -14,7 +14,7 @@ gir1.0-gssdp-1.0, gir1.0-gupnp-1.0, gir1.0-soup-2.4 -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://www.gupnp.org Vcs-Git: git://git.debian.org/git/collab-maint/gupnp-av.git Vcs-Browser: http://git.debian.org/?p=collab-maint/gupnp-av.git diff -Nru gupnp-av-0.5.6/doc/gupnp-av-sections.txt gupnp-av-0.5.9/doc/gupnp-av-sections.txt --- gupnp-av-0.5.6/doc/gupnp-av-sections.txt 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/gupnp-av-sections.txt 2010-08-10 05:14:58.000000000 -0700 @@ -152,6 +152,7 @@ gupnp_didl_lite_resource_set_import_uri gupnp_didl_lite_resource_set_protocol_info gupnp_didl_lite_resource_set_size +gupnp_didl_lite_resource_set_size64 gupnp_didl_lite_resource_set_duration gupnp_didl_lite_resource_set_bitrate gupnp_didl_lite_resource_set_sample_freq @@ -165,6 +166,7 @@ gupnp_didl_lite_resource_get_import_uri gupnp_didl_lite_resource_get_protocol_info gupnp_didl_lite_resource_get_size +gupnp_didl_lite_resource_get_size64 gupnp_didl_lite_resource_get_duration gupnp_didl_lite_resource_get_bitrate gupnp_didl_lite_resource_get_sample_freq diff -Nru gupnp-av-0.5.6/doc/html/annotation-glossary.html gupnp-av-0.5.9/doc/html/annotation-glossary.html --- gupnp-av-0.5.6/doc/html/annotation-glossary.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/annotation-glossary.html 2010-08-10 05:14:58.000000000 -0700 @@ -7,7 +7,7 @@ - + @@ -25,7 +25,7 @@ T -
+

Annotation Glossary

E

@@ -42,6 +42,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/ch01.html gupnp-av-0.5.9/doc/html/ch01.html --- gupnp-av-0.5.6/doc/html/ch01.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/ch01.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -19,9 +19,9 @@ GUPnP A/V Reference Manual Next -
+

-GUPnP A/V

+GUPnP A/V
GUPnPDIDLLiteParser — A/V DIDL-Lite XML parser @@ -60,6 +60,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1 \ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/ch02.html gupnp-av-0.5.9/doc/html/ch02.html --- gupnp-av-0.5.6/doc/html/ch02.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/ch02.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -19,15 +19,15 @@ GUPnP A/V Reference Manual Next -
+

-Error Codes

+Error Codes
Error codes — Error domains and codes.
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1 \ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/gupnp-av.devhelp gupnp-av-0.5.9/doc/html/gupnp-av.devhelp --- gupnp-av-0.5.6/doc/html/gupnp-av.devhelp 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/gupnp-av.devhelp 2010-08-10 05:14:58.000000000 -0700 @@ -117,6 +117,7 @@ + @@ -130,6 +131,7 @@ + @@ -150,6 +152,7 @@ + @@ -178,6 +181,8 @@ + + diff -Nru gupnp-av-0.5.6/doc/html/gupnp-av.devhelp2 gupnp-av-0.5.9/doc/html/gupnp-av.devhelp2 --- gupnp-av-0.5.6/doc/html/gupnp-av.devhelp2 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/gupnp-av.devhelp2 2010-08-10 05:14:58.000000000 -0700 @@ -117,6 +117,7 @@ + @@ -130,6 +131,7 @@ + @@ -150,6 +152,7 @@ + @@ -178,6 +181,8 @@ + + diff -Nru gupnp-av-0.5.6/doc/html/gupnp-av-Error-codes.html gupnp-av-0.5.9/doc/html/gupnp-av-Error-codes.html --- gupnp-av-0.5.6/doc/html/gupnp-av-Error-codes.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/gupnp-av-Error-codes.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,35 +35,35 @@
-
+

Synopsis

#define             GUPNP_PROTOCOL_ERROR
 enum                GUPnPProtocolError;
-
+

Description

-
+

Details

-
+

GUPNP_PROTOCOL_ERROR

#define GUPNP_PROTOCOL_ERROR (gupnp_protocol_error_quark ())

-The GQuark uniquely used by GUPnP AV protocol related errors. +The GQuark uniquely used by GUPnP AV protocol related errors.

-

Returns :

 a GQuark uniquely used by GUPnP AV protocol related errors. + a GQuark uniquely used by GUPnP AV protocol related errors.
-
+

enum GUPnPProtocolError

typedef enum {
         GUPNP_PROTOCOL_ERROR_INVALID_SYNTAX,
@@ -71,7 +71,7 @@
 } GUPnPProtocolError;

-GError codes used for errors in the GUPNP_PROTOCOL_ERROR domain, upon any +GError codes used for errors in the GUPNP_PROTOCOL_ERROR domain, upon any protocol related errors.

@@ -94,6 +94,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1 \ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteContainer.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteContainer.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteContainer.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteContainer.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties
-
+
@@ -39,52 +39,52 @@
-
+

Synopsis

                    GUPnPDIDLLiteContainer;
-gboolean            gupnp_didl_lite_container_get_searchable
+gboolean            gupnp_didl_lite_container_get_searchable
                                                         (GUPnPDIDLLiteContainer *container);
-gint                gupnp_didl_lite_container_get_child_count
+gint                gupnp_didl_lite_container_get_child_count
                                                         (GUPnPDIDLLiteContainer *container);
 void                gupnp_didl_lite_container_set_searchable
                                                         (GUPnPDIDLLiteContainer *container,
-                                                         gboolean searchable);
+                                                         gboolean searchable);
 void                gupnp_didl_lite_container_set_child_count
                                                         (GUPnPDIDLLiteContainer *container,
-                                                         gint child_count);
+                                                         gint child_count);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteObject
          +----GUPnPDIDLLiteContainer
-
+

Properties

-  "child-count"              gint                  : Read / Write
-  "searchable"               gboolean              : Read / Write
+  "child-count"              gint                  : Read / Write
+  "searchable"               gboolean              : Read / Write
-
+

Description

GUPnPDIDLLiteContainer respresents a DIDL-Lite container element.

-
+

Details

-
+

GUPnPDIDLLiteContainer

typedef struct _GUPnPDIDLLiteContainer GUPnPDIDLLiteContainer;
-
+

gupnp_didl_lite_container_get_searchable ()

-
gboolean            gupnp_didl_lite_container_get_searchable
+
gboolean            gupnp_didl_lite_container_get_searchable
                                                         (GUPnPDIDLLiteContainer *container);

 

 Checks whether container is searchable.
@@ -100,16 +100,16 @@
 
 
 
Returns :

- TRUE if container is searchable.
+ TRUE if container is searchable.
-
+

gupnp_didl_lite_container_get_child_count ()

-
gint                gupnp_didl_lite_container_get_child_count
+
gint                gupnp_didl_lite_container_get_child_count
                                                         (GUPnPDIDLLiteContainer *container);

 

 Get the child count of the container.  If the child count is unknown, -1 is
@@ -133,11 +133,11 @@
-
+

gupnp_didl_lite_container_set_searchable ()

void                gupnp_didl_lite_container_set_searchable
                                                         (GUPnPDIDLLiteContainer *container,
-                                                         gboolean searchable);
+ gboolean searchable);

(Un)set the searchibility of container.

@@ -159,11 +159,11 @@
-
+

gupnp_didl_lite_container_set_child_count ()

void                gupnp_didl_lite_container_set_child_count
                                                         (GUPnPDIDLLiteContainer *container,
-                                                         gint child_count);
+ gint child_count);

Set the child count of the container.

@@ -185,11 +185,11 @@
-
+

Property Details

-
+

The "child-count" property

-
  "child-count"              gint                  : Read / Write
+
  "child-count"              gint                  : Read / Write

The child count of this container.

@@ -197,9 +197,9 @@

Default value: 0

-
+

The "searchable" property

-
  "searchable"               gboolean              : Read / Write
+
  "searchable"               gboolean              : Read / Write

Whether this container is searchable.

@@ -209,6 +209,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteContributor.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteContributor.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteContributor.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteContributor.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,7 +39,7 @@
-
+

Synopsis

                    GUPnPDIDLLiteContributor;
 xmlNode *           gupnp_didl_lite_contributor_get_xml_node
@@ -56,35 +56,37 @@
                                                          const char *name);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteContributor
-
+

Properties

-  "name"                     gchar*                : Read / Write
-  "role"                     gchar*                : Read / Write
+  "name"                     gchar*                : Read / Write
+  "role"                     gchar*                : Read / Write
+  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+  "xml-node"                 gpointer              : Read / Write / Construct Only
-
+

Description

GUPnPDIDLLiteContributor respresents a contributor (artist, author, actor, producer, director, producer and contributor) property in a DIDL-Lite object.

-
+

Details

-
+

GUPnPDIDLLiteContributor

typedef struct _GUPnPDIDLLiteContributor GUPnPDIDLLiteContributor;
-
+

gupnp_didl_lite_contributor_get_xml_node ()

xmlNode *           gupnp_didl_lite_contributor_get_xml_node
                                                         (GUPnPDIDLLiteContributor *contributor);
@@ -108,7 +110,7 @@
-
+

gupnp_didl_lite_contributor_get_role ()

const char *        gupnp_didl_lite_contributor_get_role
                                                         (GUPnPDIDLLiteContributor *contributor);
@@ -126,14 +128,14 @@

Returns :

- The role of the contributor, or NULL. + The role of the contributor, or NULL.
-
+

gupnp_didl_lite_contributor_get_name ()

const char *        gupnp_didl_lite_contributor_get_name
                                                         (GUPnPDIDLLiteContributor *contributor);
@@ -150,14 +152,14 @@

Returns :

- The name of the contributor or NULL. + The name of the contributor or NULL.
-
+

gupnp_didl_lite_contributor_set_role ()

void                gupnp_didl_lite_contributor_set_role
                                                         (GUPnPDIDLLiteContributor *contributor,
@@ -188,7 +190,7 @@
-
+

gupnp_didl_lite_contributor_set_name ()

void                gupnp_didl_lite_contributor_set_name
                                                         (GUPnPDIDLLiteContributor *contributor,
@@ -218,29 +220,49 @@
-
+

Property Details

-
+

The "name" property

-
  "name"                     gchar*                : Read / Write
+
  "name"                     gchar*                : Read / Write

The name of this contributor.

Default value: NULL

-
+

The "role" property

-
  "role"                     gchar*                : Read / Write
+
  "role"                     gchar*                : Read / Write

The role of this contributor.

Default value: NULL

+
+
+

The "xml-doc" property

+
  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+

+The reference to XML document containing this object. +

+

+Internal property. +

+

Stability Level: Private

+
+
+
+

The "xml-node" property

+
  "xml-node"                 gpointer              : Read / Write / Construct Only
+

+The pointer to object node in XML document. +

+
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteDescriptor.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteDescriptor.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteDescriptor.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteDescriptor.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,7 +39,7 @@
-
+

Synopsis

                    GUPnPDIDLLiteDescriptor;
 xmlNode *           gupnp_didl_lite_descriptor_get_xml_node
@@ -64,38 +64,38 @@
                                                          const char *name_space);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteDescriptor
-
+

Properties

-  "content"                  gchar*                : Read / Write
-  "id"                       gchar*                : Read / Write
-  "metadata-type"            gchar*                : Read / Write
-  "name-space"               gchar*                : Read / Write
-  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
-  "xml-node"                 gpointer              : Read / Write / Construct Only
+  "content"                  gchar*                : Read / Write
+  "id"                       gchar*                : Read / Write
+  "metadata-type"            gchar*                : Read / Write
+  "name-space"               gchar*                : Read / Write
+  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+  "xml-node"                 gpointer              : Read / Write / Construct Only
-
+

Description

GUPnPDIDLLiteDescriptor respresent a DIDL-Lite descriptor (desc) element.

-
+

Details

-
+

GUPnPDIDLLiteDescriptor

typedef struct _GUPnPDIDLLiteDescriptor GUPnPDIDLLiteDescriptor;
-
+

gupnp_didl_lite_descriptor_get_xml_node ()

xmlNode *           gupnp_didl_lite_descriptor_get_xml_node
                                                         (GUPnPDIDLLiteDescriptor *descriptor);
@@ -119,7 +119,7 @@
-
+

gupnp_didl_lite_descriptor_get_content ()

const char *        gupnp_didl_lite_descriptor_get_content
                                                         (GUPnPDIDLLiteDescriptor *descriptor);
@@ -136,14 +136,14 @@

Returns :

- The content of the descriptor or NULL. + The content of the descriptor or NULL.
-
+

gupnp_didl_lite_descriptor_get_id ()

const char *        gupnp_didl_lite_descriptor_get_id   (GUPnPDIDLLiteDescriptor *descriptor);

@@ -159,14 +159,14 @@

Returns :

- The ID string or NULL. + The ID string or NULL.
-
+

gupnp_didl_lite_descriptor_get_metadata_type ()

const char *        gupnp_didl_lite_descriptor_get_metadata_type
                                                         (GUPnPDIDLLiteDescriptor *descriptor);
@@ -183,14 +183,14 @@

Returns :

- The type as string or NULL. + The type as string or NULL.
-
+

gupnp_didl_lite_descriptor_get_name_space ()

const char *        gupnp_didl_lite_descriptor_get_name_space
                                                         (GUPnPDIDLLiteDescriptor *descriptor);
@@ -207,14 +207,14 @@

Returns :

- The name space or NULL. + The name space or NULL.
-
+

gupnp_didl_lite_descriptor_set_content ()

void                gupnp_didl_lite_descriptor_set_content
                                                         (GUPnPDIDLLiteDescriptor *descriptor,
@@ -244,7 +244,7 @@
-
+

gupnp_didl_lite_descriptor_set_id ()

void                gupnp_didl_lite_descriptor_set_id   (GUPnPDIDLLiteDescriptor *descriptor,
                                                          const char *id);
@@ -273,7 +273,7 @@
-
+

gupnp_didl_lite_descriptor_set_metadata_type ()

void                gupnp_didl_lite_descriptor_set_metadata_type
                                                         (GUPnPDIDLLiteDescriptor *descriptor,
@@ -303,7 +303,7 @@
-
+

gupnp_didl_lite_descriptor_set_name_space ()

void                gupnp_didl_lite_descriptor_set_name_space
                                                         (GUPnPDIDLLiteDescriptor *descriptor,
@@ -333,47 +333,47 @@
-
+

Property Details

-
+

The "content" property

-
  "content"                  gchar*                : Read / Write
+
  "content"                  gchar*                : Read / Write

The content of this descriptor.

Default value: NULL

-
+

The "id" property

-
  "id"                       gchar*                : Read / Write
+
  "id"                       gchar*                : Read / Write

The ID of this descriptor.

Default value: NULL

-
+

The "metadata-type" property

-
  "metadata-type"            gchar*                : Read / Write
+
  "metadata-type"            gchar*                : Read / Write

The type of this descriptor.

Default value: NULL

-
+

The "name-space" property

-
  "name-space"               gchar*                : Read / Write
+
  "name-space"               gchar*                : Read / Write

The name space associated with this descriptor.

Default value: NULL

-
+

The "xml-doc" property

-
  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+
  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only

The reference to XML document containing this object.

@@ -383,9 +383,9 @@

Stability Level: Private

-
+

The "xml-node" property

-
  "xml-node"                 gpointer              : Read / Write / Construct Only
+
  "xml-node"                 gpointer              : Read / Write / Construct Only

The pointer to desc node in XML document.

@@ -394,6 +394,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteItem.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteItem.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteItem.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteItem.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,7 +39,7 @@
-
+

Synopsis

                    GUPnPDIDLLiteItem;
 const char *        gupnp_didl_lite_item_get_ref_id     (GUPnPDIDLLiteItem *item);
@@ -47,34 +47,34 @@
                                                          const char *ref_id);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteObject
          +----GUPnPDIDLLiteItem
-
+

Properties

-  "ref-id"                   gchar*                : Read / Write
+  "ref-id"                   gchar*                : Read / Write
-
+

Description

GUPnPDIDLLiteItem respresents a DIDL-Lite item element.

-
+

Details

-
+

GUPnPDIDLLiteItem

typedef struct _GUPnPDIDLLiteItem GUPnPDIDLLiteItem;
-
+

gupnp_didl_lite_item_get_ref_id ()

const char *        gupnp_didl_lite_item_get_ref_id     (GUPnPDIDLLiteItem *item);

@@ -91,14 +91,14 @@

Returns :

- The ref ID of the item, or NULL. + The ref ID of the item, or NULL.
-
+

gupnp_didl_lite_item_set_ref_id ()

void                gupnp_didl_lite_item_set_ref_id     (GUPnPDIDLLiteItem *item,
                                                          const char *ref_id);
@@ -123,11 +123,11 @@
-
+

Property Details

-
+

The "ref-id" property

-
  "ref-id"                   gchar*                : Read / Write
+
  "ref-id"                   gchar*                : Read / Write

The ref ID of this item.

@@ -137,6 +137,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteObject.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteObject.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteObject.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteObject.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,26 +39,26 @@
-
+

Synopsis

                    GUPnPDIDLLiteObject;
 xmlNode *           gupnp_didl_lite_object_get_xml_node (GUPnPDIDLLiteObject *object);
-GList *             gupnp_didl_lite_object_get_properties
+GList *             gupnp_didl_lite_object_get_properties
                                                         (GUPnPDIDLLiteObject *object,
                                                          const char *name);
 const char *        gupnp_didl_lite_object_get_id       (GUPnPDIDLLiteObject *object);
 const char *        gupnp_didl_lite_object_get_parent_id
                                                         (GUPnPDIDLLiteObject *object);
-gboolean            gupnp_didl_lite_object_get_restricted
+gboolean            gupnp_didl_lite_object_get_restricted
                                                         (GUPnPDIDLLiteObject *object);
 const char *        gupnp_didl_lite_object_get_title    (GUPnPDIDLLiteObject *object);
 const char *        gupnp_didl_lite_object_get_creator  (GUPnPDIDLLiteObject *object);
 const char *        gupnp_didl_lite_object_get_artist   (GUPnPDIDLLiteObject *object);
 const char *        gupnp_didl_lite_object_get_author   (GUPnPDIDLLiteObject *object);
-GList *             gupnp_didl_lite_object_get_creators (GUPnPDIDLLiteObject *object);
-GList *             gupnp_didl_lite_object_get_artists  (GUPnPDIDLLiteObject *object);
-GList *             gupnp_didl_lite_object_get_authors  (GUPnPDIDLLiteObject *object);
-GList *             gupnp_didl_lite_object_get_descriptors
+GList *             gupnp_didl_lite_object_get_creators (GUPnPDIDLLiteObject *object);
+GList *             gupnp_didl_lite_object_get_artists  (GUPnPDIDLLiteObject *object);
+GList *             gupnp_didl_lite_object_get_authors  (GUPnPDIDLLiteObject *object);
+GList *             gupnp_didl_lite_object_get_descriptors
                                                         (GUPnPDIDLLiteObject *object);
 const char *        gupnp_didl_lite_object_get_write_status
                                                         (GUPnPDIDLLiteObject *object);
@@ -73,12 +73,12 @@
 const char *        gupnp_didl_lite_object_get_date     (GUPnPDIDLLiteObject *object);
 int                 gupnp_didl_lite_object_get_track_number
                                                         (GUPnPDIDLLiteObject *object);
-GList *             gupnp_didl_lite_object_get_resources
+GList *             gupnp_didl_lite_object_get_resources
                                                         (GUPnPDIDLLiteObject *object);
 GUPnPDIDLLiteResource * gupnp_didl_lite_object_get_compat_resource
                                                         (GUPnPDIDLLiteObject *object,
                                                          const char *sink_protocol_info,
-                                                         gboolean lenient);
+                                                         gboolean lenient);
 GUPnPDIDLLiteResource * gupnp_didl_lite_object_add_resource
                                                         (GUPnPDIDLLiteObject *object);
 GUPnPDIDLLiteDescriptor * gupnp_didl_lite_object_add_descriptor
@@ -93,7 +93,7 @@
                                                          const char *parent_id);
 void                gupnp_didl_lite_object_set_restricted
                                                         (GUPnPDIDLLiteObject *object,
-                                                         gboolean restricted);
+                                                         gboolean restricted);
 void                gupnp_didl_lite_object_set_title    (GUPnPDIDLLiteObject *object,
                                                          const char *title);
 void                gupnp_didl_lite_object_set_creator  (GUPnPDIDLLiteObject *object,
@@ -128,53 +128,53 @@
                                                          int track_number);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteObject
          +----GUPnPDIDLLiteContainer
          +----GUPnPDIDLLiteItem
-
+

Properties

-  "album"                    gchar*                : Read / Write
-  "album-art"                gchar*                : Read / Write
-  "artist"                   gchar*                : Read / Write
-  "author"                   gchar*                : Read / Write
-  "creator"                  gchar*                : Read / Write
-  "date"                     gchar*                : Read / Write
-  "dc-namespace"             gpointer              : Write / Construct Only
-  "description"              gchar*                : Read / Write
-  "genre"                    gchar*                : Read / Write
-  "id"                       gchar*                : Read / Write
-  "parent-id"                gchar*                : Read / Write
-  "restricted"               gboolean              : Read / Write
-  "title"                    gchar*                : Read / Write
-  "track-number"             gint                  : Read / Write
-  "upnp-class"               gchar*                : Read / Write
-  "upnp-namespace"           gpointer              : Write / Construct Only
-  "write-status"             gchar*                : Read / Write
-  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
-  "xml-node"                 gpointer              : Read / Write / Construct Only
+  "album"                    gchar*                : Read / Write
+  "album-art"                gchar*                : Read / Write
+  "artist"                   gchar*                : Read / Write
+  "author"                   gchar*                : Read / Write
+  "creator"                  gchar*                : Read / Write
+  "date"                     gchar*                : Read / Write
+  "dc-namespace"             gpointer              : Read / Write / Construct Only
+  "description"              gchar*                : Read / Write
+  "genre"                    gchar*                : Read / Write
+  "id"                       gchar*                : Read / Write
+  "parent-id"                gchar*                : Read / Write
+  "restricted"               gboolean              : Read / Write
+  "title"                    gchar*                : Read / Write
+  "track-number"             gint                  : Read / Write
+  "upnp-class"               gchar*                : Read / Write
+  "upnp-namespace"           gpointer              : Read / Write / Construct Only
+  "write-status"             gchar*                : Read / Write
+  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+  "xml-node"                 gpointer              : Read / Write / Construct Only
-
+

Description

GUPnPDIDLLiteObject respresent a DIDL-Lite object element.

-
+

Details

-
+

GUPnPDIDLLiteObject

typedef struct _GUPnPDIDLLiteObject GUPnPDIDLLiteObject;
-
+

gupnp_didl_lite_object_get_xml_node ()

xmlNode *           gupnp_didl_lite_object_get_xml_node (GUPnPDIDLLiteObject *object);

@@ -197,9 +197,9 @@

-
+

gupnp_didl_lite_object_get_properties ()

-
GList *             gupnp_didl_lite_object_get_properties
+
GList *             gupnp_didl_lite_object_get_properties
                                                         (GUPnPDIDLLiteObject *object,
                                                          const char *name);

 

@@ -222,14 +222,15 @@
 
 
Returns :

  The list of property nodes
-by the name property_name belonging to object, or NULL. g_list_free the
-returned list after usage but do not modify the contents.. element-type utf8. transfer none utf8. 
+by the name property_name belonging to object, or NULL. g_list_free the
+returned list after usage but do not modify the contents. [element-type utf8][transfer none utf8]
+
-
+

gupnp_didl_lite_object_get_id ()

const char *        gupnp_didl_lite_object_get_id       (GUPnPDIDLLiteObject *object);

@@ -246,14 +247,14 @@

Returns :

- The ID of the object, or NULL. + The ID of the object, or NULL.
-
+

gupnp_didl_lite_object_get_parent_id ()

const char *        gupnp_didl_lite_object_get_parent_id
                                                         (GUPnPDIDLLiteObject *object);
@@ -271,7 +272,7 @@

Returns :

- The ID of parent of the object, or NULL. g_free after + The ID of parent of the object, or NULL. g_free after usage. @@ -279,9 +280,9 @@
-
+

gupnp_didl_lite_object_get_restricted ()

-
gboolean            gupnp_didl_lite_object_get_restricted
+
gboolean            gupnp_didl_lite_object_get_restricted
                                                         (GUPnPDIDLLiteObject *object);

 

 Whether the object is restricted or not.
@@ -297,14 +298,14 @@
 
 
 
Returns :

- TRUE if object is restricted.
+ TRUE if object is restricted.
-
+

gupnp_didl_lite_object_get_title ()

const char *        gupnp_didl_lite_object_get_title    (GUPnPDIDLLiteObject *object);

@@ -321,17 +322,17 @@

Returns :

- The title of the object, or NULL. + The title of the object, or NULL.
-
+

gupnp_didl_lite_object_get_creator ()

const char *        gupnp_didl_lite_object_get_creator  (GUPnPDIDLLiteObject *object);
-
+

Warning

gupnp_didl_lite_object_get_creator has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_get_creators instead.

@@ -349,7 +350,7 @@

Returns :

- The creator of the object, or NULL. + The creator of the object, or NULL. @@ -357,15 +358,15 @@
-
+

gupnp_didl_lite_object_get_artist ()

const char *        gupnp_didl_lite_object_get_artist   (GUPnPDIDLLiteObject *object);
-
+

Warning

gupnp_didl_lite_object_get_artist has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_get_artists instead.

-Get the artist of the object. If role is not NULL, it is set to the role +Get the artist of the object. If role is not NULL, it is set to the role of the artist if available.

@@ -379,7 +380,7 @@ - @@ -387,10 +388,10 @@

Returns :

 The artist of the object, or NULL. + The artist of the object, or NULL.
-
+

gupnp_didl_lite_object_get_author ()

const char *        gupnp_didl_lite_object_get_author   (GUPnPDIDLLiteObject *object);
-
+

Warning

gupnp_didl_lite_object_get_author has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_get_authors instead.

@@ -408,7 +409,7 @@

Returns :

- The author of the object, or NULL. + The author of the object, or NULL. @@ -416,9 +417,9 @@
-
+

gupnp_didl_lite_object_get_creators ()

-
GList *             gupnp_didl_lite_object_get_creators (GUPnPDIDLLiteObject *object);
+
GList *             gupnp_didl_lite_object_get_creators (GUPnPDIDLLiteObject *object);

Get the creators of the object.

@@ -433,17 +434,17 @@

Returns :

- The list of creators belonging to object, or NULL. -g_list_free the returned list after usage and unref each object in it. + The list of creators belonging to object, or NULL. +g_list_free the returned list after usage and unref each object in it.
-
+

gupnp_didl_lite_object_get_artists ()

-
GList *             gupnp_didl_lite_object_get_artists  (GUPnPDIDLLiteObject *object);
+
GList *             gupnp_didl_lite_object_get_artists  (GUPnPDIDLLiteObject *object);

Get the artists of the object.

@@ -458,17 +459,17 @@

Returns :

- The list of artists belonging to object, or NULL. -g_list_free the returned list after usage and unref each object in it. + The list of artists belonging to object, or NULL. +g_list_free the returned list after usage and unref each object in it.
-
+

gupnp_didl_lite_object_get_authors ()

-
GList *             gupnp_didl_lite_object_get_authors  (GUPnPDIDLLiteObject *object);
+
GList *             gupnp_didl_lite_object_get_authors  (GUPnPDIDLLiteObject *object);

Get the authors of the object.

@@ -483,17 +484,17 @@

Returns :

- The list of authors belonging to object, or NULL. -g_list_free the returned list after usage and unref each object in it. + The list of authors belonging to object, or NULL. +g_list_free the returned list after usage and unref each object in it.
-
+

gupnp_didl_lite_object_get_descriptors ()

-
GList *             gupnp_didl_lite_object_get_descriptors
+
GList *             gupnp_didl_lite_object_get_descriptors
                                                         (GUPnPDIDLLiteObject *object);

 

 Get the descriptors of the object.
@@ -509,15 +510,15 @@
 
 
 
Returns :

- The list of descriptors belonging to object, or NULL.
-g_list_free the returned list after usage and unref each object in it.
+ The list of descriptors belonging to object, or NULL.
+g_list_free the returned list after usage and unref each object in it.
-
+

gupnp_didl_lite_object_get_write_status ()

const char *        gupnp_didl_lite_object_get_write_status
                                                         (GUPnPDIDLLiteObject *object);
@@ -535,14 +536,14 @@

Returns :

- The write status of the object, or NULL. + The write status of the object, or NULL.
-
+

gupnp_didl_lite_object_get_genre ()

const char *        gupnp_didl_lite_object_get_genre    (GUPnPDIDLLiteObject *object);

@@ -559,14 +560,14 @@

Returns :

- The genre of the object, or NULL. + The genre of the object, or NULL.
-
+

gupnp_didl_lite_object_get_upnp_class ()

const char *        gupnp_didl_lite_object_get_upnp_class
                                                         (GUPnPDIDLLiteObject *object);
@@ -583,14 +584,14 @@

Returns :

- The class of object, or NULL. + The class of object, or NULL.
-
+

gupnp_didl_lite_object_get_album ()

const char *        gupnp_didl_lite_object_get_album    (GUPnPDIDLLiteObject *object);

@@ -607,14 +608,14 @@

Returns :

- The album of the object, or NULL. + The album of the object, or NULL.
-
+

gupnp_didl_lite_object_get_album_art ()

const char *        gupnp_didl_lite_object_get_album_art
                                                         (GUPnPDIDLLiteObject *object);
@@ -632,14 +633,14 @@

Returns :

- The URI to album art of the object, or NULL. + The URI to album art of the object, or NULL.
-
+

gupnp_didl_lite_object_get_description ()

const char *        gupnp_didl_lite_object_get_description
                                                         (GUPnPDIDLLiteObject *object);
@@ -657,14 +658,14 @@

Returns :

- The description of the object, or NULL. + The description of the object, or NULL.
-
+

gupnp_didl_lite_object_get_date ()

const char *        gupnp_didl_lite_object_get_date     (GUPnPDIDLLiteObject *object);

@@ -681,14 +682,14 @@

Returns :

- The date of the object, or NULL. + The date of the object, or NULL.
-
+

gupnp_didl_lite_object_get_track_number ()

int                 gupnp_didl_lite_object_get_track_number
                                                         (GUPnPDIDLLiteObject *object);
@@ -713,9 +714,9 @@
-
+

gupnp_didl_lite_object_get_resources ()

-
GList *             gupnp_didl_lite_object_get_resources
+
GList *             gupnp_didl_lite_object_get_resources
                                                         (GUPnPDIDLLiteObject *object);

 

 Use this function to retreive resources from the object.
@@ -732,19 +733,20 @@
 
 
Returns :

  The list of resources belonging to 
-object, or NULL.
-g_list_free the returned list after usage and unref each resource in it.. element-type GUPnPDIDLLiteResource. transfer full GUPnPDIDLLiteResource. 
+object, or NULL.
+g_list_free the returned list after usage and unref each resource in it. [element-type GUPnPDIDLLiteResource][transfer full GUPnPDIDLLiteResource]
+
-
+

gupnp_didl_lite_object_get_compat_resource ()

GUPnPDIDLLiteResource * gupnp_didl_lite_object_get_compat_resource
                                                         (GUPnPDIDLLiteObject *object,
                                                          const char *sink_protocol_info,
-                                                         gboolean lenient);
+ gboolean lenient);

Use this function to get a resource from the object that is compatible with any of the protocols specified in the sink_protocol_info. The value of @@ -753,8 +755,8 @@ ConnectionManager service.

-If lenient is TRUE, the first resource in the list is returned instead of -NULL if none of resources and protocols are found to be compatible. +If lenient is TRUE, the first resource in the list is returned instead of +NULL if none of resources and protocols are found to be compatible.

@@ -778,7 +780,7 @@ @@ -786,7 +788,7 @@

Returns :

 The resource belonging to object that is comaptible with -any of the protocols specified in sink_protocol_info, or NULL. Unref after +any of the protocols specified in sink_protocol_info, or NULL. Unref after usage.
-
+

gupnp_didl_lite_object_add_resource ()

GUPnPDIDLLiteResource * gupnp_didl_lite_object_add_resource
                                                         (GUPnPDIDLLiteObject *object);
@@ -810,7 +812,7 @@
-
+

gupnp_didl_lite_object_add_descriptor ()

GUPnPDIDLLiteDescriptor * gupnp_didl_lite_object_add_descriptor
                                                         (GUPnPDIDLLiteObject *object);
@@ -834,7 +836,7 @@
-
+

gupnp_didl_lite_object_set_upnp_class ()

void                gupnp_didl_lite_object_set_upnp_class
                                                         (GUPnPDIDLLiteObject *object,
@@ -859,7 +861,7 @@
-
+

gupnp_didl_lite_object_set_id ()

void                gupnp_didl_lite_object_set_id       (GUPnPDIDLLiteObject *object,
                                                          const char *id);
@@ -884,7 +886,7 @@
-
+

gupnp_didl_lite_object_set_parent_id ()

void                gupnp_didl_lite_object_set_parent_id
                                                         (GUPnPDIDLLiteObject *object,
@@ -910,11 +912,11 @@
-
+

gupnp_didl_lite_object_set_restricted ()

void                gupnp_didl_lite_object_set_restricted
                                                         (GUPnPDIDLLiteObject *object,
-                                                         gboolean restricted);
+ gboolean restricted);

Set the restricted status of object to restricted.

@@ -936,7 +938,7 @@
-
+

gupnp_didl_lite_object_set_title ()

void                gupnp_didl_lite_object_set_title    (GUPnPDIDLLiteObject *object,
                                                          const char *title);
@@ -961,11 +963,11 @@
-
+

gupnp_didl_lite_object_set_creator ()

void                gupnp_didl_lite_object_set_creator  (GUPnPDIDLLiteObject *object,
                                                          const char *creator);
-
+

Warning

gupnp_didl_lite_object_set_creator has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_add_creator instead.

@@ -990,11 +992,11 @@
-
+

gupnp_didl_lite_object_set_artist ()

void                gupnp_didl_lite_object_set_artist   (GUPnPDIDLLiteObject *object,
                                                          const char *artist);
-
+

Warning

gupnp_didl_lite_object_set_artist has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_add_artist instead.

@@ -1018,11 +1020,11 @@
-
+

gupnp_didl_lite_object_set_author ()

void                gupnp_didl_lite_object_set_author   (GUPnPDIDLLiteObject *object,
                                                          const char *author);
-
+

Warning

gupnp_didl_lite_object_set_author has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_add_author instead.

@@ -1046,7 +1048,7 @@
-
+

gupnp_didl_lite_object_add_creator ()

GUPnPDIDLLiteContributor * gupnp_didl_lite_object_add_creator
                                                         (GUPnPDIDLLiteObject *object);
@@ -1071,7 +1073,7 @@
-
+

gupnp_didl_lite_object_add_artist ()

GUPnPDIDLLiteContributor * gupnp_didl_lite_object_add_artist
                                                         (GUPnPDIDLLiteObject *object);
@@ -1096,7 +1098,7 @@
-
+

gupnp_didl_lite_object_add_author ()

GUPnPDIDLLiteContributor * gupnp_didl_lite_object_add_author
                                                         (GUPnPDIDLLiteObject *object);
@@ -1121,7 +1123,7 @@
-
+

gupnp_didl_lite_object_set_genre ()

void                gupnp_didl_lite_object_set_genre    (GUPnPDIDLLiteObject *object,
                                                          const char *genre);
@@ -1145,7 +1147,7 @@
-
+

gupnp_didl_lite_object_set_write_status ()

void                gupnp_didl_lite_object_set_write_status
                                                         (GUPnPDIDLLiteObject *object,
@@ -1171,7 +1173,7 @@
-
+

gupnp_didl_lite_object_set_album ()

void                gupnp_didl_lite_object_set_album    (GUPnPDIDLLiteObject *object,
                                                          const char *album);
@@ -1196,7 +1198,7 @@
-
+

gupnp_didl_lite_object_set_album_art ()

void                gupnp_didl_lite_object_set_album_art
                                                         (GUPnPDIDLLiteObject *object,
@@ -1222,7 +1224,7 @@
-
+

gupnp_didl_lite_object_set_description ()

void                gupnp_didl_lite_object_set_description
                                                         (GUPnPDIDLLiteObject *object,
@@ -1248,7 +1250,7 @@
-
+

gupnp_didl_lite_object_set_date ()

void                gupnp_didl_lite_object_set_date     (GUPnPDIDLLiteObject *object,
                                                          const char *date);
@@ -1273,7 +1275,7 @@
-
+

gupnp_didl_lite_object_set_track_number ()

void                gupnp_didl_lite_object_set_track_number
                                                         (GUPnPDIDLLiteObject *object,
@@ -1299,30 +1301,30 @@
-
+

Property Details

-
+

The "album" property

-
  "album"                    gchar*                : Read / Write
+
  "album"                    gchar*                : Read / Write

The album of this object.

Default value: NULL

-
+

The "album-art" property

-
  "album-art"                gchar*                : Read / Write
+
  "album-art"                gchar*                : Read / Write

The URI to album art of this object.

Default value: NULL

-
+

The "artist" property

-
  "artist"                   gchar*                : Read / Write
-
+
  "artist"                   gchar*                : Read / Write
+

Warning

GUPnPDIDLLiteObject:artist has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_get_artists and gupnp_didl_lite_object_add_artist instead since unlike this @@ -1334,10 +1336,10 @@

Default value: NULL

-
+

The "author" property

-
  "author"                   gchar*                : Read / Write
-
+
  "author"                   gchar*                : Read / Write
+

Warning

GUPnPDIDLLiteObject:author has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_get_authors and gupnp_didl_lite_object_add_author instead since unlike this @@ -1349,10 +1351,10 @@

Default value: NULL

-
+

The "creator" property

-
  "creator"                  gchar*                : Read / Write
-
+
  "creator"                  gchar*                : Read / Write
+

Warning

GUPnPDIDLLiteObject:creator has been deprecated since version 0.5.3 and should not be used in newly-written code. Use gupnp_didl_lite_object_get_creators and gupnp_didl_lite_object_add_creator instead since unlike this @@ -1364,85 +1366,81 @@

Default value: NULL

-
+

The "date" property

-
  "date"                     gchar*                : Read / Write
+
  "date"                     gchar*                : Read / Write

The date of this object.

Default value: NULL

-
+

The "dc-namespace" property

-
  "dc-namespace"             gpointer              : Write / Construct Only
+
  "dc-namespace"             gpointer              : Read / Write / Construct Only

-Pointer to the DublinCore XML namespace registered with -the XML document containing this object. -

-

-Internal property. +Pointer to the DublinCore namespace registered with the XML document +containing this object.

-

Stability Level: Private

-
+

The "description" property

-
  "description"              gchar*                : Read / Write
+
  "description"              gchar*                : Read / Write

The description of this object.

Default value: NULL

-
+

The "genre" property

-
  "genre"                    gchar*                : Read / Write
+
  "genre"                    gchar*                : Read / Write

The genre of this object.

Default value: NULL

-
+

The "id" property

-
  "id"                       gchar*                : Read / Write
+
  "id"                       gchar*                : Read / Write

The ID of this object.

Default value: NULL

-
+

The "parent-id" property

-
  "parent-id"                gchar*                : Read / Write
+
  "parent-id"                gchar*                : Read / Write

The ID of the parent container of this object.

Default value: NULL

-
+

The "restricted" property

-
  "restricted"               gboolean              : Read / Write
+
  "restricted"               gboolean              : Read / Write

Whether this object is restricted.

Default value: FALSE

-
+

The "title" property

-
  "title"                    gchar*                : Read / Write
+
  "title"                    gchar*                : Read / Write

The title of this object.

Default value: NULL

-
+

The "track-number" property

-
  "track-number"             gint                  : Read / Write
+
  "track-number"             gint                  : Read / Write

The original track number of this object.

@@ -1450,40 +1448,35 @@

Default value: -1

-
+

The "upnp-class" property

-
  "upnp-class"               gchar*                : Read / Write
+
  "upnp-class"               gchar*                : Read / Write

The UPnP class of this object.

Default value: NULL

-
+

The "upnp-namespace" property

-
  "upnp-namespace"           gpointer              : Write / Construct Only
+
  "upnp-namespace"           gpointer              : Read / Write / Construct Only

-Pointer to the UPNP XML namespace registered with the -XML document containing this object. +Pointer to the UPnP namespace registered with the XML document * containing this object.

-

-Internal property. -

-

Stability Level: Private

-
+

The "write-status" property

-
  "write-status"             gchar*                : Read / Write
+
  "write-status"             gchar*                : Read / Write

The write status of this object.

Default value: NULL

-
+

The "xml-doc" property

-
  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+
  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only

The reference to XML document containing this object.

@@ -1493,9 +1486,9 @@

Stability Level: Private

-
+

The "xml-node" property

-
  "xml-node"                 gpointer              : Read / Write / Construct Only
+
  "xml-node"                 gpointer              : Read / Write / Construct Only

The pointer to object node in XML document.

@@ -1504,6 +1497,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteParser.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteParser.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteParser.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteParser.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Signals -
+
@@ -39,23 +39,23 @@
-
+

Synopsis

                    GUPnPDIDLLiteParser;
 GUPnPDIDLLiteParser * gupnp_didl_lite_parser_new        (void);
-gboolean            gupnp_didl_lite_parser_parse_didl   (GUPnPDIDLLiteParser *parser,
+gboolean            gupnp_didl_lite_parser_parse_didl   (GUPnPDIDLLiteParser *parser,
                                                          const char *didl,
-                                                         GError **error);
+                                                         GError **error);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteParser
-
+

Signals

   "container-available"                            : Run Last
@@ -63,20 +63,20 @@
   "object-available"                               : Run Last
-
+

Description

GUPnPDIDLLiteParser parses DIDL-Lite XML strings.

-
+

Details

-
+

GUPnPDIDLLiteParser

typedef struct _GUPnPDIDLLiteParser GUPnPDIDLLiteParser;
-
+

gupnp_didl_lite_parser_new ()

GUPnPDIDLLiteParser * gupnp_didl_lite_parser_new        (void);
@@ -89,11 +89,11 @@
-
+

gupnp_didl_lite_parser_parse_didl ()

-
gboolean            gupnp_didl_lite_parser_parse_didl   (GUPnPDIDLLiteParser *parser,
+
gboolean            gupnp_didl_lite_parser_parse_didl   (GUPnPDIDLLiteParser *parser,
                                                          const char *didl,
-                                                         GError **error);

+                                                         GError **error);

Parses DIDL-Lite XML string didl, emitting the ::object-available, ::item-available and ::container-available signals appropriately during the @@ -126,13 +126,13 @@

-
+

Signal Details

-
+

The "container-available" signal

void                user_function                      (GUPnPDIDLLiteParser    *parser,
                                                         GUPnPDIDLLiteContainer *container,
-                                                        gpointer                user_data)      : Run Last
+ gpointer user_data) : Run Last

The ::container-available signal is emitted each time a container is found in the DIDL-Lite XML being parsed. @@ -158,11 +158,11 @@

-
+

The "item-available" signal

void                user_function                      (GUPnPDIDLLiteParser *parser,
                                                         GUPnPDIDLLiteItem   *item,
-                                                        gpointer             user_data)      : Run Last
+ gpointer user_data) : Run Last

The ::item-available signal is emitted each time an item is found in the DIDL-Lite XML being parsed. @@ -188,11 +188,11 @@

-
+

The "object-available" signal

void                user_function                      (GUPnPDIDLLiteParser *parser,
                                                         GUPnPDIDLLiteObject *object,
-                                                        gpointer             user_data)      : Run Last
+ gpointer user_data) : Run Last

The ::object-available signal is emitted each time an object is found in the DIDL-Lite XML being parsed. @@ -221,6 +221,6 @@

- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteResource.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteResource.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteResource.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteResource.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,7 +39,7 @@
-
+

Synopsis

                    GUPnPDIDLLiteResource;
 void                gupnp_didl_lite_resource_set_uri    (GUPnPDIDLLiteResource *resource,
@@ -52,6 +52,8 @@
                                                          GUPnPProtocolInfo *info);
 void                gupnp_didl_lite_resource_set_size   (GUPnPDIDLLiteResource *resource,
                                                          long size Param2);
+void                gupnp_didl_lite_resource_set_size64 (GUPnPDIDLLiteResource *resource,
+                                                         gint64 size);
 void                gupnp_didl_lite_resource_set_duration
                                                         (GUPnPDIDLLiteResource *resource,
                                                          long duration Param2);
@@ -83,6 +85,7 @@
 GUPnPProtocolInfo * gupnp_didl_lite_resource_get_protocol_info
                                                         (GUPnPDIDLLiteResource *resource);
 long                gupnp_didl_lite_resource_get_size   (GUPnPDIDLLiteResource *resource);
+gint64              gupnp_didl_lite_resource_get_size64 (GUPnPDIDLLiteResource *resource);
 long                gupnp_didl_lite_resource_get_duration
                                                         (GUPnPDIDLLiteResource *resource);
 int                 gupnp_didl_lite_resource_get_bitrate
@@ -101,47 +104,48 @@
                                                         (GUPnPDIDLLiteResource *resource);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteResource
-
+

Properties

-  "audio-channels"           gint                  : Read / Write
-  "bitrate"                  gint                  : Read / Write
-  "bits-per-sample"          gint                  : Read / Write
-  "color-depth"              gint                  : Read / Write
-  "duration"                 glong                 : Read / Write
-  "height"                   gint                  : Read / Write
-  "import-uri"               gchar*                : Read / Write
-  "protection"               gchar*                : Read / Write
+  "audio-channels"           gint                  : Read / Write
+  "bitrate"                  gint                  : Read / Write
+  "bits-per-sample"          gint                  : Read / Write
+  "color-depth"              gint                  : Read / Write
+  "duration"                 glong                 : Read / Write
+  "height"                   gint                  : Read / Write
+  "import-uri"               gchar*                : Read / Write
+  "protection"               gchar*                : Read / Write
   "protocol-info"            GUPnPProtocolInfo*    : Read / Write
-  "sample-freq"              gint                  : Read / Write
-  "size"                     glong                 : Read / Write
-  "uri"                      gchar*                : Read / Write
-  "width"                    gint                  : Read / Write
-  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
-  "xml-node"                 gpointer              : Read / Write / Construct Only
+  "sample-freq"              gint                  : Read / Write
+  "size"                     glong                 : Read / Write
+  "size64"                   gint64                : Read / Write
+  "uri"                      gchar*                : Read / Write
+  "width"                    gint                  : Read / Write
+  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+  "xml-node"                 gpointer              : Read / Write / Construct Only
-
+

Description

GUPnPDIDLLiteResource respresent a DIDL-Lite resource (res) element.

-
+

Details

-
+

GUPnPDIDLLiteResource

typedef struct _GUPnPDIDLLiteResource GUPnPDIDLLiteResource;
-
+

gupnp_didl_lite_resource_set_uri ()

void                gupnp_didl_lite_resource_set_uri    (GUPnPDIDLLiteResource *resource,
                                                          const char *uri);
@@ -170,7 +174,7 @@
-
+

gupnp_didl_lite_resource_set_import_uri ()

void                gupnp_didl_lite_resource_set_import_uri
                                                         (GUPnPDIDLLiteResource *resource,
@@ -200,15 +204,13 @@
-
+

gupnp_didl_lite_resource_set_protocol_info ()

void                gupnp_didl_lite_resource_set_protocol_info
                                                         (GUPnPDIDLLiteResource *resource,
                                                          GUPnPProtocolInfo *info);

-Set the protocol info associated with the resource. If the -"dlna-profile" of info is not set, an attempt will be made -to guess it for you. +Set the protocol info associated with the resource.

@@ -232,7 +234,7 @@
-
+

gupnp_didl_lite_resource_set_size ()

void                gupnp_didl_lite_resource_set_size   (GUPnPDIDLLiteResource *resource,
                                                          long size Param2);
@@ -262,7 +264,37 @@
-
+
+

gupnp_didl_lite_resource_set_size64 ()

+
void                gupnp_didl_lite_resource_set_size64 (GUPnPDIDLLiteResource *resource,
+                                                         gint64 size);
+

+Set the size (in bytes) of the resource. Passing a negative number will +unset this property. +

+
++ + + + + + + + + + + + + + +

resource :

A GUPnPDIDLLiteResource +

size :

The size (in bytes) +

Returns :

 None. +
+
+
+

gupnp_didl_lite_resource_set_duration ()

void                gupnp_didl_lite_resource_set_duration
                                                         (GUPnPDIDLLiteResource *resource,
@@ -293,7 +325,7 @@
-
+

gupnp_didl_lite_resource_set_bitrate ()

void                gupnp_didl_lite_resource_set_bitrate
                                                         (GUPnPDIDLLiteResource *resource,
@@ -324,7 +356,7 @@
-
+

gupnp_didl_lite_resource_set_sample_freq ()

void                gupnp_didl_lite_resource_set_sample_freq
                                                         (GUPnPDIDLLiteResource *resource,
@@ -355,7 +387,7 @@
-
+

gupnp_didl_lite_resource_set_bits_per_sample ()

void                gupnp_didl_lite_resource_set_bits_per_sample
                                                         (GUPnPDIDLLiteResource *resource,
@@ -386,7 +418,7 @@
-
+

gupnp_didl_lite_resource_set_protection ()

void                gupnp_didl_lite_resource_set_protection
                                                         (GUPnPDIDLLiteResource *resource,
@@ -417,7 +449,7 @@
-
+

gupnp_didl_lite_resource_set_audio_channels ()

void                gupnp_didl_lite_resource_set_audio_channels
                                                         (GUPnPDIDLLiteResource *resource,
@@ -448,7 +480,7 @@
-
+

gupnp_didl_lite_resource_set_width ()

void                gupnp_didl_lite_resource_set_width  (GUPnPDIDLLiteResource *resource,
                                                          int width);
@@ -478,7 +510,7 @@
-
+

gupnp_didl_lite_resource_set_height ()

void                gupnp_didl_lite_resource_set_height (GUPnPDIDLLiteResource *resource,
                                                          int height);
@@ -508,7 +540,7 @@
-
+

gupnp_didl_lite_resource_set_color_depth ()

void                gupnp_didl_lite_resource_set_color_depth
                                                         (GUPnPDIDLLiteResource *resource,
@@ -539,7 +571,7 @@
-
+

gupnp_didl_lite_resource_get_uri ()

const char *        gupnp_didl_lite_resource_get_uri    (GUPnPDIDLLiteResource *resource);

@@ -555,14 +587,14 @@

Returns :

- The of URI the resource or NULL. + The of URI the resource or NULL.
-
+

gupnp_didl_lite_resource_get_import_uri ()

const char *        gupnp_didl_lite_resource_get_import_uri
                                                         (GUPnPDIDLLiteResource *resource);
@@ -579,14 +611,14 @@

Returns :

- The import URI or NULL. + The import URI or NULL.
-
+

gupnp_didl_lite_resource_get_protocol_info ()

GUPnPProtocolInfo * gupnp_didl_lite_resource_get_protocol_info
                                                         (GUPnPDIDLLiteResource *resource);
@@ -603,7 +635,7 @@

Returns :

- The protocol info associated with the resource or NULL. The + The protocol info associated with the resource or NULL. The returned object must not be unrefed. @@ -611,7 +643,7 @@
-
+

gupnp_didl_lite_resource_get_size ()

long                gupnp_didl_lite_resource_get_size   (GUPnPDIDLLiteResource *resource);

@@ -634,7 +666,30 @@

-
+
+

gupnp_didl_lite_resource_get_size64 ()

+
gint64              gupnp_didl_lite_resource_get_size64 (GUPnPDIDLLiteResource *resource);
+

+Get the size (in bytes) of the resource. +

+
++ + + + + + + + + + +

resource :

A GUPnPDIDLLiteResource +

Returns :

 The size (in bytes) of the resource or -1. +
+
+
+

gupnp_didl_lite_resource_get_duration ()

long                gupnp_didl_lite_resource_get_duration
                                                         (GUPnPDIDLLiteResource *resource);
@@ -658,7 +713,7 @@
-
+

gupnp_didl_lite_resource_get_bitrate ()

int                 gupnp_didl_lite_resource_get_bitrate
                                                         (GUPnPDIDLLiteResource *resource);
@@ -682,7 +737,7 @@
-
+

gupnp_didl_lite_resource_get_sample_freq ()

int                 gupnp_didl_lite_resource_get_sample_freq
                                                         (GUPnPDIDLLiteResource *resource);
@@ -706,7 +761,7 @@
-
+

gupnp_didl_lite_resource_get_bits_per_sample ()

int                 gupnp_didl_lite_resource_get_bits_per_sample
                                                         (GUPnPDIDLLiteResource *resource);
@@ -730,7 +785,7 @@
-
+

gupnp_didl_lite_resource_get_protection ()

const char *        gupnp_didl_lite_resource_get_protection
                                                         (GUPnPDIDLLiteResource *resource);
@@ -747,14 +802,14 @@

Returns :

- The protection system in use by the resource or NULL. + The protection system in use by the resource or NULL.
-
+

gupnp_didl_lite_resource_get_audio_channels ()

int                 gupnp_didl_lite_resource_get_audio_channels
                                                         (GUPnPDIDLLiteResource *resource);
@@ -778,7 +833,7 @@
-
+

gupnp_didl_lite_resource_get_width ()

int                 gupnp_didl_lite_resource_get_width  (GUPnPDIDLLiteResource *resource);

@@ -801,7 +856,7 @@

-
+

gupnp_didl_lite_resource_get_height ()

int                 gupnp_didl_lite_resource_get_height (GUPnPDIDLLiteResource *resource);

@@ -824,7 +879,7 @@

-
+

gupnp_didl_lite_resource_get_color_depth ()

int                 gupnp_didl_lite_resource_get_color_depth
                                                         (GUPnPDIDLLiteResource *resource);
@@ -848,11 +903,11 @@
-
+

Property Details

-
+

The "audio-channels" property

-
  "audio-channels"           gint                  : Read / Write
+
  "audio-channels"           gint                  : Read / Write

The number of audio channels in this resource.

@@ -860,9 +915,9 @@

Default value: -1

-
+

The "bitrate" property

-
  "bitrate"                  gint                  : Read / Write
+
  "bitrate"                  gint                  : Read / Write

The bitrate of this resource.

@@ -870,9 +925,9 @@

Default value: -1

-
+

The "bits-per-sample" property

-
  "bits-per-sample"          gint                  : Read / Write
+
  "bits-per-sample"          gint                  : Read / Write

The sample size of this resource.

@@ -880,9 +935,9 @@

Default value: -1

-
+

The "color-depth" property

-
  "color-depth"              gint                  : Read / Write
+
  "color-depth"              gint                  : Read / Write

The color-depth of this image/video resource.

@@ -890,9 +945,9 @@

Default value: -1

-
+

The "duration" property

-
  "duration"                 glong                 : Read / Write
+
  "duration"                 glong                 : Read / Write

The duration (in seconds) of this resource.

@@ -900,9 +955,9 @@

Default value: -1

-
+

The "height" property

-
  "height"                   gint                  : Read / Write
+
  "height"                   gint                  : Read / Write

The height of this image/video resource.

@@ -910,25 +965,25 @@

Default value: -1

-
+

The "import-uri" property

-
  "import-uri"               gchar*                : Read / Write
+
  "import-uri"               gchar*                : Read / Write

The Import URI associated with this resource.

Default value: NULL

-
+

The "protection" property

-
  "protection"               gchar*                : Read / Write
+
  "protection"               gchar*                : Read / Write

The protection system used for this resource.

Default value: NULL

-
+

The "protocol-info" property

  "protocol-info"            GUPnPProtocolInfo*    : Read / Write

@@ -936,9 +991,9 @@

-
+

The "sample-freq" property

-
  "sample-freq"              gint                  : Read / Write
+
  "sample-freq"              gint                  : Read / Write

The sample frequency of this resource.

@@ -946,9 +1001,19 @@

Default value: -1

-
+

The "size" property

-
  "size"                     glong                 : Read / Write
+
  "size"                     glong                 : Read / Write
+

+The size (in bytes) of this resource. +

+

Allowed values: >= -1

+

Default value: -1

+
+
+
+

The "size64" property

+
  "size64"                   gint64                : Read / Write

The size (in bytes) of this resource.

@@ -956,18 +1021,18 @@

Default value: -1

-
+

The "uri" property

-
  "uri"                      gchar*                : Read / Write
+
  "uri"                      gchar*                : Read / Write

The URI associated with this resource.

Default value: NULL

-
+

The "width" property

-
  "width"                    gint                  : Read / Write
+
  "width"                    gint                  : Read / Write

The width of this image/video resource.

@@ -975,9 +1040,9 @@

Default value: -1

-
+

The "xml-doc" property

-
  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only
+
  "xml-doc"                  GUPnPXMLDoc*          : Write / Construct Only

The reference to XML document containing this object.

@@ -987,9 +1052,9 @@

Stability Level: Private

-
+

The "xml-node" property

-
  "xml-node"                 gpointer              : Read / Write / Construct Only
+
  "xml-node"                 gpointer              : Read / Write / Construct Only

The pointer to res node in XML document.

@@ -998,6 +1063,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteWriter.html gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteWriter.html --- gupnp-av-0.5.6/doc/html/GUPnPDIDLLiteWriter.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPDIDLLiteWriter.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,7 +39,7 @@
-
+

Synopsis

                    GUPnPDIDLLiteWriter;
 GUPnPDIDLLiteWriter * gupnp_didl_lite_writer_new        (const char *language);
@@ -55,34 +55,34 @@
                                                          const char *filter);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPDIDLLiteWriter
-
+

Properties

-  "language"                 gchar*                : Read / Write / Construct Only
-  "xml-node"                 gpointer              : Read
+  "language"                 gchar*                : Read / Write / Construct Only
+  "xml-node"                 gpointer              : Read
-
+

Description

GUPnPDIDLLiteWriter is a helper class for writing DIDL-Lite fragments.

-
+

Details

-
+

GUPnPDIDLLiteWriter

typedef struct _GUPnPDIDLLiteWriter GUPnPDIDLLiteWriter;
-
+

gupnp_didl_lite_writer_new ()

GUPnPDIDLLiteWriter * gupnp_didl_lite_writer_new        (const char *language);
@@ -102,7 +102,7 @@
-
+

gupnp_didl_lite_writer_add_item ()

GUPnPDIDLLiteItem * gupnp_didl_lite_writer_add_item     (GUPnPDIDLLiteWriter *writer);

@@ -125,7 +125,7 @@

-
+

gupnp_didl_lite_writer_add_container ()

GUPnPDIDLLiteContainer * gupnp_didl_lite_writer_add_container
                                                         (GUPnPDIDLLiteWriter *writer);
@@ -149,7 +149,7 @@
-
+

gupnp_didl_lite_writer_add_descriptor ()

GUPnPDIDLLiteDescriptor * gupnp_didl_lite_writer_add_descriptor
                                                         (GUPnPDIDLLiteWriter *writer);
@@ -173,7 +173,7 @@
-
+

gupnp_didl_lite_writer_get_xml_node ()

xmlNode *           gupnp_didl_lite_writer_get_xml_node (GUPnPDIDLLiteWriter *writer);

@@ -196,7 +196,7 @@

-
+

gupnp_didl_lite_writer_get_string ()

char *              gupnp_didl_lite_writer_get_string   (GUPnPDIDLLiteWriter *writer);

@@ -212,14 +212,14 @@

Returns :

- The DIDL-Lite XML string, or NULL. g_free after usage. + The DIDL-Lite XML string, or NULL. g_free after usage.
-
+

gupnp_didl_lite_writer_get_language ()

const char *        gupnp_didl_lite_writer_get_language (GUPnPDIDLLiteWriter *writer);

@@ -236,14 +236,14 @@

Returns :

- The language of the writer, or NULL. + The language of the writer, or NULL.
-
+

gupnp_didl_lite_writer_filter ()

void                gupnp_didl_lite_writer_filter       (GUPnPDIDLLiteWriter *writer,
                                                          const char *filter);
@@ -276,20 +276,20 @@
-
+

Property Details

-
+

The "language" property

-
  "language"                 gchar*                : Read / Write / Construct Only
+
  "language"                 gchar*                : Read / Write / Construct Only

The language the DIDL-Lite fragment is in.

Default value: NULL

-
+

The "xml-node" property

-
  "xml-node"                 gpointer              : Read
+
  "xml-node"                 gpointer              : Read

The pointer to root node in XML document.

@@ -298,6 +298,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPLastChangeParser.html gupnp-av-0.5.9/doc/html/GUPnPLastChangeParser.html --- gupnp-av-0.5.6/doc/html/GUPnPLastChangeParser.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPLastChangeParser.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -28,7 +28,7 @@ Object Hierarchy -
+
@@ -37,46 +37,46 @@
-
+

Synopsis

                    GUPnPLastChangeParser;
 GUPnPLastChangeParser * gupnp_last_change_parser_new    (void);
-gboolean            gupnp_last_change_parser_parse_last_change_valist
+gboolean            gupnp_last_change_parser_parse_last_change_valist
                                                         (GUPnPLastChangeParser *parser,
-                                                         guint instance_id,
+                                                         guint instance_id,
                                                          const char *last_change_xml,
-                                                         GError **error,
+                                                         GError **error,
                                                          va_list var_args);
-gboolean            gupnp_last_change_parser_parse_last_change
+gboolean            gupnp_last_change_parser_parse_last_change
                                                         (GUPnPLastChangeParser *parser,
-                                                         guint instance_id,
+                                                         guint instance_id,
                                                          const char *last_change_xml,
-                                                         GError **error,
+                                                         GError **error,
                                                          ...);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPLastChangeParser
-
+

Description

GUPnPLastChangeParser parses XML strings from LastChange events that are generated by AVTransport and RenderingControl services.

-
+

Details

-
+

GUPnPLastChangeParser

typedef struct _GUPnPLastChangeParser GUPnPLastChangeParser;
-
+

gupnp_last_change_parser_new ()

GUPnPLastChangeParser * gupnp_last_change_parser_new    (void);
@@ -89,13 +89,13 @@
-
+

gupnp_last_change_parser_parse_last_change_valist ()

-
gboolean            gupnp_last_change_parser_parse_last_change_valist
+
gboolean            gupnp_last_change_parser_parse_last_change_valist
                                                         (GUPnPLastChangeParser *parser,
-                                                         guint instance_id,
+                                                         guint instance_id,
                                                          const char *last_change_xml,
-                                                         GError **error,
+                                                         GError **error,
                                                          va_list var_args);

 

 See gupnp_last_change_parser_parse_last_change(); this version takes a
@@ -140,13 +140,13 @@
-
+

gupnp_last_change_parser_parse_last_change ()

-
gboolean            gupnp_last_change_parser_parse_last_change
+
gboolean            gupnp_last_change_parser_parse_last_change
                                                         (GUPnPLastChangeParser *parser,
-                                                         guint instance_id,
+                                                         guint instance_id,
                                                          const char *last_change_xml,
-                                                         GError **error,
+                                                         GError **error,
                                                          ...);

 

 Parses the xml fragment from a LastChange event.
@@ -193,6 +193,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPProtocolInfo.html gupnp-av-0.5.9/doc/html/GUPnPProtocolInfo.html --- gupnp-av-0.5.6/doc/html/GUPnPProtocolInfo.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPProtocolInfo.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Properties -
+
@@ -39,16 +39,16 @@
-
+

Synopsis

                    GUPnPProtocolInfo;
 enum                GUPnPDLNAConversion;
 enum                GUPnPDLNAFlags;
 enum                GUPnPDLNAOperation;
 GUPnPProtocolInfo * gupnp_protocol_info_new_from_string (const char *protocol_info,
-                                                         GError **error);
+                                                         GError **error);
 char *              gupnp_protocol_info_to_string       (GUPnPProtocolInfo *info);
-gboolean            gupnp_protocol_info_is_compatible   (GUPnPProtocolInfo *info1,
+gboolean            gupnp_protocol_info_is_compatible   (GUPnPProtocolInfo *info1,
                                                          GUPnPProtocolInfo *info2);
 void                gupnp_protocol_info_set_protocol    (GUPnPProtocolInfo *info,
                                                          const char *protocol);
@@ -82,41 +82,41 @@
 GUPnPDLNAFlags      gupnp_protocol_info_get_dlna_flags  (GUPnPProtocolInfo *info);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPProtocolInfo
-
+

Properties

   "dlna-conversion"          GUPnPDLNAConversion   : Read / Write
   "dlna-flags"               GUPnPDLNAFlags        : Read / Write
   "dlna-operation"           GUPnPDLNAOperation    : Read / Write
-  "dlna-profile"             gchar*                : Read / Write
-  "mime-type"                gchar*                : Read / Write
-  "network"                  gchar*                : Read / Write
-  "play-speeds"              GStrv*                : Read / Write
-  "protocol"                 gchar*                : Read / Write
+  "dlna-profile"             gchar*                : Read / Write
+  "mime-type"                gchar*                : Read / Write
+  "network"                  gchar*                : Read / Write
+  "play-speeds"              GStrv                 : Read / Write
+  "protocol"                 gchar*                : Read / Write
-
+

Description

GUPnPProtocolInfo provides a convenient API to deal with ProtocolInfo strings used in UPnP AV specifications.

-
+

Details

-
+

GUPnPProtocolInfo

typedef struct _GUPnPProtocolInfo GUPnPProtocolInfo;
-
+

enum GUPnPDLNAConversion

typedef enum {
         GUPNP_DLNA_CONVERSION_NONE       = 0,
@@ -143,7 +143,7 @@
-
+

enum GUPnPDLNAFlags

typedef enum {
         GUPNP_DLNA_FLAGS_NONE                      = 0,
@@ -242,7 +242,7 @@
-
+

enum GUPnPDLNAOperation

typedef enum {
         GUPNP_DLNA_OPERATION_NONE     = 0x00,
@@ -275,10 +275,10 @@
-
+

gupnp_protocol_info_new_from_string ()

GUPnPProtocolInfo * gupnp_protocol_info_new_from_string (const char *protocol_info,
-                                                         GError **error);
+ GError **error);

Parses the protocol_info string and creates a new GUPnPProtocolInfo object as a result. @@ -305,7 +305,7 @@

-
+

gupnp_protocol_info_to_string ()

char *              gupnp_protocol_info_to_string       (GUPnPProtocolInfo *info);

@@ -321,16 +321,16 @@

Returns :

- String representation of info. g_free after usage. + String representation of info. g_free after usage.
-
+

gupnp_protocol_info_is_compatible ()

-
gboolean            gupnp_protocol_info_is_compatible   (GUPnPProtocolInfo *info1,
+
gboolean            gupnp_protocol_info_is_compatible   (GUPnPProtocolInfo *info1,
                                                          GUPnPProtocolInfo *info2);

 

 Checks if the given protocolInfo string is compatible with info.
@@ -350,15 +350,15 @@
 
 
 
Returns :

- TRUE if protocol_info is compatible with info, otherwise
-FALSE.
+ TRUE if protocol_info is compatible with info, otherwise
+FALSE.
-
+

gupnp_protocol_info_set_protocol ()

void                gupnp_protocol_info_set_protocol    (GUPnPProtocolInfo *info,
                                                          const char *protocol);
@@ -387,7 +387,7 @@
-
+

gupnp_protocol_info_set_network ()

void                gupnp_protocol_info_set_network     (GUPnPProtocolInfo *info,
                                                          const char *network);
@@ -416,7 +416,7 @@
-
+

gupnp_protocol_info_set_mime_type ()

void                gupnp_protocol_info_set_mime_type   (GUPnPProtocolInfo *info,
                                                          const char *mime_type);
@@ -445,7 +445,7 @@
-
+

gupnp_protocol_info_set_dlna_profile ()

void                gupnp_protocol_info_set_dlna_profile
                                                         (GUPnPProtocolInfo *info,
@@ -475,7 +475,7 @@
-
+

gupnp_protocol_info_set_play_speeds ()

void                gupnp_protocol_info_set_play_speeds (GUPnPProtocolInfo *info,
                                                          const char **speeds);
@@ -504,7 +504,7 @@
-
+

gupnp_protocol_info_set_dlna_conversion ()

void                gupnp_protocol_info_set_dlna_conversion
                                                         (GUPnPProtocolInfo *info,
@@ -534,7 +534,7 @@
-
+

gupnp_protocol_info_set_dlna_operation ()

void                gupnp_protocol_info_set_dlna_operation
                                                         (GUPnPProtocolInfo *info,
@@ -564,7 +564,7 @@
-
+

gupnp_protocol_info_set_dlna_flags ()

void                gupnp_protocol_info_set_dlna_flags  (GUPnPProtocolInfo *info,
                                                          GUPnPDLNAFlags flags);
@@ -593,7 +593,7 @@
-
+

gupnp_protocol_info_get_protocol ()

const char *        gupnp_protocol_info_get_protocol    (GUPnPProtocolInfo *info);

@@ -609,7 +609,7 @@

Returns :

- The protocol of this info or NULL. This string should not + The protocol of this info or NULL. This string should not be freed. @@ -617,7 +617,7 @@
-
+

gupnp_protocol_info_get_network ()

const char *        gupnp_protocol_info_get_network     (GUPnPProtocolInfo *info);

@@ -633,14 +633,14 @@

Returns :

- The network string or NULL. This string should not be freed. + The network string or NULL. This string should not be freed.
-
+

gupnp_protocol_info_get_mime_type ()

const char *        gupnp_protocol_info_get_mime_type   (GUPnPProtocolInfo *info);

@@ -656,7 +656,7 @@

Returns :

- The MIME-type of this info or NULL. This string should not + The MIME-type of this info or NULL. This string should not be freed. @@ -664,7 +664,7 @@
-
+

gupnp_protocol_info_get_dlna_profile ()

const char *        gupnp_protocol_info_get_dlna_profile
                                                         (GUPnPProtocolInfo *info);
@@ -681,7 +681,7 @@

Returns :

- The DLNA profile of this info or NULL. This string should + The DLNA profile of this info or NULL. This string should not be freed. @@ -689,7 +689,7 @@
-
+

gupnp_protocol_info_get_play_speeds ()

const char **       gupnp_protocol_info_get_play_speeds (GUPnPProtocolInfo *info);

@@ -705,7 +705,7 @@

Returns :

- The allowed play speeds as array of strings or NULL. This + The allowed play speeds as array of strings or NULL. This return array and it's content must not be modified or freed. @@ -713,7 +713,7 @@
-
+

gupnp_protocol_info_get_dlna_conversion ()

GUPnPDLNAConversion  gupnp_protocol_info_get_dlna_conversion
                                                         (GUPnPProtocolInfo *info);
@@ -737,7 +737,7 @@
-
+

gupnp_protocol_info_get_dlna_operation ()

GUPnPDLNAOperation  gupnp_protocol_info_get_dlna_operation
                                                         (GUPnPProtocolInfo *info);
@@ -761,7 +761,7 @@
-
+

gupnp_protocol_info_get_dlna_flags ()

GUPnPDLNAFlags      gupnp_protocol_info_get_dlna_flags  (GUPnPProtocolInfo *info);

@@ -784,9 +784,9 @@

-
+

Property Details

-
+

The "dlna-conversion" property

  "dlna-conversion"          GUPnPDLNAConversion   : Read / Write

@@ -794,7 +794,7 @@

-
+

The "dlna-flags" property

  "dlna-flags"               GUPnPDLNAFlags        : Read / Write

@@ -802,7 +802,7 @@

-
+

The "dlna-operation" property

  "dlna-operation"           GUPnPDLNAOperation    : Read / Write

@@ -810,45 +810,45 @@

-
+

The "dlna-profile" property

-
  "dlna-profile"             gchar*                : Read / Write
+
  "dlna-profile"             gchar*                : Read / Write

The DLNA profile of this info.

Default value: NULL

-
+

The "mime-type" property

-
  "mime-type"                gchar*                : Read / Write
+
  "mime-type"                gchar*                : Read / Write

The MIME-type of this info.

Default value: NULL

-
+

The "network" property

-
  "network"                  gchar*                : Read / Write
+
  "network"                  gchar*                : Read / Write

The network this info is associated with.

Default value: NULL

-
+

The "play-speeds" property

-
  "play-speeds"              GStrv*                : Read / Write
+
  "play-speeds"              GStrv                 : Read / Write

The allowed play speeds on this info in the form of array of strings.

-
+

The "protocol" property

-
  "protocol"                 gchar*                : Read / Write
+
  "protocol"                 gchar*                : Read / Write

The protocol of this info.

@@ -858,6 +858,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/GUPnPSearchCriteriaParser.html gupnp-av-0.5.9/doc/html/GUPnPSearchCriteriaParser.html --- gupnp-av-0.5.6/doc/html/GUPnPSearchCriteriaParser.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/GUPnPSearchCriteriaParser.html 2010-08-10 05:14:58.000000000 -0700 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Signals -
+
@@ -39,26 +39,26 @@
-
+

Synopsis

                    GUPnPSearchCriteriaParser;
 enum                GUPnPSearchCriteriaOp;
 GUPnPSearchCriteriaParser * gupnp_search_criteria_parser_new
                                                         (void);
-gboolean            gupnp_search_criteria_parser_parse_text
+gboolean            gupnp_search_criteria_parser_parse_text
                                                         (GUPnPSearchCriteriaParser *parser,
                                                          const char *text,
-                                                         GError **error);
+                                                         GError **error);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPSearchCriteriaParser
-
+

Signals

   "begin-parens"                                   : Run Last
@@ -68,7 +68,7 @@
   "expression"                                     : Run Last
-
+

Description

GUPnPSearchCriteriaParser parses ContentDirectory search criteria @@ -80,14 +80,14 @@ over disjunction.

-
+

Details

-
+

GUPnPSearchCriteriaParser

typedef struct _GUPnPSearchCriteriaParser GUPnPSearchCriteriaParser;
-
+

enum GUPnPSearchCriteriaOp

typedef enum {
         /* G_TYPE_STRING */
@@ -165,7 +165,7 @@
-
+

gupnp_search_criteria_parser_new ()

GUPnPSearchCriteriaParser * gupnp_search_criteria_parser_new
                                                         (void);
@@ -179,12 +179,12 @@
-
+

gupnp_search_criteria_parser_parse_text ()

-
gboolean            gupnp_search_criteria_parser_parse_text
+
gboolean            gupnp_search_criteria_parser_parse_text
                                                         (GUPnPSearchCriteriaParser *parser,
                                                          const char *text,
-                                                         GError **error);

+                                                         GError **error);

Parses text, emitting the various defined signals on the way. If an error occured error will be set. @@ -216,12 +216,12 @@

-
+

Signal Details

-
+

The "begin-parens" signal

void                user_function                      (GUPnPSearchCriteriaParser *parser,
-                                                        gpointer                   user_data)      : Run Last
+ gpointer user_data) : Run Last

The ::begin_parens signal is emitted to mark the beginning of a parenthetical expression. @@ -242,10 +242,10 @@

-
+

The "conjunction" signal

void                user_function                      (GUPnPSearchCriteriaParser *parser,
-                                                        gpointer                   user_data)      : Run Last
+ gpointer user_data) : Run Last

The ::conjuction signal is emitted whenever a conjuction marker (and) is parsed. @@ -266,10 +266,10 @@

-
+

The "disjunction" signal

void                user_function                      (GUPnPSearchCriteriaParser *parser,
-                                                        gpointer                   user_data)      : Run Last
+ gpointer user_data) : Run Last

The ::disjuction signal is emitted whenever a disjuction marker (or&rpar is parsed. @@ -290,10 +290,10 @@

-
+

The "end-parens" signal

void                user_function                      (GUPnPSearchCriteriaParser *parser,
-                                                        gpointer                   user_data)      : Run Last
+ gpointer user_data) : Run Last

The ::end_parens signal is emitted to mark the end of a parenthetical expression. @@ -314,17 +314,17 @@

-
+

The "expression" signal

-
gboolean            user_function                      (GUPnPSearchCriteriaParser *parser,
-                                                        gchar                     *property,
+
gboolean            user_function                      (GUPnPSearchCriteriaParser *parser,
+                                                        gchar                     *property,
                                                         GUPnPSearchCriteriaOp      op,
-                                                        gchar                     *value,
-                                                        gpointer                   error,
-                                                        gpointer                   user_data)      : Run Last

+                                                        gchar                     *value,
+                                                        gpointer                   error,
+                                                        gpointer                   user_data)      : Run Last

The ::expression signal is emitted whenever an expression is parsed. -Set error and return FALSE if an error occurred. +Set error and return FALSE if an error occurred.

@@ -365,6 +365,6 @@
- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1 \ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/index.html gupnp-av-0.5.9/doc/html/index.html --- gupnp-av-0.5.6/doc/html/index.html 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/index.html 2010-08-10 05:14:58.000000000 -0700 @@ -6,21 +6,21 @@ - + -
+
-

Version 0.5.6 +

Version 0.5.9

Copyright © 2007,2008 OpenedHand LTD

Copyright © 2007,2008 Zeeshan Ali <zeenix@gmail.com>

Copyright © 2009,2010 Nokia Corporation

-
-

+

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -90,6 +90,6 @@

- Generated by GTK-Doc V1.14
+ Generated by GTK-Doc V1.15.1
\ No newline at end of file diff -Nru gupnp-av-0.5.6/doc/html/index.sgml gupnp-av-0.5.9/doc/html/index.sgml --- gupnp-av-0.5.6/doc/html/index.sgml 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/index.sgml 2010-08-10 05:14:58.000000000 -0700 @@ -135,6 +135,7 @@ + @@ -148,6 +149,7 @@ + @@ -169,6 +171,7 @@ + @@ -211,6 +214,8 @@ + + diff -Nru gupnp-av-0.5.6/doc/html/style.css gupnp-av-0.5.9/doc/html/style.css --- gupnp-av-0.5.6/doc/html/style.css 2010-06-09 11:06:23.000000000 -0700 +++ gupnp-av-0.5.9/doc/html/style.css 2010-08-10 05:14:58.000000000 -0700 @@ -209,6 +209,14 @@ font-weight: normal; } +.annotation +{ + /* tango:aluminium 5 */ + color: #555753; + font-size: 80%; + font-weight: normal; +} + /* code listings */ .listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ diff -Nru gupnp-av-0.5.6/doc/Makefile.in gupnp-av-0.5.9/doc/Makefile.in --- gupnp-av-0.5.6/doc/Makefile.in 2010-06-09 10:59:42.000000000 -0700 +++ gupnp-av-0.5.9/doc/Makefile.in 2010-08-05 15:16:46.000000000 -0700 @@ -513,8 +513,11 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) - @cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ @@ -533,8 +536,11 @@ sgml-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) - @cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp diff -Nru gupnp-av-0.5.6/doc/version.xml gupnp-av-0.5.9/doc/version.xml --- gupnp-av-0.5.6/doc/version.xml 2010-06-09 11:06:10.000000000 -0700 +++ gupnp-av-0.5.9/doc/version.xml 2010-08-05 15:16:53.000000000 -0700 @@ -1 +1 @@ -0.5.6 +0.5.9 diff -Nru gupnp-av-0.5.6/gtk-doc.make gupnp-av-0.5.9/gtk-doc.make --- gupnp-av-0.5.6/gtk-doc.make 2010-04-03 07:35:19.000000000 -0700 +++ gupnp-av-0.5.9/gtk-doc.make 2010-07-19 18:20:21.000000000 -0700 @@ -74,8 +74,11 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) - @cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ @@ -94,8 +97,11 @@ sgml-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) - @cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-av-marshal.c gupnp-av-0.5.9/libgupnp-av/gupnp-av-marshal.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-av-marshal.c 2010-04-09 06:45:53.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-av-marshal.c 2010-07-20 08:20:31.000000000 -0700 @@ -25,6 +25,7 @@ #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -48,6 +49,7 @@ #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-contributor.c gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-contributor.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-contributor.c 2010-02-14 14:31:28.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-contributor.c 2010-07-31 03:47:51.000000000 -0700 @@ -44,6 +44,8 @@ enum { PROP_0, + PROP_XML_NODE, + PROP_XML_DOC, PROP_ROLE, PROP_NAME }; @@ -68,6 +70,12 @@ contributor = GUPNP_DIDL_LITE_CONTRIBUTOR (object); switch (property_id) { + case PROP_XML_NODE: + g_value_set_pointer + (value, + gupnp_didl_lite_contributor_get_xml_node + (contributor)); + break; case PROP_ROLE: g_value_set_string (value, @@ -96,6 +104,12 @@ contributor = GUPNP_DIDL_LITE_CONTRIBUTOR (object); switch (property_id) { + case PROP_XML_NODE: + contributor->priv->xml_node = g_value_get_pointer (value); + break; + case PROP_XML_DOC: + contributor->priv->xml_doc = g_value_dup_object (value); + break; case PROP_ROLE: gupnp_didl_lite_contributor_set_role (contributor, @@ -141,6 +155,51 @@ object_class->set_property = gupnp_didl_lite_contributor_set_property; object_class->dispose = gupnp_didl_lite_contributor_dispose; + g_type_class_add_private (klass, + sizeof (GUPnPDIDLLiteContributorPrivate)); + + /** + * GUPnPDIDLLiteContributor:xml-node + * + * The pointer to object node in XML document. + **/ + g_object_class_install_property + (object_class, + PROP_XML_NODE, + g_param_spec_pointer ("xml-node", + "XMLNode", + "The pointer to contributor node in XML" + " document.", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + /** + * GUPnPDIDLLiteContributor:xml-doc + * + * The reference to XML document containing this object. + * + * Internal property. + * + * Stability: Private + **/ + g_object_class_install_property + (object_class, + PROP_XML_DOC, + g_param_spec_object ("xml-doc", + "XMLDoc", + "The reference to XML document" + " containing this contributor.", + GUPNP_TYPE_XML_DOC, + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_PRIVATE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + /** * GUPnPDIDLLiteContributor:role * diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-descriptor.c gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-descriptor.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-descriptor.c 2010-02-14 14:31:28.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-descriptor.c 2010-07-20 09:21:24.000000000 -0700 @@ -30,7 +30,6 @@ #include #include "gupnp-didl-lite-descriptor.h" -#include "gupnp-dlna-private.h" #include "xml-util.h" G_DEFINE_TYPE (GUPnPDIDLLiteDescriptor, diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-object.c gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-object.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-object.c 2010-05-25 13:30:46.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-object.c 2010-07-20 09:29:39.000000000 -0700 @@ -74,6 +74,19 @@ PROP_TRACK_NUMBER, }; +static int +is_non_transcoded_resource (GUPnPDIDLLiteResource *resource) +{ + GUPnPProtocolInfo *info; + + info = gupnp_didl_lite_resource_get_protocol_info (resource); + if (G_UNLIKELY (info == NULL)) + return -1; + + return gupnp_protocol_info_get_dlna_conversion (info) & + GUPNP_DLNA_CONVERSION_TRANSCODED; +} + static void gupnp_didl_lite_object_init (GUPnPDIDLLiteObject *object) { @@ -203,6 +216,18 @@ (value, gupnp_didl_lite_object_get_xml_node (didl_object)); break; + case PROP_UPNP_NAMESPACE: + g_value_set_pointer + (value, + gupnp_didl_lite_object_get_upnp_namespace + (didl_object)); + break; + case PROP_DC_NAMESPACE: + g_value_set_pointer + (value, + gupnp_didl_lite_object_get_dc_namespace + (didl_object)); + break; case PROP_ID: g_value_set_string (value, @@ -285,55 +310,6 @@ } static void -gupnp_didl_lite_object_lookup_namespaces (GUPnPDIDLLiteObjectPrivate *priv) -{ - xmlNs **ns_list; - - if (priv->upnp_ns && priv->dc_ns) - return; - - ns_list = xmlGetNsList (priv->xml_doc->doc, - xmlDocGetRootElement (priv->xml_doc->doc)); - - if (ns_list) { - short i; - - for (i = 0; ns_list[i] != NULL; i++) { - const char *prefix; - - prefix = (const char *) ns_list[i]->prefix; - - if (prefix == NULL) - continue; - - if (! priv->upnp_ns && - g_ascii_strcasecmp (prefix, "upnp") == 0) - priv->upnp_ns = ns_list[i]; - else if (! priv->dc_ns && - g_ascii_strcasecmp (prefix, "dc") == 0) - priv->dc_ns = ns_list[i]; - } - - xmlFree (ns_list); - } -} - -static void -gupnp_didl_lite_object_constructed (GObject *object) -{ - GObjectClass *object_class; - GUPnPDIDLLiteObjectPrivate *priv; - - priv = GUPNP_DIDL_LITE_OBJECT (object)->priv; - - gupnp_didl_lite_object_lookup_namespaces (priv); - - object_class = G_OBJECT_CLASS (gupnp_didl_lite_object_parent_class); - if (object_class->constructed != NULL) - object_class->constructed (object); -} - -static void gupnp_didl_lite_object_dispose (GObject *object) { GObjectClass *object_class; @@ -359,7 +335,6 @@ object_class->set_property = gupnp_didl_lite_object_set_property; object_class->get_property = gupnp_didl_lite_object_get_property; - object_class->constructed = gupnp_didl_lite_object_constructed; object_class->dispose = gupnp_didl_lite_object_dispose; g_type_class_add_private (klass, sizeof (GUPnPDIDLLiteObjectPrivate)); @@ -409,22 +384,18 @@ /** * GUPnPDIDLLiteObject:upnp-namespace * - * Pointer to the UPNP XML namespace registered with the - * XML document containing this object. + * Pointer to the UPnP namespace registered with the XML document * containing this object. * - * Internal property. - * - * Stability: Private **/ g_object_class_install_property (object_class, PROP_UPNP_NAMESPACE, g_param_spec_pointer ("upnp-namespace", "XML namespace", - "Pointer to the UPNP XML namespace " + "Pointer to the UPnP XML namespace " "registered with the XML document " "containing this object.", - G_PARAM_WRITABLE | + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | @@ -433,12 +404,9 @@ /** * GUPnPDIDLLiteObject:dc-namespace * - * Pointer to the DublinCore XML namespace registered with - * the XML document containing this object. - * - * Internal property. + * Pointer to the DublinCore namespace registered with the XML document + * containing this object. * - * Stability: Private **/ g_object_class_install_property (object_class, @@ -448,7 +416,7 @@ "Pointer to the Dublin Core XML " "namespace registered with the XML " "document containing this object.", - G_PARAM_WRITABLE | + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | @@ -785,6 +753,8 @@ * gupnp_didl_lite_object_new_from_xml: * @xml_node: The pointer to 'res' node in XML document * @xml_doc: The reference to XML document containing this object + * @upnp_ns: The pointer to 'upnp' namespace in XML document + * @dc_ns: The pointer to 'dc' namespace in XML document * * Creates a new #GUPnPDIDLLiteObject for the @xml_node. * @@ -798,7 +768,8 @@ { g_return_val_if_fail (xml_node != NULL, NULL); g_return_val_if_fail (xml_node->name != NULL, NULL); - g_return_val_if_fail (GUPNP_IS_XML_DOC (xml_doc), NULL); + g_return_val_if_fail (upnp_ns != NULL, NULL); + g_return_val_if_fail (dc_ns != NULL, NULL); if (g_ascii_strcasecmp ((char *) xml_node->name, "container") == 0) return g_object_new (GUPNP_TYPE_DIDL_LITE_CONTAINER, @@ -835,6 +806,39 @@ } /** + * gupnp_didl_lite_object_get_upnp_namespace: + * @object: The #GUPnPDIDLLiteObject + * + * Get the pointer to the UPnP namespace registered with the XML document. + * + * Return value: The pointer to UPnP namespace in XML document. + **/ +xmlNsPtr +gupnp_didl_lite_object_get_upnp_namespace (GUPnPDIDLLiteObject *object) +{ + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + + return object->priv->upnp_ns; +} + +/** + * gupnp_didl_lite_object_get_dc_namespace: + * @object: The #GUPnPDIDLLiteObject + * + * Get the pointer to the DublinCore namespace registered with the XML document + * containing this object. + * + * Return value: The pointer to DublinCore namespace in XML document. + **/ +xmlNsPtr +gupnp_didl_lite_object_get_dc_namespace (GUPnPDIDLLiteObject *object) +{ + g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); + + return object->priv->dc_ns; +} + +/** * gupnp_didl_lite_object_get_upnp_class: * @object: The #GUPnPDIDLLiteObject * @@ -1280,6 +1284,7 @@ { GUPnPDIDLLiteResource *resource = NULL; GList *resources = NULL; + GList *compat_resources = NULL; GList *res; g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); @@ -1290,15 +1295,32 @@ return NULL; for (res = resources; - res != NULL && resource == NULL; + res != NULL; res = res->next) { resource = (GUPnPDIDLLiteResource *) res->data; - if (!is_resource_compatible (resource, sink_protocol_info)) - resource = NULL; + if (is_resource_compatible (resource, sink_protocol_info)) + compat_resources = g_list_append (compat_resources, + resource); } - if (resource == NULL && lenient) + resource = NULL; + + if (compat_resources != NULL) { + /* Try to find non-transcoded resource */ + res = g_list_find_custom (compat_resources, + NULL, + (GCompareFunc) + is_non_transcoded_resource); + + if (res != NULL) + resource = (GUPnPDIDLLiteResource *) res->data; + else + /* Just use the first compatible resource */ + resource = (GUPnPDIDLLiteResource *) + compat_resources->data; + + } else if (lenient) /* Just use the first resource */ resource = (GUPnPDIDLLiteResource *) resources->data; @@ -1307,6 +1329,7 @@ if (res->data != resource) g_object_unref (res->data); g_list_free (resources); + g_list_free (compat_resources); return resource; } @@ -1660,14 +1683,26 @@ gupnp_didl_lite_object_set_album_art (GUPnPDIDLLiteObject *object, const char *album_art) { + xmlNode *node; + xmlNs *dlna_ns; + g_return_if_fail (object != NULL); g_return_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object)); - xml_util_set_child (object->priv->xml_node, - object->priv->upnp_ns, - object->priv->xml_doc->doc, - "albumArtURI", - album_art); + node = xml_util_set_child (object->priv->xml_node, + object->priv->upnp_ns, + object->priv->xml_doc->doc, + "albumArtURI", + album_art); + + dlna_ns = xmlNewNs (node, + (const unsigned char *) + "urn:schemas-dlna-org:metadata-2-0/", + (const unsigned char *) "dlna"); + xmlNewNsProp (node, + dlna_ns, + (const unsigned char *) "profileID", + (const unsigned char *) "JPEG_TN"); g_object_notify (G_OBJECT (object), "album-art"); } diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-object.h gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-object.h --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-object.h 2010-02-14 14:31:28.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-object.h 2010-07-20 08:20:06.000000000 -0700 @@ -80,6 +80,13 @@ xmlNode * gupnp_didl_lite_object_get_xml_node (GUPnPDIDLLiteObject *object); +xmlNsPtr +gupnp_didl_lite_object_get_upnp_namespace + (GUPnPDIDLLiteObject *object); + +xmlNsPtr +gupnp_didl_lite_object_get_dc_namespace (GUPnPDIDLLiteObject *object); + const char * gupnp_didl_lite_object_get_upnp_class (GUPnPDIDLLiteObject *object); diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-parser.c gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-parser.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-parser.c 2010-05-25 13:30:46.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-parser.c 2010-07-20 08:20:06.000000000 -0700 @@ -163,9 +163,12 @@ const char *didl, GError **error) { - xmlDoc *doc; - xmlNode *element; - GUPnPXMLDoc *xml_doc; + xmlDoc *doc; + xmlNode *element; + xmlNs **ns_list; + xmlNs *upnp_ns = NULL; + xmlNs *dc_ns = NULL; + GUPnPXMLDoc *xml_doc; doc = xmlRecoverMemory (didl, strlen (didl)); if (doc == NULL) { @@ -203,13 +206,51 @@ return FALSE; } + /* Lookup UPnP and DC namespaces */ + ns_list = xmlGetNsList (doc, + xmlDocGetRootElement (doc)); + + if (ns_list) { + short i; + + for (i = 0; ns_list[i] != NULL; i++) { + const char *prefix = (const char *) ns_list[i]->prefix; + + if (prefix == NULL) + continue; + + if (! upnp_ns && + g_ascii_strcasecmp (prefix, "upnp") == 0) + upnp_ns = ns_list[i]; + else if (! dc_ns && + g_ascii_strcasecmp (prefix, "dc") == 0) + dc_ns = ns_list[i]; + } + + xmlFree (ns_list); + } + + /* Create UPnP and DC namespaces if they don't exist */ + if (! upnp_ns) + upnp_ns = xmlNewNs (xmlDocGetRootElement (doc), + (unsigned char *) + "urn:schemas-upnp-org:metadata-1-0/upnp/", + (unsigned char *) + GUPNP_DIDL_LITE_WRITER_NAMESPACE_UPNP); + if (! dc_ns) + dc_ns = xmlNewNs (xmlDocGetRootElement (doc), + (unsigned char *) + "http://purl.org/dc/elements/1.1/", + (unsigned char *) + GUPNP_DIDL_LITE_WRITER_NAMESPACE_DC); + xml_doc = gupnp_xml_doc_new (doc); for (element = element->children; element; element = element->next) { GUPnPDIDLLiteObject *object; object = gupnp_didl_lite_object_new_from_xml (element, xml_doc, - NULL, NULL); + upnp_ns, dc_ns); if (object == NULL) continue; diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-resource.c gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-resource.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-resource.c 2010-03-23 07:04:20.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-resource.c 2010-08-05 15:25:01.000000000 -0700 @@ -32,7 +32,6 @@ #include #include "gupnp-didl-lite-resource.h" -#include "gupnp-dlna-private.h" #include "xml-util.h" #define SEC_PER_MIN 60 @@ -60,6 +59,7 @@ PROP_PROTOCOL_INFO, PROP_SIZE, + PROP_SIZE64, PROP_DURATION, PROP_BITRATE, PROP_SAMPLE_FREQ, @@ -180,6 +180,10 @@ gupnp_didl_lite_resource_set_size (resource, g_value_get_long (value)); break; + case PROP_SIZE64: + gupnp_didl_lite_resource_set_size64 (resource, + g_value_get_int64 (value)); + break; case PROP_DURATION: gupnp_didl_lite_resource_set_duration (resource, @@ -262,6 +266,9 @@ case PROP_SIZE: g_value_set_long (value, gupnp_didl_lite_resource_get_size (resource)); + case PROP_SIZE64: + g_value_set_int64 (value, + gupnp_didl_lite_resource_get_size64 (resource)); break; case PROP_DURATION: g_value_set_long @@ -465,6 +472,25 @@ G_PARAM_STATIC_BLURB)); /** + * GUPnPDIDLLiteResource:size64 + * + * The size (in bytes) of this resource. + **/ + g_object_class_install_property + (object_class, + PROP_SIZE64, + g_param_spec_int64 ("size64", + "Size64", + "The size (in bytes) of this resource.", + -1, + G_MAXINT64, + -1, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + /** * GUPnPDIDLLiteResource:duration * * The duration (in seconds) of this resource. @@ -747,20 +773,6 @@ error->message); g_error_free (error); - } else { - /* Try guessing the DLNA profile if not available */ - if (gupnp_protocol_info_get_dlna_profile (info) == NULL) { - const char *dlna_profile; - const char *mime_type; - - mime_type = gupnp_protocol_info_get_mime_type (info); - dlna_profile = dlna_guess_profile (resource, mime_type); - - if (dlna_profile) - gupnp_protocol_info_set_dlna_profile - (info, - dlna_profile); - } } resource->priv->protocol_info = info; @@ -779,13 +791,28 @@ long gupnp_didl_lite_resource_get_size (GUPnPDIDLLiteResource *resource) { + return (long) gupnp_didl_lite_resource_get_size64 (resource); +} + +/** + * gupnp_didl_lite_resource_get_size64 + * @resource: A #GUPnPDIDLLiteResource + * + * Get the size (in bytes) of the @resource. + * + * Return value: The size (in bytes) of the @resource or -1. + **/ +gint64 +gupnp_didl_lite_resource_get_size64 (GUPnPDIDLLiteResource *resource) +{ g_return_val_if_fail (GUPNP_IS_DIDL_LITE_RESOURCE (resource), -1); - return xml_util_get_long_attribute (resource->priv->xml_node, - "size", - -1); + return xml_util_get_int64_attribute (resource->priv->xml_node, + "size", + -1); } + /** * gupnp_didl_lite_resource_get_duration * @resource: A #GUPnPDIDLLiteResource @@ -1009,9 +1036,7 @@ * @resource: A #GUPnPDIDLLiteResource * @info: The protocol string * - * Set the protocol info associated with the @resource. If the - * #GUPnPProtocolInfo:dlna-profile of @info is not set, an attempt will be made - * to guess it for you. + * Set the protocol info associated with the @resource. * * Return value: None. **/ @@ -1024,19 +1049,6 @@ g_return_if_fail (GUPNP_IS_DIDL_LITE_RESOURCE (resource)); g_return_if_fail (GUPNP_IS_PROTOCOL_INFO (info)); - /* Try guessing the DLNA profile if not available */ - if (gupnp_protocol_info_get_dlna_profile (info) == NULL) { - const char *dlna_profile; - const char *mime_type; - - mime_type = gupnp_protocol_info_get_mime_type (info); - dlna_profile = dlna_guess_profile (resource, mime_type); - - if (dlna_profile) - gupnp_protocol_info_set_dlna_profile (info, - dlna_profile); - } - str = gupnp_protocol_info_to_string (info); xmlSetProp (resource->priv->xml_node, (unsigned char *) "protocolInfo", @@ -1077,6 +1089,23 @@ gupnp_didl_lite_resource_set_size (GUPnPDIDLLiteResource *resource, long size) { + gupnp_didl_lite_resource_set_size64 (resource, size); +} + +/** + * gupnp_didl_lite_resource_set_size64 + * @resource: A #GUPnPDIDLLiteResource + * @size: The size (in bytes) + * + * Set the size (in bytes) of the @resource. Passing a negative number will + * unset this property. + * + * Return value: None. + **/ +void +gupnp_didl_lite_resource_set_size64 (GUPnPDIDLLiteResource *resource, + gint64 size) +{ g_return_if_fail (GUPNP_IS_DIDL_LITE_RESOURCE (resource)); if (size < 0) @@ -1085,16 +1114,18 @@ else { char *str; - str = g_strdup_printf ("%ld", size); + str = g_strdup_printf ("%" G_GINT64_FORMAT, size); xmlSetProp (resource->priv->xml_node, (unsigned char *) "size", (unsigned char *) str); g_free (str); } + g_object_notify (G_OBJECT (resource), "size64"); g_object_notify (G_OBJECT (resource), "size"); } + /** * gupnp_didl_lite_resource_set_duration * @resource: A #GUPnPDIDLLiteResource @@ -1117,7 +1148,7 @@ else { char *str; - str = g_strdup_printf ("%ld:%.2ld:%.2ld.00", + str = g_strdup_printf ("%ld:%.2ld:%.2ld.000", duration / (60 * 60), (duration / 60) % 60, duration % 60); diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-resource.h gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-resource.h --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-resource.h 2010-02-09 08:19:37.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-resource.h 2010-08-05 15:14:39.000000000 -0700 @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -95,6 +96,10 @@ long size); void +gupnp_didl_lite_resource_set_size64 (GUPnPDIDLLiteResource *resource, + gint64 size); + +void gupnp_didl_lite_resource_set_duration (GUPnPDIDLLiteResource *resource, long duration); @@ -150,6 +155,9 @@ long gupnp_didl_lite_resource_get_size (GUPnPDIDLLiteResource *resource); +gint64 +gupnp_didl_lite_resource_get_size64 (GUPnPDIDLLiteResource *resource); + long gupnp_didl_lite_resource_get_duration (GUPnPDIDLLiteResource *resource); diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-writer.c gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-writer.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-didl-lite-writer.c 2010-05-25 13:30:46.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-didl-lite-writer.c 2010-07-20 09:22:32.000000000 -0700 @@ -32,7 +32,6 @@ #include "gupnp-didl-lite-object.h" #include "gupnp-didl-lite-object-private.h" #include "gupnp-didl-lite-descriptor-private.h" -#include "gupnp-dlna-private.h" G_DEFINE_TYPE (GUPnPDIDLLiteWriter, gupnp_didl_lite_writer, @@ -135,6 +134,8 @@ strcmp (name, "title") == 0) || (g_strcmp0 (namespace, "upnp") == 0 && strcmp (name, "class") == 0) || + (g_strcmp0 (parent_name, "albumArtURI") == 0 && + strcmp (name, "profileID") == 0) || (g_strcmp0 (parent_name, "res") == 0 && strcmp (name, "protocolInfo") == 0); } @@ -184,7 +185,9 @@ if (child->ns != NULL) ns = (const char *) child->ns->prefix; - if (!is_standard_prop ((const char *) child->name, ns, NULL) && + if (!is_standard_prop ((const char *) child->name, + ns, + (const char *) node->name) && is_node_forbidden (child, allowed, ns)) forbidden = g_list_append (forbidden, child); } diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-dlna.c gupnp-av-0.5.9/libgupnp-av/gupnp-dlna.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-dlna.c 2010-03-02 02:27:11.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-dlna.c 2010-07-20 09:30:16.000000000 -0700 @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ -#include "gupnp-dlna-private.h" +#include "gupnp-dlna.h" GType gupnp_dlna_conversion_get_type (void) @@ -73,7 +73,7 @@ return type; } - GType +GType gupnp_dlna_flags_get_type (void) { static GType type = 0; @@ -129,296 +129,3 @@ return type; } - -static const char * -guess_jpeg_profile (GUPnPDIDLLiteResource *resource) -{ - int width; - int height; - - width = gupnp_didl_lite_resource_get_width (resource); - height = gupnp_didl_lite_resource_get_height (resource); - - if (width < 0 || height < 0) { - return "JPEG_MED"; - } else if (width <= 48 && height <= 48) { - return "JPEG_SM_ICO"; - } else if (width <= 120 && height <= 120) { - return "JPEG_LRG_ICO"; - } else if (width <= 160 && height <= 160) { - return "JPEG_TN"; /* Thumbnail */ - } else if (width <= 640 && height <= 480) { - return "JPEG_SM"; - } else if (width <= 1024 && height <= 768) { - return "JPEG_MED"; - } else if (width <= 4096 && height <= 4096) { - return "JPEG_LRG"; - } else { - return NULL; - } -} - -static const char * -guess_png_profile (GUPnPDIDLLiteResource *resource) -{ - int width; - int height; - - width = gupnp_didl_lite_resource_get_width (resource); - height = gupnp_didl_lite_resource_get_height (resource); - - if (width < 0 || height < 0) { - return "PNG_MED"; - } else if (width <= 48 && height <= 48) { - return "PNG_SM_ICO"; - } else if (width <= 120 && height <= 120) { - return "PNG_LRG_ICO"; - } else if (width <= 160 && height <= 160) { - return "PNG_TN"; /* Thumbnail */ - } else if (width <= 640 && height <= 480) { - return "PNG_SM"; - } else if (width <= 1024 && height <= 768) { - return "PNG_MED"; - } else if (width <= 4096 && height <= 4096) { - return "PNG_LRG"; - } else { - return NULL; - } -} - -static void -check_int_allowed (int value, - const char *value_name, - const int *allowed_values, - const char *profile) -{ - if (value > 0) { - const int *allowed_value; - gboolean not_allowed = TRUE; - - for (allowed_value = allowed_values; - *allowed_value != -1; - allowed_value++) { - if (value == *allowed_value) { - not_allowed = FALSE; - break; - } - } - - if (not_allowed) { - g_warning ("DLNA specs do not allow %d as %s for %s profile", - value, - value_name, - profile); - } - } -} - -static void -check_frequency (GUPnPDIDLLiteResource *resource, - const int *allowed_freq, - const char *profile) -{ - int sample_freq; - - sample_freq = gupnp_didl_lite_resource_get_sample_freq (resource); - - check_int_allowed (sample_freq, - "frequency", - allowed_freq, - profile); -} - -static void -check_bitrate (GUPnPDIDLLiteResource *resource, - const int *allowed_bitrates, - const char *profile) -{ - int bitrate; - - bitrate = gupnp_didl_lite_resource_get_bitrate (resource); - - check_int_allowed (bitrate, - "bitrate", - allowed_bitrates, - profile); -} - -static void -check_sample_size (GUPnPDIDLLiteResource *resource, - const int *allowed_sample_size, - const char *profile) -{ - int sample_size; - - sample_size = gupnp_didl_lite_resource_get_bits_per_sample (resource); - - check_int_allowed (sample_size, - "bitsPerSample", - allowed_sample_size, - profile); -} - -static void -check_num_channels (GUPnPDIDLLiteResource *resource, - const int *allowed_num_channels, - const char *profile) -{ - int channels; - - channels = gupnp_didl_lite_resource_get_audio_channels (resource); - - check_int_allowed (channels, - "nrAudioChannels", - allowed_num_channels, - profile); -} - -static const char * -guess_ac3_profile (GUPnPDIDLLiteResource *resource) -{ - const int allowed_freq[] = { 32000, 44100, 48000, -1 }; - - check_frequency (resource, allowed_freq, "AC3"); - - return "AC3"; -} - -static const char * -guess_lpcm_profile (GUPnPDIDLLiteResource *resource) -{ - const int allowed_freq[] = { 44100, 48000, -1 }; - const int allowed_num_channels[] = { 1, 2, -1 }; - const int allowed_sample_size [] = { 16, -1 }; - - check_frequency (resource, allowed_freq, "LPCM"); - check_num_channels (resource, allowed_num_channels, "LPCM"); - check_sample_size (resource, allowed_sample_size, "LPCM"); - - return "LPCM"; -} - -static const char * -guess_mp3_profile (GUPnPDIDLLiteResource *resource) -{ - const int allowed_freq[] = { 32000, 44100, 48000, -1 }; - const int allowed_num_channels[] = { 1, 2, -1 }; - const int allowed_bitrates[] = { 4000, - 5000, - 6000, - 7000, - 8000, - 10000, - 12000, - 14000, - 16000, - 20000, - 24000, - 28000, - 32000, - 40000, - -1 }; - - check_frequency (resource, allowed_freq, "MP3"); - check_num_channels (resource, allowed_num_channels, "MP3"); - check_bitrate (resource, allowed_bitrates, "MP3"); - - return "MP3"; -} - -static const char * -guess_aac_profile (GUPnPDIDLLiteResource *resource) -{ - const int allowed_freq[] = { 8000, - 11025, - 12000, - 16000, - 22050, - 24000, - 32000, - 44100, - 48000, - -1 }; - const int allowed_num_channels[] = { 1, 2, -1 }; - int bitrate; - - check_frequency (resource, allowed_freq, "AAC_ISO"); - check_num_channels (resource, allowed_num_channels, "AAC_ISO"); - - bitrate = gupnp_didl_lite_resource_get_bitrate (resource); - if (bitrate > 0 && bitrate <= 4000) { - return "AAC_ISO_320"; - } else if (bitrate <= 7200) { - return "AAC_ISO"; - } - return NULL; -} - -static const char * -guess_wma_profile (GUPnPDIDLLiteResource *resource) -{ - int sample_freq; - int channels; - int bitrate; - - sample_freq = gupnp_didl_lite_resource_get_sample_freq (resource); - channels = gupnp_didl_lite_resource_get_audio_channels (resource); - bitrate = gupnp_didl_lite_resource_get_bitrate (resource); - - if (sample_freq > 0 && channels > 0 && - sample_freq <= 48000 && channels <= 2) { - if (bitrate > 0 && bitrate <= 24125) { - return "WMABASE"; - } else { - return "WMAFULL"; - } - } else { - return "WMAPRO"; - } -} - -static const char * -guess_mpeg_ts_profile (GUPnPDIDLLiteResource *resource) -{ - int width; - int height; - - width = gupnp_didl_lite_resource_get_width (resource); - height = gupnp_didl_lite_resource_get_height (resource); - - if (width > 0 && height > 0 && width / height == 16 / 9) { - return "MPEG_TS_HD_NA"; - } else { - return "MPEG_TS_SD_NA"; - } -} - -const char * -dlna_guess_profile (GUPnPDIDLLiteResource *resource, - const char *mime_type) -{ - if (g_str_has_prefix (mime_type, "image/jpeg")) { - return guess_jpeg_profile (resource); - } else if (g_str_has_prefix (mime_type, "image/png")) { - return guess_png_profile (resource); - } else if (g_str_has_prefix (mime_type, - "audio/vnd.dolby.dd-raw")) { - return guess_ac3_profile (resource); - } else if (g_str_has_prefix (mime_type, "audio/mp4") || - g_str_has_prefix (mime_type, "audio/3gpp")) { - return guess_aac_profile (resource); - } else if (g_str_has_prefix (mime_type, "audio/L16")) { - return guess_lpcm_profile (resource); - } else if (g_str_has_prefix (mime_type, "audio/mpeg")) { - return guess_mp3_profile (resource); - } else if (g_str_has_prefix (mime_type, "audio/x-ms-wma")) { - return guess_wma_profile (resource); - } else if (g_str_has_prefix (mime_type, "video/mpeg")) { - return guess_mpeg_ts_profile (resource); - } else if (g_str_has_prefix (mime_type, "video/mp4") || - g_str_has_prefix (mime_type, "video/3gpp")) { - return "MPEG4_P2_MP4_SP_VGA_AAC"; - } else { - return NULL; - } -} diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-dlna.h gupnp-av-0.5.9/libgupnp-av/gupnp-dlna.h --- gupnp-av-0.5.6/libgupnp-av/gupnp-dlna.h 2010-02-14 14:31:28.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-dlna.h 2010-07-20 09:24:57.000000000 -0700 @@ -22,7 +22,7 @@ #ifndef __GUPNP_DLNA_H__ #define __GUPNP_DLNA_H__ -#include +#include G_BEGIN_DECLS diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-dlna-private.h gupnp-av-0.5.9/libgupnp-av/gupnp-dlna-private.h --- gupnp-av-0.5.6/libgupnp-av/gupnp-dlna-private.h 2010-03-02 02:27:11.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-dlna-private.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation. - * - * Authors: Zeeshan Ali - * - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GUPNP_DLNA_PRIVATE_H__ -#define __GUPNP_DLNA_PRIVATE_H__ - -#include -#include "gupnp-didl-lite-resource.h" - -G_BEGIN_DECLS - -G_GNUC_INTERNAL const char * -dlna_guess_profile (GUPnPDIDLLiteResource *resource, - const char *mime_type); - -G_END_DECLS - -#endif /* __GUPNP_DLNA_PRIVATE_H__ */ diff -Nru gupnp-av-0.5.6/libgupnp-av/gupnp-protocol-info.c gupnp-av-0.5.9/libgupnp-av/gupnp-protocol-info.c --- gupnp-av-0.5.6/libgupnp-av/gupnp-protocol-info.c 2010-02-14 14:31:28.000000000 -0800 +++ gupnp-av-0.5.9/libgupnp-av/gupnp-protocol-info.c 2010-08-05 14:31:18.000000000 -0700 @@ -236,6 +236,7 @@ const char *dlna_profile; const char **speeds; GUPnPDLNAConversion conversion; + GUPnPDLNAOperation operation; GUPnPDLNAFlags flags; dlna_profile = gupnp_protocol_info_get_dlna_profile (info); @@ -246,17 +247,16 @@ g_string_append_printf (str, ":DLNA.ORG_PN=%s", dlna_profile); - /* the OP parameter is only allowed for the "http-get" - * and "rtsp-rtp-udp" protocols - */ - if (strcmp (gupnp_protocol_info_get_protocol (info), - "http-get") == 0 || - strcmp (gupnp_protocol_info_get_protocol (info), - "rtsp-rtp-udp") == 0) - g_string_append_printf - (str, - ";DLNA.ORG_OP=%.2x", - gupnp_protocol_info_get_dlna_operation (info)); + operation = gupnp_protocol_info_get_dlna_operation (info); + if (operation != GUPNP_DLNA_OPERATION_NONE && + /* the OP parameter is only allowed for the "http-get" + * and "rtsp-rtp-udp" protocols + */ + (strcmp (gupnp_protocol_info_get_protocol (info), + "http-get") == 0 || + strcmp (gupnp_protocol_info_get_protocol (info), + "rtsp-rtp-udp") == 0)) + g_string_append_printf (str, ";DLNA.ORG_OP=%.2x", operation); /* Specify PS parameter if list of play speeds is provided */ speeds = gupnp_protocol_info_get_play_speeds (info); diff -Nru gupnp-av-0.5.6/libgupnp-av/Makefile.am gupnp-av-0.5.9/libgupnp-av/Makefile.am --- gupnp-av-0.5.6/libgupnp-av/Makefile.am 2010-04-09 08:58:08.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/Makefile.am 2010-07-20 09:20:45.000000000 -0700 @@ -58,7 +58,6 @@ gupnp-protocol-info.c \ gupnp-search-criteria-parser.c \ gupnp-last-change-parser.c \ - gupnp-dlna-private.h \ gupnp-dlna.c \ gupnp-av-error.c \ xml-util.c \ diff -Nru gupnp-av-0.5.6/libgupnp-av/Makefile.in gupnp-av-0.5.9/libgupnp-av/Makefile.in --- gupnp-av-0.5.6/libgupnp-av/Makefile.in 2010-06-09 10:59:42.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/Makefile.in 2010-08-05 15:16:46.000000000 -0700 @@ -300,7 +300,6 @@ gupnp-protocol-info.c \ gupnp-search-criteria-parser.c \ gupnp-last-change-parser.c \ - gupnp-dlna-private.h \ gupnp-dlna.c \ gupnp-av-error.c \ xml-util.c \ diff -Nru gupnp-av-0.5.6/libgupnp-av/xml-util.c gupnp-av-0.5.9/libgupnp-av/xml-util.c --- gupnp-av-0.5.6/libgupnp-av/xml-util.c 2010-04-06 08:25:38.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/xml-util.c 2010-08-05 15:31:22.000000000 -0700 @@ -169,16 +169,26 @@ const char *attribute_name, glong default_value) { + return (glong) xml_util_get_int64_attribute (node, + attribute_name, + (gint64) default_value); +} + +gint64 +xml_util_get_int64_attribute (xmlNode *node, + const char *attribute_name, + gint64 default_value) +{ const char *content; content = xml_util_get_attribute_content (node, attribute_name); if (!content) return default_value; - return atoll (content); + return g_ascii_strtoll (content, NULL, 0); } -void +xmlNode * xml_util_set_child (xmlNode *parent_node, xmlNs *namespace, xmlDoc *doc, @@ -199,5 +209,7 @@ escaped = xmlEncodeSpecialChars (doc, (const unsigned char *) value); xmlNodeSetContent (node, escaped); xmlFree (escaped); + + return node; } diff -Nru gupnp-av-0.5.6/libgupnp-av/xml-util.h gupnp-av-0.5.9/libgupnp-av/xml-util.h --- gupnp-av-0.5.6/libgupnp-av/xml-util.h 2010-03-18 08:19:39.000000000 -0700 +++ gupnp-av-0.5.9/libgupnp-av/xml-util.h 2010-08-05 15:26:08.000000000 -0700 @@ -64,7 +64,12 @@ const char *attribute_name, glong default_value); -G_GNUC_INTERNAL void +G_GNUC_INTERNAL gint64 +xml_util_get_int64_attribute (xmlNode *node, + const char *attribute_name, + gint64 default_value); + +G_GNUC_INTERNAL xmlNode * xml_util_set_child (xmlNode *parent_node, xmlNs *namespace, xmlDoc *doc, diff -Nru gupnp-av-0.5.6/m4/libtool.m4 gupnp-av-0.5.9/m4/libtool.m4 --- gupnp-av-0.5.6/m4/libtool.m4 2010-02-20 15:11:53.000000000 -0800 +++ gupnp-av-0.5.9/m4/libtool.m4 2010-07-20 08:20:21.000000000 -0700 @@ -2445,7 +2445,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -2485,6 +2485,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3072,11 +3084,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3693,7 +3705,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3757,7 +3769,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3977,7 +3989,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4182,6 +4194,9 @@ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4246,6 +4261,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4267,6 +4285,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4358,7 +4377,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4428,7 +4447,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4603,6 +4622,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4841,7 +4861,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5841,7 +5861,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -Nru gupnp-av-0.5.6/NEWS gupnp-av-0.5.9/NEWS --- gupnp-av-0.5.6/NEWS 2010-06-09 10:58:44.000000000 -0700 +++ gupnp-av-0.5.9/NEWS 2010-08-10 05:13:00.000000000 -0700 @@ -1,3 +1,62 @@ +0.5.9 +===== + +Changes since 0.5.8: + +- Add 64bit size property to allow resources to be bigger than 2-GB. +- Mircoseconds part of duration in resources needs to be a 3-digit number + as per DLNA requirement (7.3.22.1). +- Don't set the operation parameter if no operations are supported as per DLNA + requirement (7.3.33.3). + +Bug fixed in this release: + +2183 - size property of DIDL resource should be 64bit unsigned according to UPnP + spec + +All contributors to this release: + +Jens Georg +Zeeshan Ali (Khattak) + +0.5.8 +===== + +Changes since 0.5.7: + +- Fix crashes in DIDLLiteContributor API. +- Remove incomplete and broken DLNA guessing code. Applications should use + gupnp-dlna now for all their DLNA needs. +- Do set the 'dlna:profileID' property of 'albumArtURI' node and treat it as + mandatory as per DLNA guidelines (7.3.61.3). +- Prefer non-transcoded resources over transcoded ones when choosing compatible + resources for a particular MediaRenderer. +- Minor correction to DIDL filtering code. +- Some other minor improvements/fixes. + +Bug fixed in this release: + +2187 - GUPnPDIDLLiteContributor class doesn't work + +All contributors to this release: + +Zeeshan Ali (Khattak) + +0.5.7 +===== + +Changes since 0.5.6: + +- Make namespace properties on GUPnPDIDLLiteObject readable and provide + getter functions for them. +- Improve performance of DIDL-Lite parsing by moving namespace lookups to + GUPnPDIDLLiteParser. + +All contributors to this release: + +Sven Neumann +Zeeshan Ali (Khattak) + 0.5.6 =====