summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Georg <mail@jensge.org>2017-06-20 21:31:06 +0200
committerJens Georg <mail@jensge.org>2017-07-21 18:58:34 +0200
commit341b8c076cd976c924449ac9fd290f56a699d86e (patch)
tree85218d4ca5a015b63c40e1ba3229897089049f43
parent8cfa5462bae9fce7e2abffe5d82c539e2df28897 (diff)
downloadrygel-341b8c076cd976c924449ac9fd290f56a699d86e.tar.gz
renderer: Style fixes
-rw-r--r--src/librygel-renderer/rygel-av-transport.vala26
-rw-r--r--src/librygel-renderer/rygel-player-controller.vala20
2 files changed, 27 insertions, 19 deletions
diff --git a/src/librygel-renderer/rygel-av-transport.vala b/src/librygel-renderer/rygel-av-transport.vala
index ded24355..287d16d9 100644
--- a/src/librygel-renderer/rygel-av-transport.vala
+++ b/src/librygel-renderer/rygel-av-transport.vala
@@ -909,17 +909,22 @@ internal class Rygel.AVTransport : Service {
// time expected by GUPnP. Due to GUPnP not using weak pointers at some
// places (e.g. xmlNode property of GUPnPServiceInfo), a crash happens when
// AVTransport is freed.
- private static void setup_handle_new_transport_uri_callback(AVTransport instance,
- Message message, string uri, string metadata, GUPnP.ServiceAction action) {
- var weakme = WeakRef(instance);
- var weakmsg = WeakRef(message);
+ private static void setup_handle_new_transport_uri_callback
+ (AVTransport instance,
+ Message message,
+ string uri,
+ string metadata,
+ GUPnP.ServiceAction action) {
+ var weakme = WeakRef (instance);
+ var weakmsg = WeakRef (message);
//var weakact = WeakRef(action);
message.finished.connect( () => {
- Rygel.AVTransport? me = (Rygel.AVTransport?)weakme.get();
- Soup.Message? msg = (Soup.Message?)weakmsg.get();
+ var me = (Rygel.AVTransport?) weakme.get();
+ var msg = (Soup.Message?) weakmsg.get();
//GUPnP.ServiceAction? act = (GUPnP.ServiceAction?)weakact.get();
- if (me == null || msg == null)
+ if (me == null || msg == null) {
return;
+ }
me.check_resource (msg, uri, metadata, action);
});
}
@@ -933,8 +938,11 @@ internal class Rygel.AVTransport : Service {
"1");
message.request_headers.append ("Connection", "close");
this.head_faked = false;
- setup_handle_new_transport_uri_callback(this, message, uri,
- metadata, action);
+ AVTransport.setup_handle_new_transport_uri_callback (this,
+ message,
+ uri,
+ metadata,
+ action);
this.session.queue_message (message, null);
} else {
diff --git a/src/librygel-renderer/rygel-player-controller.vala b/src/librygel-renderer/rygel-player-controller.vala
index df58b4f2..67e5239c 100644
--- a/src/librygel-renderer/rygel-player-controller.vala
+++ b/src/librygel-renderer/rygel-player-controller.vala
@@ -70,22 +70,22 @@ public interface Rygel.PlayerController : GLib.Object {
public abstract bool previous ();
public abstract void set_single_play_uri (string uri,
- string metadata,
- string? mime,
- string? features);
+ string metadata,
+ string? mime,
+ string? features);
public abstract void set_playlist_uri (string uri,
- string metadata,
- MediaCollection collection);
+ string metadata,
+ MediaCollection collection);
public abstract void set_next_single_play_uri (string uri,
- string metadata,
- string? mime,
- string? features);
+ string metadata,
+ string? mime,
+ string? features);
public abstract void set_next_playlist_uri (string uri,
- string metadata,
- MediaCollection collection);
+ string metadata,
+ MediaCollection collection);
public abstract bool is_play_mode_valid (string play_mode);