From e9fd686fcfa36de5756a0408037919f3d08abd2c Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Thu, 3 Jan 2013 12:28:31 +0100 Subject: [PATCH] server: Small coding-style fixes --- src/librygel-server/rygel-http-server.vala | 2 +- src/librygel-server/rygel-music-item.vala | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/librygel-server/rygel-http-server.vala b/src/librygel-server/rygel-http-server.vala index f68e7ae..f6aa08c 100644 --- a/src/librygel-server/rygel-http-server.vala +++ b/src/librygel-server/rygel-http-server.vala @@ -49,7 +49,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine { } public async void run () { - context.server.add_handler (this.path_root, server_handler); + context.server.add_handler (this.path_root, this.server_handler); context.server.request_aborted.connect (this.on_request_aborted); context.server.request_started.connect (this.on_request_started); diff --git a/src/librygel-server/rygel-music-item.vala b/src/librygel-server/rygel-music-item.vala index 288c229..73b5a5b 100644 --- a/src/librygel-server/rygel-music-item.vala +++ b/src/librygel-server/rygel-music-item.vala @@ -97,18 +97,10 @@ public class Rygel.MusicItem : AudioItem { } } - private string get_first (GLib.List? contributors) { - if (contributors != null) { - return contributors.data.name; - } - - return ""; - } - internal override void apply_didl_lite (DIDLLiteObject didl_object) { base.apply_didl_lite (didl_object); - this.artist = get_first (didl_object.get_artists ()); + this.artist = this.get_first (didl_object.get_artists ()); this.track_number = didl_object.track_number; this.album = didl_object.album; this.genre = didl_object.genre; @@ -165,4 +157,13 @@ public class Rygel.MusicItem : AudioItem { null); } } + + private string get_first (GLib.List? contributors) { + if (contributors != null) { + return contributors.data.name; + } + + return ""; + } + } -- 2.7.4