=== modified file 'ChangeLog'
--- ChangeLog	2009-01-14 00:30:51 +0000
+++ ChangeLog	2009-01-14 01:55:01 +0000
@@ -379,6 +379,11 @@
 	with podcasts list being zero height and therefore not visible on small
 	screens (BGO #560675)
 
+2008-12-02  Christopher James Halse Rogers <raof@ubuntu.com>
+
+	* data/audio-profiles/mp3-lame.xml.in: Expose the "preset" options of 
+	the lame encoder.
+
 2008-11-24  Aaron Bockover  <abock@gnome.org>
 
 	* src/Clients/Booter/banshee-1.in: Fixed quoting in wrapper script so

=== modified file 'data/audio-profiles/mp3-lame.xml.in'
--- data/audio-profiles/mp3-lame.xml.in	2008-07-31 04:40:47 +0000
+++ data/audio-profiles/mp3-lame.xml.in	2009-01-16 04:02:05 +0000
@@ -19,10 +19,12 @@
             (gst-construct-pipeline
                 "audioconvert"
                 (gst-construct-element "lame"
-                    "mode" 4
-                    (if (= vbr_mode 0) 
-                        ("bitrate" bitrate)
-                        ("vbr" vbr_mode "vbr-quality" (- 9 vbr_quality))))
+                    (if (= vbr_mode -1)
+                        ("preset" preset)
+                        ("mode" 4
+                         (if (= vbr_mode 0) 
+                             ("bitrate" bitrate)
+                             ("vbr" vbr_mode "vbr-quality" (- 9 vbr_quality))))))
                 (if (and 
                     (!= vbr_mode 0) 
                     (gst-element-is-available "xingmux")) 
@@ -38,9 +40,10 @@
           <control-type>combo</control-type>
           <default-value>0</default-value>
           <possible-values>
-            <_value value="0" enables="bitrate" disables="vbr_quality">Constant Bitrate</_value>
-            <_value value="4" disables="bitrate" enables="vbr_quality">Variable Bitrate</_value>
-            <_value value="3" disables="bitrate" enables="vbr_quality">Average Bitrate</_value>
+            <_value value="0" disables="vbr_quality,preset" enables="bitrate" >Constant Bitrate</_value>
+            <_value value="4" disables="bitrate,preset" enables="vbr_quality">Variable Bitrate</_value>
+            <_value value="3" disables="bitrate,preset" enables="vbr_quality">Average Bitrate</_value>
+            <_value value="-1" disables="bitrate,vbr_quality" enables="preset">Preset</_value>
           </possible-values>
         </variable>
         <variable id="vbr_quality">
@@ -67,6 +70,17 @@
             <value value="320">320 Kbps</value>
           </possible-values>
         </variable>
+        <variable id="preset">
+          <_name>LAME Preset</_name>
+          <control-type>combo</control-type>
+          <default-value>standard</default-value>
+          <possible-values>
+            <_value value="medium">Medium</_value>
+            <_value value="standard">Standard</_value>
+            <_value value="extreme">Extreme</_value>
+            <_value value="insane">Insane</_value>
+          </possible-values>
+        </variable>
       </pipeline>
     </profile>
   </profiles>

