From 6a3f121e7ceb74783f70c66b85a076e137e0ebb6 Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Sun, 5 Jul 2009 16:06:49 +0300 Subject: [PATCH] core: Pass MediaItem to Transcoder.create_source() --- src/rygel/rygel-http-request.vala | 2 +- src/rygel/rygel-l16-transcoder.vala | 4 +++- src/rygel/rygel-mp2ts-transcoder.vala | 4 +++- src/rygel/rygel-mp3-transcoder.vala | 4 +++- src/rygel/rygel-transcoder.vala | 4 +++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/rygel/rygel-http-request.vala b/src/rygel/rygel-http-request.vala index ffd0772..2793a01 100644 --- a/src/rygel/rygel-http-request.vala +++ b/src/rygel/rygel-http-request.vala @@ -209,7 +209,7 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine { try { if (this.transcoder != null) { - src = this.transcoder.create_source (src); + src = this.transcoder.create_source (this.item, src); } // Then start the gst stream diff --git a/src/rygel/rygel-l16-transcoder.vala b/src/rygel/rygel-l16-transcoder.vala index 10cdb55..8146a51 100644 --- a/src/rygel/rygel-l16-transcoder.vala +++ b/src/rygel/rygel-l16-transcoder.vala @@ -57,7 +57,9 @@ internal class Rygel.L16Transcoder : Rygel.Transcoder { this.endianness = endianness; } - public override Element create_source (Element src) throws Error { + public override Element create_source (MediaItem item, + Element src) + throws Error { return new L16TranscoderBin (src, this); } diff --git a/src/rygel/rygel-mp2ts-transcoder.vala b/src/rygel/rygel-mp2ts-transcoder.vala index 41b0080..acb9f7b 100644 --- a/src/rygel/rygel-mp2ts-transcoder.vala +++ b/src/rygel/rygel-mp2ts-transcoder.vala @@ -55,7 +55,9 @@ internal class Rygel.MP2TSTranscoder : Rygel.Transcoder { this.profile = profile; } - public override Element create_source (Element src) throws Error { + public override Element create_source (MediaItem item, + Element src) + throws Error { return new MP2TSTranscoderBin (src, this); } diff --git a/src/rygel/rygel-mp3-transcoder.vala b/src/rygel/rygel-mp3-transcoder.vala index e882295..a348d3e 100644 --- a/src/rygel/rygel-mp3-transcoder.vala +++ b/src/rygel/rygel-mp3-transcoder.vala @@ -44,7 +44,9 @@ internal class Rygel.MP3Transcoder : Rygel.Transcoder { this.layer = layer; } - public override Element create_source (Element src) throws Error { + public override Element create_source (MediaItem item, + Element src) + throws Error { return new MP3TranscoderBin (src, this); } diff --git a/src/rygel/rygel-transcoder.vala b/src/rygel/rygel-transcoder.vala index 3fa42e1..b136c79 100644 --- a/src/rygel/rygel-transcoder.vala +++ b/src/rygel/rygel-transcoder.vala @@ -48,11 +48,13 @@ internal abstract class Rygel.Transcoder : GLib.Object { /** * Creates a transcoding source. * + * @param src the media item to create the transcoding source for * @param src the original (non-transcoding) source * * @return the new transcoding source */ - public abstract Element create_source (Element src) throws Error; + public abstract Element create_source (MediaItem item, + Element src) throws Error; public virtual DIDLLiteResource? add_resource (DIDLLiteItem didl_item, MediaItem item, -- 2.7.4