Commit 28a1d74a authored by Andreas Henriksson's avatar Andreas Henriksson

New upstream version 0.32.1

parents 481b329b 3c84b744
# Generated by Makefile. Do not edit.
commit 3c84b744b446ae84f6811e6b232840ab3d77fc7d
Author: Jens Georg <mail@jensge.org>
Date: Mon Oct 10 20:44:55 2016 +0200
Prepare 0.32.1
Signed-off-by: Jens Georg <mail@jensge.org>
NEWS | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit b44f67fbf58ceefb3fe3123b077c4bab6d6645d4
Author: Rico Tzschichholz <ricotz@ubuntu.com>
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 <ricotz@ubuntu.com>
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 <gianvito@gmx.it>
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 <mail@jensge.org>
Date: Mon Sep 19 20:45:26 2016 +0200
0.32.1
======
- Translation updates
- Fix compile warnings with newer vala compiler
All contributors to this release:
- Rico Tzschichholz <ricotz@ubuntu.com>
- Gianvito Cavasoli <gianvito@gmx.it>
Added/updated translations
- it, courtesy of Gianvito Cavasoli
0.32.0
======
- Translation updates
......
#! /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 <http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel>.
#
......@@ -651,8 +651,8 @@ MAKEFLAGS=
# 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 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures 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 @@ fi
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 @@ fi
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 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by 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 @@ fi
# Define the identity of the package.
PACKAGE='rygel'
VERSION='0.32.0'
VERSION='0.32.1'
cat >>confdefs.h <<_ACEOF
......@@ -20355,7 +20355,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by 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 @@ _ACEOF
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\\"
......
......@@ -12,4 +12,4 @@ NotShowIn=GNOME;
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
......@@ -13,4 +13,4 @@ X-GNOME-Autostart-enabled=true
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
......@@ -10,7 +10,7 @@
<manufacturer>Rygel Developers</manufacturer>
<manufacturerURL>http://www.rygel-project.org</manufacturerURL>
<modelName>Rygel</modelName>
<modelNumber>0.32.0</modelNumber>
<modelNumber>0.32.1</modelNumber>
<modelURL>http://www.rygel-project.org</modelURL>
<UDN></UDN>
<serviceList>
......
......@@ -10,7 +10,7 @@
<manufacturer>Rygel Developers.</manufacturer>
<manufacturerURL>http://www.rygel-project.org</manufacturerURL>
<modelName>Rygel</modelName>
<modelNumber>0.32.0</modelNumber>
<modelNumber>0.32.1</modelNumber>
<serialNumber>0000001</serialNumber>
<UDN></UDN>
<serviceList></serviceList>
......
......@@ -11,7 +11,7 @@
<manufacturer>Rygel Developers.</manufacturer>
<manufacturerURL>http://www.rygel-project.org</manufacturerURL>
<modelName>Rygel</modelName>
<modelNumber>0.32.0</modelNumber>
<modelNumber>0.32.1</modelNumber>
<serialNumber>0000001</serialNumber>
<serviceList>
</serviceList>
......
......@@ -2,12 +2,12 @@
.\" Title: RYGEL
.\" Author: Jens Georg <mail@jensge.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
......
......@@ -2,12 +2,12 @@
.\" Title: rygel.conf
.\" Author: Jens Georg <mail@jensge.org>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
......
No preview for this file type
This diff is collapsed.
......@@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -107,11 +107,11 @@ internal class Rygel.BasicManagementTestNSLookup : BasicManagementTest {
}
}
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;
......
......@@ -25,17 +25,17 @@ using GLib;
// 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,
......
......@@ -25,18 +25,18 @@ using GLib;
// 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,
......
......@@ -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;
}
......@@ -76,31 +76,31 @@ public enum Rygel.PluginCapabilities {
* 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; }
......
......@@ -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 + "," +
......
......@@ -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;
......
......@@ -44,7 +44,7 @@ protected class ProtocolElem : UIListing {
public ProtocolElem (Xml.Node* node) throws Rygel.RuihServiceError;
public string get_protocol_info ();
public string get_short_name ();
public override bool match (Gee.ArrayList<ProtocolElem>? protocols, Gee.ArrayList filters);
public override bool match (Gee.ArrayList<ProtocolElem>? protocols, Gee.ArrayList<FilterEntry> filters);
public override string to_ui_listing (Gee.ArrayList<FilterEntry> filters);
}
[CCode (cheader_filename = "rygel-ruih.h")]
......
......@@ -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;
......
......@@ -25,11 +25,11 @@ using Gee;
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;
......
......@@ -76,7 +76,7 @@ protected class ProtocolElem : UIListing {
}
public override bool match (Gee.ArrayList<ProtocolElem>? protocols,
Gee.ArrayList filters) {
Gee.ArrayList<FilterEntry> filters) {
if (protocols == null || protocols.size == 0) {
return true;
}
......
......@@ -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";
......
......@@ -28,12 +28,12 @@ using GLib;
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 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
......
......@@ -25,18 +25,18 @@ using Gee;
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<ProtocolElem>? protocols,
ArrayList<FilterEntry> filters);
......
......@@ -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.
......
......@@ -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 {
/**
......
......@@ -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
......
......@@ -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
......
......@@ -41,6 +41,6 @@ public errordomain Rygel.HTTPSeekRequestError {
*/
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
}
......@@ -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
*/
......
......@@ -34,8 +34,8 @@
* <link linkend="implementing-server-plugins">Implementing Server Plugins</link> 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; }
......
......@@ -29,7 +29,7 @@ public errordomain Rygel.PlaySpeedError {
* 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; }
......
......@@ -27,7 +27,7 @@ public class Rygel.PlaySpeedResponse : Rygel.HTTPResponseElement {
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
......
......@@ -41,7 +41,7 @@ public errordomain Rygel.WritableContainerError {
* # 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:
......
......@@ -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 @@ public interface Rygel.External.MediaObjectProxy : DBusProxy {
[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" };