Easy setup for tak/ogg/mp3 external encoders

CUERipper/frmCUERipper.resx

@@ -147,24 +147,6 @@
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>0, 371</value>
   </metadata>
-  <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>169, 17</value>
-  </data>
-  <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="toolStripProgressBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 16</value>
-  </data>
-  <data name="toolStripProgressBar1.ToolTipText" xml:space="preserve">
-    <value>Track progress</value>
-  </data>
-  <data name="toolStripProgressBar2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 16</value>
-  </data>
-  <data name="toolStripProgressBar2.ToolTipText" xml:space="preserve">
-    <value>Disk progress</value>
-  </data>
   <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 371</value>
   </data>
@@ -189,9 +171,48 @@
   <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
+  <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>200, 17</value>
+  </data>
+  <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="toolStripProgressBar1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>140, 16</value>
+  </data>
+  <data name="toolStripProgressBar1.ToolTipText" xml:space="preserve">
+    <value>Track progress</value>
+  </data>
+  <data name="toolStripProgressBar2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>140, 16</value>
+  </data>
+  <data name="toolStripProgressBar2.ToolTipText" xml:space="preserve">
+    <value>Disk progress</value>
+  </data>
   <data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
+  <data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 60</value>
+  </data>
+  <data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>481, 269</value>
+  </data>
+  <data name="listTracks.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;listTracks.Name" xml:space="preserve">
+    <value>listTracks</value>
+  </data>
+  <data name="&gt;&gt;listTracks.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
   <data name="Title.DisplayIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
@@ -222,27 +243,6 @@
   <data name="Length.Width" type="System.Int32, mscorlib">
     <value>70</value>
   </data>
-  <data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 60</value>
-  </data>
-  <data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>481, 269</value>
-  </data>
-  <data name="listTracks.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;listTracks.Name" xml:space="preserve">
-    <value>listTracks</value>
-  </data>
-  <data name="&gt;&gt;listTracks.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
   <data name="buttonGo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
@@ -436,13 +436,13 @@
     <value>285, 58</value>
   </metadata>
   <data name="editToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>94, 22</value>
+    <value>152, 22</value>
   </data>
   <data name="editToolStripMenuItem.Text" xml:space="preserve">
     <value>Edit</value>
   </data>
   <data name="contextMenuStripRelease.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 26</value>
+    <value>153, 48</value>
   </data>
   <data name="&gt;&gt;contextMenuStripRelease.Name" xml:space="preserve">
     <value>contextMenuStripRelease</value>

CUETools.Codecs/Codecs.cs

@@ -810,16 +810,14 @@ namespace CUETools.Codecs
 	public class UserDefinedReader : IAudioSource
 	{
 		string _path, _decoder, _decoderParams;
-		bool _apev2tags;
 		Process _decoderProcess;
 		WAVReader rdr;
 
-		public UserDefinedReader(string path, Stream IO, string decoder, string decoderParams, bool apev2tags)
+		public UserDefinedReader(string path, Stream IO, string decoder, string decoderParams)
 		{
 			_path = path;
 			_decoder = decoder;
 			_decoderParams = decoderParams;
-			_apev2tags = apev2tags;
 			_decoderProcess = null;
 			rdr = null;
 		}

CUETools.Processor/AudioReadWrite.cs

@@ -35,7 +35,7 @@ namespace CUETools.Processor
 #endif
 				default:
 					if (extension == "." + config.udc1Extension && config.udc1Decoder != "")
-						return new UserDefinedReader(path, IO, config.udc1Decoder, config.udc1Params, config.udc1APEv2);
+						return new UserDefinedReader(path, IO, config.udc1Decoder, config.udc1Params);
 					throw new Exception("Unsupported audio type: " + path);
 			}
 		}

CUETools.Processor/Processor.cs

@@ -273,7 +273,7 @@ namespace CUETools.Processor
 		public bool decodeHDCDtoLW16;
 		public bool decodeHDCDto24bit;
 		public string udc1Extension, udc1Decoder, udc1Params, udc1Encoder, udc1EncParams;
-		public bool udc1APEv2;
+		public bool udc1APEv2, udc1ID3v2;
 
 		public CUEConfig()
 		{
@@ -322,7 +322,7 @@ namespace CUETools.Processor
 			decodeHDCDto24bit = true;
 
 			udc1Extension = udc1Decoder = udc1Params = udc1Encoder = udc1EncParams = "";
-			udc1APEv2 = false;
+			udc1ID3v2 = udc1APEv2 = false;
 		}
 
 		public void Save (SettingsWriter sw)
@@ -378,6 +378,7 @@ namespace CUETools.Processor
 				sw.Save("UDC1Encoder", udc1Encoder);
 				sw.Save("UDC1EncParams", udc1EncParams);
 				sw.Save("UDC1APEv2", udc1APEv2);
+				sw.Save("UDC1ID3v2", udc1ID3v2);
 			}
 		}
 
