diff -Nru rygel-0.32.0/ChangeLog rygel-0.32.1/ChangeLog --- rygel-0.32.0/ChangeLog 2016-09-19 19:12:11.000000000 +0000 +++ rygel-0.32.1/ChangeLog 2016-10-10 18:58:33.000000000 +0000 @@ -1,5 +1,81 @@ # Generated by Makefile. Do not edit. +commit 3c84b744b446ae84f6811e6b232840ab3d77fc7d +Author: Jens Georg +Date: Mon Oct 10 20:44:55 2016 +0200 + + Prepare 0.32.1 + + Signed-off-by: Jens Georg + + NEWS | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit b44f67fbf58ceefb3fe3123b077c4bab6d6645d4 +Author: Rico Tzschichholz +Date: Fri Sep 30 16:25:30 2016 +0200 + + Fix non-matching generic types of inferface implementations + + src/librygel-ruih/rygel-ruih-protocol-elem.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d2e516d409109804ac2ae589dc4a19cae28eac71 +Author: Rico Tzschichholz +Date: Fri Sep 30 16:17:30 2016 +0200 + + Fix 'static const' warnings with vala 0.33.1 + + .../rygel-basic-management-test-nslookup.vala | 10 +++---- + .../rygel-basic-management-test-ping.vala | 22 +++++++------- + .../rygel-basic-management-test-traceroute.vala | 24 +++++++-------- + src/librygel-core/rygel-build-config.vapi | 26 ++++++++--------- + src/librygel-core/rygel-plugin.vala | 32 ++++++++++---------- + .../rygel-recursive-module-loader.vala | 2 +- + .../rygel-media-renderer-plugin.vala | 4 +-- + src/librygel-ruih/rygel-ruih-filter-entry.vala | 2 +- + src/librygel-ruih/rygel-ruih-icon-elem.vala | 10 +++---- + src/librygel-ruih/rygel-ruih-server-plugin.vala | 4 +-- + src/librygel-ruih/rygel-ruih-servicemanager.vala | 12 ++++---- + src/librygel-ruih/rygel-ruih-ui-listing.vala | 24 +++++++-------- + .../rygel-dlna-available-seek-request.vala | 2 +- + .../rygel-dlna-available-seek-response.vala | 2 +- + .../rygel-dtcp-cleartext-request.vala | 2 +- + .../rygel-http-response-element.vala | 2 +- + src/librygel-server/rygel-http-seek.vala | 2 +- + .../rygel-http-time-seek-request.vala | 2 +- + src/librygel-server/rygel-media-server-plugin.vala | 4 +-- + src/librygel-server/rygel-playspeed-request.vala | 2 +- + src/librygel-server/rygel-playspeed-response.vala | 2 +- + src/librygel-server/rygel-writable-container.vala | 2 +- + .../external/rygel-external-interfaces.vala | 12 ++++---- + src/plugins/lms/rygel-lms-album.vala | 12 ++++---- + src/plugins/lms/rygel-lms-albums.vala | 14 ++++----- + src/plugins/lms/rygel-lms-all-images.vala | 10 +++---- + src/plugins/lms/rygel-lms-all-music.vala | 12 ++++---- + src/plugins/lms/rygel-lms-all-videos.vala | 10 +++---- + src/plugins/lms/rygel-lms-artist.vala | 6 ++-- + src/plugins/lms/rygel-lms-artists.vala | 6 ++-- + src/plugins/lms/rygel-lms-image-year.vala | 10 +++---- + src/plugins/lms/rygel-lms-image-years.vala | 6 ++-- + .../media-export/rygel-media-export-extract.vala | 2 +- + .../rygel-media-export-playlist-container.vala | 2 +- + ...rygel-media-export-playlist-root-container.vala | 4 +-- + .../rygel-media-export-query-container.vala | 4 +-- + src/rygel/rygel-user-config.vala | 34 +++++++++++----------- + tests/object-creator/test.vala | 8 ++--- + tests/rygel-http-response-test.vala | 4 +-- + 39 files changed, 175 insertions(+), 175 deletions(-) + +commit e6158753f2413076fa74e558cd9ec3ce0fcfc2ff +Author: Gianvito Cavasoli +Date: Thu Oct 6 11:51:11 2016 +0000 + + Updated Italian translation + + po/it.po | 125 ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 51 insertions(+), 74 deletions(-) + commit 88ea6f896fa6abc3d46e383956dd3e7c33313553 Author: Jens Georg Date: Mon Sep 19 20:45:26 2016 +0200 diff -Nru rygel-0.32.0/configure rygel-0.32.1/configure --- rygel-0.32.0/configure 2016-09-19 19:02:45.000000000 +0000 +++ rygel-0.32.1/configure 2016-10-10 18:50:46.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Rygel 0.32.0. +# Generated by GNU Autoconf 2.69 for Rygel 0.32.1. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='Rygel' PACKAGE_TARNAME='rygel' -PACKAGE_VERSION='0.32.0' -PACKAGE_STRING='Rygel 0.32.0' +PACKAGE_VERSION='0.32.1' +PACKAGE_STRING='Rygel 0.32.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel' PACKAGE_URL='http://www.rygel-project.org' @@ -1598,7 +1598,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 Rygel 0.32.0 to adapt to many kinds of systems. +\`configure' configures Rygel 0.32.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1669,7 +1669,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Rygel 0.32.0:";; + short | recursive ) echo "Configuration of Rygel 0.32.1:";; esac cat <<\_ACEOF @@ -1926,7 +1926,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Rygel configure 0.32.0 +Rygel configure 0.32.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2295,7 +2295,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Rygel $as_me 0.32.0, which was +It was created by Rygel $as_me 0.32.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5336,7 +5336,7 @@ # Define the identity of the package. PACKAGE='rygel' - VERSION='0.32.0' + VERSION='0.32.1' cat >>confdefs.h <<_ACEOF @@ -20355,7 +20355,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Rygel $as_me 0.32.0, which was +This file was extended by Rygel $as_me 0.32.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20422,7 +20422,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Rygel config.status 0.32.0 +Rygel config.status 0.32.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru rygel-0.32.0/data/rygel.desktop.in rygel-0.32.1/data/rygel.desktop.in --- rygel-0.32.0/data/rygel.desktop.in 2016-09-19 19:08:22.000000000 +0000 +++ rygel-0.32.1/data/rygel.desktop.in 2016-10-10 18:55:50.000000000 +0000 @@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Rygel X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=0.32.0 +X-GNOME-Bugzilla-Version=0.32.1 diff -Nru rygel-0.32.0/data/rygel-preferences.desktop.in rygel-0.32.1/data/rygel-preferences.desktop.in --- rygel-0.32.0/data/rygel-preferences.desktop.in 2016-09-19 19:08:22.000000000 +0000 +++ rygel-0.32.1/data/rygel-preferences.desktop.in 2016-10-10 18:55:50.000000000 +0000 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Rygel X-GNOME-Bugzilla-Component=rygel-preferences -X-GNOME-Bugzilla-Version=0.32.0 +X-GNOME-Bugzilla-Version=0.32.1 diff -Nru rygel-0.32.0/data/xml/MediaRenderer2.xml.in rygel-0.32.1/data/xml/MediaRenderer2.xml.in --- rygel-0.32.0/data/xml/MediaRenderer2.xml.in 2016-09-19 19:03:21.000000000 +0000 +++ rygel-0.32.1/data/xml/MediaRenderer2.xml.in 2016-10-10 18:51:13.000000000 +0000 @@ -10,7 +10,7 @@ Rygel Developers http://www.rygel-project.org Rygel - 0.32.0 + 0.32.1 http://www.rygel-project.org diff -Nru rygel-0.32.0/data/xml/MediaServer3.xml.in rygel-0.32.1/data/xml/MediaServer3.xml.in --- rygel-0.32.0/data/xml/MediaServer3.xml.in 2016-09-19 19:03:21.000000000 +0000 +++ rygel-0.32.1/data/xml/MediaServer3.xml.in 2016-10-10 18:51:13.000000000 +0000 @@ -10,7 +10,7 @@ Rygel Developers. http://www.rygel-project.org Rygel - 0.32.0 + 0.32.1 0000001 diff -Nru rygel-0.32.0/data/xml/RuihServer2.xml.in rygel-0.32.1/data/xml/RuihServer2.xml.in --- rygel-0.32.0/data/xml/RuihServer2.xml.in 2016-09-19 19:03:21.000000000 +0000 +++ rygel-0.32.1/data/xml/RuihServer2.xml.in 2016-10-10 18:51:13.000000000 +0000 @@ -11,7 +11,7 @@ Rygel Developers. http://www.rygel-project.org Rygel - 0.32.0 + 0.32.1 0000001 diff -Nru rygel-0.32.0/debian/changelog rygel-0.32.1/debian/changelog --- rygel-0.32.0/debian/changelog 2016-10-04 14:36:07.000000000 +0000 +++ rygel-0.32.1/debian/changelog 2016-10-18 07:21:52.000000000 +0000 @@ -1,3 +1,13 @@ +rygel (0.32.1-1) unstable; urgency=medium + + * Drop obsolete transitional package (Closes: #841098) + * Drop explicitly disabling silent build + * Bump to dh compat 10 + * Use fail-missing to detect shipping mistakes + * New upstream release. + + -- Andreas Henriksson Tue, 18 Oct 2016 09:21:52 +0200 + rygel (0.32.0-2) unstable; urgency=medium * Fix rygel system service examples install path diff -Nru rygel-0.32.0/debian/compat rygel-0.32.1/debian/compat --- rygel-0.32.0/debian/compat 2016-10-04 14:36:07.000000000 +0000 +++ rygel-0.32.1/debian/compat 2016-10-18 07:21:52.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru rygel-0.32.0/debian/control rygel-0.32.1/debian/control --- rygel-0.32.0/debian/control 2016-10-04 14:36:07.000000000 +0000 +++ rygel-0.32.1/debian/control 2016-10-18 07:21:52.000000000 +0000 @@ -7,8 +7,7 @@ Priority: extra Maintainer: Debian GNOME Maintainers Uploaders: Andreas Henriksson , Laurent Bigonville -Build-Depends: debhelper (>= 9.20160114~), - dh-autoreconf (>= 4), +Build-Depends: debhelper (>= 10), gnome-pkg-tools, gobject-introspection, gstreamer1.0-plugins-base, @@ -209,15 +208,6 @@ This package provides a MediaServer plugin that exports user's media contents known to Tracker (http://projects.gnome.org/tracker). -Package: rygel-gst-renderer -Section: oldlibs -Architecture: all -Depends: rygel-playbin, ${misc:Depends} -Description: transitional dummy package - The old rygel-gst-renderer package was renamed to rygel-playbin. - This is just a transitional dummy package to guide upgrades. - This package can safely be removed! - Package: rygel-playbin Architecture: any Depends: gstreamer1.0-plugins-good, diff -Nru rygel-0.32.0/debian/control.in rygel-0.32.1/debian/control.in --- rygel-0.32.0/debian/control.in 2016-10-04 14:36:07.000000000 +0000 +++ rygel-0.32.1/debian/control.in 2016-10-18 07:21:52.000000000 +0000 @@ -3,8 +3,7 @@ Priority: extra Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 9.20160114~), - dh-autoreconf (>= 4), +Build-Depends: debhelper (>= 10), gnome-pkg-tools, gobject-introspection, gstreamer1.0-plugins-base, @@ -205,15 +204,6 @@ This package provides a MediaServer plugin that exports user's media contents known to Tracker (http://projects.gnome.org/tracker). -Package: rygel-gst-renderer -Section: oldlibs -Architecture: all -Depends: rygel-playbin, ${misc:Depends} -Description: transitional dummy package - The old rygel-gst-renderer package was renamed to rygel-playbin. - This is just a transitional dummy package to guide upgrades. - This package can safely be removed! - Package: rygel-playbin Architecture: any Depends: gstreamer1.0-plugins-good, diff -Nru rygel-0.32.0/debian/rules rygel-0.32.1/debian/rules --- rygel-0.32.0/debian/rules 2016-10-04 14:36:07.000000000 +0000 +++ rygel-0.32.1/debian/rules 2016-10-18 07:21:52.000000000 +0000 @@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autoreconf,gnome + dh $@ --with gnome export DEB_LFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed @@ -18,8 +18,7 @@ --enable-mediathek-plugin \ --enable-gst-launch-plugin \ --disable-lms-plugin \ - --disable-apidocs \ - --disable-silent-rules + --disable-apidocs override_dh_autoreconf: dh_autoreconf --as-needed @@ -32,5 +31,5 @@ override_dh_install: find . -name '*.la' | xargs rm -f - dh_install --list-missing + dh_install --fail-missing diff -Nru rygel-0.32.0/doc/rygel.1 rygel-0.32.1/doc/rygel.1 --- rygel-0.32.0/doc/rygel.1 2016-09-19 19:10:30.000000000 +0000 +++ rygel-0.32.1/doc/rygel.1 2016-10-10 18:57:51.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: RYGEL .\" Author: Jens Georg .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 09/19/2016 +.\" Date: 10/10/2016 .\" Manual: Rygel User Manual .\" Source: rygel .\" Language: English .\" -.TH "RYGEL" "1" "09/19/2016" "rygel" "Rygel User Manual" +.TH "RYGEL" "1" "10/10/2016" "rygel" "Rygel User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru rygel-0.32.0/doc/rygel.conf.5 rygel-0.32.1/doc/rygel.conf.5 --- rygel-0.32.0/doc/rygel.conf.5 2016-09-19 19:10:30.000000000 +0000 +++ rygel-0.32.1/doc/rygel.conf.5 2016-10-10 18:57:52.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: rygel.conf .\" Author: Jens Georg .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 09/19/2016 +.\" Date: 10/10/2016 .\" Manual: Rygel User Manual .\" Source: rygel .\" Language: English .\" -.TH "RYGEL\&.CONF" "5" "09/19/2016" "rygel" "Rygel User Manual" +.TH "RYGEL\&.CONF" "5" "10/10/2016" "rygel" "Rygel User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru rygel-0.32.0/NEWS rygel-0.32.1/NEWS --- rygel-0.32.0/NEWS 2016-09-19 18:45:15.000000000 +0000 +++ rygel-0.32.1/NEWS 2016-10-10 18:44:45.000000000 +0000 @@ -1,3 +1,16 @@ +0.32.1 +====== + +- Translation updates +- Fix compile warnings with newer vala compiler + +All contributors to this release: + - Rico Tzschichholz + - Gianvito Cavasoli + +Added/updated translations + - it, courtesy of Gianvito Cavasoli + 0.32.0 ====== - Translation updates Binary files /tmp/tmpaaWVuI/Pi55xs3wal/rygel-0.32.0/po/it.gmo and /tmp/tmpaaWVuI/C5vngcm14L/rygel-0.32.1/po/it.gmo differ diff -Nru rygel-0.32.0/po/it.po rygel-0.32.1/po/it.po --- rygel-0.32.0/po/it.po 2016-06-29 19:20:26.000000000 +0000 +++ rygel-0.32.1/po/it.po 2016-10-10 18:43:30.000000000 +0000 @@ -12,8 +12,8 @@ "Project-Id-Version: rygel\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=rygel&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-22 06:33+0000\n" -"PO-Revision-Date: 2016-03-22 10:05+0100\n" +"POT-Creation-Date: 2016-09-14 17:45+0000\n" +"PO-Revision-Date: 2016-10-06 13:40+0200\n" "Last-Translator: Gianvito Cavasoli \n" "Language-Team: Italiano \n" "Language: it\n" @@ -32,7 +32,8 @@ msgid "UPnP/DLNA Services" msgstr "Servizi UPnP/DLNA" -#: data/rygel.desktop.in.in:6 +#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: data/rygel.desktop.in.in:7 msgid "mediaserver;mediarenderer;share;audio;video;pictures;" msgstr "" "mediaserver;media;condividere;condividi;audio;video;immagini;foto;fotografie;" @@ -45,15 +46,11 @@ msgid "UPnP/DLNA Preferences" msgstr "Preferenze UPnP/DLNA" -#: data/rygel-preferences.desktop.in.in:6 -#| msgid "Rygel" +#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! +#: data/rygel-preferences.desktop.in.in:7 msgid "rygel" msgstr "rygel" -#: data/rygel-preferences.ui:67 data/rygel-preferences.ui:198 -msgid "column" -msgstr "colonna" - #: data/rygel-preferences.ui:94 msgid "Add a directory to the list of shared directories" msgstr "Aggiunge una directory all'elenco di directory condivise" @@ -175,6 +172,7 @@ #: src/librygel-core/rygel-connection-manager.vala:95 #: src/librygel-core/rygel-connection-manager.vala:109 #: src/librygel-core/rygel-connection-manager.vala:126 +#: src/librygel-core/rygel-energy-management.vala:223 #: src/librygel-renderer/rygel-av-transport.vala:198 #: src/librygel-renderer/rygel-rendering-control.vala:131 #: src/librygel-ruih/rygel-ruih-service.vala:63 @@ -206,7 +204,7 @@ msgid "Invalid connection reference" msgstr "Riferimento di connessione non valido" -#: src/librygel-core/rygel-description-file.vala:490 +#: src/librygel-core/rygel-description-file.vala:494 #, c-format msgid "Failed to write modified description to %s" msgstr "Scrittura della descrizione modificata in %s non riuscita" @@ -266,22 +264,22 @@ msgstr "Nessun valore disponibile" #. translators: "enabled" is part of the config key and must not be translated -#: src/librygel-core/rygel-meta-config.vala:325 +#: src/librygel-core/rygel-meta-config.vala:336 #, c-format msgid "No value set for '%s/enabled'" msgstr "Nessun valore impostato per «%s/enabled»" #. translators: "title" is part of the config key and must not be translated -#: src/librygel-core/rygel-meta-config.vala:344 +#: src/librygel-core/rygel-meta-config.vala:355 #, c-format msgid "No value set for '%s/title'" msgstr "Nessun valore impostato per «%s/title»" -#: src/librygel-core/rygel-meta-config.vala:364 -#: src/librygel-core/rygel-meta-config.vala:386 -#: src/librygel-core/rygel-meta-config.vala:412 -#: src/librygel-core/rygel-meta-config.vala:434 -#: src/librygel-core/rygel-meta-config.vala:458 +#: src/librygel-core/rygel-meta-config.vala:375 +#: src/librygel-core/rygel-meta-config.vala:397 +#: src/librygel-core/rygel-meta-config.vala:423 +#: src/librygel-core/rygel-meta-config.vala:445 +#: src/librygel-core/rygel-meta-config.vala:469 #, c-format msgid "No value available for '%s/%s'" msgstr "Nessun valore disponibile per «%s/%s»" @@ -295,22 +293,22 @@ msgid "Plugin module %s does not exist" msgstr "Il modulo del plugin %s non esiste" -#: src/librygel-core/rygel-plugin-loader.vala:81 +#: src/librygel-core/rygel-plugin-loader.vala:89 #, c-format msgid "New plugin '%s' available" msgstr "Disponibile il nuovo plugin «%s»" -#: src/librygel-core/rygel-plugin-loader.vala:96 +#: src/librygel-core/rygel-plugin-loader.vala:104 #, c-format msgid "A module named %s is already loaded" msgstr "Un modulo chiamato %s è già caricato" -#: src/librygel-core/rygel-plugin-loader.vala:105 +#: src/librygel-core/rygel-plugin-loader.vala:113 #, c-format msgid "Failed to load module from path '%s': %s" msgstr "Caricamento del modulo dal percorso «%s» non riuscito: %s" -#: src/librygel-core/rygel-plugin-loader.vala:115 +#: src/librygel-core/rygel-plugin-loader.vala:123 #, c-format msgid "Failed to find entry point function '%s' in '%s': %s" msgstr "" @@ -493,7 +491,7 @@ msgid "Failed to browse '%s': %s\n" msgstr "Esplorazione di «%s» non riuscita: %s\n" -#: src/librygel-server/rygel-client-hacks.vala:141 +#: src/librygel-server/rygel-client-hacks.vala:145 msgid "Not Applicable" msgstr "Non applicabile" @@ -718,13 +716,6 @@ msgid "Bad URI: %s" msgstr "Indirizzo errato: %s" -#. Assume the protocol to be the scheme of the URI -#: src/librygel-server/rygel-media-object.vala:527 -#, c-format -msgid "Failed to probe protocol for URI %s. Assuming '%s'" -msgstr "" -"Esame del protocollo per l'indirizzo %s non riuscito. Viene supposto «%s»." - #: src/librygel-server/rygel-media-query-action.vala:100 msgid "Invalid number of arguments" msgstr "Numero di argomenti non valido" @@ -937,12 +928,12 @@ msgid "Failed to seek" msgstr "Posizionamento non riuscito" -#: src/media-engines/gstreamer/rygel-gst-media-engine.vala:128 +#: src/media-engines/gstreamer/rygel-gst-media-engine.vala:129 #, c-format msgid "Invalid URI without prefix: %s" msgstr "URI non valido senza prefisso: %s" -#: src/media-engines/gstreamer/rygel-gst-media-engine.vala:141 +#: src/media-engines/gstreamer/rygel-gst-media-engine.vala:140 #, c-format msgid "Can't process URI %s with protocol %s" msgstr "Impossibile elaborare l'URI %s senza protocollo %s" @@ -976,16 +967,11 @@ msgstr "Supportato solo il posizionamento basato sui byte" #: src/media-engines/simple/rygel-simple-media-engine.vala:57 -#: src/media-engines/simple/rygel-simple-media-engine.vala:96 +#: src/media-engines/simple/rygel-simple-media-engine.vala:98 msgid "Can only process file-based MediaObjects (MediaFileItems)" msgstr "" "È possibile elaborare solo MediaObjects (MediaFileItems) basati su file" -#: src/media-engines/simple/rygel-simple-media-engine.vala:67 -#, c-format -msgid "Can't process non-file URI %s" -msgstr "Impossibile elaborare URI %s diverso da un file" - #: src/plugins/external/rygel-external-plugin-factory.vala:35 #: src/plugins/mpris/rygel-mpris-plugin-factory.vala:35 #, c-format @@ -1019,22 +1005,22 @@ msgid "Artists" msgstr "Artisti" -#: src/plugins/lms/rygel-lms-root-container.vala:34 +#: src/plugins/lms/rygel-lms-root-container.vala:33 msgid "Shared media" msgstr "File multimediali condivisi" -#: src/plugins/lms/rygel-lms-root-container.vala:46 -#: src/plugins/media-export/rygel-media-export-root-container.vala:603 +#: src/plugins/lms/rygel-lms-root-container.vala:45 +#: src/plugins/media-export/rygel-media-export-root-container.vala:605 msgid "Music" msgstr "Musica" -#: src/plugins/lms/rygel-lms-root-container.vala:50 -#: src/plugins/media-export/rygel-media-export-root-container.vala:608 +#: src/plugins/lms/rygel-lms-root-container.vala:49 +#: src/plugins/media-export/rygel-media-export-root-container.vala:610 msgid "Videos" msgstr "Video" -#: src/plugins/lms/rygel-lms-root-container.vala:54 -#: src/plugins/media-export/rygel-media-export-root-container.vala:606 +#: src/plugins/lms/rygel-lms-root-container.vala:53 +#: src/plugins/media-export/rygel-media-export-root-container.vala:608 msgid "Pictures" msgstr "Immagini" @@ -1043,56 +1029,46 @@ msgid "Title %d" msgstr "Titolo %d" -#: src/plugins/media-export/rygel-media-export-dvd-parser.vala:42 +#: src/plugins/media-export/rygel-media-export-dvd-parser.vala:39 msgid "" "Failed to find lsdvd binary in path. DVD extraction will not be available" msgstr "" "Binario lsdvd non trovato nel percorso. L'estrazione DVD non sarà disponibile" -#: src/plugins/media-export/rygel-media-export-extract.vala:74 +#: src/plugins/media-export/rygel-media-export-extract.vala:73 msgid "Invalid command received, ignoring" msgstr "Ricevuto comando non valido, verrà ignorato" -#: src/plugins/media-export/rygel-media-export-extract.vala:100 +#: src/plugins/media-export/rygel-media-export-extract.vala:90 #, c-format msgid "Failed to discover URI %s: %s" msgstr "Scoperta dell'URI %s non riuscita: %s" -#: src/plugins/media-export/rygel-media-export-extract.vala:119 +#: src/plugins/media-export/rygel-media-export-extract.vala:105 #, c-format msgid "Failed to read from pipe: %s" msgstr "Lettura da pipe non riuscita: %s" -#: src/plugins/media-export/rygel-media-export-extract.vala:146 -#: src/plugins/media-export/rygel-media-export-extract.vala:158 +#: src/plugins/media-export/rygel-media-export-extract.vala:132 +#: src/plugins/media-export/rygel-media-export-extract.vala:144 #, c-format msgid "Failed to send error to parent: %s" msgstr "Invio dell'errore al genitore non riuscito: %s" -#: src/plugins/media-export/rygel-media-export-extract.vala:204 -#, c-format -msgid "Failed to extract basic metadata from %s: %s" -msgstr "Estrazione dei meta-dati di base da %s non riuscita: %s" - -#: src/plugins/media-export/rygel-media-export-extract.vala:228 +#: src/plugins/media-export/rygel-media-export-extract.vala:149 msgid "- helper binary for Rygel to extract metadata" msgstr "- binario di assistenza per Rygel per l'estrazione dei meta-dati" -#: src/plugins/media-export/rygel-media-export-extract.vala:235 +#: src/plugins/media-export/rygel-media-export-extract.vala:156 #, c-format msgid "Failed to parse commandline args: %s" msgstr "Analisi degli argomenti della riga di comando non riuscita: %s" -#: src/plugins/media-export/rygel-media-export-extract.vala:243 +#: src/plugins/media-export/rygel-media-export-generic-extractor.vala:50 #, c-format msgid "Failed to create media art extractor: %s" msgstr "Creazione dell'estrattore di immagini non riuscita: %s" -#: src/plugins/media-export/rygel-media-export-extract.vala:258 -#, c-format -msgid "Failed to start metadata discoverer: %s" -msgstr "Avvio del rilevamento dei meta-dati non riuscito: %s" - #: src/plugins/media-export/rygel-media-export-harvester.vala:146 #, c-format msgid "'%s' harvested" @@ -1322,7 +1298,7 @@ msgstr "Impossibile rimuovere i contenitori da %s" #: src/plugins/media-export/rygel-media-export-playlist-root-container.vala:43 -#: src/plugins/media-export/rygel-media-export-root-container.vala:610 +#: src/plugins/media-export/rygel-media-export-root-container.vala:612 msgid "Playlists" msgstr "Playlist" @@ -1347,10 +1323,11 @@ #. Avoid warning when file is removed in the meantime, e.g. in #. upload case. -#: src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala:98 +#: src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala:105 #, c-format -msgid "Failed to get file information for %s: %s" -msgstr "Recupero delle informazioni sul file per %s non riuscito: %s" +#| msgid "Failed to get file information for %s: %s" +msgid "Failed to setup up file monitor for %s: %s" +msgstr "Impostazione monitoraggio del file per %s non riuscita: %s" #. Titles and definitions of some virtual folders, #. for use with QueryContainer. @@ -1435,17 +1412,17 @@ msgid "Failed to create a Tracker connection: %s" msgstr "Creazione di una connessione a Tracker non riuscita: %s" -#: src/plugins/tracker/rygel-tracker-category-all-container.vala:62 +#: src/plugins/tracker/rygel-tracker-category-all-container.vala:63 #, c-format msgid "Failed to construct URI for folder '%s': %s" msgstr "Generazione dell'indirizzo per la cartella «%s» non riuscita: %s" -#: src/plugins/tracker/rygel-tracker-category-all-container.vala:77 +#: src/plugins/tracker/rygel-tracker-category-all-container.vala:79 #, c-format msgid "Could not subscribe to Tracker signals: %s" msgstr "Impossibile abbonarsi a segnali di Tracker: %s" -#: src/plugins/tracker/rygel-tracker-category-all-container.vala:95 +#: src/plugins/tracker/rygel-tracker-category-all-container.vala:97 msgid "Not supported" msgstr "Non supportato" @@ -1459,7 +1436,7 @@ msgid "Error getting all values for '%s': %s" msgstr "Errore nel recuperare tutti i valori per «%s»: %s" -#: src/plugins/tracker/rygel-tracker-plugin-factory.vala:42 +#: src/plugins/tracker/rygel-tracker-plugin-factory.vala:35 #, c-format msgid "Failed to start Tracker service: %s. Plugin disabled." msgstr "Avvio del servizio Tracker non riuscito: %s. Plugin disabilitato." @@ -1585,17 +1562,17 @@ msgstr[1] "Nessun plugin trovato in %d secondi; terminazione…" # (ndt) molto bella... -#: src/rygel/rygel-main.vala:176 +#: src/rygel/rygel-main.vala:177 #, c-format msgid "Failed to create root device factory: %s" msgstr "Creazione della fabbrica del device root non riuscita: %s" -#: src/rygel/rygel-main.vala:233 +#: src/rygel/rygel-main.vala:235 #, c-format msgid "Failed to create RootDevice for %s. Reason: %s" msgstr "Creazione di RootDevice per %s non riuscita. Motivo: %s" -#: src/rygel/rygel-main.vala:270 +#: src/rygel/rygel-main.vala:272 #, c-format msgid "Failed to load user configuration: %s" msgstr "Caricamento della configurazione utente non riuscito: %s" diff -Nru rygel-0.32.0/po/rygel.pot rygel-0.32.1/po/rygel.pot --- rygel-0.32.0/po/rygel.pot 2016-09-19 19:08:23.000000000 +0000 +++ rygel-0.32.1/po/rygel.pot 2016-10-10 18:55:51.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rygel 0.32.0\n" +"Project-Id-Version: rygel 0.32.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel\n" -"POT-Creation-Date: 2016-09-19 21:08+0200\n" +"POT-Creation-Date: 2016-10-10 20:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru rygel-0.32.0/src/librygel-core/rygel-basic-management-test-nslookup.vala rygel-0.32.1/src/librygel-core/rygel-basic-management-test-nslookup.vala --- rygel-0.32.0/src/librygel-core/rygel-basic-management-test-nslookup.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-core/rygel-basic-management-test-nslookup.vala 2016-10-10 18:43:39.000000000 +0000 @@ -107,11 +107,11 @@ } } - private static const uint MAX_REPETITIONS = 100; - private static const uint DEFAULT_REPETITIONS = 1; - private static const uint MIN_INTERVAL_TIMEOUT = 1000; - private static const uint MAX_INTERVAL_TIMEOUT = 30000; - private static const uint DEFAULT_INTERVAL_TIMEOUT = 1000; + private const uint MAX_REPETITIONS = 100; + private const uint DEFAULT_REPETITIONS = 1; + private const uint MIN_INTERVAL_TIMEOUT = 1000; + private const uint MAX_INTERVAL_TIMEOUT = 30000; + private const uint DEFAULT_INTERVAL_TIMEOUT = 1000; private struct Result { public ProcessState state; diff -Nru rygel-0.32.0/src/librygel-core/rygel-basic-management-test-ping.vala rygel-0.32.1/src/librygel-core/rygel-basic-management-test-ping.vala --- rygel-0.32.0/src/librygel-core/rygel-basic-management-test-ping.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-core/rygel-basic-management-test-ping.vala 2016-10-10 18:43:39.000000000 +0000 @@ -25,17 +25,17 @@ // Helper class for BasicManagementTestPing. internal class Rygel.BasicManagementTestPing : BasicManagementTest { - private static const uint MAX_REPEAT_COUNT = 100; - private static const uint DEFAULT_REPEAT_COUNT = 1; - private static const uint DEFAULT_REPLY_TIMEOUT = 10000; - private static const uint MIN_REQUEST_INTERVAL_TIMEOUT = 1000; - private static const uint MAX_REQUEST_INTERVAL_TIMEOUT = 30000; - private static const uint DEFAULT_REQUEST_INTERVAL_TIMEOUT = 1000; - private static const uint MIN_DATA_BLOCK_SIZE = 20; - private static const uint MAX_DATA_BLOCK_SIZE = 2048; - private static const uint DEFAULT_DATA_BLOCK_SIZE = 32; - private static const uint MAX_DSCP = 64; - private static const uint DEFAULT_DSCP = 30; + private const uint MAX_REPEAT_COUNT = 100; + private const uint DEFAULT_REPEAT_COUNT = 1; + private const uint DEFAULT_REPLY_TIMEOUT = 10000; + private const uint MIN_REQUEST_INTERVAL_TIMEOUT = 1000; + private const uint MAX_REQUEST_INTERVAL_TIMEOUT = 30000; + private const uint DEFAULT_REQUEST_INTERVAL_TIMEOUT = 1000; + private const uint MIN_DATA_BLOCK_SIZE = 20; + private const uint MAX_DATA_BLOCK_SIZE = 2048; + private const uint DEFAULT_DATA_BLOCK_SIZE = 32; + private const uint MAX_DSCP = 64; + private const uint DEFAULT_DSCP = 30; private enum ProcessState { INIT, diff -Nru rygel-0.32.0/src/librygel-core/rygel-basic-management-test-traceroute.vala rygel-0.32.1/src/librygel-core/rygel-basic-management-test-traceroute.vala --- rygel-0.32.0/src/librygel-core/rygel-basic-management-test-traceroute.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-core/rygel-basic-management-test-traceroute.vala 2016-10-10 18:43:39.000000000 +0000 @@ -25,18 +25,18 @@ // Helper class for BasicManagementTestTraceroute. internal class Rygel.BasicManagementTestTraceroute : BasicManagementTest { - private static const uint MIN_TIMEOUT = 1000; - private static const uint MAX_TIMEOUT = 30000; - private static const uint DEFAULT_TIMEOUT = 5000; - private static const uint MIN_DATA_BLOCK_SIZE = 20; - private static const uint MAX_DATA_BLOCK_SIZE = 2048; - private static const uint DEFAULT_DATA_BLOCK_SIZE = 32; - private static const uint MAX_DSCP = 64; - private static const uint DEFAULT_DSCP = 30; - private static const uint MAX_HOPS = 64; - private static const uint DEFAULT_HOPS = 30; - private static const uint MAX_HOSTS = 2048; - private static const uint MAX_RESULT_SIZE = 4; + private const uint MIN_TIMEOUT = 1000; + private const uint MAX_TIMEOUT = 30000; + private const uint DEFAULT_TIMEOUT = 5000; + private const uint MIN_DATA_BLOCK_SIZE = 20; + private const uint MAX_DATA_BLOCK_SIZE = 2048; + private const uint DEFAULT_DATA_BLOCK_SIZE = 32; + private const uint MAX_DSCP = 64; + private const uint DEFAULT_DSCP = 30; + private const uint MAX_HOPS = 64; + private const uint DEFAULT_HOPS = 30; + private const uint MAX_HOSTS = 2048; + private const uint MAX_RESULT_SIZE = 4; private enum ProcessState { INIT, diff -Nru rygel-0.32.0/src/librygel-core/rygel-build-config.vapi rygel-0.32.1/src/librygel-core/rygel-build-config.vapi --- rygel-0.32.0/src/librygel-core/rygel-build-config.vapi 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-core/rygel-build-config.vapi 2016-10-10 18:43:39.000000000 +0000 @@ -29,41 +29,41 @@ [CCode (cheader_filename = "config.h")] public class Rygel.BuildConfig { [CCode (cname = "DATA_DIR")] - public static const string DATA_DIR; + public const string DATA_DIR; [CCode (cname = "SYS_CONFIG_DIR")] - public static const string SYS_CONFIG_DIR; + public const string SYS_CONFIG_DIR; [CCode (cname = "DESKTOP_DIR")] - public static const string DESKTOP_DIR; + public const string DESKTOP_DIR; [CCode (cname = "PLUGIN_DIR")] - public static const string PLUGIN_DIR; + public const string PLUGIN_DIR; [CCode (cname = "BIG_ICON_DIR")] - public static const string BIG_ICON_DIR; + public const string BIG_ICON_DIR; [CCode (cname = "SMALL_ICON_DIR")] - public static const string SMALL_ICON_DIR; + public const string SMALL_ICON_DIR; [CCode (cname = "PACKAGE_NAME")] - public static const string PACKAGE_NAME; + public const string PACKAGE_NAME; [CCode (cname = "PACKAGE_VERSION")] - public static const string PACKAGE_VERSION; + public const string PACKAGE_VERSION; [CCode (cname = "PACKAGE_STRING")] - public static const string PACKAGE_STRING; + public const string PACKAGE_STRING; [CCode (cname = "GETTEXT_PACKAGE")] - public static const string GETTEXT_PACKAGE; + public const string GETTEXT_PACKAGE; [CCode (cname = "LOCALEDIR")] - public static const string LOCALEDIR; + public const string LOCALEDIR; [CCode (cname = "ENGINE_DIR")] - public static const string ENGINE_DIR; + public const string ENGINE_DIR; [CCode (cname = "PRESET_DIR")] - public static const string PRESET_DIR; + public const string PRESET_DIR; } diff -Nru rygel-0.32.0/src/librygel-core/rygel-plugin.vala rygel-0.32.1/src/librygel-core/rygel-plugin.vala --- rygel-0.32.0/src/librygel-core/rygel-plugin.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-core/rygel-plugin.vala 2016-10-10 18:43:39.000000000 +0000 @@ -76,31 +76,31 @@ * configuration. See rygel_meta_config_get_default(). */ public class Rygel.Plugin : GUPnP.ResourceFactory { - private static const string PNG_EXT = "png"; - private static const string JPG_EXT = "jpg"; + private const string PNG_EXT = "png"; + private const string JPG_EXT = "jpg"; - private static const string ICON_BIG = "file://" + + private const string ICON_BIG = "file://" + BuildConfig.BIG_ICON_DIR + "/rygel"; - private static const string ICON_PNG_BIG = ICON_BIG + "." + PNG_EXT; - private static const string ICON_JPG_BIG = ICON_BIG + "." + JPG_EXT; + private const string ICON_PNG_BIG = ICON_BIG + "." + PNG_EXT; + private const string ICON_JPG_BIG = ICON_BIG + "." + JPG_EXT; - private static const string ICON_SMALL = "file://" + + private const string ICON_SMALL = "file://" + BuildConfig.SMALL_ICON_DIR + "/rygel"; - private static const string ICON_PNG_SMALL = ICON_SMALL + "." + PNG_EXT; - private static const string ICON_JPG_SMALL = ICON_SMALL + "." + JPG_EXT; + private const string ICON_PNG_SMALL = ICON_SMALL + "." + PNG_EXT; + private const string ICON_JPG_SMALL = ICON_SMALL + "." + JPG_EXT; - private static const string ICON_PNG_MIME = "image/png"; - private static const string ICON_JPG_MIME = "image/jpeg"; + private const string ICON_PNG_MIME = "image/png"; + private const string ICON_JPG_MIME = "image/jpeg"; - private static const int ICON_PNG_DEPTH = 24; - private static const int ICON_JPG_DEPTH = 24; + private const int ICON_PNG_DEPTH = 24; + private const int ICON_JPG_DEPTH = 24; - private static const int ICON_BIG_WIDTH = 120; - private static const int ICON_BIG_HEIGHT = 120; - private static const int ICON_SMALL_WIDTH = 48; - private static const int ICON_SMALL_HEIGHT = 48; + private const int ICON_BIG_WIDTH = 120; + private const int ICON_BIG_HEIGHT = 120; + private const int ICON_SMALL_WIDTH = 48; + private const int ICON_SMALL_HEIGHT = 48; public PluginCapabilities capabilities { get; construct set; } diff -Nru rygel-0.32.0/src/librygel-core/rygel-recursive-module-loader.vala rygel-0.32.1/src/librygel-core/rygel-recursive-module-loader.vala --- rygel-0.32.0/src/librygel-core/rygel-recursive-module-loader.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-core/rygel-recursive-module-loader.vala 2016-10-10 18:43:39.000000000 +0000 @@ -29,7 +29,7 @@ * dynamic module file. */ public abstract class Rygel.RecursiveModuleLoader : Object { - private static const string LOADER_ATTRIBUTES = + private const string LOADER_ATTRIBUTES = FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE + "," + FileAttribute.STANDARD_IS_HIDDEN + "," + diff -Nru rygel-0.32.0/src/librygel-renderer/rygel-media-renderer-plugin.vala rygel-0.32.1/src/librygel-renderer/rygel-media-renderer-plugin.vala --- rygel-0.32.0/src/librygel-renderer/rygel-media-renderer-plugin.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-renderer/rygel-media-renderer-plugin.vala 2016-10-10 18:43:39.000000000 +0000 @@ -31,10 +31,10 @@ * and return an instance of it from their get_player() implementation. */ public class Rygel.MediaRendererPlugin : Rygel.Plugin { - private static const string MEDIA_RENDERER_DESC_PATH = + private const string MEDIA_RENDERER_DESC_PATH = BuildConfig.DATA_DIR + "/xml/MediaRenderer2.xml"; - private static const string DMR = "urn:schemas-upnp-org:device:MediaRenderer"; + private const string DMR = "urn:schemas-upnp-org:device:MediaRenderer"; private string sink_protocol_info; private PlayerController controller; diff -Nru rygel-0.32.0/src/librygel-ruih/rygel-ruih-2.0.vapi rygel-0.32.1/src/librygel-ruih/rygel-ruih-2.0.vapi --- rygel-0.32.0/src/librygel-ruih/rygel-ruih-2.0.vapi 2016-09-19 19:05:56.000000000 +0000 +++ rygel-0.32.1/src/librygel-ruih/rygel-ruih-2.0.vapi 2016-10-10 18:53:36.000000000 +0000 @@ -44,7 +44,7 @@ public ProtocolElem (Xml.Node* node) throws Rygel.RuihServiceError; public string get_protocol_info (); public string get_short_name (); - public override bool match (Gee.ArrayList? protocols, Gee.ArrayList filters); + public override bool match (Gee.ArrayList? protocols, Gee.ArrayList filters); public override string to_ui_listing (Gee.ArrayList filters); } [CCode (cheader_filename = "rygel-ruih.h")] diff -Nru rygel-0.32.0/src/librygel-ruih/rygel-ruih-filter-entry.vala rygel-0.32.1/src/librygel-ruih/rygel-ruih-filter-entry.vala --- rygel-0.32.0/src/librygel-ruih/rygel-ruih-filter-entry.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-ruih/rygel-ruih-filter-entry.vala 2016-10-10 18:43:39.000000000 +0000 @@ -22,7 +22,7 @@ */ protected class FilterEntry { - private static const string LIFETIME = "lifetime"; + private const string LIFETIME = "lifetime"; private string entry_name = null; private string entry_value = null; diff -Nru rygel-0.32.0/src/librygel-ruih/rygel-ruih-icon-elem.vala rygel-0.32.1/src/librygel-ruih/rygel-ruih-icon-elem.vala --- rygel-0.32.0/src/librygel-ruih/rygel-ruih-icon-elem.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-ruih/rygel-ruih-icon-elem.vala 2016-10-10 18:43:39.000000000 +0000 @@ -25,11 +25,11 @@ using Xml; protected class IconElem : UIListing { - private static const string MIMETYPE = "mimetype"; - private static const string WIDTH = "width"; - private static const string HEIGHT = "height"; - private static const string DEPTH = "depth"; - private static const string URL = "url"; + private const string MIMETYPE = "mimetype"; + private const string WIDTH = "width"; + private const string HEIGHT = "height"; + private const string DEPTH = "depth"; + private const string URL = "url"; // optional attributes private string mime_type = null; diff -Nru rygel-0.32.0/src/librygel-ruih/rygel-ruih-protocol-elem.vala rygel-0.32.1/src/librygel-ruih/rygel-ruih-protocol-elem.vala --- rygel-0.32.0/src/librygel-ruih/rygel-ruih-protocol-elem.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-ruih/rygel-ruih-protocol-elem.vala 2016-10-10 18:43:41.000000000 +0000 @@ -76,7 +76,7 @@ } public override bool match (Gee.ArrayList? protocols, - Gee.ArrayList filters) { + Gee.ArrayList filters) { if (protocols == null || protocols.size == 0) { return true; } diff -Nru rygel-0.32.0/src/librygel-ruih/rygel-ruih-server-plugin.vala rygel-0.32.1/src/librygel-ruih/rygel-ruih-server-plugin.vala --- rygel-0.32.0/src/librygel-ruih/rygel-ruih-server-plugin.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-ruih/rygel-ruih-server-plugin.vala 2016-10-10 18:43:39.000000000 +0000 @@ -28,10 +28,10 @@ * */ public class Rygel.RuihServerPlugin : Rygel.Plugin { - private static const string RUIH_SERVER_DESC_PATH = + private const string RUIH_SERVER_DESC_PATH = BuildConfig.DATA_DIR + "/xml/RuihServer2.xml"; - private static const string RUIH = + private const string RUIH = "urn:schemas-upnp-org:device:RemoteUIServer"; diff -Nru rygel-0.32.0/src/librygel-ruih/rygel-ruih-servicemanager.vala rygel-0.32.1/src/librygel-ruih/rygel-ruih-servicemanager.vala --- rygel-0.32.0/src/librygel-ruih/rygel-ruih-servicemanager.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-ruih/rygel-ruih-servicemanager.vala 2016-10-10 18:43:39.000000000 +0000 @@ -28,12 +28,12 @@ public class Rygel.RuihServiceManager : Object { - private static const string DEVICEPROFILE = "deviceprofile"; - private static const string PROTOCOL = "protocol"; - private static const string PROTOCOL_INFO = "protocolInfo"; - private static const string SHORT_NAME = "shortName"; - private static const string UI = "ui"; - private static const string UILIST = "uilist"; + private const string DEVICEPROFILE = "deviceprofile"; + private const string PROTOCOL = "protocol"; + private const string PROTOCOL_INFO = "protocolInfo"; + private const string SHORT_NAME = "shortName"; + private const string UI = "ui"; + private const string UILIST = "uilist"; private static string PRE_RESULT = "\n" diff -Nru rygel-0.32.0/src/librygel-ruih/rygel-ruih-ui-listing.vala rygel-0.32.1/src/librygel-ruih/rygel-ruih-ui-listing.vala --- rygel-0.32.0/src/librygel-ruih/rygel-ruih-ui-listing.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-ruih/rygel-ruih-ui-listing.vala 2016-10-10 18:43:39.000000000 +0000 @@ -25,18 +25,18 @@ public abstract class UIListing { - protected static const string DESCRIPTION = "description"; - protected static const string FORK = "fork"; - protected static const string ICON = "icon"; - protected static const string ICONLIST = "iconList"; - protected static const string LIFETIME = "lifetime"; - protected static const string NAME = "name"; - protected static const string PROTOCOL = "protocol"; - protected static const string PROTOCOL_INFO = "protocolInfo"; - protected static const string SHORT_NAME = "shortName"; - protected static const string UI = "ui"; - protected static const string URI = "uri"; - protected static const string UIID = "uiID"; + protected const string DESCRIPTION = "description"; + protected const string FORK = "fork"; + protected const string ICON = "icon"; + protected const string ICONLIST = "iconList"; + protected const string LIFETIME = "lifetime"; + protected const string NAME = "name"; + protected const string PROTOCOL = "protocol"; + protected const string PROTOCOL_INFO = "protocolInfo"; + protected const string SHORT_NAME = "shortName"; + protected const string UI = "ui"; + protected const string URI = "uri"; + protected const string UIID = "uiID"; public abstract bool match (ArrayList? protocols, ArrayList filters); diff -Nru rygel-0.32.0/src/librygel-server/rygel-dlna-available-seek-request.vala rygel-0.32.1/src/librygel-server/rygel-dlna-available-seek-request.vala --- rygel-0.32.0/src/librygel-server/rygel-dlna-available-seek-request.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-dlna-available-seek-request.vala 2016-10-10 18:43:39.000000000 +0000 @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -public static const string GET_AVAILABLE_SEEK_RANGE_HEADER = "getAvailableSeekRange.dlna.org"; +public const string GET_AVAILABLE_SEEK_RANGE_HEADER = "getAvailableSeekRange.dlna.org"; /** * This class represents a DLNA getAvailableSeekRange request. diff -Nru rygel-0.32.0/src/librygel-server/rygel-dlna-available-seek-response.vala rygel-0.32.1/src/librygel-server/rygel-dlna-available-seek-response.vala --- rygel-0.32.0/src/librygel-server/rygel-dlna-available-seek-response.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-dlna-available-seek-response.vala 2016-10-10 18:43:39.000000000 +0000 @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -public static const string AVAILABLE_SEEK_RANGE_HEADER = "availableSeekRange.dlna.org"; +public const string AVAILABLE_SEEK_RANGE_HEADER = "availableSeekRange.dlna.org"; public class Rygel.DLNAAvailableSeekRangeResponse : Rygel.HTTPResponseElement { /** diff -Nru rygel-0.32.0/src/librygel-server/rygel-dtcp-cleartext-request.vala rygel-0.32.1/src/librygel-server/rygel-dtcp-cleartext-request.vala --- rygel-0.32.0/src/librygel-server/rygel-dtcp-cleartext-request.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-dtcp-cleartext-request.vala 2016-10-10 18:43:39.000000000 +0000 @@ -23,7 +23,7 @@ using GUPnP; public class Rygel.DTCPCleartextRequest : Rygel.HTTPSeekRequest { - public static const string DTCP_RANGE_HEADER = "Range.dtcp.com"; + public const string DTCP_RANGE_HEADER = "Range.dtcp.com"; /** * The start of the cleartext range in bytes diff -Nru rygel-0.32.0/src/librygel-server/rygel-http-response-element.vala rygel-0.32.1/src/librygel-server/rygel-http-response-element.vala --- rygel-0.32.0/src/librygel-server/rygel-http-response-element.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-http-response-element.vala 2016-10-10 18:43:39.000000000 +0000 @@ -26,7 +26,7 @@ */ public abstract class Rygel.HTTPResponseElement : GLib.Object { // For designating fields that are unset - public static const int64 UNSPECIFIED = -1; + public const int64 UNSPECIFIED = -1; /** * Set the type-appropriate headers on the associated HTTP Message diff -Nru rygel-0.32.0/src/librygel-server/rygel-http-seek.vala rygel-0.32.1/src/librygel-server/rygel-http-seek.vala --- rygel-0.32.0/src/librygel-server/rygel-http-seek.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-http-seek.vala 2016-10-10 18:43:39.000000000 +0000 @@ -41,6 +41,6 @@ */ public abstract class Rygel.HTTPSeekRequest : GLib.Object { // For designating fields that are unset - public static const int64 UNSPECIFIED = -1; + public const int64 UNSPECIFIED = -1; // Note: -1 is significant in that libsoup also uses it to designate an "unknown" value } diff -Nru rygel-0.32.0/src/librygel-server/rygel-http-time-seek-request.vala rygel-0.32.1/src/librygel-server/rygel-http-time-seek-request.vala --- rygel-0.32.0/src/librygel-server/rygel-http-time-seek-request.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-http-time-seek-request.vala 2016-10-10 18:43:39.000000000 +0000 @@ -31,7 +31,7 @@ * A TimeSeekRange request can only have a time range ("npt=start-end"). */ public class Rygel.HTTPTimeSeekRequest : Rygel.HTTPSeekRequest { - public static const string TIMESEEKRANGE_HEADER = "TimeSeekRange.dlna.org"; + public const string TIMESEEKRANGE_HEADER = "TimeSeekRange.dlna.org"; /** * Requested range start time, in microseconds */ diff -Nru rygel-0.32.0/src/librygel-server/rygel-media-server-plugin.vala rygel-0.32.1/src/librygel-server/rygel-media-server-plugin.vala --- rygel-0.32.0/src/librygel-server/rygel-media-server-plugin.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-media-server-plugin.vala 2016-10-10 18:43:39.000000000 +0000 @@ -34,8 +34,8 @@ * Implementing Server Plugins section. */ public abstract class Rygel.MediaServerPlugin : Rygel.Plugin { - private static const string DMS = "urn:schemas-upnp-org:device:MediaServer"; - private static const string MEDIA_SERVER_DESC_PATH = + private const string DMS = "urn:schemas-upnp-org:device:MediaServer"; + private const string MEDIA_SERVER_DESC_PATH = BuildConfig.DATA_DIR + "/xml/MediaServer3.xml"; public MediaContainer root_container { get; construct; } diff -Nru rygel-0.32.0/src/librygel-server/rygel-playspeed-request.vala rygel-0.32.1/src/librygel-server/rygel-playspeed-request.vala --- rygel-0.32.0/src/librygel-server/rygel-playspeed-request.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-playspeed-request.vala 2016-10-10 18:43:39.000000000 +0000 @@ -29,7 +29,7 @@ * This class represents a DLNA PlaySpeed request (PlaySpeed.dlna.org) */ public class Rygel.PlaySpeedRequest : GLib.Object { - public static const string PLAYSPEED_HEADER = "PlaySpeed.dlna.org"; + public const string PLAYSPEED_HEADER = "PlaySpeed.dlna.org"; public PlaySpeed speed { get; private set; } diff -Nru rygel-0.32.0/src/librygel-server/rygel-playspeed-response.vala rygel-0.32.1/src/librygel-server/rygel-playspeed-response.vala --- rygel-0.32.0/src/librygel-server/rygel-playspeed-response.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-playspeed-response.vala 2016-10-10 18:43:39.000000000 +0000 @@ -27,7 +27,7 @@ public const string FRAMERATE_HEADER = "FrameRateInTrickMode.dlna.org"; PlaySpeed speed; - public static const int NO_FRAMERATE = -1; + public const int NO_FRAMERATE = -1; /** * The framerate supported for the given rate, in frames per second diff -Nru rygel-0.32.0/src/librygel-server/rygel-writable-container.vala rygel-0.32.1/src/librygel-server/rygel-writable-container.vala --- rygel-0.32.0/src/librygel-server/rygel-writable-container.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/librygel-server/rygel-writable-container.vala 2016-10-10 18:43:39.000000000 +0000 @@ -41,7 +41,7 @@ * # Monitor not only its own URI but also that of its child items, though the latter is implied in the former if you use GIO for monitoring. */ public interface Rygel.WritableContainer : MediaContainer { - public static const string WRITABLE_SCHEME = "rygel-writable://"; + public const string WRITABLE_SCHEME = "rygel-writable://"; //TODO: The valadoc gtk-doc doclet doesn't use the property's documentation //on getters and setters: diff -Nru rygel-0.32.0/src/plugins/external/rygel-external-interfaces.vala rygel-0.32.1/src/plugins/external/rygel-external-interfaces.vala --- rygel-0.32.0/src/plugins/external/rygel-external-interfaces.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/plugins/external/rygel-external-interfaces.vala 2016-10-10 18:43:39.000000000 +0000 @@ -23,8 +23,8 @@ [DBus (name = "org.gnome.UPnP.MediaObject2")] public interface Rygel.External.MediaObjectProxy : DBusProxy { - public static const string IFACE = "org.gnome.UPnP.MediaObject2"; - public static const string[] PROPERTIES = { "Parent", + public const string IFACE = "org.gnome.UPnP.MediaObject2"; + public const string[] PROPERTIES = { "Parent", "Type", "Path", "DisplayName" }; @@ -38,8 +38,8 @@ [DBus (name = "org.gnome.UPnP.MediaContainer2")] public interface Rygel.External.MediaContainerProxy : DBusProxy, MediaObjectProxy { - public static const string IFACE = "org.gnome.UPnP.MediaContainer2"; - public static const string[] PROPERTIES = { "ChildCount", "Searchable" }; + public const string IFACE = "org.gnome.UPnP.MediaContainer2"; + public const string[] PROPERTIES = { "ChildCount", "Searchable" }; public abstract signal void updated (); @@ -73,8 +73,8 @@ [DBus (name = "org.gnome.UPnP.MediaItem2")] public interface Rygel.External.MediaItemProxy : DBusProxy, MediaObjectProxy { - public static const string IFACE = "org.gnome.UPnP.MediaItem2"; - public static const string[] PROPERTIES = { "URLs", + public const string IFACE = "org.gnome.UPnP.MediaItem2"; + public const string[] PROPERTIES = { "URLs", "MIMEType", "DLNAProfile", "Size", diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-albums.vala rygel-0.32.1/src/plugins/lms/rygel-lms-albums.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-albums.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-albums.vala 2016-10-10 18:43:39.000000000 +0000 @@ -25,7 +25,7 @@ using Sqlite; public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL = + private const string SQL_ALL = "SELECT audio_albums.id, audio_albums.name as title, " + "audio_artists.name as artist " + "FROM audio_albums " + @@ -33,7 +33,7 @@ "ON audio_albums.artist_id = audio_artists.id " + "LIMIT ? OFFSET ?;"; - private static const string SQL_ALL_WITH_FILTER_TEMPLATE = + private const string SQL_ALL_WITH_FILTER_TEMPLATE = "SELECT audio_albums.id, audio_albums.name as title, " + "audio_artists.name as artist " + "FROM audio_albums " + @@ -42,11 +42,11 @@ "WHERE %s " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT = + private const string SQL_COUNT = "SELECT COUNT(audio_albums.id) " + "FROM audio_albums;"; - private static const string SQL_COUNT_WITH_FILTER_TEMPLATE = + private const string SQL_COUNT_WITH_FILTER_TEMPLATE = "SELECT COUNT(audio_albums.id), audio_albums.name as title, " + "audio_artists.name as artist " + "FROM audio_albums " + @@ -55,7 +55,7 @@ "WHERE %s;"; /* count songs inside albums */ - private static const string SQL_CHILD_COUNT_WITH_FILTER_TEMPLATE = + private const string SQL_CHILD_COUNT_WITH_FILTER_TEMPLATE = "SELECT COUNT(audios.id), audios.title as title, " + "audio_artists.name as artist " + "FROM audios, files, audio_albums " + @@ -64,7 +64,7 @@ "WHERE dtime = 0 AND audios.id = files.id AND audios.album_id = audio_albums.id %s;"; /* select songs inside albums */ - private static const string SQL_CHILD_ALL_WITH_FILTER_TEMPLATE = + private const string SQL_CHILD_ALL_WITH_FILTER_TEMPLATE = "SELECT files.id, files.path, files.size, " + "audios.title as title, audios.trackno, audios.length, audios.channels, audios.sampling_rate, audios.bitrate, audios.dlna_profile, audios.dlna_mime, " + "audio_artists.name as artist, " + @@ -76,7 +76,7 @@ "LIMIT ? OFFSET ?;"; - private static const string SQL_FIND_OBJECT = + private const string SQL_FIND_OBJECT = "SELECT audio_albums.id, audio_albums.name " + "FROM audio_albums " + "WHERE audio_albums.id = ?;"; diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-album.vala rygel-0.32.1/src/plugins/lms/rygel-lms-album.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-album.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-album.vala 2016-10-10 18:43:39.000000000 +0000 @@ -24,7 +24,7 @@ using Sqlite; public class Rygel.LMS.Album : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL_TEMPLATE = + private const string SQL_ALL_TEMPLATE = "SELECT files.id, files.path, files.size, " + "audios.title as title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + @@ -39,12 +39,12 @@ "WHERE dtime = 0 AND audios.id = files.id AND audios.album_id = %s " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT_TEMPLATE = + private const string SQL_COUNT_TEMPLATE = "SELECT COUNT(audios.id) " + "FROM audios, files " + "WHERE dtime = 0 AND audios.id = files.id AND audios.album_id = %s;"; - private static const string SQL_COUNT_WITH_FILTER_TEMPLATE = + private const string SQL_COUNT_WITH_FILTER_TEMPLATE = "SELECT COUNT(audios.id), audios.title as title, " + "audio_artists.name as artist, " + "audio_albums.name " + @@ -55,7 +55,7 @@ "ON audios.album_id = audio_albums.id " + "WHERE dtime = 0 AND audios.id = files.id AND audios.album_id = %s;"; - private static const string SQL_FIND_OBJECT_TEMPLATE = + private const string SQL_FIND_OBJECT_TEMPLATE = "SELECT files.id, files.path, files.size, " + "audios.title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + @@ -70,7 +70,7 @@ "WHERE dtime = 0 AND files.id = ? AND audios.id = files.id " + "AND audios.album_id = %s;"; - private static const string SQL_ADDED_TEMPLATE = + private const string SQL_ADDED_TEMPLATE = "SELECT files.id, files.path, files.size, " + "audios.title as title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + @@ -85,7 +85,7 @@ "WHERE dtime = 0 AND audios.id = files.id AND audios.album_id = %s " + "AND update_id > ? AND update_id <= ?;"; - private static const string SQL_REMOVED_TEMPLATE = + private const string SQL_REMOVED_TEMPLATE = "SELECT files.id, files.path, files.size, " + "audios.title as title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-all-images.vala rygel-0.32.1/src/plugins/lms/rygel-lms-all-images.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-all-images.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-all-images.vala 2016-10-10 18:43:39.000000000 +0000 @@ -24,32 +24,32 @@ using Sqlite; public class Rygel.LMS.AllImages : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL = + private const string SQL_ALL = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime " + "FROM images, files " + "WHERE dtime = 0 AND images.id = files.id " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT = + private const string SQL_COUNT = "SELECT count(images.id) " + "FROM images, files " + "WHERE dtime = 0 AND images.id = files.id;"; - private static const string SQL_FIND_OBJECT = + private const string SQL_FIND_OBJECT = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime " + "FROM images, files " + "WHERE dtime = 0 AND files.id = ? AND images.id = files.id;"; - private static const string SQL_ADDED = + private const string SQL_ADDED = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime " + "FROM images, files " + "WHERE dtime = 0 AND images.id = files.id " + "AND update_id > ? AND update_id <= ?;"; - private static const string SQL_REMOVED = + private const string SQL_REMOVED = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime " + "FROM images, files " + diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-all-music.vala rygel-0.32.1/src/plugins/lms/rygel-lms-all-music.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-all-music.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-all-music.vala 2016-10-10 18:43:39.000000000 +0000 @@ -24,7 +24,7 @@ using Sqlite; public class Rygel.LMS.AllMusic : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL_TEMPLATE = + private const string SQL_ALL_TEMPLATE = "SELECT files.id, files.path, files.size, " + "audios.title as title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + @@ -43,12 +43,12 @@ "WHERE dtime = 0 AND audios.id = files.id %s " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT = + private const string SQL_COUNT = "SELECT COUNT(audios.id) " + "FROM audios, files " + "WHERE dtime = 0 AND audios.id = files.id;"; - private static const string SQL_COUNT_WITH_FILTER_TEMPLATE = + private const string SQL_COUNT_WITH_FILTER_TEMPLATE = "SELECT COUNT(audios.id), audios.title as title, " + "audio_artists.name as artist " + "FROM audios, files " + @@ -56,7 +56,7 @@ "ON audios.artist_id = audio_artists.id " + "WHERE dtime = 0 AND audios.id = files.id %s;"; - private static const string SQL_FIND_OBJECT = + private const string SQL_FIND_OBJECT = "SELECT files.id, files.path, files.size, " + "audios.title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + @@ -74,7 +74,7 @@ "ON audios.genre_id = audio_genres.id " + "WHERE dtime = 0 AND files.id = ? AND audios.id = files.id;"; - private static const string SQL_ADDED = + private const string SQL_ADDED = "SELECT files.id, files.path, files.size, " + "audios.title as title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + @@ -93,7 +93,7 @@ "WHERE dtime = 0 AND audios.id = files.id " + "AND update_id > ? AND update_id <= ?;"; - private static const string SQL_REMOVED = + private const string SQL_REMOVED = "SELECT files.id, files.path, files.size, " + "audios.title as title, audios.trackno, audios.length, " + "audios.channels, audios.sampling_rate, audios.bitrate, " + diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-all-videos.vala rygel-0.32.1/src/plugins/lms/rygel-lms-all-videos.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-all-videos.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-all-videos.vala 2016-10-10 18:43:39.000000000 +0000 @@ -25,29 +25,29 @@ using Sqlite; public class Rygel.LMS.AllVideos : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL = + private const string SQL_ALL = "SELECT videos.id, title, artist, length, path, mtime, size, dlna_profile, dlna_mime " + "FROM videos, files " + "WHERE dtime = 0 AND videos.id = files.id " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT = + private const string SQL_COUNT = "SELECT count(videos.id) " + "FROM videos, files " + "WHERE dtime = 0 AND videos.id = files.id;"; - private static const string SQL_FIND_OBJECT = + private const string SQL_FIND_OBJECT = "SELECT videos.id, title, artist, length, path, mtime, size, dlna_profile, dlna_mime " + "FROM videos, files " + "WHERE dtime = 0 AND files.id = ? AND videos.id = files.id;"; - private static const string SQL_ADDED = + private const string SQL_ADDED = "SELECT videos.id, title, artist, length, path, mtime, size, dlna_profile, dlna_mime " + "FROM videos, files " + "WHERE dtime = 0 AND videos.id = files.id " + "AND update_id > ? AND update_id <= ?;"; - private static const string SQL_REMOVED = + private const string SQL_REMOVED = "SELECT videos.id, title, artist, length, path, mtime, size, dlna_profile, dlna_mime " + "FROM videos, files " + "WHERE dtime <> 0 AND videos.id = files.id " + diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-artists.vala rygel-0.32.1/src/plugins/lms/rygel-lms-artists.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-artists.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-artists.vala 2016-10-10 18:43:39.000000000 +0000 @@ -24,16 +24,16 @@ using Sqlite; public class Rygel.LMS.Artists : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL = + private const string SQL_ALL = "SELECT audio_artists.id, audio_artists.name " + "FROM audio_artists " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT = + private const string SQL_COUNT = "SELECT COUNT(audio_artists.id) " + "FROM audio_artists;"; - private static const string SQL_FIND_OBJECT = + private const string SQL_FIND_OBJECT = "SELECT audio_artists.id, audio_artists.name " + "FROM audio_artists " + "WHERE audio_artists.id = ?;"; diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-artist.vala rygel-0.32.1/src/plugins/lms/rygel-lms-artist.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-artist.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-artist.vala 2016-10-10 18:43:39.000000000 +0000 @@ -24,18 +24,18 @@ using Sqlite; public class Rygel.LMS.Artist : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL_TEMPLATE = + private const string SQL_ALL_TEMPLATE = "SELECT audio_albums.id, audio_albums.name " + "FROM audio_albums " + "WHERE audio_albums.artist_id = %s " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT_TEMPLATE = + private const string SQL_COUNT_TEMPLATE = "SELECT COUNT(audio_albums.id) " + "FROM audio_albums " + "WHERE audio_albums.artist_id = %s"; - private static const string SQL_FIND_OBJECT_TEMPLATE = + private const string SQL_FIND_OBJECT_TEMPLATE = "SELECT audio_albums.id, audio_albums.name " + "FROM audio_albums " + "WHERE audio_albums.id = ? AND audio_albums.artist_id = %s;"; diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-image-years.vala rygel-0.32.1/src/plugins/lms/rygel-lms-image-years.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-image-years.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-image-years.vala 2016-10-10 18:43:39.000000000 +0000 @@ -24,12 +24,12 @@ using Sqlite; public class Rygel.LMS.ImageYears : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL = + private const string SQL_ALL = "SELECT DISTINCT(strftime('%Y', images.date, 'unixepoch')) as year " + "FROM images " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT = + private const string SQL_COUNT = "SELECT COUNT(DISTINCT(strftime('%Y', images.date, 'unixepoch'))) " + "FROM images;"; @@ -37,7 +37,7 @@ /* Casting the year is a workaround so we can keep using * Database.find_object() without making the argument a variant or * something like it */ - private static const string SQL_FIND_OBJECT = + private const string SQL_FIND_OBJECT = "SELECT strftime('%Y', images.date, 'unixepoch') as year " + "FROM images " + "WHERE year = CAST(? AS TEXT)"; diff -Nru rygel-0.32.0/src/plugins/lms/rygel-lms-image-year.vala rygel-0.32.1/src/plugins/lms/rygel-lms-image-year.vala --- rygel-0.32.0/src/plugins/lms/rygel-lms-image-year.vala 2016-06-26 15:10:17.000000000 +0000 +++ rygel-0.32.1/src/plugins/lms/rygel-lms-image-year.vala 2016-10-10 18:43:39.000000000 +0000 @@ -24,32 +24,32 @@ using Sqlite; public class Rygel.LMS.ImageYear : Rygel.LMS.CategoryContainer { - private static const string SQL_ALL_TEMPLATE = + private const string SQL_ALL_TEMPLATE = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime, strftime('%Y', date, 'unixepoch') as year " + "FROM images, files " + "WHERE dtime = 0 AND images.id = files.id AND year = '%s' " + "LIMIT ? OFFSET ?;"; - private static const string SQL_COUNT_TEMPLATE = + private const string SQL_COUNT_TEMPLATE = "SELECT count(images.id), strftime('%Y', date, 'unixepoch') as year " + "FROM images, files " + "WHERE dtime = 0 AND images.id = files.id AND year = '%s';"; - private static const string SQL_FIND_OBJECT_TEMPLATE = + private const string SQL_FIND_OBJECT_TEMPLATE = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime, strftime('%Y', date, 'unixepoch') as year " + "FROM images, files " + "WHERE dtime = 0 AND files.id = ? AND images.id = files.id AND year = '%s';"; - private static const string SQL_ADDED_TEMPLATE = + private const string SQL_ADDED_TEMPLATE = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime, strftime('%Y', date, 'unixepoch') as year " + "FROM images, files " + "WHERE dtime = 0 AND images.id = files.id AND year = '%s' " + "AND update_id > ? AND update_id <= ?;"; - private static const string SQL_REMOVED_TEMPLATE = + private const string SQL_REMOVED_TEMPLATE = "SELECT images.id, title, artist, date, width, height, path, size, " + "dlna_profile, dlna_mime, strftime('%Y', date, 'unixepoch') as year " + "FROM images, files " + diff -Nru rygel-0.32.0/src/plugins/media-export/rygel-media-export-extract.vala rygel-0.32.1/src/plugins/media-export/rygel-media-export-extract.vala --- rygel-0.32.0/src/plugins/media-export/rygel-media-export-extract.vala 2016-08-08 16:08:24.000000000 +0000 +++ rygel-0.32.1/src/plugins/media-export/rygel-media-export-extract.vala 2016-10-10 18:43:39.000000000 +0000 @@ -49,7 +49,7 @@ GENERAL } -static const OptionEntry[] options = { +const OptionEntry[] options = { { "input-fd", 'i', 0, OptionArg.INT, ref in_fd, "File descriptor used for input", null }, { "output-fd", 'o', 0, OptionArg.INT, ref out_fd, "File descriptor used for output", null }, { "extract-metadata", 'm', 0, OptionArg.NONE, ref metadata, diff -Nru rygel-0.32.0/src/plugins/media-export/rygel-media-export-playlist-container.vala rygel-0.32.1/src/plugins/media-export/rygel-media-export-playlist-container.vala --- rygel-0.32.0/src/plugins/media-export/rygel-media-export-playlist-container.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/plugins/media-export/rygel-media-export-playlist-container.vala 2016-10-10 18:43:39.000000000 +0000 @@ -23,7 +23,7 @@ internal class Rygel.MediaExport.PlaylistContainer : DBContainer, Rygel.WritableContainer { - internal static const string URI = WritableContainer.WRITABLE_SCHEME + + internal const string URI = WritableContainer.WRITABLE_SCHEME + "playlist-container"; public ArrayList create_classes { get; set; } diff -Nru rygel-0.32.0/src/plugins/media-export/rygel-media-export-playlist-root-container.vala rygel-0.32.1/src/plugins/media-export/rygel-media-export-playlist-root-container.vala --- rygel-0.32.0/src/plugins/media-export/rygel-media-export-playlist-root-container.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/plugins/media-export/rygel-media-export-playlist-root-container.vala 2016-10-10 18:43:39.000000000 +0000 @@ -32,9 +32,9 @@ */ internal class Rygel.MediaExport.PlaylistRootContainer : Rygel.WritableContainer, DBContainer { - internal static const string ID = "virtual-parent:" + + internal const string ID = "virtual-parent:" + Rygel.PlaylistItem.UPNP_CLASS; - internal static const string URI = WritableContainer.WRITABLE_SCHEME + + internal const string URI = WritableContainer.WRITABLE_SCHEME + "playlist-root"; public ArrayList create_classes { get; set; } diff -Nru rygel-0.32.0/src/plugins/media-export/rygel-media-export-query-container.vala rygel-0.32.1/src/plugins/media-export/rygel-media-export-query-container.vala --- rygel-0.32.0/src/plugins/media-export/rygel-media-export-query-container.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/src/plugins/media-export/rygel-media-export-query-container.vala 2016-10-10 18:43:39.000000000 +0000 @@ -23,8 +23,8 @@ internal abstract class Rygel.MediaExport.QueryContainer : DBContainer { // public static members - public static const string PREFIX = "virtual-container:"; - public static const string ITEM_PREFIX = "virtual-id:"; + public const string PREFIX = "virtual-container:"; + public const string ITEM_PREFIX = "virtual-id:"; // public members public SearchExpression expression { get; construct set; } diff -Nru rygel-0.32.0/src/rygel/rygel-user-config.vala rygel-0.32.1/src/rygel/rygel-user-config.vala --- rygel-0.32.0/src/rygel/rygel-user-config.vala 2016-08-29 17:48:57.000000000 +0000 +++ rygel-0.32.1/src/rygel/rygel-user-config.vala 2016-10-10 18:43:39.000000000 +0000 @@ -37,25 +37,25 @@ * Manages the user configuration for Rygel. */ public class Rygel.UserConfig : GLib.Object, Configuration { - public static const string GENERAL_SECTION = "general"; - public static const string CONFIG_FILE = "rygel.conf"; - public static const string IFACE_KEY = "interface"; - public static const string PORT_KEY = "port"; - public static const string ENABLED_KEY = "enabled"; - public static const string TITLE_KEY = "title"; - public static const string TRANSCODING_KEY = "enable-transcoding"; - public static const string ALLOW_UPLOAD_KEY = "allow-upload"; - public static const string ALLOW_DELETION_KEY = "allow-deletion"; - public static const string LOG_LEVELS_KEY = "log-level"; - public static const string PLUGIN_PATH_KEY = "plugin-path"; - public static const string ENGINE_PATH_KEY = "engine-path"; - public static const string MEDIA_ENGINE_KEY = "media-engine"; - public static const string UPLOAD_FOLDER_KEY = "upload-folder"; - public static const string VIDEO_UPLOAD_DIR_PATH_KEY = + public const string GENERAL_SECTION = "general"; + public const string CONFIG_FILE = "rygel.conf"; + public const string IFACE_KEY = "interface"; + public const string PORT_KEY = "port"; + public const string ENABLED_KEY = "enabled"; + public const string TITLE_KEY = "title"; + public const string TRANSCODING_KEY = "enable-transcoding"; + public const string ALLOW_UPLOAD_KEY = "allow-upload"; + public const string ALLOW_DELETION_KEY = "allow-deletion"; + public const string LOG_LEVELS_KEY = "log-level"; + public const string PLUGIN_PATH_KEY = "plugin-path"; + public const string ENGINE_PATH_KEY = "engine-path"; + public const string MEDIA_ENGINE_KEY = "media-engine"; + public const string UPLOAD_FOLDER_KEY = "upload-folder"; + public const string VIDEO_UPLOAD_DIR_PATH_KEY = "video-" + UPLOAD_FOLDER_KEY; - public static const string MUSIC_UPLOAD_DIR_PATH_KEY = + public const string MUSIC_UPLOAD_DIR_PATH_KEY = "music-" + UPLOAD_FOLDER_KEY; - public static const string PICTURE_UPLOAD_DIR_PATH_KEY = + public const string PICTURE_UPLOAD_DIR_PATH_KEY = "picture-" + UPLOAD_FOLDER_KEY; // Our singleton diff -Nru rygel-0.32.0/src/ui/rygel-user-config.vala rygel-0.32.1/src/ui/rygel-user-config.vala --- rygel-0.32.0/src/ui/rygel-user-config.vala 2016-08-29 17:48:57.000000000 +0000 +++ rygel-0.32.1/src/ui/rygel-user-config.vala 2016-10-10 18:43:39.000000000 +0000 @@ -37,25 +37,25 @@ * Manages the user configuration for Rygel. */ public class Rygel.UserConfig : GLib.Object, Configuration { - public static const string GENERAL_SECTION = "general"; - public static const string CONFIG_FILE = "rygel.conf"; - public static const string IFACE_KEY = "interface"; - public static const string PORT_KEY = "port"; - public static const string ENABLED_KEY = "enabled"; - public static const string TITLE_KEY = "title"; - public static const string TRANSCODING_KEY = "enable-transcoding"; - public static const string ALLOW_UPLOAD_KEY = "allow-upload"; - public static const string ALLOW_DELETION_KEY = "allow-deletion"; - public static const string LOG_LEVELS_KEY = "log-level"; - public static const string PLUGIN_PATH_KEY = "plugin-path"; - public static const string ENGINE_PATH_KEY = "engine-path"; - public static const string MEDIA_ENGINE_KEY = "media-engine"; - public static const string UPLOAD_FOLDER_KEY = "upload-folder"; - public static const string VIDEO_UPLOAD_DIR_PATH_KEY = + public const string GENERAL_SECTION = "general"; + public const string CONFIG_FILE = "rygel.conf"; + public const string IFACE_KEY = "interface"; + public const string PORT_KEY = "port"; + public const string ENABLED_KEY = "enabled"; + public const string TITLE_KEY = "title"; + public const string TRANSCODING_KEY = "enable-transcoding"; + public const string ALLOW_UPLOAD_KEY = "allow-upload"; + public const string ALLOW_DELETION_KEY = "allow-deletion"; + public const string LOG_LEVELS_KEY = "log-level"; + public const string PLUGIN_PATH_KEY = "plugin-path"; + public const string ENGINE_PATH_KEY = "engine-path"; + public const string MEDIA_ENGINE_KEY = "media-engine"; + public const string UPLOAD_FOLDER_KEY = "upload-folder"; + public const string VIDEO_UPLOAD_DIR_PATH_KEY = "video-" + UPLOAD_FOLDER_KEY; - public static const string MUSIC_UPLOAD_DIR_PATH_KEY = + public const string MUSIC_UPLOAD_DIR_PATH_KEY = "music-" + UPLOAD_FOLDER_KEY; - public static const string PICTURE_UPLOAD_DIR_PATH_KEY = + public const string PICTURE_UPLOAD_DIR_PATH_KEY = "picture-" + UPLOAD_FOLDER_KEY; // Our singleton diff -Nru rygel-0.32.0/.tarball-version rygel-0.32.1/.tarball-version --- rygel-0.32.0/.tarball-version 2016-09-19 19:12:05.000000000 +0000 +++ rygel-0.32.1/.tarball-version 2016-10-10 18:58:27.000000000 +0000 @@ -1 +1 @@ -0.32.0 +0.32.1 diff -Nru rygel-0.32.0/tests/Makefile.in rygel-0.32.1/tests/Makefile.in --- rygel-0.32.0/tests/Makefile.in 2016-09-19 19:03:05.000000000 +0000 +++ rygel-0.32.1/tests/Makefile.in 2016-10-10 18:51:00.000000000 +0000 @@ -1553,66 +1553,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rygel-user-config-test.c' object='rygel_user_config_test-rygel-user-config-test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rygel_user_config_test_CFLAGS) $(CFLAGS) -c -o rygel_user_config_test-rygel-user-config-test.obj `if test -f 'rygel-user-config-test.c'; then $(CYGPATH_W) 'rygel-user-config-test.c'; else $(CYGPATH_W) '$(srcdir)/rygel-user-config-test.c'; fi` -$(srcdir)/searchable-container/rygel-searchable-container.c: $(srcdir)/rygel_searchable_container_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_searchable_container_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_searchable_container_test_vala.stamp; \ - fi -$(srcdir)/searchable-container/test.c: $(srcdir)/rygel_searchable_container_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_searchable_container_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_searchable_container_test_vala.stamp; \ - fi -$(srcdir)/rygel_searchable_container_test_vala.stamp: searchable-container/rygel-searchable-container.vala searchable-container/test.vala - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_searchable_container_test_VALAFLAGS) $(VALAFLAGS) -C searchable-container/rygel-searchable-container.vala searchable-container/test.vala - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/rygel-configuration.c: $(srcdir)/rygel_user_config_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_user_config_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_user_config_test_vala.stamp; \ - fi -$(srcdir)/rygel-user-config.c: $(srcdir)/rygel_user_config_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_user_config_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_user_config_test_vala.stamp; \ - fi -$(srcdir)/rygel-user-config-test.c: $(srcdir)/rygel_user_config_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_user_config_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_user_config_test_vala.stamp; \ - fi -$(srcdir)/rygel_user_config_test_vala.stamp: rygel-configuration.vala rygel-user-config.vala rygel-user-config-test.vala - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_user_config_test_VALAFLAGS) $(VALAFLAGS) -C rygel-configuration.vala rygel-user-config.vala rygel-user-config-test.vala - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/rygel-playbin-renderer-test.c: $(srcdir)/rygel_playbin_renderer_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_playbin_renderer_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_playbin_renderer_test_vala.stamp; \ - fi -$(srcdir)/rygel_playbin_renderer_test_vala.stamp: rygel-playbin-renderer-test.vala - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_playbin_renderer_test_VALAFLAGS) $(VALAFLAGS) -C rygel-playbin-renderer-test.vala - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/rygel-database-test.c: $(srcdir)/rygel_database_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_database_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_database_test_vala.stamp; \ - fi -$(srcdir)/rygel_database_test_vala.stamp: rygel-database-test.vala - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_database_test_VALAFLAGS) $(VALAFLAGS) -C rygel-database-test.vala - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/rygel-environment-test.c: $(srcdir)/rygel_environment_test_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/rygel_environment_test_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_environment_test_vala.stamp; \ - fi -$(srcdir)/rygel_environment_test_vala.stamp: rygel-environment-test.vala - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_environment_test_VALAFLAGS) $(VALAFLAGS) -C rygel-environment-test.vala - $(AM_V_at)mv -f $@-t $@ $(srcdir)/object-creator/test.c: $(srcdir)/rygel_object_creator_test_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/rygel_object_creator_test_vala.stamp; fi @if test -f $@; then :; else \ @@ -1676,6 +1616,66 @@ $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_regression_VALAFLAGS) $(VALAFLAGS) -C rygel-regression.vala $(AM_V_at)mv -f $@-t $@ +$(srcdir)/rygel-playbin-renderer-test.c: $(srcdir)/rygel_playbin_renderer_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_playbin_renderer_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_playbin_renderer_test_vala.stamp; \ + fi +$(srcdir)/rygel_playbin_renderer_test_vala.stamp: rygel-playbin-renderer-test.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_playbin_renderer_test_VALAFLAGS) $(VALAFLAGS) -C rygel-playbin-renderer-test.vala + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/rygel-configuration.c: $(srcdir)/rygel_user_config_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_user_config_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_user_config_test_vala.stamp; \ + fi +$(srcdir)/rygel-user-config.c: $(srcdir)/rygel_user_config_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_user_config_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_user_config_test_vala.stamp; \ + fi +$(srcdir)/rygel-user-config-test.c: $(srcdir)/rygel_user_config_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_user_config_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_user_config_test_vala.stamp; \ + fi +$(srcdir)/rygel_user_config_test_vala.stamp: rygel-configuration.vala rygel-user-config.vala rygel-user-config-test.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_user_config_test_VALAFLAGS) $(VALAFLAGS) -C rygel-configuration.vala rygel-user-config.vala rygel-user-config-test.vala + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/rygel-database-test.c: $(srcdir)/rygel_database_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_database_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_database_test_vala.stamp; \ + fi +$(srcdir)/rygel_database_test_vala.stamp: rygel-database-test.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_database_test_VALAFLAGS) $(VALAFLAGS) -C rygel-database-test.vala + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/rygel-environment-test.c: $(srcdir)/rygel_environment_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_environment_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_environment_test_vala.stamp; \ + fi +$(srcdir)/rygel_environment_test_vala.stamp: rygel-environment-test.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_environment_test_VALAFLAGS) $(VALAFLAGS) -C rygel-environment-test.vala + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/searchable-container/rygel-searchable-container.c: $(srcdir)/rygel_searchable_container_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_searchable_container_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_searchable_container_test_vala.stamp; \ + fi +$(srcdir)/searchable-container/test.c: $(srcdir)/rygel_searchable_container_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/rygel_searchable_container_test_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/rygel_searchable_container_test_vala.stamp; \ + fi +$(srcdir)/rygel_searchable_container_test_vala.stamp: searchable-container/rygel-searchable-container.vala searchable-container/test.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(rygel_searchable_container_test_VALAFLAGS) $(VALAFLAGS) -C searchable-container/rygel-searchable-container.vala searchable-container/test.vala + $(AM_V_at)mv -f $@-t $@ $(srcdir)/rygel-media-engine-test.c: $(srcdir)/rygel_media_engine_test_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/rygel_media_engine_test_vala.stamp; fi @if test -f $@; then :; else \ diff -Nru rygel-0.32.0/tests/object-creator/test.vala rygel-0.32.1/tests/object-creator/test.vala --- rygel-0.32.0/tests/object-creator/test.vala 2016-04-13 15:54:52.000000000 +0000 +++ rygel-0.32.1/tests/object-creator/test.vala 2016-10-10 18:43:39.000000000 +0000 @@ -237,11 +237,11 @@ public Gee.ArrayList create_classes = new Gee.ArrayList (); public int child_count { get; set; } public string sort_criteria = "+dc:title"; - public static const string ANY = "DLNA.ORG_AnyContainer"; - public static const string UPNP_CLASS = "object.container"; - public static const string STORAGE_FOLDER = + public const string ANY = "DLNA.ORG_AnyContainer"; + public const string UPNP_CLASS = "object.container"; + public const string STORAGE_FOLDER = "object.container.storageFolder"; - public static const string PLAYLIST = + public const string PLAYLIST = "object.container.playlistContainer"; public uint update_id; diff -Nru rygel-0.32.0/tests/rygel-user-config.vala rygel-0.32.1/tests/rygel-user-config.vala --- rygel-0.32.0/tests/rygel-user-config.vala 2016-08-29 17:48:57.000000000 +0000 +++ rygel-0.32.1/tests/rygel-user-config.vala 2016-10-10 18:43:39.000000000 +0000 @@ -37,25 +37,25 @@ * Manages the user configuration for Rygel. */ public class Rygel.UserConfig : GLib.Object, Configuration { - public static const string GENERAL_SECTION = "general"; - public static const string CONFIG_FILE = "rygel.conf"; - public static const string IFACE_KEY = "interface"; - public static const string PORT_KEY = "port"; - public static const string ENABLED_KEY = "enabled"; - public static const string TITLE_KEY = "title"; - public static const string TRANSCODING_KEY = "enable-transcoding"; - public static const string ALLOW_UPLOAD_KEY = "allow-upload"; - public static const string ALLOW_DELETION_KEY = "allow-deletion"; - public static const string LOG_LEVELS_KEY = "log-level"; - public static const string PLUGIN_PATH_KEY = "plugin-path"; - public static const string ENGINE_PATH_KEY = "engine-path"; - public static const string MEDIA_ENGINE_KEY = "media-engine"; - public static const string UPLOAD_FOLDER_KEY = "upload-folder"; - public static const string VIDEO_UPLOAD_DIR_PATH_KEY = + public const string GENERAL_SECTION = "general"; + public const string CONFIG_FILE = "rygel.conf"; + public const string IFACE_KEY = "interface"; + public const string PORT_KEY = "port"; + public const string ENABLED_KEY = "enabled"; + public const string TITLE_KEY = "title"; + public const string TRANSCODING_KEY = "enable-transcoding"; + public const string ALLOW_UPLOAD_KEY = "allow-upload"; + public const string ALLOW_DELETION_KEY = "allow-deletion"; + public const string LOG_LEVELS_KEY = "log-level"; + public const string PLUGIN_PATH_KEY = "plugin-path"; + public const string ENGINE_PATH_KEY = "engine-path"; + public const string MEDIA_ENGINE_KEY = "media-engine"; + public const string UPLOAD_FOLDER_KEY = "upload-folder"; + public const string VIDEO_UPLOAD_DIR_PATH_KEY = "video-" + UPLOAD_FOLDER_KEY; - public static const string MUSIC_UPLOAD_DIR_PATH_KEY = + public const string MUSIC_UPLOAD_DIR_PATH_KEY = "music-" + UPLOAD_FOLDER_KEY; - public static const string PICTURE_UPLOAD_DIR_PATH_KEY = + public const string PICTURE_UPLOAD_DIR_PATH_KEY = "picture-" + UPLOAD_FOLDER_KEY; // Our singleton diff -Nru rygel-0.32.0/.version rygel-0.32.1/.version --- rygel-0.32.0/.version 2016-09-19 19:04:17.000000000 +0000 +++ rygel-0.32.1/.version 2016-10-10 18:52:07.000000000 +0000 @@ -1 +1 @@ -0.32.0 +0.32.1