[rygel/rygel-0-32] Fix 'static const' warnings with vala 0.33.1
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel/rygel-0-32] Fix 'static const' warnings with vala 0.33.1
- Date: Mon, 10 Oct 2016 19:13:01 +0000 (UTC)
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(-)
---
diff --git a/src/librygel-core/rygel-basic-management-test-nslookup.vala
b/src/librygel-core/rygel-basic-management-test-nslookup.vala
index 3ffe492..b93c3d9 100644
--- a/src/librygel-core/rygel-basic-management-test-nslookup.vala
+++ b/src/librygel-core/rygel-basic-management-test-nslookup.vala
@@ -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;
diff --git a/src/librygel-core/rygel-basic-management-test-ping.vala
b/src/librygel-core/rygel-basic-management-test-ping.vala
index 51f7c28..a0f278d 100644
--- a/src/librygel-core/rygel-basic-management-test-ping.vala
+++ b/src/librygel-core/rygel-basic-management-test-ping.vala
@@ -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,
diff --git a/src/librygel-core/rygel-basic-management-test-traceroute.vala
b/src/librygel-core/rygel-basic-management-test-traceroute.vala
index 6ba28b9..9e0a6d1 100644
--- a/src/librygel-core/rygel-basic-management-test-traceroute.vala
+++ b/src/librygel-core/rygel-basic-management-test-traceroute.vala
@@ -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,
diff --git a/src/librygel-core/rygel-build-config.vapi b/src/librygel-core/rygel-build-config.vapi
index 3d6d2fc..8e74634 100644
--- a/src/librygel-core/rygel-build-config.vapi
+++ b/src/librygel-core/rygel-build-config.vapi
@@ -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 --git a/src/librygel-core/rygel-plugin.vala b/src/librygel-core/rygel-plugin.vala
index 36e4684..86e3353 100644
--- a/src/librygel-core/rygel-plugin.vala
+++ b/src/librygel-core/rygel-plugin.vala
@@ -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; }
diff --git a/src/librygel-core/rygel-recursive-module-loader.vala
b/src/librygel-core/rygel-recursive-module-loader.vala
index 83d6fa0..9dfa230 100644
--- a/src/librygel-core/rygel-recursive-module-loader.vala
+++ b/src/librygel-core/rygel-recursive-module-loader.vala
@@ -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 --git a/src/librygel-renderer/rygel-media-renderer-plugin.vala
b/src/librygel-renderer/rygel-media-renderer-plugin.vala
index 088198f..ab1acff 100644
--- a/src/librygel-renderer/rygel-media-renderer-plugin.vala
+++ b/src/librygel-renderer/rygel-media-renderer-plugin.vala
@@ -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 --git a/src/librygel-ruih/rygel-ruih-filter-entry.vala b/src/librygel-ruih/rygel-ruih-filter-entry.vala
index c17cdf1..a2abf23 100644
--- a/src/librygel-ruih/rygel-ruih-filter-entry.vala
+++ b/src/librygel-ruih/rygel-ruih-filter-entry.vala
@@ -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 --git a/src/librygel-ruih/rygel-ruih-icon-elem.vala b/src/librygel-ruih/rygel-ruih-icon-elem.vala
index 3c0478d..04a006b 100644
--- a/src/librygel-ruih/rygel-ruih-icon-elem.vala
+++ b/src/librygel-ruih/rygel-ruih-icon-elem.vala
@@ -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;
diff --git a/src/librygel-ruih/rygel-ruih-server-plugin.vala b/src/librygel-ruih/rygel-ruih-server-plugin.vala
index 0838f91..4bc356f 100644
--- a/src/librygel-ruih/rygel-ruih-server-plugin.vala
+++ b/src/librygel-ruih/rygel-ruih-server-plugin.vala
@@ -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 --git a/src/librygel-ruih/rygel-ruih-servicemanager.vala
b/src/librygel-ruih/rygel-ruih-servicemanager.vala
index 8ad20fd..b0b7af0 100644
--- a/src/librygel-ruih/rygel-ruih-servicemanager.vala
+++ b/src/librygel-ruih/rygel-ruih-servicemanager.vala
@@ -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"
diff --git a/src/librygel-ruih/rygel-ruih-ui-listing.vala b/src/librygel-ruih/rygel-ruih-ui-listing.vala
index da0d4f5..f664c91 100644
--- a/src/librygel-ruih/rygel-ruih-ui-listing.vala
+++ b/src/librygel-ruih/rygel-ruih-ui-listing.vala
@@ -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);
diff --git a/src/librygel-server/rygel-dlna-available-seek-request.vala
b/src/librygel-server/rygel-dlna-available-seek-request.vala
index 2ed1997..e978c89 100644
--- a/src/librygel-server/rygel-dlna-available-seek-request.vala
+++ b/src/librygel-server/rygel-dlna-available-seek-request.vala
@@ -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 --git a/src/librygel-server/rygel-dlna-available-seek-response.vala
b/src/librygel-server/rygel-dlna-available-seek-response.vala
index 8a35eef..2f16670 100644
--- a/src/librygel-server/rygel-dlna-available-seek-response.vala
+++ b/src/librygel-server/rygel-dlna-available-seek-response.vala
@@ -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 --git a/src/librygel-server/rygel-dtcp-cleartext-request.vala
b/src/librygel-server/rygel-dtcp-cleartext-request.vala
index a09fd8b..32070de 100644
--- a/src/librygel-server/rygel-dtcp-cleartext-request.vala
+++ b/src/librygel-server/rygel-dtcp-cleartext-request.vala
@@ -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 --git a/src/librygel-server/rygel-http-response-element.vala
b/src/librygel-server/rygel-http-response-element.vala
index 2f20fd4..58fe5af 100644
--- a/src/librygel-server/rygel-http-response-element.vala
+++ b/src/librygel-server/rygel-http-response-element.vala
@@ -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 --git a/src/librygel-server/rygel-http-seek.vala b/src/librygel-server/rygel-http-seek.vala
index edefbe2..115a2b1 100644
--- a/src/librygel-server/rygel-http-seek.vala
+++ b/src/librygel-server/rygel-http-seek.vala
@@ -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
}
diff --git a/src/librygel-server/rygel-http-time-seek-request.vala
b/src/librygel-server/rygel-http-time-seek-request.vala
index b4b090b..1c0d950 100644
--- a/src/librygel-server/rygel-http-time-seek-request.vala
+++ b/src/librygel-server/rygel-http-time-seek-request.vala
@@ -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 --git a/src/librygel-server/rygel-media-server-plugin.vala
b/src/librygel-server/rygel-media-server-plugin.vala
index 3915601..18d95dd 100644
--- a/src/librygel-server/rygel-media-server-plugin.vala
+++ b/src/librygel-server/rygel-media-server-plugin.vala
@@ -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; }
diff --git a/src/librygel-server/rygel-playspeed-request.vala
b/src/librygel-server/rygel-playspeed-request.vala
index c85a8ba..f958004 100644
--- a/src/librygel-server/rygel-playspeed-request.vala
+++ b/src/librygel-server/rygel-playspeed-request.vala
@@ -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; }
diff --git a/src/librygel-server/rygel-playspeed-response.vala
b/src/librygel-server/rygel-playspeed-response.vala
index e08fe55..c014861 100644
--- a/src/librygel-server/rygel-playspeed-response.vala
+++ b/src/librygel-server/rygel-playspeed-response.vala
@@ -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
diff --git a/src/librygel-server/rygel-writable-container.vala
b/src/librygel-server/rygel-writable-container.vala
index 8909a59..70b9806 100644
--- a/src/librygel-server/rygel-writable-container.vala
+++ b/src/librygel-server/rygel-writable-container.vala
@@ -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:
diff --git a/src/plugins/external/rygel-external-interfaces.vala
b/src/plugins/external/rygel-external-interfaces.vala
index bf56450..d97ed5c 100644
--- a/src/plugins/external/rygel-external-interfaces.vala
+++ b/src/plugins/external/rygel-external-interfaces.vala
@@ -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" };
public abstract signal void updated ();
@@ -73,8 +73,8 @@ public interface Rygel.External.MediaContainerProxy : DBusProxy,
[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 --git a/src/plugins/lms/rygel-lms-album.vala b/src/plugins/lms/rygel-lms-album.vala
index 2747675..6580857 100644
--- a/src/plugins/lms/rygel-lms-album.vala
+++ b/src/plugins/lms/rygel-lms-album.vala
@@ -24,7 +24,7 @@ using Rygel;
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 @@ public class Rygel.LMS.Album : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.Album : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.Album : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.Album : Rygel.LMS.CategoryContainer {
"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 --git a/src/plugins/lms/rygel-lms-albums.vala b/src/plugins/lms/rygel-lms-albums.vala
index cf2fe51..f76648b 100644
--- a/src/plugins/lms/rygel-lms-albums.vala
+++ b/src/plugins/lms/rygel-lms-albums.vala
@@ -25,7 +25,7 @@ using Rygel.Database;
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 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
"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 --git a/src/plugins/lms/rygel-lms-all-images.vala b/src/plugins/lms/rygel-lms-all-images.vala
index 87505a7..e1da656 100644
--- a/src/plugins/lms/rygel-lms-all-images.vala
+++ b/src/plugins/lms/rygel-lms-all-images.vala
@@ -24,32 +24,32 @@ using Rygel;
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 --git a/src/plugins/lms/rygel-lms-all-music.vala b/src/plugins/lms/rygel-lms-all-music.vala
index 23fd8b2..f99b736 100644
--- a/src/plugins/lms/rygel-lms-all-music.vala
+++ b/src/plugins/lms/rygel-lms-all-music.vala
@@ -24,7 +24,7 @@ using Rygel;
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 @@ public class Rygel.LMS.AllMusic : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.AllMusic : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.AllMusic : Rygel.LMS.CategoryContainer {
"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 @@ public class Rygel.LMS.AllMusic : Rygel.LMS.CategoryContainer {
"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 --git a/src/plugins/lms/rygel-lms-all-videos.vala b/src/plugins/lms/rygel-lms-all-videos.vala
index 42723d4..3721ac2 100644
--- a/src/plugins/lms/rygel-lms-all-videos.vala
+++ b/src/plugins/lms/rygel-lms-all-videos.vala
@@ -25,29 +25,29 @@ using Rygel.Database;
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 --git a/src/plugins/lms/rygel-lms-artist.vala b/src/plugins/lms/rygel-lms-artist.vala
index 90ac284..0e8059a 100644
--- a/src/plugins/lms/rygel-lms-artist.vala
+++ b/src/plugins/lms/rygel-lms-artist.vala
@@ -24,18 +24,18 @@ using Rygel;
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 --git a/src/plugins/lms/rygel-lms-artists.vala b/src/plugins/lms/rygel-lms-artists.vala
index 1049fba..be71595 100644
--- a/src/plugins/lms/rygel-lms-artists.vala
+++ b/src/plugins/lms/rygel-lms-artists.vala
@@ -24,16 +24,16 @@ using Rygel;
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 --git a/src/plugins/lms/rygel-lms-image-year.vala b/src/plugins/lms/rygel-lms-image-year.vala
index 2b21cf0..a376111 100644
--- a/src/plugins/lms/rygel-lms-image-year.vala
+++ b/src/plugins/lms/rygel-lms-image-year.vala
@@ -24,32 +24,32 @@ using Rygel;
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 --git a/src/plugins/lms/rygel-lms-image-years.vala b/src/plugins/lms/rygel-lms-image-years.vala
index 9feb1ed..501a6f4 100644
--- a/src/plugins/lms/rygel-lms-image-years.vala
+++ b/src/plugins/lms/rygel-lms-image-years.vala
@@ -24,12 +24,12 @@ using Rygel;
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 @@ public class Rygel.LMS.ImageYears : Rygel.LMS.CategoryContainer {
/* 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 --git a/src/plugins/media-export/rygel-media-export-extract.vala
b/src/plugins/media-export/rygel-media-export-extract.vala
index 1929800..41c9e7f 100644
--- a/src/plugins/media-export/rygel-media-export-extract.vala
+++ b/src/plugins/media-export/rygel-media-export-extract.vala
@@ -49,7 +49,7 @@ public errordomain MetadataExtractorError {
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 --git a/src/plugins/media-export/rygel-media-export-playlist-container.vala
b/src/plugins/media-export/rygel-media-export-playlist-container.vala
index 651a491..7083d9a 100644
--- a/src/plugins/media-export/rygel-media-export-playlist-container.vala
+++ b/src/plugins/media-export/rygel-media-export-playlist-container.vala
@@ -23,7 +23,7 @@ using GUPnP;
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<string> create_classes { get; set; }
diff --git a/src/plugins/media-export/rygel-media-export-playlist-root-container.vala
b/src/plugins/media-export/rygel-media-export-playlist-root-container.vala
index 01db62a..7391263 100644
--- a/src/plugins/media-export/rygel-media-export-playlist-root-container.vala
+++ b/src/plugins/media-export/rygel-media-export-playlist-root-container.vala
@@ -32,9 +32,9 @@ using GUPnP;
*/
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<string> create_classes { get; set; }
diff --git a/src/plugins/media-export/rygel-media-export-query-container.vala
b/src/plugins/media-export/rygel-media-export-query-container.vala
index 59066b6..8381d1c 100644
--- a/src/plugins/media-export/rygel-media-export-query-container.vala
+++ b/src/plugins/media-export/rygel-media-export-query-container.vala
@@ -23,8 +23,8 @@ using GUPnP;
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 --git a/src/rygel/rygel-user-config.vala b/src/rygel/rygel-user-config.vala
index 2f8d53f..13227a7 100644
--- a/src/rygel/rygel-user-config.vala
+++ b/src/rygel/rygel-user-config.vala
@@ -37,25 +37,25 @@ private enum Rygel.EntryType {
* 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 --git a/tests/object-creator/test.vala b/tests/object-creator/test.vala
index a0198d8..71b231a 100644
--- a/tests/object-creator/test.vala
+++ b/tests/object-creator/test.vala
@@ -237,11 +237,11 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
public Gee.ArrayList<string> create_classes = new Gee.ArrayList<string> ();
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 --git a/tests/rygel-http-response-test.vala b/tests/rygel-http-response-test.vala
index 5e1582a..c6d9792 100644
--- a/tests/rygel-http-response-test.vala
+++ b/tests/rygel-http-response-test.vala
@@ -391,8 +391,8 @@ internal class Rygel.TestDataSource : Rygel.DataSource, Object {
}
public class Rygel.MediaItem {
- private static const long BLOCK_SIZE = HTTPResponseTest.MAX_BYTES / 16;
- private static const long MAX_BUFFERS = 25;
+ private const long BLOCK_SIZE = HTTPResponseTest.MAX_BYTES / 16;
+ private const long MAX_BUFFERS = 25;
public int64 size {
get {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
