diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-30 16:17:30 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-30 16:21:11 +0200 |
commit | a5c510f8e247e68110051179ebaebe0fe74e794c (patch) | |
tree | 42d631bcc210b6eef69766a64e433235c75fbe3f /src/librygel-server | |
parent | 251421b0d9f26de6b3c388c5666a95ea1bcc2eee (diff) | |
download | rygel-a5c510f8e247e68110051179ebaebe0fe74e794c.tar.gz |
Fix 'static const' warnings with vala 0.33.1
Diffstat (limited to 'src/librygel-server')
10 files changed, 11 insertions, 11 deletions
diff --git a/src/librygel-server/rygel-dlna-available-seek-request.vala b/src/librygel-server/rygel-dlna-available-seek-request.vala index 2ed1997b..e978c890 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 8a35eef5..2f16670c 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 a09fd8b8..32070de5 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 2f20fd45..58fe5af8 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 edefbe2a..115a2b1d 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 b4b090bc..1c0d9503 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 39156014..18d95dd4 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 c85a8ba5..f9580043 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 e08fe554..c014861b 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 8909a59f..70b98066 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: |