[rygel] all: Style fixes from superflous "static"
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] all: Style fixes from superflous "static"
- Date: Fri, 30 Sep 2016 16:49:56 +0000 (UTC)
commit 080aad6412ac9428f3b8fbf5f8827ca2a61e976d
Author: Jens Georg <mail jensge org>
Date: Fri Sep 30 18:47:01 2016 +0200
all: Style fixes from superflous "static"
Signed-off-by: Jens Georg <mail jensge org>
.../rygel-media-renderer-plugin.vala | 5 +--
src/librygel-ruih/rygel-ruih-server-plugin.vala | 8 ++---
.../rygel-dlna-available-seek-request.vala | 2 +-
.../rygel-dlna-available-seek-response.vala | 3 +-
src/librygel-server/rygel-media-server-plugin.vala | 4 +-
.../external/rygel-external-interfaces.vala | 36 ++++++++++----------
.../rygel-media-export-playlist-container.vala | 2 +-
...rygel-media-export-playlist-root-container.vala | 4 +-
tests/object-creator/test.vala | 6 +--
9 files changed, 32 insertions(+), 38 deletions(-)
---
diff --git a/src/librygel-renderer/rygel-media-renderer-plugin.vala
b/src/librygel-renderer/rygel-media-renderer-plugin.vala
index ab1acff..2d6cef1 100644
--- a/src/librygel-renderer/rygel-media-renderer-plugin.vala
+++ b/src/librygel-renderer/rygel-media-renderer-plugin.vala
@@ -31,9 +31,8 @@
* and return an instance of it from their get_player() implementation.
*/
public class Rygel.MediaRendererPlugin : Rygel.Plugin {
- private const string MEDIA_RENDERER_DESC_PATH =
- BuildConfig.DATA_DIR +
- "/xml/MediaRenderer2.xml";
+ private const string MEDIA_RENDERER_DESC_PATH = BuildConfig.DATA_DIR +
+ "/xml/MediaRenderer2.xml";
private const string DMR = "urn:schemas-upnp-org:device:MediaRenderer";
private string sink_protocol_info;
diff --git a/src/librygel-ruih/rygel-ruih-server-plugin.vala b/src/librygel-ruih/rygel-ruih-server-plugin.vala
index 4bc356f..14ae1eb 100644
--- a/src/librygel-ruih/rygel-ruih-server-plugin.vala
+++ b/src/librygel-ruih/rygel-ruih-server-plugin.vala
@@ -28,11 +28,9 @@
*
*/
public class Rygel.RuihServerPlugin : Rygel.Plugin {
- private const string RUIH_SERVER_DESC_PATH =
- BuildConfig.DATA_DIR +
- "/xml/RuihServer2.xml";
- private const string RUIH =
- "urn:schemas-upnp-org:device:RemoteUIServer";
+ private const string RUIH_SERVER_DESC_PATH = BuildConfig.DATA_DIR +
+ "/xml/RuihServer2.xml";
+ private const string RUIH = "urn:schemas-upnp-org:device:RemoteUIServer";
/**
diff --git a/src/librygel-server/rygel-dlna-available-seek-request.vala
b/src/librygel-server/rygel-dlna-available-seek-request.vala
index e978c89..c7e94cb 100644
--- a/src/librygel-server/rygel-dlna-available-seek-request.vala
+++ b/src/librygel-server/rygel-dlna-available-seek-request.vala
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-public const string GET_AVAILABLE_SEEK_RANGE_HEADER = "getAvailableSeekRange.dlna.org";
/**
* This class represents a DLNA getAvailableSeekRange request.
@@ -29,6 +28,7 @@ public const string GET_AVAILABLE_SEEK_RANGE_HEADER = "getAvailableSeekRange.dln
* A getAvailableSeekRange request can only have a single parameter: "1"
*/
public class Rygel.DLNAAvailableSeekRangeRequest : Rygel.HTTPSeekRequest {
+ public const string GET_AVAILABLE_SEEK_RANGE_HEADER = "getAvailableSeekRange.dlna.org";
/**
* Create a DLNAAvailableSeekRangeRequest corresponding with a HTTPGet
* that contains a getAvailableSeekRange.dlna.org header value.
diff --git a/src/librygel-server/rygel-dlna-available-seek-response.vala
b/src/librygel-server/rygel-dlna-available-seek-response.vala
index 2f16670..c262d30 100644
--- a/src/librygel-server/rygel-dlna-available-seek-response.vala
+++ b/src/librygel-server/rygel-dlna-available-seek-response.vala
@@ -21,9 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-public const string AVAILABLE_SEEK_RANGE_HEADER = "availableSeekRange.dlna.org";
-
public class Rygel.DLNAAvailableSeekRangeResponse : Rygel.HTTPResponseElement {
+ public const string AVAILABLE_SEEK_RANGE_HEADER = "availableSeekRange.dlna.org";
/**
* The Limited Operation mode (0 or 1)
*/
diff --git a/src/librygel-server/rygel-media-server-plugin.vala
b/src/librygel-server/rygel-media-server-plugin.vala
index 18d95dd..b7d87ef 100644
--- a/src/librygel-server/rygel-media-server-plugin.vala
+++ b/src/librygel-server/rygel-media-server-plugin.vala
@@ -35,8 +35,8 @@
*/
public abstract class Rygel.MediaServerPlugin : Rygel.Plugin {
private const string DMS = "urn:schemas-upnp-org:device:MediaServer";
- private const string MEDIA_SERVER_DESC_PATH =
- BuildConfig.DATA_DIR + "/xml/MediaServer3.xml";
+ private const string MEDIA_SERVER_DESC_PATH = BuildConfig.DATA_DIR +
+ "/xml/MediaServer3.xml";
public MediaContainer root_container { get; construct; }
diff --git a/src/plugins/external/rygel-external-interfaces.vala
b/src/plugins/external/rygel-external-interfaces.vala
index d97ed5c..873a084 100644
--- a/src/plugins/external/rygel-external-interfaces.vala
+++ b/src/plugins/external/rygel-external-interfaces.vala
@@ -75,24 +75,24 @@ public interface Rygel.External.MediaContainerProxy : DBusProxy,
public interface Rygel.External.MediaItemProxy : DBusProxy, MediaObjectProxy {
public const string IFACE = "org.gnome.UPnP.MediaItem2";
public const string[] PROPERTIES = { "URLs",
- "MIMEType",
- "DLNAProfile",
- "Size",
- "Artist",
- "Album",
- "Date",
- "Duration",
- "Bitrate",
- "SampleRate",
- "BitsPerSample",
- "Width",
- "Height",
- "ColorDepth",
- "PixelWidth",
- "PixelHeight",
- "Thumbnail",
- "AlbumArt",
- "TrackNumber" };
+ "MIMEType",
+ "DLNAProfile",
+ "Size",
+ "Artist",
+ "Album",
+ "Date",
+ "Duration",
+ "Bitrate",
+ "SampleRate",
+ "BitsPerSample",
+ "Width",
+ "Height",
+ "ColorDepth",
+ "PixelWidth",
+ "PixelHeight",
+ "Thumbnail",
+ "AlbumArt",
+ "TrackNumber" };
[DBus (name = "URLs")]
public abstract string[] urls { owned get; set; }
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 7083d9a..adc0a23 100644
--- a/src/plugins/media-export/rygel-media-export-playlist-container.vala
+++ b/src/plugins/media-export/rygel-media-export-playlist-container.vala
@@ -24,7 +24,7 @@ using GUPnP;
internal class Rygel.MediaExport.PlaylistContainer : DBContainer,
Rygel.WritableContainer {
internal const string URI = WritableContainer.WRITABLE_SCHEME +
- "playlist-container";
+ "playlist-container";
public ArrayList<string> create_classes { get; set; }
public PlaylistContainer (string id, string title) {
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 7391263..d64b770 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
@@ -33,9 +33,9 @@ using GUPnP;
internal class Rygel.MediaExport.PlaylistRootContainer : Rygel.WritableContainer,
DBContainer {
internal const string ID = "virtual-parent:" +
- Rygel.PlaylistItem.UPNP_CLASS;
+ Rygel.PlaylistItem.UPNP_CLASS;
internal const string URI = WritableContainer.WRITABLE_SCHEME +
- "playlist-root";
+ "playlist-root";
public ArrayList<string> create_classes { get; set; }
public PlaylistRootContainer () {
diff --git a/tests/object-creator/test.vala b/tests/object-creator/test.vala
index 71b231a..aa25ae3 100644
--- a/tests/object-creator/test.vala
+++ b/tests/object-creator/test.vala
@@ -239,10 +239,8 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
public string sort_criteria = "+dc:title";
public const string ANY = "DLNA.ORG_AnyContainer";
public const string UPNP_CLASS = "object.container";
- public const string STORAGE_FOLDER =
- "object.container.storageFolder";
- public const string PLAYLIST =
- "object.container.playlistContainer";
+ public const string STORAGE_FOLDER = "object.container.storageFolder";
+ public const string PLAYLIST = "object.container.playlistContainer";
public uint update_id;
// mockable elements
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
