Commit 341b8c07 authored by Jens Georg's avatar Jens Georg

renderer: Style fixes

parent 8cfa5462
...@@ -909,17 +909,22 @@ internal class Rygel.AVTransport : Service { ...@@ -909,17 +909,22 @@ internal class Rygel.AVTransport : Service {
// time expected by GUPnP. Due to GUPnP not using weak pointers at some // time expected by GUPnP. Due to GUPnP not using weak pointers at some
// places (e.g. xmlNode property of GUPnPServiceInfo), a crash happens when // places (e.g. xmlNode property of GUPnPServiceInfo), a crash happens when
// AVTransport is freed. // AVTransport is freed.
private static void setup_handle_new_transport_uri_callback(AVTransport instance, private static void setup_handle_new_transport_uri_callback
Message message, string uri, string metadata, GUPnP.ServiceAction action) { (AVTransport instance,
var weakme = WeakRef(instance); Message message,
var weakmsg = WeakRef(message); string uri,
string metadata,
GUPnP.ServiceAction action) {
var weakme = WeakRef (instance);
var weakmsg = WeakRef (message);
//var weakact = WeakRef(action); //var weakact = WeakRef(action);
message.finished.connect( () => { message.finished.connect( () => {
Rygel.AVTransport? me = (Rygel.AVTransport?)weakme.get(); var me = (Rygel.AVTransport?) weakme.get();
Soup.Message? msg = (Soup.Message?)weakmsg.get(); var msg = (Soup.Message?) weakmsg.get();
//GUPnP.ServiceAction? act = (GUPnP.ServiceAction?)weakact.get(); //GUPnP.ServiceAction? act = (GUPnP.ServiceAction?)weakact.get();
if (me == null || msg == null) if (me == null || msg == null) {
return; return;
}
me.check_resource (msg, uri, metadata, action); me.check_resource (msg, uri, metadata, action);
}); });
} }
...@@ -933,8 +938,11 @@ internal class Rygel.AVTransport : Service { ...@@ -933,8 +938,11 @@ internal class Rygel.AVTransport : Service {
"1"); "1");
message.request_headers.append ("Connection", "close"); message.request_headers.append ("Connection", "close");
this.head_faked = false; this.head_faked = false;
setup_handle_new_transport_uri_callback(this, message, uri, AVTransport.setup_handle_new_transport_uri_callback (this,
metadata, action); message,
uri,
metadata,
action);
this.session.queue_message (message, null); this.session.queue_message (message, null);
} else { } else {
......
...@@ -70,22 +70,22 @@ public interface Rygel.PlayerController : GLib.Object { ...@@ -70,22 +70,22 @@ public interface Rygel.PlayerController : GLib.Object {
public abstract bool previous (); public abstract bool previous ();
public abstract void set_single_play_uri (string uri, public abstract void set_single_play_uri (string uri,
string metadata, string metadata,
string? mime, string? mime,
string? features); string? features);
public abstract void set_playlist_uri (string uri, public abstract void set_playlist_uri (string uri,
string metadata, string metadata,
MediaCollection collection); MediaCollection collection);
public abstract void set_next_single_play_uri (string uri, public abstract void set_next_single_play_uri (string uri,
string metadata, string metadata,
string? mime, string? mime,
string? features); string? features);
public abstract void set_next_playlist_uri (string uri, public abstract void set_next_playlist_uri (string uri,
string metadata, string metadata,
MediaCollection collection); MediaCollection collection);
public abstract bool is_play_mode_valid (string play_mode); public abstract bool is_play_mode_valid (string play_mode);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment