engine-simple: Style fixes

Signed-off-by: Jens Georg <mail@jensge.org>

2 files changed, 30 insertions, 24 deletions

diff --git a/src/media-engines/simple/rygel-simple-data-source.vala b/src/media-engines/simple/rygel-simple-data-source.vala
index 1a36c587..b80a8957 100644
--- a/src/media-engines/simple/rygel-simple-data-source.vala
+++ b/src/media-engines/simple/rygel-simple-data-source.vala
@@ -50,9 +50,9 @@ internal class Rygel.SimpleDataSource : DataSource, Object {
         this.stop ();
     }
 
-    public Gee.List<HTTPResponseElement> ? preroll (HTTPSeekRequest? seek_request,
-                                                    PlaySpeedRequest? playspeed_request)
-       throws Error {
+    public Gee.List<HTTPResponseElement>? preroll (HTTPSeekRequest? seek_request,
+                                                   PlaySpeedRequest? playspeed_request)
+                                                   throws Error {
         var response_list = new Gee.ArrayList<HTTPResponseElement> ();
 
         if (seek_request != null) {
@@ -65,7 +65,9 @@ internal class Rygel.SimpleDataSource : DataSource, Object {
             this.first_byte = (Posix.off_t) byte_seek.start_byte;
             this.last_byte = (Posix.off_t) (byte_seek.end_byte + 1);
             debug ("Processing byte seek request for bytes %lld-%lld of %s",
-                    byte_seek.start_byte, byte_seek.end_byte, this.uri);
+                    byte_seek.start_byte,
+                    byte_seek.end_byte,
+                    this.uri);
             var seek_response = new HTTPByteSeekResponse.from_request (byte_seek);
             // Response will just return what was in the request
             response_list.add (seek_response);
diff --git a/src/media-engines/simple/rygel-simple-media-engine.vala b/src/media-engines/simple/rygel-simple-media-engine.vala
index 422ec16e..849b485b 100644
--- a/src/media-engines/simple/rygel-simple-media-engine.vala
+++ b/src/media-engines/simple/rygel-simple-media-engine.vala
@@ -32,33 +32,35 @@ using GUPnP;
  * Also, its RygelSimpleDataSource does not support time-base seeking.
  */
 internal class Rygel.SimpleMediaEngine : MediaEngine {
-    private List<DLNAProfile> profiles = new List<DLNAProfile> ();
+    private List<DLNAProfile> profiles;
 
-    public SimpleMediaEngine () { }
+    public override void constructed () {
+        this.profiles = new List<DLNAProfile> ();
+    }
 
     public override unowned List<DLNAProfile> get_dlna_profiles() {
         return this.profiles;
     }
 
-    public override async Gee.List<MediaResource> ? get_resources_for_item
-                                                        (MediaObject object) {
-        if (! (object is MediaFileItem)) {
-            warning ("Can only process file-based MediaObjects (MediaFileItems)");
+    public override async Gee.List<MediaResource>? get_resources_for_item
+                                        (MediaObject object) {
+        if (!(object is MediaFileItem)) {
+            warning (_("Can only process file-based MediaObjects (MediaFileItems)"));
+
             return null;
         }
 
         var item = object as MediaFileItem;
 
         // For MediaFileItems, uri 0 is the file URI referring directly to the content
-        string source_uri = item.get_primary_uri ();
+        var source_uri = item.get_primary_uri ();
         if (!source_uri.has_prefix ("file://")) {
-            warning ("Can't process non-file uri " + source_uri);
+            warning (_("Can't process non-file uri %s"), source_uri);
         }
 
         debug ("get_resources_for_item (%s)", source_uri);
 
-        Gee.List<MediaResource> resources = new Gee.ArrayList<MediaResource> ();
-
+        var resources = new Gee.ArrayList<MediaResource> ();
         var primary_res = item.get_primary_resource ();
 
         // The SimpleMediaEngine supports only byte-based seek
@@ -68,34 +70,36 @@ internal class Rygel.SimpleMediaEngine : MediaEngine {
         primary_res.dlna_flags |= DLNAFlags.CONNECTION_STALL;
 
         // Add a resource for http consumption (as SimpleMediaEngine can handle http)
-        MediaResource http_res = new MediaResource.from_resource ("primary_http",
-                                                                  primary_res);
+        var http_res = new MediaResource.from_resource ("primary_http",
+                                                        primary_res);
         http_res.uri = ""; // The URI needs to be assigned by the MediaServer
         resources.add (http_res);
-
         resources.add (primary_res);
 
         return resources;
     }
 
-    public override DataSource? create_data_source_for_resource (MediaObject object,
-                                                                 MediaResource resource)
-        throws Error {
-        if (! (object is MediaFileItem)) {
-            warning ("Can only process file-based MediaObjects (MediaFileItems)");
+    public override DataSource? create_data_source_for_resource
+                                        (MediaObject object,
+                                         MediaResource resource)
+                                        throws Error {
+        if (!(object is MediaFileItem)) {
+            warning (_("Can only process file-based MediaObjects (MediaFileItems)"));
+
             return null;
         }
 
         // For MediaFileItems, the primary URI referrs to the local content file
-        string source_uri = object.get_primary_uri ();
-        return new SimpleDataSource (source_uri);
+        return new SimpleDataSource (object.get_primary_uri ());
     }
 
     public override DataSource? create_data_source_for_uri (string uri) {
         if (!uri.has_prefix ("file://")) {
             return null;
         }
+
         debug ("creating data source for %s", uri);
+
         return new SimpleDataSource (uri);
     }
 }