From e6f52b3007c342573390b36120af187cde3c8f45 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Tue, 18 Dec 2012 12:31:20 +0100 Subject: [PATCH] gstreamer media engine: Slight cleanup RygelGstTranscoder: Remove the upnp_class construct parameter, and adapt the classes that provide it. --- src/media-engines/gstreamer/rygel-audio-transcoder.vala | 5 ++--- src/media-engines/gstreamer/rygel-gst-transcoder.vala | 1 - src/media-engines/gstreamer/rygel-video-transcoder.vala | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/media-engines/gstreamer/rygel-audio-transcoder.vala b/src/media-engines/gstreamer/rygel-audio-transcoder.vala index 76a503c..bdddc04 100644 --- a/src/media-engines/gstreamer/rygel-audio-transcoder.vala +++ b/src/media-engines/gstreamer/rygel-audio-transcoder.vala @@ -40,7 +40,7 @@ internal class Rygel.AudioTranscoder : Rygel.GstTranscoder { string? container_caps, string audio_codec_caps, string extension) { - base (content_type, dlna_profile, AudioItem.UPNP_CLASS, extension); + base (content_type, dlna_profile, extension); this.audio_bitrate = audio_bitrate; if (container_caps != null) { @@ -52,12 +52,11 @@ internal class Rygel.AudioTranscoder : Rygel.GstTranscoder { public AudioTranscoder.with_class (string content_type, string dlna_profile, - string upnp_class, int audio_bitrate, string? container_caps, string audio_codec_caps, string extension) { - base (content_type, dlna_profile, upnp_class, extension); + base (content_type, dlna_profile, extension); this.audio_bitrate = audio_bitrate; if (container_caps != null) { diff --git a/src/media-engines/gstreamer/rygel-gst-transcoder.vala b/src/media-engines/gstreamer/rygel-gst-transcoder.vala index 70ccf61..b884c72 100644 --- a/src/media-engines/gstreamer/rygel-gst-transcoder.vala +++ b/src/media-engines/gstreamer/rygel-gst-transcoder.vala @@ -47,7 +47,6 @@ internal abstract class Rygel.GstTranscoder : Rygel.Transcoder { public GstTranscoder (string mime_type, string dlna_profile, - string upnp_class, string extension) { this.mime_type = mime_type; this.dlna_profile = dlna_profile; diff --git a/src/media-engines/gstreamer/rygel-video-transcoder.vala b/src/media-engines/gstreamer/rygel-video-transcoder.vala index 7589ded..2863917 100644 --- a/src/media-engines/gstreamer/rygel-video-transcoder.vala +++ b/src/media-engines/gstreamer/rygel-video-transcoder.vala @@ -43,7 +43,6 @@ internal class Rygel.VideoTranscoder : Rygel.AudioTranscoder { base.with_class (content_type, dlna_profile, - VideoItem.UPNP_CLASS, audio_bitrate, container_caps, audio_codec_caps, -- 2.7.4