[rygel] Revert "core: Use Signal.connect* for connecting dynamic signals"
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] Revert "core: Use Signal.connect* for connecting dynamic signals"
- Date: Mon, 1 Nov 2010 12:54:33 +0000 (UTC)
commit db01f03e216258cb4db503e85d9f06224a95e558
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Mon Oct 18 15:55:20 2010 +0300
Revert "core: Use Signal.connect* for connecting dynamic signals"
This reverts commit 565c72bba0bb5f6ff60fa587a78a02cfed4e5ca9.
Conflicts:
src/rygel/rygel-live-response.vala
src/rygel/rygel-mp2ts-transcoder-bin.vala
src/rygel/rygel-wmv-transcoder-bin.vala
src/rygel/rygel-live-response.vala | 9 +--------
src/rygel/rygel-mp2ts-transcoder-bin.vala | 9 +--------
src/rygel/rygel-wmv-transcoder-bin.vala | 9 +--------
3 files changed, 3 insertions(+), 24 deletions(-)
---
diff --git a/src/rygel/rygel-live-response.vala b/src/rygel/rygel-live-response.vala
index 027d711..3f90e9e 100644
--- a/src/rygel/rygel-live-response.vala
+++ b/src/rygel/rygel-live-response.vala
@@ -93,13 +93,7 @@ internal class Rygel.LiveResponse : Rygel.HTTPResponse {
}
sink.signal_handoffs = true;
- // FIXME: Use 'connect' syntax & remove the ugly annotation on the
- // callback once bug#622089 is fixed.
- Signal.connect_object (sink,
- "handoff",
- (Callback) this.on_new_buffer,
- this,
- ConnectFlags.AFTER);
+ sink.handoff.connect (this.on_new_buffer);
this.pipeline = new Pipeline (name);
assert (this.pipeline != null);
@@ -159,7 +153,6 @@ internal class Rygel.LiveResponse : Rygel.HTTPResponse {
}
}
- [CCode (instance_pos = -1)]
private void on_new_buffer (Element sink,
Buffer buffer,
Pad pad) {
diff --git a/src/rygel/rygel-mp2ts-transcoder-bin.vala b/src/rygel/rygel-mp2ts-transcoder-bin.vala
index 81a530b..b4c4f3a 100644
--- a/src/rygel/rygel-mp2ts-transcoder-bin.vala
+++ b/src/rygel/rygel-mp2ts-transcoder-bin.vala
@@ -63,16 +63,9 @@ internal class Rygel.MP2TSTranscoderBin : Gst.Bin {
this.add_pad (ghost);
decodebin.pad_added.connect (this.decodebin_pad_added);
- // FIXME: Use 'connect' syntax & remove the ugly annotation on the
- // callback once bug#622089 is fixed.
- Signal.connect_object (decodebin,
- "autoplug-continue",
- (Callback) this.autoplug_continue,
- this,
- ConnectFlags.AFTER);
+ decodebin.autoplug_continue.connect (this.autoplug_continue);
}
- [CCode (instance_pos = -1)]
private bool autoplug_continue (Element decodebin,
Pad new_pad,
Caps caps) {
diff --git a/src/rygel/rygel-wmv-transcoder-bin.vala b/src/rygel/rygel-wmv-transcoder-bin.vala
index d66e78e..f50d010 100644
--- a/src/rygel/rygel-wmv-transcoder-bin.vala
+++ b/src/rygel/rygel-wmv-transcoder-bin.vala
@@ -61,16 +61,9 @@ internal class Rygel.WMVTranscoderBin : Gst.Bin {
this.add_pad (ghost);
decodebin.pad_added.connect (this.decodebin_pad_added);
- // FIXME: Use 'connect' syntax & remove the ugly annotation on the
- // callback once bug#622089 is fixed.
- Signal.connect_object (decodebin,
- "autoplug-continue",
- (Callback) this.autoplug_continue,
- this,
- ConnectFlags.AFTER);
+ decodebin.autoplug_continue.connect (this.autoplug_continue);
}
- [CCode (instance_pos = -1)]
private bool autoplug_continue (Element decodebin,
Pad new_pad,
Caps caps) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]