[rygel/wip/media-engine: 4/9] core,data,doc: Drop transcoder options
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel/wip/media-engine: 4/9] core,data,doc: Drop transcoder options
- Date: Fri, 21 Sep 2012 14:07:58 +0000 (UTC)
commit 8f25ffc65862db5b5cc8587b615fd077f5fe5ff9
Author: Jens Georg <jensg openismus org>
Date: Fri Aug 31 15:41:43 2012 +0200
core,data,doc: Drop transcoder options
Add a new [MediaEngine] section and add a "transcoders" list.
data/rygel.conf | 26 ++----
doc/man/rygel.conf.xml | 76 +++------------
doc/man/rygel.xml | 114 ----------------------
src/librygel-core/rygel-configuration.vala | 14 +---
src/librygel-core/rygel-meta-config.vala | 116 +----------------------
src/librygel-server/rygel-gst-media-engine.vala | 67 ++++++--------
src/rygel/rygel-cmdline-config.vala | 69 +-------------
src/rygel/rygel-environment-config.vala | 33 +------
src/rygel/rygel-user-config.vala | 32 +------
src/ui/rygel-writable-user-config.vala | 18 +---
tests/rygel-item-creator-test.vala | 7 ++
11 files changed, 68 insertions(+), 504 deletions(-)
---
diff --git a/data/rygel.conf b/data/rygel.conf
index 35b3f01..c898602 100644
--- a/data/rygel.conf
+++ b/data/rygel.conf
@@ -13,25 +13,6 @@ upnp-enabled=true
# Set it to 'false' if you want to disable transcoding support.
enable-transcoding=true
-# Set it to 'false' if you want to disable MP3 transcoding support.
-enable-mp3-transcoder=true
-
-# Set it to 'false' if you want to disable LPCM transcoding support.
-enable-lpcm-transcoder=true
-
-# Set it to 'false' if you want to disable mpeg transport stream
-# (mpeg 2 video + audio) transcoding support.
-enable-mp2ts-transcoder=true
-
-# Set it to 'false' if you want to disable WMV transcoding support.
-enable-wmv-transcoder=true
-
-# Set it to 'false' if you want to disable AAC_ADTS_320 transcoding support.
-enable-aac-transcoder=true
-
-# Set it to 'false' if you want to disable AVC_MP4 transcoding support.
-enable-avc-transcoder=true
-
# Where video files should be saved if allow-upload is true.
# Defaults to @VIDEOS@, the standard videos folder (typically ${HOME}/Videos).
video-upload-folder= VIDEOS@
@@ -93,6 +74,13 @@ allow-deletion=true
# returned by g_get_host_name() function of glib library.
#
+# Options related to the used media backend.
+# The options shown in this configuration file are specific to GStreamer.
+[MediaEngine]
+
+# List of active transcoders. To disable one, remove from list.
+transcoders=mp3;lpcm;mp2ts;wmv;aac;avc
+
[Tracker]
enabled=true
share-pictures=true
diff --git a/doc/man/rygel.conf.xml b/doc/man/rygel.conf.xml
index 1d70476..9a2c6d1 100644
--- a/doc/man/rygel.conf.xml
+++ b/doc/man/rygel.conf.xml
@@ -147,66 +147,6 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
</varlistentry>
<varlistentry>
<term>
- <option>enable-mp3-transcoder</option>
- </term>
- <listitem>
- <para>Set to <userinput>true</userinput> to enable transcoding to MP3.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>enable-mp2ts-transcoder</option>
- </term>
- <listitem>
- <para>
- Set to <userinput>true</userinput> to enable transcoding to MPEG2
- in TS container.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>enable-lpcm-transcoder</option>
- </term>
- <listitem>
- <para>
- Set to <userinput>true</userinput> to enable transcoding to Linear PCM.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>enable-wmv-transcoder</option>
- </term>
- <listitem>
- <para>
- Set to <userinput>true</userinput> to enable transcoding to WMV.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>enable-aac-transcoder</option>
- </term>
- <listitem>
- <para>
- Set to <userinput>true</userinput> to enable transcoding to AAC.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>enable-avc-transcoder</option>
- </term>
- <listitem>
- <para>
- Set to <userinput>true</userinput> to enable transcoding to AVC.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
<option>log-level=<replaceable>DOMAIN</replaceable>:<replaceable>LEVEL</replaceable>[,<replaceable>DOMAIN</replaceable>:<replaceable>LEVEL</replaceable>,â]</option>
</term>
<listitem>
@@ -304,6 +244,20 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
</variablelist>
</refsect1>
<refsect1>
+ <title>Media Engine settings</title>
+ <para>The settings in this <code>[MediaEngine]</code> section are specific to the media engine used. This document lists the options available for the <ulink url="http://gstreamer.freedesktop.org";>GStreamer</ulink> media engine.</para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>transcoders</option>
+ </term>
+ <listitem>
+ <para>A semicolon-separated list of the active transcoders. This setting has no effect if <option>enable-transcoding</option> is set to <code>false</code>. Possible values are: <code>lpcm,mp3,mp2ts,aac,avc</code> or <code>wmv</code>. Its default value is <code>lpcm;mp3;mp2ts;aac;wmv</code>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
<title>Tracker Plugin</title>
<para>The tracker plugin uses the centralized database of meta information
from the tracker project. See the
@@ -472,7 +426,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
<option>identifier-dlnaprofile</option>
</term>
<listitem>
- <para>DLNA profile for the stream.</para>
+ <para>DLNA profile for the stream.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/doc/man/rygel.xml b/doc/man/rygel.xml
index a22aaaf..ae90d10 100644
--- a/doc/man/rygel.xml
+++ b/doc/man/rygel.xml
@@ -178,72 +178,6 @@ handling.</para>
</varlistentry>
<varlistentry>
<term>
- <option>-m</option>
- </term>
- <term>
- <option>--disable-mp3-transcoder</option>
- </term>
- <listitem>
- <para>Disable transcoding to MP3.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>-s</option>
- </term>
- <term>
- <option>--disable-mp2ts-transcoder</option>
- </term>
- <listitem>
- <para>Disable transcoding to MPEG2 in TS container.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>-l</option>
- </term>
- <term>
- <option>--disable-lpcm-transcoder</option>
- </term>
- <listitem>
- <para>Disable transcoding to Linear PCM.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>-w</option>
- </term>
- <term>
- <option>--disable-wmv-transcoder</option>
- </term>
- <listitem>
- <para>Disable transcoding to WMV.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>-a</option>
- </term>
- <term>
- <option>--disable-aac-transcoder</option>
- </term>
- <listitem>
- <para>Disable transcoding to AAC.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>-z</option>
- </term>
- <term>
- <option>--disable-avc-transcoder</option>
- </term>
- <listitem>
- <para>Disable transcoding to AVC.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
<option>-U</option>
</term>
<term>
@@ -420,54 +354,6 @@ handling.</para>
</varlistentry>
<varlistentry>
<term>
- <envar>RYGEL_DISABLE_MP3_TRANS</envar>
- </term>
- <listitem>
- <para>Disable the MP3 transcoder.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <envar>RYGEL_DISABLE_LPCM_TRANS</envar>
- </term>
- <listitem>
- <para>Disable the Linear PCM transcoder.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <envar>RYGEL_DISABLE_MP2TS_TRANS</envar>
- </term>
- <listitem>
- <para>Disable the MPEG2 in TS transcoder.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <envar>RYGEL_DISABLE_WMV_TRANS</envar>
- </term>
- <listitem>
- <para>Disable transcoding to WMV format.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <envar>RYGEL_DISABLE_AAC_TRANS</envar>
- </term>
- <listitem>
- <para>Disable transcoding to AAC format.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <envar>RYGEL_DISABLE_AVC_TRANS</envar>
- </term>
- <listitem>
- <para>Disable transcoding to AVC format.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
<envar>RYGEL_LOG</envar>
</term>
<listitem>
diff --git a/src/librygel-core/rygel-configuration.vala b/src/librygel-core/rygel-configuration.vala
index f37638d..eeb5001 100644
--- a/src/librygel-core/rygel-configuration.vala
+++ b/src/librygel-core/rygel-configuration.vala
@@ -1,9 +1,11 @@
/*
* Copyright (C) 2008,2009 Nokia Corporation.
* Copyright (C) 2008,2009 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
+ * Copyright (C) 2012 Intel Corporation.
*
* Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
* <zeeshan ali nokia com>
+ * Jens Georg <jensg openismus com>
*
* This file is part of Rygel.
*
@@ -39,18 +41,6 @@ public interface Rygel.Configuration : GLib.Object {
public abstract bool get_transcoding () throws GLib.Error;
- public abstract bool get_mp3_transcoder () throws GLib.Error;
-
- public abstract bool get_mp2ts_transcoder () throws GLib.Error;
-
- public abstract bool get_lpcm_transcoder () throws GLib.Error;
-
- public abstract bool get_wmv_transcoder () throws GLib.Error;
-
- public abstract bool get_aac_transcoder () throws GLib.Error;
-
- public abstract bool get_avc_transcoder () throws GLib.Error;
-
public abstract bool get_allow_upload () throws GLib.Error;
public abstract bool get_allow_deletion () throws GLib.Error;
diff --git a/src/librygel-core/rygel-meta-config.vala b/src/librygel-core/rygel-meta-config.vala
index 3bae6c1..b695b3c 100644
--- a/src/librygel-core/rygel-meta-config.vala
+++ b/src/librygel-core/rygel-meta-config.vala
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2008,2009 Nokia Corporation.
* Copyright (C) 2008,2009 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
- * Copyright (C) 2012 Openismus GmbH.
+ * Copyright (C) 2012 Intel Corporation.
*
* Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
* <zeeshan ali nokia com>
@@ -134,120 +134,6 @@ public class Rygel.MetaConfig : GLib.Object, Configuration {
return val;
}
- public bool get_mp3_transcoder () throws GLib.Error {
- bool val = true;
- bool unavailable = true;
-
- foreach (var config in MetaConfig.configs) {
- try {
- val = config.get_mp3_transcoder ();
- unavailable = false;
- break;
- } catch (GLib.Error err) {}
- }
-
- if (unavailable) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- }
-
- return val;
- }
-
- public bool get_mp2ts_transcoder () throws GLib.Error {
- bool val = true;
- bool unavailable = true;
-
- foreach (var config in MetaConfig.configs) {
- try {
- val = config.get_mp2ts_transcoder ();
- unavailable = false;
- break;
- } catch (GLib.Error err) {}
- }
-
- if (unavailable) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- }
-
- return val;
- }
-
- public bool get_lpcm_transcoder () throws GLib.Error {
- bool val = true;
- bool unavailable = true;
-
- foreach (var config in MetaConfig.configs) {
- try {
- val = config.get_lpcm_transcoder ();
- unavailable = false;
- break;
- } catch (GLib.Error err) {}
- }
-
- if (unavailable) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- }
-
- return val;
- }
-
- public bool get_wmv_transcoder () throws GLib.Error {
- bool val = true;
- bool unavailable = true;
-
- foreach (var config in MetaConfig.configs) {
- try {
- val = config.get_wmv_transcoder ();
- unavailable = false;
- break;
- } catch (GLib.Error err) {}
- }
-
- if (unavailable) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- }
-
- return val;
- }
-
- public bool get_aac_transcoder () throws GLib.Error {
- bool val = true;
- bool unavailable = true;
-
- foreach (var config in MetaConfig.configs) {
- try {
- val = config.get_aac_transcoder ();
- unavailable = false;
- break;
- } catch (GLib.Error err) {}
- }
-
- if (unavailable) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- }
-
- return val;
- }
-
- public bool get_avc_transcoder () throws GLib.Error {
- bool val = true;
- bool unavailable = true;
-
- foreach (var config in MetaConfig.configs) {
- try {
- val = config.get_avc_transcoder ();
- unavailable = false;
- break;
- } catch (GLib.Error err) {}
- }
-
- if (unavailable) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- }
-
- return val;
- }
-
public bool get_allow_upload () throws GLib.Error {
bool val = true;
bool unavailable = true;
diff --git a/src/librygel-server/rygel-gst-media-engine.vala b/src/librygel-server/rygel-gst-media-engine.vala
index 5868598..8a7ba70 100644
--- a/src/librygel-server/rygel-gst-media-engine.vala
+++ b/src/librygel-server/rygel-gst-media-engine.vala
@@ -21,6 +21,7 @@
*/
using Gst;
+using Gee;
internal class Rygel.GstMediaEngine : Rygel.MediaEngine {
private GLib.List<DLNAProfile> dlna_profiles = null;
@@ -38,51 +39,41 @@ internal class Rygel.GstMediaEngine : Rygel.MediaEngine {
this.dlna_profiles.reverse ();
var transcoding = true;
- var lpcm_transcoder = true;
- var mp3_transcoder = true;
- var mp2ts_transcoder = true;
- var wmv_transcoder = true;
- var aac_transcoder = true;
- var avc_transcoder = true;
+ var transcoder_list = new ArrayList<string> ();
var config = MetaConfig.get_default ();
try {
transcoding = config.get_transcoding ();
-
- if (transcoding) {
- lpcm_transcoder = config.get_lpcm_transcoder ();
- mp3_transcoder = config.get_mp3_transcoder ();
- mp2ts_transcoder = config.get_mp2ts_transcoder ();
- wmv_transcoder = config.get_wmv_transcoder ();
- aac_transcoder = config.get_aac_transcoder ();
- avc_transcoder = config.get_avc_transcoder ();
- }
+ transcoder_list = config.get_string_list ("MediaEngine",
+ "transcoders");
} catch (Error err) {}
if (transcoding) {
- if (lpcm_transcoder) {
- this.transcoders.prepend (new L16Transcoder ());
- }
-
- if (mp3_transcoder) {
- this.transcoders.prepend (new MP3Transcoder ());
- }
-
- if (mp2ts_transcoder) {
- this.transcoders.prepend (new MP2TSTranscoder(MP2TSProfile.SD));
- this.transcoders.prepend (new MP2TSTranscoder(MP2TSProfile.HD));
- }
-
- if (wmv_transcoder) {
- this.transcoders.prepend (new WMVTranscoder ());
- }
-
- if (aac_transcoder) {
- this.transcoders.prepend (new AACTranscoder ());
- }
-
- if (avc_transcoder) {
- this.transcoders.prepend (new AVCTranscoder ());
+ foreach (var transcoder in transcoder_list) {
+ switch (transcoder) {
+ case "lpcm":
+ this.transcoders.prepend (new L16Transcoder ());
+ break;
+ case "mp3":
+ this.transcoders.prepend (new MP3Transcoder ());
+ break;
+ case "mp2ts":
+ this.transcoders.prepend (new MP2TSTranscoder(MP2TSProfile.SD));
+ this.transcoders.prepend (new MP2TSTranscoder(MP2TSProfile.HD));
+ break;
+ case "wmv":
+ this.transcoders.prepend (new WMVTranscoder ());
+ break;
+ case "aac":
+ this.transcoders.prepend (new AACTranscoder ());
+ break;
+ case "avc":
+ this.transcoders.prepend (new AVCTranscoder ());
+ break;
+ default:
+ debug ("Unsupported transcoder \"%s\"", transcoder);
+ break;
+ }
}
this.transcoders.reverse ();
diff --git a/src/rygel/rygel-cmdline-config.vala b/src/rygel/rygel-cmdline-config.vala
index ccf7d97..ea00324 100644
--- a/src/rygel/rygel-cmdline-config.vala
+++ b/src/rygel/rygel-cmdline-config.vala
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2008,2009 Nokia Corporation.
* Copyright (C) 2008,2009 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
- * Copyright (C) 2012 Openismus GmbH.
+ * Copyright (C) 2012 Intel Corporation.
*
* Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
* <zeeshan ali nokia com>
@@ -39,12 +39,6 @@ public class Rygel.CmdlineConfig : GLib.Object, Configuration {
private static bool no_upnp;
private static bool no_transcoding;
- private static bool no_mp3_trans;
- private static bool no_mp2ts_trans;
- private static bool no_lpcm_trans;
- private static bool no_wmv_trans;
- private static bool no_aac_trans;
- private static bool no_avc_trans;
private static bool disallow_upload;
private static bool disallow_deletion;
@@ -80,19 +74,6 @@ public class Rygel.CmdlineConfig : GLib.Object, Configuration {
"Port", "PORT" },
{ "disable-transcoding", 't', 0, OptionArg.NONE, ref no_transcoding,
"Disable transcoding", null },
- { "disable-mp3-transcoder", 'm', 0, OptionArg.NONE, ref no_mp3_trans,
- "Disable MP3 transcoder", null },
- { "disable-mp2ts-transcoder", 's', 0, OptionArg.NONE,
- ref no_mp2ts_trans,
- "Disable mpeg2 transport stream transcoder", null },
- { "disable-lpcm-transcoder", 'l', 0, OptionArg.NONE, ref no_lpcm_trans,
- "Disable Linear PCM transcoder", null },
- { "disable-wmv-transcoder", 'w', 0, OptionArg.NONE, ref no_wmv_trans,
- "Disable WMV transcoder", null },
- { "disable-aac-transcoder", 'a', 0, OptionArg.NONE, ref no_aac_trans,
- "Disable AAC_ISO_320 transcoder", null },
- { "disable-avc-transcoder", 'z', 0, OptionArg.NONE, ref no_avc_trans,
- "Disable AVC_MP4 transcoder", null },
{ "disallow-upload", 'U', 0, OptionArg.NONE,
ref disallow_upload, "Disallow upload", null },
{ "disallow-deletion", 'D', 0, OptionArg.NONE,
@@ -185,54 +166,6 @@ public class Rygel.CmdlineConfig : GLib.Object, Configuration {
}
}
- public bool get_mp3_transcoder () throws GLib.Error {
- if (!no_mp3_trans) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- } else {
- return false;
- }
- }
-
- public bool get_mp2ts_transcoder () throws GLib.Error {
- if (!no_mp2ts_trans) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- } else {
- return false;
- }
- }
-
- public bool get_lpcm_transcoder () throws GLib.Error {
- if (!no_lpcm_trans) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- } else {
- return false;
- }
- }
-
- public bool get_wmv_transcoder () throws GLib.Error {
- if (!no_wmv_trans) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- } else {
- return false;
- }
- }
-
- public bool get_aac_transcoder () throws GLib.Error {
- if (!no_aac_trans) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- } else {
- return false;
- }
- }
-
- public bool get_avc_transcoder () throws GLib.Error {
- if (!no_avc_trans) {
- throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
- } else {
- return false;
- }
- }
-
public bool get_allow_upload () throws GLib.Error {
if (!disallow_upload) {
throw new ConfigurationError.NO_VALUE_SET (_("No value available"));
diff --git a/src/rygel/rygel-environment-config.vala b/src/rygel/rygel-environment-config.vala
index 35d991b..75d7d1f 100644
--- a/src/rygel/rygel-environment-config.vala
+++ b/src/rygel/rygel-environment-config.vala
@@ -1,9 +1,11 @@
/*
* Copyright (C) 2008-2010 Nokia Corporation.
* Copyright (C) 2008 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
+ * Copyright (C) 2012 Intel Corporation.
*
* Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
* <zeeshan ali nokia com>
+ * Jens Georg <jensg openismus com>
*
* This file is part of Rygel.
*
@@ -36,13 +38,6 @@ internal class Rygel.EnvironmentConfig : GLib.Object, Configuration {
private static string PORT_ENV = RYGEL_PREFIX + "_PORT";
private static string DISABLE_UPNP_ENV = DISABLE_PREFIX + "_UPNP";
private static string TRANSCODING_ENV = DISABLE_PREFIX + "_TRANSCODING";
- private static string MP3_TRANSCODING_ENV = DISABLE_PREFIX + "_MP3_TRANS";
- private static string LPCM_TRANSCODING_ENV = DISABLE_PREFIX + "_LPCM_TRANS";
- private static string MP2TS_TRANSCODING_ENV = DISABLE_PREFIX +
- "_MP2TS_TRANS";
- private static string WMV_TRANSCODING_ENV = DISABLE_PREFIX + "_WMV_TRANS";
- private static string AAC_TRANSCODING_ENV = DISABLE_PREFIX + "_AAC_TRANS";
- private static string AVC_TRANSCODING_ENV = DISABLE_PREFIX + "_AVC_TRANS";
private static string DISALLOW_UPLOAD_ENV = DISABLE_PREFIX + "_UPLOAD";
private static string DISALLOW_DELETION_ENV = DISABLE_PREFIX + "_DELETION";
private static string LOG_LEVELS_ENV = RYGEL_PREFIX + "_LOG";
@@ -75,30 +70,6 @@ internal class Rygel.EnvironmentConfig : GLib.Object, Configuration {
return !this.get_bool_variable (TRANSCODING_ENV);
}
- public bool get_mp3_transcoder () throws GLib.Error {
- return !this.get_bool_variable (MP3_TRANSCODING_ENV);
- }
-
- public bool get_mp2ts_transcoder () throws GLib.Error {
- return !this.get_bool_variable (MP2TS_TRANSCODING_ENV);
- }
-
- public bool get_wmv_transcoder () throws GLib.Error {
- return !this.get_bool_variable (WMV_TRANSCODING_ENV);
- }
-
- public bool get_aac_transcoder () throws GLib.Error {
- return !this.get_bool_variable (AAC_TRANSCODING_ENV);
- }
-
- public bool get_avc_transcoder () throws GLib.Error {
- return !this.get_bool_variable (AVC_TRANSCODING_ENV);
- }
-
- public bool get_lpcm_transcoder () throws GLib.Error {
- return !this.get_bool_variable (LPCM_TRANSCODING_ENV);
- }
-
public bool get_allow_upload () throws GLib.Error {
return !this.get_bool_variable (DISALLOW_UPLOAD_ENV);
}
diff --git a/src/rygel/rygel-user-config.vala b/src/rygel/rygel-user-config.vala
index 06efffd..26f5b5a 100644
--- a/src/rygel/rygel-user-config.vala
+++ b/src/rygel/rygel-user-config.vala
@@ -1,9 +1,11 @@
/*
* Copyright (C) 2008,2009 Nokia Corporation.
* Copyright (C) 2008,2009 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
+ * Copyright (C) 2012 Intel Corporation.
*
* Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
* <zeeshan ali nokia com>
+ * Jens Georg <jensg openismus com>
*
* This file is part of Rygel.
*
@@ -35,12 +37,6 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
public static const string UPNP_ENABLED_KEY = "upnp-" + ENABLED_KEY;
public static const string TITLE_KEY = "title";
public static const string TRANSCODING_KEY = "enable-transcoding";
- public static const string MP3_TRANSCODER_KEY = "enable-mp3-transcoder";
- public static const string MP2TS_TRANSCODER_KEY = "enable-mp2ts-transcoder";
- public static const string LPCM_TRANSCODER_KEY = "enable-lpcm-transcoder";
- public static const string WMV_TRANSCODER_KEY = "enable-wmv-transcoder";
- public static const string AAC_TRANSCODER_KEY = "enable-aac-transcoder";
- public static const string AVC_TRANSCODER_KEY = "enable-avc-transcoder";
public static const string ALLOW_UPLOAD_KEY = "allow-upload";
public static const string ALLOW_DELETION_KEY = "allow-deletion";
public static const string LOG_LEVELS_KEY = "log-level";
@@ -75,30 +71,6 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
return this.get_bool ("general", TRANSCODING_KEY);
}
- public bool get_mp3_transcoder () throws GLib.Error {
- return this.get_bool ("general", MP3_TRANSCODER_KEY);
- }
-
- public bool get_mp2ts_transcoder () throws GLib.Error {
- return this.get_bool ("general", MP2TS_TRANSCODER_KEY);
- }
-
- public bool get_lpcm_transcoder () throws GLib.Error {
- return this.get_bool ("general", LPCM_TRANSCODER_KEY);
- }
-
- public bool get_wmv_transcoder () throws GLib.Error {
- return this.get_bool ("general", WMV_TRANSCODER_KEY);
- }
-
- public bool get_aac_transcoder () throws GLib.Error {
- return this.get_bool ("general", AAC_TRANSCODER_KEY);
- }
-
- public bool get_avc_transcoder () throws GLib.Error {
- return this.get_bool ("general", AVC_TRANSCODER_KEY);
- }
-
public bool get_allow_upload () throws GLib.Error {
return this.get_bool ("general", ALLOW_UPLOAD_KEY);
}
diff --git a/src/ui/rygel-writable-user-config.vala b/src/ui/rygel-writable-user-config.vala
index 5841740..ecd30fb 100644
--- a/src/ui/rygel-writable-user-config.vala
+++ b/src/ui/rygel-writable-user-config.vala
@@ -1,9 +1,11 @@
/*
* Copyright (C) 2008-2011 Nokia Corporation.
* Copyright (C) 2008,2009 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
+ * Copyright (C) 2012 Intel Corporation.
*
* Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
* <zeeshan ali nokia com>
+ * Jens Georg <jensg openismus com>
*
* This file is part of Rygel.
*
@@ -84,22 +86,6 @@ public class Rygel.WritableUserConfig : Rygel.UserConfig {
this.set_bool ("general", TRANSCODING_KEY, value);
}
- public void set_mp3_transcoder (bool value) {
- this.set_bool ("general", MP3_TRANSCODER_KEY, value);
- }
-
- public void set_mp2ts_transcoder (bool value) {
- this.set_bool ("general", MP2TS_TRANSCODER_KEY, value);
- }
-
- public void set_lpcm_transcoder (bool value) {
- this.set_bool ("general", LPCM_TRANSCODER_KEY, value);
- }
-
- public void set_wmv_transcoder (bool value) {
- this.set_bool ("general", WMV_TRANSCODER_KEY, value);
- }
-
public void set_allow_upload (bool value) throws GLib.Error {
this.set_bool ("general", ALLOW_UPLOAD_KEY, value);
}
diff --git a/tests/rygel-item-creator-test.vala b/tests/rygel-item-creator-test.vala
index 84e17b8..4b1a16a 100644
--- a/tests/rygel-item-creator-test.vala
+++ b/tests/rygel-item-creator-test.vala
@@ -97,6 +97,9 @@ public class Rygel.ServiceAction : GLib.Object {
public class Rygel.HTTPServer : GLib.Object {
}
+public class Rygel.Transcoder : GLib.Object {
+}
+
public class Rygel.ItemRemovalQueue : GLib.Object {
public static ItemRemovalQueue get_default () {
return new ItemRemovalQueue ();
@@ -246,6 +249,10 @@ public class Rygel.GstMediaEngine : Rygel.MediaEngine {
public override unowned GLib.List<DLNAProfile> get_dlna_profiles () {
return null;
}
+
+ public override unowned GLib.List<Transcoder>? get_transcoders () {
+ return null;
+ }
}
public class Rygel.HTTPItemCreatorTest : GLib.Object {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