@@ -433,6 +434,7 @@ namespace CUETools.Processor
 			udc1Encoder = sr.Load("UDC1Encoder") ?? "";
 			udc1EncParams = sr.Load("UDC1EncParams") ?? "";
 			udc1APEv2 = sr.LoadBoolean("UDC1APEv2") ?? false;
+			udc1ID3v2 = sr.LoadBoolean("UDC1ID3v2") ?? false;
 		}
 
 		public string CleanseString (string s)

CUETools.Processor/Tagging.cs

@@ -9,17 +9,22 @@ namespace CUETools.Processor
 	{
 		public static bool UpdateTags(TagLib.File fileInfo, NameValueCollection tags, CUEConfig config)
 		{
-			if (fileInfo is TagLib.Flac.File)
+			if (fileInfo is TagLib.Riff.File)
+				return false;
+			TagLib.Ogg.XiphComment xiph = (TagLib.Ogg.XiphComment)fileInfo.GetTag(TagLib.TagTypes.Xiph);
+			if (xiph != null)
 			{
-				TagLib.Ogg.XiphComment xiph = (TagLib.Ogg.XiphComment)fileInfo.GetTag(TagLib.TagTypes.Xiph);
 				foreach (string tag in tags.AllKeys)
 					xiph.SetField(tag, tags.GetValues(tag));
 				return true;
 			}
-			if (fileInfo is TagLib.Riff.File)
-				return false;
 			if (fileInfo is TagLib.UserDefined.File && !(fileInfo as TagLib.UserDefined.File).SupportsAPEv2)
-				return false;
+			{
+				if (!(fileInfo as TagLib.UserDefined.File).SupportsID3v2)
+					return false;
+				TagLib.Id3v2.Tag id3v2 = (TagLib.Id3v2.Tag)fileInfo.GetTag(TagLib.TagTypes.Id3v2, true);
+				return true;
+			}
 			TagLib.Ape.Tag ape = (TagLib.Ape.Tag)fileInfo.GetTag(TagLib.TagTypes.Ape, true);
 			foreach (string tag in tags.AllKeys)
 				ape.SetValue(XiphTagNameToApe(tag), tags.GetValues(tag));

CUETools.Processor/UserDefined.cs

@@ -45,7 +45,9 @@ namespace TagLib.UserDefined {
 	{
 		#region Private Fields
 
-		private bool _supportsAPEv2 = true;
+		private bool _supportsAPEv2 = true;
+
+		private bool _supportsID3v2 = true;
 		
 		#endregion
 		
@@ -70,10 +72,17 @@ namespace TagLib.UserDefined {
 		/// <exception cref="ArgumentNullException">
 		///    <paramref name="path" /> is <see langword="null" />.
 		/// </exception>
-		public File (string path, ReadStyle propertiesStyle, bool supportsAPEv2)
+		public File (string path, ReadStyle propertiesStyle, bool supportsAPEv2, bool supportsID3v2)
 			: base (path, propertiesStyle)
 		{
-			_supportsAPEv2 = supportsAPEv2;
+			_supportsAPEv2 = supportsAPEv2;
+			_supportsID3v2 = supportsID3v2;
+			// Make sure we have an APE tag.
+			if (_supportsAPEv2)
+				GetTag(TagTypes.Ape, true);
+			else
+				if (_supportsID3v2)
+					GetTag(TagTypes.Id3v2, true);
 		}
 		
 		/// <summary>
@@ -87,10 +96,18 @@ namespace TagLib.UserDefined {
 		/// </param>
 		/// <exception cref="ArgumentNullException">
 		///    <paramref name="path" /> is <see langword="null" />.
-		/// </exception>
+		/// </exception>
-		public File (string path, bool supportsAPEv2) : base (path)
+		public File(string path, bool supportsAPEv2, bool supportsID3v2)
+			: base(path)
 		{
-			_supportsAPEv2 = supportsAPEv2;
+			_supportsAPEv2 = supportsAPEv2;
+			_supportsID3v2 = supportsID3v2;
+			// Make sure we have an APE tag.
+			if (_supportsAPEv2)
+				GetTag(TagTypes.Ape, true);
+			else
+				if (_supportsID3v2)
+					GetTag(TagTypes.Id3v2, true);
 		}
 		
 		/// <summary>
@@ -111,11 +128,18 @@ namespace TagLib.UserDefined {
 		///    <paramref name="abstraction" /> is <see langword="null"
 		///    />.
 		/// </exception>
-		public File (File.IFileAbstraction abstraction,
+		public File (File.IFileAbstraction abstraction,
-		             ReadStyle propertiesStyle, bool supportsAPEv2)
+					 ReadStyle propertiesStyle, bool supportsAPEv2, bool supportsID3v2)
 			: base (abstraction, propertiesStyle)
 		{
-			_supportsAPEv2 = supportsAPEv2;
+			_supportsAPEv2 = supportsAPEv2;
+			_supportsID3v2 = supportsID3v2;
+			// Make sure we have an APE tag.
+			if (_supportsAPEv2)
+				GetTag(TagTypes.Ape, true);
+			else
+				if (_supportsID3v2)
+					GetTag(TagTypes.Id3v2, true);
 		}
 		
 		/// <summary>
@@ -130,11 +154,18 @@ namespace TagLib.UserDefined {
 		/// <exception cref="ArgumentNullException">
 		///    <paramref name="abstraction" /> is <see langword="null"
 		///    />.
-		/// </exception>
+		/// </exception>
-		public File (File.IFileAbstraction abstraction, bool supportsAPEv2)
+		public File(File.IFileAbstraction abstraction, bool supportsAPEv2, bool supportsID3v2)
 			: base (abstraction)
 		{
-			_supportsAPEv2 = supportsAPEv2;
+			_supportsAPEv2 = supportsAPEv2;
+			_supportsID3v2 = supportsID3v2;
+			// Make sure we have an APE tag.
+			if (_supportsAPEv2)
+				GetTag(TagTypes.Ape, true);
+			else
+				if (_supportsID3v2)
+					GetTag(TagTypes.Id3v2, true);
 		}
 		
 		#endregion
@@ -149,6 +180,14 @@ namespace TagLib.UserDefined {
 			{
 				return _supportsAPEv2;
 			}
+		}
+
+		public bool SupportsID3v2
+		{
+			get
+			{
+				return _supportsID3v2;
+			}
 		}
 		
 
@@ -240,9 +279,6 @@ namespace TagLib.UserDefined {
 		protected override void ReadEnd (long end,
 		                                 ReadStyle propertiesStyle)
 		{
-			// Make sure we have an APE tag.
-			if (_supportsAPEv2)
-				GetTag (TagTypes.Ape, true);
 		}
 		
 		/// <summary>
@@ -293,12 +329,12 @@ namespace TagLib.UserDefined {
 
 		private static TagLib.File UserDefinedResolver(TagLib.File.IFileAbstraction abstraction, string mimetype, TagLib.ReadStyle style)
 		{
-			if (mimetype == "taglib/flac" || mimetype == "taglib/wv" || mimetype == "taglib/ape" || mimetype == "taglib/wav")
+			if (mimetype == "taglib/flac" || mimetype == "taglib/wv" || mimetype == "taglib/ape" || mimetype == "taglib/wav" || mimetype == "taglib/ogg")
 				return null;
 			if (mimetype == "taglib/tta")
-				return new File(abstraction, style, true);
+				return new File(abstraction, style, true, false);
 			if (mimetype == "taglib/" + _config.udc1Extension)
-				return new File(abstraction, style, _config.udc1APEv2);
+				return new File(abstraction, style, _config.udc1APEv2, _config.udc1ID3v2);
 			return null;
 		}
 

CUETools/frmCUETools.Designer.cs

@@ -49,6 +49,7 @@ namespace JDP {
 			this.rbAppendFilename = new System.Windows.Forms.RadioButton();
 			this.txtAppendFilename = new System.Windows.Forms.TextBox();
 			this.grpAudioOutput = new System.Windows.Forms.GroupBox();
+			this.rbUDC1 = new System.Windows.Forms.RadioButton();
 			this.rbTTA = new System.Windows.Forms.RadioButton();
 			this.chkLossyWAV = new System.Windows.Forms.CheckBox();
 			this.rbAPE = new System.Windows.Forms.RadioButton();
@@ -79,7 +80,11 @@ namespace JDP {
 			this.rbFreedbAlways = new System.Windows.Forms.RadioButton();
 			this.rbFreedbIf = new System.Windows.Forms.RadioButton();
 			this.rbFreedbNever = new System.Windows.Forms.RadioButton();
-			this.rbUDC1 = new System.Windows.Forms.RadioButton();
+			this.btnCodec = new System.Windows.Forms.Button();
+			this.contextMenuStripUDC = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.tAKToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mP3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.oGGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.grpCUEPaths.SuspendLayout();
 			this.grpOutputStyle.SuspendLayout();
 			this.grpOutputPathGeneration.SuspendLayout();
@@ -87,6 +92,7 @@ namespace JDP {
 			this.grpAccurateRip.SuspendLayout();
 			this.statusStrip1.SuspendLayout();
 			this.groupBox1.SuspendLayout();
+			this.contextMenuStripUDC.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// btnConvert
@@ -269,6 +275,7 @@ namespace JDP {
 			// 
 			// grpAudioOutput
 			// 
+			this.grpAudioOutput.Controls.Add(this.btnCodec);
 			this.grpAudioOutput.Controls.Add(this.rbUDC1);
 			this.grpAudioOutput.Controls.Add(this.rbTTA);
 			this.grpAudioOutput.Controls.Add(this.chkLossyWAV);
@@ -281,6 +288,14 @@ namespace JDP {
 			this.grpAudioOutput.Name = "grpAudioOutput";
 			this.grpAudioOutput.TabStop = false;
 			// 
+			// rbUDC1
+			// 
+			resources.ApplyResources(this.rbUDC1, "rbUDC1");
+			this.rbUDC1.Name = "rbUDC1";
+			this.rbUDC1.TabStop = true;
+			this.rbUDC1.UseVisualStyleBackColor = true;
+			this.rbUDC1.CheckedChanged += new System.EventHandler(this.rbUDC1_CheckedChanged);
+			// 
 			// rbTTA
 			// 
 			resources.ApplyResources(this.rbTTA, "rbTTA");
@@ -510,13 +525,37 @@ namespace JDP {
 			this.rbFreedbNever.TabStop = true;
 			this.rbFreedbNever.UseVisualStyleBackColor = true;
 			// 
-			// rbUDC1
+			// btnCodec
 			// 
-			resources.ApplyResources(this.rbUDC1, "rbUDC1");
+			resources.ApplyResources(this.btnCodec, "btnCodec");
-			this.rbUDC1.Name = "rbUDC1";
+			this.btnCodec.Name = "btnCodec";
-			this.rbUDC1.TabStop = true;
+			this.btnCodec.UseVisualStyleBackColor = true;
-			this.rbUDC1.UseVisualStyleBackColor = true;
+			this.btnCodec.Click += new System.EventHandler(this.btnCodec_Click);
-			this.rbUDC1.CheckedChanged += new System.EventHandler(this.rbUDC1_CheckedChanged);
+			// 
+			// contextMenuStripUDC
+			// 
+			this.contextMenuStripUDC.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tAKToolStripMenuItem,
+            this.mP3ToolStripMenuItem,
+            this.oGGToolStripMenuItem});
+			this.contextMenuStripUDC.Name = "contextMenuStripUDC";
+			resources.ApplyResources(this.contextMenuStripUDC, "contextMenuStripUDC");
+			this.contextMenuStripUDC.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.contextMenuStripUDC_ItemClicked);
+			// 
+			// tAKToolStripMenuItem
+			// 
+			this.tAKToolStripMenuItem.Name = "tAKToolStripMenuItem";
+			resources.ApplyResources(this.tAKToolStripMenuItem, "tAKToolStripMenuItem");
+			// 
+			// mP3ToolStripMenuItem
+			// 
+			this.mP3ToolStripMenuItem.Name = "mP3ToolStripMenuItem";
+			resources.ApplyResources(this.mP3ToolStripMenuItem, "mP3ToolStripMenuItem");
+			// 
+			// oGGToolStripMenuItem
+			// 
+			this.oGGToolStripMenuItem.Name = "oGGToolStripMenuItem";
+			resources.ApplyResources(this.oGGToolStripMenuItem, "oGGToolStripMenuItem");
 			// 
 			// frmCUETools
 			// 
@@ -557,6 +596,7 @@ namespace JDP {
 			this.statusStrip1.PerformLayout();
 			this.groupBox1.ResumeLayout(false);
 			this.groupBox1.PerformLayout();
+			this.contextMenuStripUDC.ResumeLayout(false);
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
@@ -619,6 +659,11 @@ namespace JDP {
 		private System.Windows.Forms.RadioButton rbFreedbIf;
 		private System.Windows.Forms.RadioButton rbFreedbNever;
 		private System.Windows.Forms.RadioButton rbUDC1;
+		private System.Windows.Forms.Button btnCodec;
+		private System.Windows.Forms.ContextMenuStrip contextMenuStripUDC;
+		private System.Windows.Forms.ToolStripMenuItem tAKToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem mP3ToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem oGGToolStripMenuItem;
 	}
 }
 

CUETools/frmCUETools.cs

@@ -1041,6 +1041,72 @@ namespace JDP {
 			updateOutputStyles();
 			UpdateOutputPath();
 		}
+
+		private void btnCodec_Click(object sender, EventArgs e)
+		{
+			contextMenuStripUDC.Show(btnCodec, btnCodec.Width, btnCodec.Height);
+			return;
+		}
+
+		private void contextMenuStripUDC_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+		{
+			contextMenuStripUDC.Hide();
+			string executable = null, extension = null, decParams = null, encParams = null;
+			bool apev2 = false, id3v2 = false;
+			switch (e.ClickedItem.Text)
+			{
+				case "TAK":
+					extension = "tak";
+					executable = "takc.exe";
+					decParams = "-d %I -";
+					encParams = "-e -p4m -overwrite - %O";
+					apev2 = true;
+					id3v2 = false;
+					break;
+				case "MP3":
+					extension = "mp3";
+					executable = "lame.exe";
+					decParams = "--decode %I -";
+					encParams = "--vbr-new -V2 - %O";
+					apev2 = false;
+					id3v2 = true;
+					break;
+				case "OGG":
+					extension = "ogg";
+					executable = "oggenc.exe";
+					encParams = "- -o %O";
+					decParams = "";
+					apev2 = false;
+					id3v2 = false;
+					break;
+				default:
+					return;
+			}
+
+			string path = Path.Combine(Application.StartupPath, executable);
+			if (!File.Exists(path))
+			{
+				OpenFileDialog fileDlg = new OpenFileDialog();
+				DialogResult dlgRes;
+				fileDlg.Title = "Select the path to encoder";
+				fileDlg.Filter = executable + "|" + executable;
+				if (Directory.Exists(Application.StartupPath))
+					fileDlg.InitialDirectory = Application.StartupPath;
+				dlgRes = fileDlg.ShowDialog();
+				if (dlgRes != DialogResult.OK)
+					return;
+				path = fileDlg.FileName;
+			}
+			_config.udc1Extension = extension;
+			_config.udc1Decoder = path;
+			_config.udc1Params = decParams;
+			_config.udc1Encoder = path;
+			_config.udc1EncParams = encParams;
+			_config.udc1APEv2 = apev2;
+			_config.udc1ID3v2 = id3v2;
+			updateOutputStyles();
+			UpdateOutputPath();
+		}
 	}
 
 	enum OutputPathGeneration {

CUETools/frmCUETools.resx

@@ -141,7 +141,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnConvert.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <data name="&gt;&gt;btnBrowseOutput.Name" xml:space="preserve">
     <value>btnBrowseOutput</value>
@@ -237,7 +237,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;grpCUEPaths.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <data name="btnBrowseOutput.Location" type="System.Drawing.Point, System.Drawing">
     <value>452, 49</value>
@@ -465,7 +465,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;grpOutputStyle.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>153, 8</value>
@@ -646,7 +646,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnAbout.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <data name="&gt;&gt;txtCustomFormat.Name" xml:space="preserve">
     <value>txtCustomFormat</value>
@@ -754,7 +754,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;grpOutputPathGeneration.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="txtCustomFormat.Location" type="System.Drawing.Point, System.Drawing">
     <value>166, 60</value>
@@ -936,6 +936,138 @@
   <data name="&gt;&gt;txtAppendFilename.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
+  <data name="&gt;&gt;btnCodec.Name" xml:space="preserve">
+    <value>btnCodec</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.Name" xml:space="preserve">
+    <value>rbUDC1</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.Name" xml:space="preserve">
+    <value>rbTTA</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.Name" xml:space="preserve">
+    <value>chkLossyWAV</value>
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;rbAPE.Name" xml:space="preserve">
+    <value>rbAPE</value>
+  </data>
+  <data name="&gt;&gt;rbAPE.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbAPE.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;rbAPE.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.Name" xml:space="preserve">
+    <value>rbNoAudio</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;rbWavPack.Name" xml:space="preserve">
+    <value>rbWavPack</value>
+  </data>
+  <data name="&gt;&gt;rbWavPack.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbWavPack.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;rbWavPack.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;rbWAV.Name" xml:space="preserve">
+    <value>rbWAV</value>
+  </data>
+  <data name="&gt;&gt;rbWAV.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbWAV.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;rbWAV.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;rbFLAC.Name" xml:space="preserve">
+    <value>rbFLAC</value>
+  </data>
+  <data name="&gt;&gt;rbFLAC.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbFLAC.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;rbFLAC.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="grpAudioOutput.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 211</value>
+  </data>
+  <data name="grpAudioOutput.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 164</value>
+  </data>
+  <data name="grpAudioOutput.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="grpAudioOutput.Text" xml:space="preserve">
+    <value>Audio Output</value>
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.Name" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
   <data name="rbUDC1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -961,7 +1093,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;rbUDC1.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="rbTTA.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -988,7 +1120,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;rbTTA.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="chkLossyWAV.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1018,7 +1150,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;chkLossyWAV.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="rbAPE.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1045,7 +1177,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;rbAPE.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="rbNoAudio.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1075,7 +1207,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;rbNoAudio.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="rbWavPack.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1102,7 +1234,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;rbWavPack.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="rbWAV.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1129,7 +1261,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;rbWAV.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="rbFLAC.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1156,31 +1288,7 @@
     <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;rbFLAC.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
-  </data>
-  <data name="grpAudioOutput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 211</value>
-  </data>
-  <data name="grpAudioOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>92, 164</value>
-  </data>
-  <data name="grpAudioOutput.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="grpAudioOutput.Text" xml:space="preserve">
-    <value>Audio Output</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.Name" xml:space="preserve">
-    <value>grpAudioOutput</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.ZOrder" xml:space="preserve">
-    <value>10</value>
   </data>
   <data name="btnBatch.Location" type="System.Drawing.Point, System.Drawing">
     <value>412, 308</value>
@@ -1204,7 +1312,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnBatch.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="btnFilenameCorrector.Location" type="System.Drawing.Point, System.Drawing">
     <value>412, 277</value>
@@ -1228,7 +1336,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnFilenameCorrector.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="btnSettings.Location" type="System.Drawing.Point, System.Drawing">
     <value>412, 215</value>
@@ -1252,7 +1360,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnSettings.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;rbArAndEncode.Name" xml:space="preserve">
     <value>rbArAndEncode</value>
@@ -1348,7 +1456,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;grpAccurateRip.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="rbArAndEncode.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1525,7 +1633,7 @@
     <value>5</value>
   </data>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>0, 378</value>
+    <value>424, 8</value>
   </metadata>
   <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 378</value>
@@ -1549,7 +1657,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>253, 17</value>
@@ -1597,7 +1705,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnCUECreator.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="btnStop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1627,7 +1735,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnStop.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="btnPause.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1657,7 +1765,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnPause.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="btnResume.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1687,7 +1795,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnResume.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;rbFreedbAlways.Name" xml:space="preserve">
     <value>rbFreedbAlways</value>
@@ -1747,7 +1855,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="rbFreedbAlways.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1830,6 +1938,63 @@
   <data name="&gt;&gt;rbFreedbNever.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="btnCodec.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+    <value>Popup</value>
+  </data>
+  <data name="btnCodec.Location" type="System.Drawing.Point, System.Drawing">
+    <value>66, 117</value>
+  </data>
+  <data name="btnCodec.Size" type="System.Drawing.Size, System.Drawing">
+    <value>20, 20</value>
+  </data>
+  <data name="btnCodec.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="btnCodec.Text" xml:space="preserve">
+    <value>&gt;</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.Name" xml:space="preserve">
+    <value>btnCodec</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="contextMenuStripUDC.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>250, 8</value>
+  </metadata>
+  <data name="tAKToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="tAKToolStripMenuItem.Text" xml:space="preserve">
+    <value>TAK</value>
+  </data>
+  <data name="mP3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="mP3ToolStripMenuItem.Text" xml:space="preserve">
+    <value>MP3</value>
+  </data>
+  <data name="oGGToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 22</value>
+  </data>
+  <data name="oGGToolStripMenuItem.Text" xml:space="preserve">
+    <value>OGG</value>
+  </data>
+  <data name="contextMenuStripUDC.Size" type="System.Drawing.Size, System.Drawing">
+    <value>153, 92</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStripUDC.Name" xml:space="preserve">
+    <value>contextMenuStripUDC</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStripUDC.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -1872,6 +2037,24 @@
   <data name="&gt;&gt;toolTip1.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;tAKToolStripMenuItem.Name" xml:space="preserve">
+    <value>tAKToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;tAKToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;mP3ToolStripMenuItem.Name" xml:space="preserve">
+    <value>mP3ToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;mP3ToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;oGGToolStripMenuItem.Name" xml:space="preserve">
+    <value>oGGToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;oGGToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmCUETools</value>
   </data>

CUETools/frmSettings.Designer.cs

@@ -98,21 +98,22 @@ namespace JDP {
 			this.tabPage8 = new System.Windows.Forms.TabPage();
 			this.label1 = new System.Windows.Forms.Label();
 			this.numericLossyWAVQuality = new System.Windows.Forms.NumericUpDown();
+			this.tabPage9 = new System.Windows.Forms.TabPage();
+			this.chkUDC1APEv2 = new System.Windows.Forms.CheckBox();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.textUDC1EncParams = new System.Windows.Forms.TextBox();
+			this.textUDC1Encoder = new System.Windows.Forms.TextBox();
+			this.textUDC1Params = new System.Windows.Forms.TextBox();
+			this.textUDC1Decoder = new System.Windows.Forms.TextBox();
+			this.textUDC1Extension = new System.Windows.Forms.TextBox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
 			this.tabPage4 = new System.Windows.Forms.TabPage();
 			this.grpHDCD = new System.Windows.Forms.GroupBox();
 			this.chkHDCDDetect = new System.Windows.Forms.CheckBox();
-			this.tabPage9 = new System.Windows.Forms.TabPage();
+			this.chkUDC1ID3v2 = new System.Windows.Forms.CheckBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label4 = new System.Windows.Forms.Label();
-			this.textUDC1Extension = new System.Windows.Forms.TextBox();
-			this.textUDC1Decoder = new System.Windows.Forms.TextBox();
-			this.textUDC1Params = new System.Windows.Forms.TextBox();
-			this.textUDC1Encoder = new System.Windows.Forms.TextBox();
-			this.textUDC1EncParams = new System.Windows.Forms.TextBox();
-			this.label5 = new System.Windows.Forms.Label();
-			this.label6 = new System.Windows.Forms.Label();
-			this.chkUDC1APEv2 = new System.Windows.Forms.CheckBox();
 			btnCancel = new System.Windows.Forms.Button();
 			this.grpGeneral.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit();
@@ -135,9 +136,9 @@ namespace JDP {
 			this.tabPage7.SuspendLayout();
 			this.tabPage8.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).BeginInit();
+			this.tabPage9.SuspendLayout();
 			this.tabPage4.SuspendLayout();
 			this.grpHDCD.SuspendLayout();
-			this.tabPage9.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// btnCancel
@@ -767,6 +768,80 @@ namespace JDP {
             0,
             0,
             0});
+			// 
+			// tabPage9
+			// 
+			this.tabPage9.Controls.Add(this.chkUDC1ID3v2);
+			this.tabPage9.Controls.Add(this.chkUDC1APEv2);
+			this.tabPage9.Controls.Add(this.label6);
+			this.tabPage9.Controls.Add(this.label5);
+			this.tabPage9.Controls.Add(this.textUDC1EncParams);
+			this.tabPage9.Controls.Add(this.textUDC1Encoder);
+			this.tabPage9.Controls.Add(this.textUDC1Params);
+			this.tabPage9.Controls.Add(this.textUDC1Decoder);
+			this.tabPage9.Controls.Add(this.textUDC1Extension);
+			this.tabPage9.Controls.Add(this.label4);
+			this.tabPage9.Controls.Add(this.label3);
+			this.tabPage9.Controls.Add(this.label2);
+			resources.ApplyResources(this.tabPage9, "tabPage9");
+			this.tabPage9.Name = "tabPage9";
+			this.tabPage9.UseVisualStyleBackColor = true;
+			// 
+			// chkUDC1APEv2
+			// 
+			resources.ApplyResources(this.chkUDC1APEv2, "chkUDC1APEv2");
+			this.chkUDC1APEv2.Name = "chkUDC1APEv2";
+			this.chkUDC1APEv2.UseVisualStyleBackColor = true;
+			// 
+			// label6
+			// 
+			resources.ApplyResources(this.label6, "label6");
+			this.label6.Name = "label6";
+			// 
+			// label5
+			// 
+			resources.ApplyResources(this.label5, "label5");
+			this.label5.Name = "label5";
+			// 
+			// textUDC1EncParams
+			// 
+			resources.ApplyResources(this.textUDC1EncParams, "textUDC1EncParams");
+			this.textUDC1EncParams.Name = "textUDC1EncParams";
+			// 
+			// textUDC1Encoder
+			// 
+			resources.ApplyResources(this.textUDC1Encoder, "textUDC1Encoder");
+			this.textUDC1Encoder.Name = "textUDC1Encoder";
+			// 
+			// textUDC1Params
+			// 
+			resources.ApplyResources(this.textUDC1Params, "textUDC1Params");
+			this.textUDC1Params.Name = "textUDC1Params";
+			// 
+			// textUDC1Decoder
+			// 
+			resources.ApplyResources(this.textUDC1Decoder, "textUDC1Decoder");
+			this.textUDC1Decoder.Name = "textUDC1Decoder";
+			// 
+			// textUDC1Extension
+			// 
+			resources.ApplyResources(this.textUDC1Extension, "textUDC1Extension");
+			this.textUDC1Extension.Name = "textUDC1Extension";
+			// 
+			// label4
+			// 
+			resources.ApplyResources(this.label4, "label4");
+			this.label4.Name = "label4";
+			// 
+			// label3
+			// 
+			resources.ApplyResources(this.label3, "label3");
+			this.label3.Name = "label3";
+			// 
+			// label2
+			// 
+			resources.ApplyResources(this.label2, "label2");
+			this.label2.Name = "label2";
 			// 
 			// tabPage4
 			// 
@@ -793,78 +868,11 @@ namespace JDP {
 			this.chkHDCDDetect.UseVisualStyleBackColor = true;
 			this.chkHDCDDetect.CheckedChanged += new System.EventHandler(this.chkHDCDDetect_CheckedChanged);
 			// 
-			// tabPage9
+			// chkUDC1ID3v2
 			// 
-			this.tabPage9.Controls.Add(this.chkUDC1APEv2);
+			resources.ApplyResources(this.chkUDC1ID3v2, "chkUDC1ID3v2");
-			this.tabPage9.Controls.Add(this.label6);
+			this.chkUDC1ID3v2.Name = "chkUDC1ID3v2";
-			this.tabPage9.Controls.Add(this.label5);
+			this.chkUDC1ID3v2.UseVisualStyleBackColor = true;
-			this.tabPage9.Controls.Add(this.textUDC1EncParams);
-			this.tabPage9.Controls.Add(this.textUDC1Encoder);
-			this.tabPage9.Controls.Add(this.textUDC1Params);
-			this.tabPage9.Controls.Add(this.textUDC1Decoder);
-			this.tabPage9.Controls.Add(this.textUDC1Extension);
-			this.tabPage9.Controls.Add(this.label4);
-			this.tabPage9.Controls.Add(this.label3);
-			this.tabPage9.Controls.Add(this.label2);
-			resources.ApplyResources(this.tabPage9, "tabPage9");
-			this.tabPage9.Name = "tabPage9";
-			this.tabPage9.UseVisualStyleBackColor = true;
-			// 
-			// label2
-			// 
-			resources.ApplyResources(this.label2, "label2");
-			this.label2.Name = "label2";
-			// 
-			// label3
-			// 
-			resources.ApplyResources(this.label3, "label3");
-			this.label3.Name = "label3";
-			// 
-			// label4
-			// 
-			resources.ApplyResources(this.label4, "label4");
-			this.label4.Name = "label4";
-			// 
-			// textUDC1Extension
-			// 
-			resources.ApplyResources(this.textUDC1Extension, "textUDC1Extension");
-			this.textUDC1Extension.Name = "textUDC1Extension";
-			// 
-			// textUDC1Decoder
-			// 
-			resources.ApplyResources(this.textUDC1Decoder, "textUDC1Decoder");
-			this.textUDC1Decoder.Name = "textUDC1Decoder";
-			// 
-			// textUDC1Params
-			// 
-			resources.ApplyResources(this.textUDC1Params, "textUDC1Params");
-			this.textUDC1Params.Name = "textUDC1Params";
-			// 
-			// textUDC1Encoder
-			// 
-			resources.ApplyResources(this.textUDC1Encoder, "textUDC1Encoder");
-			this.textUDC1Encoder.Name = "textUDC1Encoder";
-			// 
-			// textUDC1EncParams
-			// 
-			resources.ApplyResources(this.textUDC1EncParams, "textUDC1EncParams");
-			this.textUDC1EncParams.Name = "textUDC1EncParams";
-			// 
-			// label5
-			// 
-			resources.ApplyResources(this.label5, "label5");
-			this.label5.Name = "label5";
-			// 
-			// label6
-			// 
-			resources.ApplyResources(this.label6, "label6");
-			this.label6.Name = "label6";
-			// 
-			// chkUDC1APEv2
-			// 
-			resources.ApplyResources(this.chkUDC1APEv2, "chkUDC1APEv2");
-			this.chkUDC1APEv2.Name = "chkUDC1APEv2";
-			this.chkUDC1APEv2.UseVisualStyleBackColor = true;
 			// 
 			// frmSettings
 			// 
@@ -912,12 +920,12 @@ namespace JDP {
 			this.tabPage8.ResumeLayout(false);
 			this.tabPage8.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).EndInit();
+			this.tabPage9.ResumeLayout(false);
+			this.tabPage9.PerformLayout();
 			this.tabPage4.ResumeLayout(false);
 			this.tabPage4.PerformLayout();
 			this.grpHDCD.ResumeLayout(false);
 			this.grpHDCD.PerformLayout();
-			this.tabPage9.ResumeLayout(false);
-			this.tabPage9.PerformLayout();
 			this.ResumeLayout(false);
 
 		}
@@ -1011,6 +1019,7 @@ namespace JDP {
 		private System.Windows.Forms.TextBox textUDC1EncParams;
 		private System.Windows.Forms.TextBox textUDC1Encoder;
 		private System.Windows.Forms.CheckBox chkUDC1APEv2;
+		private System.Windows.Forms.CheckBox chkUDC1ID3v2;
 
 	}
 }

CUETools/frmSettings.cs

@@ -76,6 +76,7 @@ namespace JDP {
 			textUDC1Encoder.Text = _config.udc1Encoder;
 			textUDC1EncParams.Text = _config.udc1EncParams;
 			chkUDC1APEv2.Checked = _config.udc1APEv2;
+			chkUDC1ID3v2.Checked = _config.udc1ID3v2;
 			EnableDisable();
 		}
 
@@ -160,6 +161,7 @@ namespace JDP {
 			_config.udc1Encoder = textUDC1Encoder.Text;
 			_config.udc1EncParams = textUDC1EncParams.Text;
 			_config.udc1APEv2 = chkUDC1APEv2.Checked;
+			_config.udc1ID3v2 = chkUDC1ID3v2.Checked;
 		}
 
 		private void EnableDisable()

CUETools/frmSettings.resx

@@ -1998,6 +1998,33 @@
   <data name="&gt;&gt;tabPage8.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="chkUDC1ID3v2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkUDC1ID3v2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>268, 8</value>
+  </data>
+  <data name="chkUDC1ID3v2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>79, 17</value>
+  </data>
+  <data name="chkUDC1ID3v2.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="chkUDC1ID3v2.Text" xml:space="preserve">
+    <value>ID3v2 tags</value>
+  </data>
+  <data name="&gt;&gt;chkUDC1ID3v2.Name" xml:space="preserve">
+    <value>chkUDC1ID3v2</value>
+  </data>
+  <data name="&gt;&gt;chkUDC1ID3v2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkUDC1ID3v2.Parent" xml:space="preserve">
+    <value>tabPage9</value>
+  </data>
+  <data name="&gt;&gt;chkUDC1ID3v2.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="chkUDC1APEv2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -2023,7 +2050,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;chkUDC1APEv2.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2050,7 +2077,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2077,7 +2104,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="textUDC1EncParams.Location" type="System.Drawing.Point, System.Drawing">
     <value>89, 114</value>
@@ -2098,7 +2125,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;textUDC1EncParams.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="textUDC1Encoder.Location" type="System.Drawing.Point, System.Drawing">
     <value>89, 87</value>
@@ -2119,7 +2146,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;textUDC1Encoder.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="textUDC1Params.Location" type="System.Drawing.Point, System.Drawing">
     <value>89, 60</value>
@@ -2140,7 +2167,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;textUDC1Params.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="textUDC1Decoder.Location" type="System.Drawing.Point, System.Drawing">
     <value>89, 33</value>
@@ -2161,7 +2188,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;textUDC1Decoder.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="textUDC1Extension.Location" type="System.Drawing.Point, System.Drawing">
     <value>89, 6</value>
@@ -2182,7 +2209,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;textUDC1Extension.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2209,7 +2236,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2236,7 +2263,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2263,7 +2290,7 @@
     <value>tabPage9</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="tabPage9.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>