rygel r748 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Sat Mar 28 00:44:40 2009
New Revision: 748
URL: http://svn.gnome.org/viewvc/rygel?rev=748&view=rev

Log:
Rename MP3Profile to MP3Layer.

Modified:
   trunk/src/rygel/rygel-mp2ts-transcoder.vala
   trunk/src/rygel/rygel-mp3-transcoder.vala
   trunk/src/rygel/rygel-transcode-manager.vala

Modified: trunk/src/rygel/rygel-mp2ts-transcoder.vala
==============================================================================
--- trunk/src/rygel/rygel-mp2ts-transcoder.vala	(original)
+++ trunk/src/rygel/rygel-mp2ts-transcoder.vala	Sat Mar 28 00:44:40 2009
@@ -77,7 +77,7 @@
                                int     width,
                                int     height)
                                throws Error {
-        var mp3_transcoder = new MP3Transcoder (MP3Profile.LAYER2);
+        var mp3_transcoder = new MP3Transcoder (MP3Layer.TWO);
 
         Element decodebin = TranscoderBin.create_element (DECODEBIN, DECODEBIN);
         this.audio_enc = mp3_transcoder.create_encoder (null,

Modified: trunk/src/rygel/rygel-mp3-transcoder.vala
==============================================================================
--- trunk/src/rygel/rygel-mp3-transcoder.vala	(original)
+++ trunk/src/rygel/rygel-mp3-transcoder.vala	Sat Mar 28 00:44:40 2009
@@ -25,15 +25,15 @@
 using GUPnP;
 using Gee;
 
-internal enum Rygel.MP3Profile {
-    LAYER2 = 1,
-    LAYER3 = 2
+internal enum Rygel.MP3Layer {
+    TWO = 1,
+    THREE = 2
 }
 
 internal class Rygel.MP3Transcoder : Rygel.Transcoder {
-    private MP3Profile layer;
+    private MP3Layer layer;
 
-    public MP3Transcoder (MP3Profile layer) {
+    public MP3Transcoder (MP3Layer layer) {
         base ("audio/mpeg", "MP3");
 
         this.layer = layer;
@@ -76,9 +76,9 @@
     private const string AUDIO_SINK_PAD = "audio-sink-pad";
 
     private dynamic Element audio_enc;
-    private MP3Profile layer;
+    private MP3Layer layer;
 
-    public MP3TranscoderBin (Element src, MP3Profile layer) throws Error {
+    public MP3TranscoderBin (Element src, MP3Layer layer) throws Error {
         this.layer = layer;
 
         Element decodebin = TranscoderBin.create_element (DECODEBIN, DECODEBIN);
@@ -97,9 +97,9 @@
         decodebin.pad_added += this.decodebin_pad_added;
     }
 
-    public static Element create_encoder (MP3Profile layer,
-                                          string?    src_pad_name,
-                                          string?    sink_pad_name)
+    public static Element create_encoder (MP3Layer layer,
+                                          string?  src_pad_name,
+                                          string?  sink_pad_name)
                                           throws Error {
         dynamic Element convert = TranscoderBin.create_element (AUDIO_CONVERT,
                                                                 AUDIO_CONVERT);
@@ -112,7 +112,7 @@
         dynamic Element parser = TranscoderBin.create_element (AUDIO_PARSER,
                                                                AUDIO_PARSER);
 
-        if (layer == MP3Profile.LAYER3) {
+        if (layer == MP3Layer.THREE) {
             // Best quality
             encoder.quality = 0;
         }

Modified: trunk/src/rygel/rygel-transcode-manager.vala
==============================================================================
--- trunk/src/rygel/rygel-transcode-manager.vala	(original)
+++ trunk/src/rygel/rygel-transcode-manager.vala	Sat Mar 28 00:44:40 2009
@@ -33,7 +33,7 @@
 
     internal TranscodeManager () {
         l16_transcoder = new L16Transcoder ();
-        mp3_transcoder = new MP3Transcoder (MP3Profile.LAYER3);
+        mp3_transcoder = new MP3Transcoder (MP3Layer.THREE);
         mp2ts_transcoder = new MP2TSTranscoder();
     }