LossyWAV support

2025-12-16 18:14:25 +00:00 · 2008-11-21 20:06:11 +00:00
parent b7b78afa8a
commit 478f92236d
19 changed files with 4110 additions and 3223 deletions
--- a/APEDotNet/apedotnet.cpp
+++ b/APEDotNet/apedotnet.cpp
@@ -367,6 +367,13 @@ namespace APEDotNet {
 			}
 		}

+		virtual property Int64 BlockSize
+		{
+			void set(Int64 value)
+			{
+			}
+		}
+
 		virtual void Write(array<Int32,2>^ buff, UInt32 sampleCount) 
 		{
 			if (_sampleBuffer == nullptr || _sampleBuffer.Length < sampleCount * _blockAlign)
--- a/ArCueDotNet/Program.cs
+++ b/ArCueDotNet/Program.cs
@@ -30,7 +30,7 @@ namespace ArCueDotNet
 			{
 				CUESheet cueSheet = new CUESheet(config);
 				cueSheet.Open(pathIn);
-				cueSheet.GenerateFilenames(OutputAudioFormat.NoAudio, pathIn);
+				cueSheet.GenerateFilenames(OutputAudioFormat.NoAudio, pathIn, false);
 				cueSheet.AccurateRip = true;
 				cueSheet.WriteAudioFiles(Path.GetDirectoryName(pathIn), CUEStyle.SingleFile);
 				cueSheet.GenerateAccurateRipLog(sw);
--- a/AudioCodecsDotNet/AudioCodecsDotNet.cs
+++ b/AudioCodecsDotNet/AudioCodecsDotNet.cs
@@ -27,6 +27,7 @@ namespace AudioCodecsDotNet
 		void Close();
 		void Delete();
 		long FinalSampleCount { set; }
+		long BlockSize { set; }
 		string Path { get; }
 	}

@@ -148,9 +149,12 @@ namespace AudioCodecsDotNet

 		public long FinalSampleCount
 		{
-			set
-			{
+			set	{ }
 		}
+
+		public long BlockSize
+		{
+			set	{ }
 		}

 		public void Write(int[,] buff, uint sampleCount)
@@ -505,6 +509,7 @@ namespace AudioCodecsDotNet
 		long _sampleLen;
 		string _path;
 		private byte[] _sampleBuffer;
+		long hdrLen = 44;

 		public WAVWriter(string path, int bitsPerSample, int channelCount, int sampleRate)
 		{
@@ -525,6 +530,22 @@ namespace AudioCodecsDotNet
 			return false;
 		}

+		public void WriteChunk(uint fcc, byte[] data)
+		{
+			if (_sampleLen > 0)
+				throw new Exception("data already written, no chunks allowed");
+			const uint fccData = 0x61746164;
+			_bw.Seek((int)hdrLen - 8, SeekOrigin.Begin);
+			_bw.Write(fcc);
+			_bw.Write((uint)data.Length);
+			_bw.Write(data);
+			if ((data.Length & 1) != 0)
+				_bw.Write((byte) 0);
+			_bw.Write(fccData);
+			_bw.Write((uint)0);
+			hdrLen += data.Length + (data.Length & 1) + 8;
+		}
+
 		private void WriteHeaders()
 		{
 			const uint fccRIFF = 0x46464952;
@@ -557,21 +578,17 @@ namespace AudioCodecsDotNet
 			dataLen = _sampleLen * _blockAlign;

 			if ((dataLen & 1) == 1)
-			{
 				_bw.Write((byte)0);
-			}

-			if ((dataLen + 44) > maxFileSize)
-			{
-				dataLen = ((maxFileSize - 44) / _blockAlign) * _blockAlign;
-			}
+			if (dataLen + hdrLen > maxFileSize)
+				dataLen = ((maxFileSize - hdrLen) / _blockAlign) * _blockAlign;

-			dataLenPadded = ((dataLen & 1) == 1) ? (dataLen + 1) : dataLen;
+			dataLenPadded = dataLen + (dataLen & 1);

 			_bw.Seek(4, SeekOrigin.Begin);
-			_bw.Write((uint)(dataLenPadded + 36));
+			_bw.Write((uint)(dataLenPadded + hdrLen - 8));

-			_bw.Seek(40, SeekOrigin.Begin);
+			_bw.Seek((int)hdrLen-4, SeekOrigin.Begin);
 			_bw.Write((uint)dataLen);

 			_bw.Close();
@@ -598,9 +615,12 @@ namespace AudioCodecsDotNet

 		public long FinalSampleCount
 		{
-			set
-			{
+			set { }
 		}
+
+		public long BlockSize
+		{
+			set { }
 		}

 		public void Write(int[,] buff, uint sampleCount)
--- a/CUETools/CUETools.sln
+++ b/CUETools/CUETools.sln
@@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALACDotNet", "..\ALACDotNet
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnRarDotNet", "..\UnRarDotNet\UnRarDotNet.csproj", "{8427CAA5-80B8-4952-9A68-5F3DFCFBDF40}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LossyWAVDotNet", "..\LossyWAVDotNet\LossyWAVDotNet.csproj", "{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -212,6 +214,18 @@ Global
 		{8427CAA5-80B8-4952-9A68-5F3DFCFBDF40}.Release|x64.Build.0 = Release|x64
 		{8427CAA5-80B8-4952-9A68-5F3DFCFBDF40}.Release|x86.ActiveCfg = Release|x86
 		{8427CAA5-80B8-4952-9A68-5F3DFCFBDF40}.Release|x86.Build.0 = Release|x86
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Debug|x64.ActiveCfg = Debug|x64
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Debug|x64.Build.0 = Debug|x64
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Debug|x86.ActiveCfg = Debug|x86
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Debug|x86.Build.0 = Debug|x86
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Release|x64.ActiveCfg = Release|x64
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Release|x64.Build.0 = Release|x64
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Release|x86.ActiveCfg = Release|x86
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -221,6 +235,7 @@ Global
 		{CC2E74B6-534A-43D8-9F16-AC03FE955000} = {85F88959-C9E9-4989-ACB1-67BA9D1BEFE7}
 		{E70FA90A-7012-4A52-86B5-362B699D1540} = {85F88959-C9E9-4989-ACB1-67BA9D1BEFE7}
 		{F2EC7193-D5E5-4252-9803-5CEB407E910F} = {85F88959-C9E9-4989-ACB1-67BA9D1BEFE7}
+		{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19} = {85F88959-C9E9-4989-ACB1-67BA9D1BEFE7}
 		{0B9C97D4-61B8-4294-A1DF-BA90752A1779} = {8B179853-B7D6-479C-B8B2-6CBCE835D040}
 		{4CEFBC84-C215-11DB-8314-0800200C9A66} = {8B179853-B7D6-479C-B8B2-6CBCE835D040}
 		{5CCCB9CF-0384-458F-BA08-72B73866840F} = {8B179853-B7D6-479C-B8B2-6CBCE835D040}
--- a/CUETools/frmBatch.cs
+++ b/CUETools/frmBatch.cs
@@ -55,6 +55,7 @@ namespace JDP
 		bool _accurateRip;
 		bool _accurateOffset;
 		bool _reducePriority;
+		bool _lossyWAV;
 		DateTime _startedAt;
 		List<string> _batchPaths;

@@ -158,7 +159,7 @@ namespace JDP
 				}
 				else
 					pathOut = Path.Combine(Path.GetDirectoryName(pathIn), cueName);
-				cueSheet.GenerateFilenames(_audioFormat, pathOut);
+				cueSheet.GenerateFilenames(_audioFormat, pathOut, _lossyWAV);
 				if (outputAudio)
 				{
 					if (_cueStyle == CUEStyle.SingleFileWithCUE)
@@ -266,6 +267,7 @@ namespace JDP
 			_reducePriority = sr.LoadBoolean("ReducePriority") ?? true;
 			_cueStyle = (CUEStyle?)sr.LoadInt32("CUEStyle", null, null) ?? CUEStyle.SingleFileWithCUE;
 			_audioFormat = (OutputAudioFormat?)sr.LoadInt32("OutputAudioFormat", null, null) ?? OutputAudioFormat.WAV;
+			_lossyWAV = sr.LoadBoolean("LossyWav") ?? false;
 			
 			if (_reducePriority)
 				Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle;
--- a/CUETools/frmCUETools.Designer.cs
+++ b/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.chkLossyWAV = new System.Windows.Forms.CheckBox();
 			this.rbAPE = new System.Windows.Forms.RadioButton();
 			this.rbNoAudio = new System.Windows.Forms.RadioButton();
 			this.rbWavPack = new System.Windows.Forms.RadioButton();
@@ -82,125 +83,78 @@ namespace JDP {
 			// 
 			// btnConvert
 			// 
-			this.btnConvert.AccessibleDescription = null;
-			this.btnConvert.AccessibleName = null;
 			resources.ApplyResources(this.btnConvert, "btnConvert");
-			this.btnConvert.BackgroundImage = null;
-			this.btnConvert.Font = null;
 			this.btnConvert.Name = "btnConvert";
-			this.toolTip1.SetToolTip(this.btnConvert, resources.GetString("btnConvert.ToolTip"));
 			this.btnConvert.UseVisualStyleBackColor = true;
 			this.btnConvert.Click += new System.EventHandler(this.btnConvert_Click);
 			// 
 			// grpCUEPaths
 			// 
-			this.grpCUEPaths.AccessibleDescription = null;
-			this.grpCUEPaths.AccessibleName = null;
-			resources.ApplyResources(this.grpCUEPaths, "grpCUEPaths");
-			this.grpCUEPaths.BackgroundImage = null;
 			this.grpCUEPaths.Controls.Add(this.btnBrowseOutput);
 			this.grpCUEPaths.Controls.Add(this.btnBrowseInput);
 			this.grpCUEPaths.Controls.Add(this.lblOutput);
 			this.grpCUEPaths.Controls.Add(this.lblInput);
 			this.grpCUEPaths.Controls.Add(this.txtOutputPath);
 			this.grpCUEPaths.Controls.Add(this.txtInputPath);
-			this.grpCUEPaths.Font = null;
+			resources.ApplyResources(this.grpCUEPaths, "grpCUEPaths");
 			this.grpCUEPaths.Name = "grpCUEPaths";
 			this.grpCUEPaths.TabStop = false;
-			this.toolTip1.SetToolTip(this.grpCUEPaths, resources.GetString("grpCUEPaths.ToolTip"));
 			// 
 			// btnBrowseOutput
 			// 
-			this.btnBrowseOutput.AccessibleDescription = null;
-			this.btnBrowseOutput.AccessibleName = null;
 			resources.ApplyResources(this.btnBrowseOutput, "btnBrowseOutput");
-			this.btnBrowseOutput.BackgroundImage = null;
-			this.btnBrowseOutput.Font = null;
 			this.btnBrowseOutput.Name = "btnBrowseOutput";
-			this.toolTip1.SetToolTip(this.btnBrowseOutput, resources.GetString("btnBrowseOutput.ToolTip"));
 			this.btnBrowseOutput.UseVisualStyleBackColor = true;
 			this.btnBrowseOutput.Click += new System.EventHandler(this.btnBrowseOutput_Click);
 			// 
 			// btnBrowseInput
 			// 
-			this.btnBrowseInput.AccessibleDescription = null;
-			this.btnBrowseInput.AccessibleName = null;
 			resources.ApplyResources(this.btnBrowseInput, "btnBrowseInput");
-			this.btnBrowseInput.BackgroundImage = null;
-			this.btnBrowseInput.Font = null;
 			this.btnBrowseInput.Name = "btnBrowseInput";
-			this.toolTip1.SetToolTip(this.btnBrowseInput, resources.GetString("btnBrowseInput.ToolTip"));
 			this.btnBrowseInput.UseVisualStyleBackColor = true;
 			this.btnBrowseInput.Click += new System.EventHandler(this.btnBrowseInput_Click);
 			// 
 			// lblOutput
 			// 
-			this.lblOutput.AccessibleDescription = null;
-			this.lblOutput.AccessibleName = null;
 			resources.ApplyResources(this.lblOutput, "lblOutput");
-			this.lblOutput.Font = null;
 			this.lblOutput.Name = "lblOutput";
-			this.toolTip1.SetToolTip(this.lblOutput, resources.GetString("lblOutput.ToolTip"));
 			// 
 			// lblInput
 			// 
-			this.lblInput.AccessibleDescription = null;
-			this.lblInput.AccessibleName = null;
 			resources.ApplyResources(this.lblInput, "lblInput");
-			this.lblInput.Font = null;
 			this.lblInput.Name = "lblInput";
-			this.toolTip1.SetToolTip(this.lblInput, resources.GetString("lblInput.ToolTip"));
 			// 
 			// txtOutputPath
 			// 
-			this.txtOutputPath.AccessibleDescription = null;
-			this.txtOutputPath.AccessibleName = null;
 			this.txtOutputPath.AllowDrop = true;
 			resources.ApplyResources(this.txtOutputPath, "txtOutputPath");
-			this.txtOutputPath.BackgroundImage = null;
-			this.txtOutputPath.Font = null;
 			this.txtOutputPath.Name = "txtOutputPath";
-			this.toolTip1.SetToolTip(this.txtOutputPath, resources.GetString("txtOutputPath.ToolTip"));
 			this.txtOutputPath.DragDrop += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragDrop);
 			this.txtOutputPath.DragEnter += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragEnter);
 			// 
 			// txtInputPath
 			// 
-			this.txtInputPath.AccessibleDescription = null;
-			this.txtInputPath.AccessibleName = null;
 			this.txtInputPath.AllowDrop = true;
 			resources.ApplyResources(this.txtInputPath, "txtInputPath");
-			this.txtInputPath.BackgroundImage = null;
-			this.txtInputPath.Font = null;
 			this.txtInputPath.Name = "txtInputPath";
-			this.toolTip1.SetToolTip(this.txtInputPath, resources.GetString("txtInputPath.ToolTip"));
 			this.txtInputPath.TextChanged += new System.EventHandler(this.txtInputPath_TextChanged);
 			this.txtInputPath.DragDrop += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragDrop);
 			this.txtInputPath.DragEnter += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragEnter);
 			// 
 			// grpOutputStyle
 			// 
-			this.grpOutputStyle.AccessibleDescription = null;
-			this.grpOutputStyle.AccessibleName = null;
-			resources.ApplyResources(this.grpOutputStyle, "grpOutputStyle");
-			this.grpOutputStyle.BackgroundImage = null;
 			this.grpOutputStyle.Controls.Add(this.rbEmbedCUE);
 			this.grpOutputStyle.Controls.Add(this.rbGapsLeftOut);
 			this.grpOutputStyle.Controls.Add(this.rbGapsPrepended);
 			this.grpOutputStyle.Controls.Add(this.rbGapsAppended);
 			this.grpOutputStyle.Controls.Add(this.rbSingleFile);
-			this.grpOutputStyle.Font = null;
+			resources.ApplyResources(this.grpOutputStyle, "grpOutputStyle");
 			this.grpOutputStyle.Name = "grpOutputStyle";
 			this.grpOutputStyle.TabStop = false;
-			this.toolTip1.SetToolTip(this.grpOutputStyle, resources.GetString("grpOutputStyle.ToolTip"));
 			// 
 			// rbEmbedCUE
 			// 
-			this.rbEmbedCUE.AccessibleDescription = null;
-			this.rbEmbedCUE.AccessibleName = null;
 			resources.ApplyResources(this.rbEmbedCUE, "rbEmbedCUE");
-			this.rbEmbedCUE.BackgroundImage = null;
-			this.rbEmbedCUE.Font = null;
 			this.rbEmbedCUE.Name = "rbEmbedCUE";
 			this.rbEmbedCUE.TabStop = true;
 			this.toolTip1.SetToolTip(this.rbEmbedCUE, resources.GetString("rbEmbedCUE.ToolTip"));
@@ -209,45 +163,29 @@ namespace JDP {
 			// 
 			// rbGapsLeftOut
 			// 
-			this.rbGapsLeftOut.AccessibleDescription = null;
-			this.rbGapsLeftOut.AccessibleName = null;
 			resources.ApplyResources(this.rbGapsLeftOut, "rbGapsLeftOut");
-			this.rbGapsLeftOut.BackgroundImage = null;
-			this.rbGapsLeftOut.Font = null;
 			this.rbGapsLeftOut.Name = "rbGapsLeftOut";
 			this.toolTip1.SetToolTip(this.rbGapsLeftOut, resources.GetString("rbGapsLeftOut.ToolTip"));
 			this.rbGapsLeftOut.UseVisualStyleBackColor = true;
 			// 
 			// rbGapsPrepended
 			// 
-			this.rbGapsPrepended.AccessibleDescription = null;
-			this.rbGapsPrepended.AccessibleName = null;
 			resources.ApplyResources(this.rbGapsPrepended, "rbGapsPrepended");
-			this.rbGapsPrepended.BackgroundImage = null;
-			this.rbGapsPrepended.Font = null;
 			this.rbGapsPrepended.Name = "rbGapsPrepended";
 			this.toolTip1.SetToolTip(this.rbGapsPrepended, resources.GetString("rbGapsPrepended.ToolTip"));
 			this.rbGapsPrepended.UseVisualStyleBackColor = true;
 			// 
 			// rbGapsAppended
 			// 
-			this.rbGapsAppended.AccessibleDescription = null;
-			this.rbGapsAppended.AccessibleName = null;
 			resources.ApplyResources(this.rbGapsAppended, "rbGapsAppended");
-			this.rbGapsAppended.BackgroundImage = null;
-			this.rbGapsAppended.Font = null;
 			this.rbGapsAppended.Name = "rbGapsAppended";
 			this.toolTip1.SetToolTip(this.rbGapsAppended, resources.GetString("rbGapsAppended.ToolTip"));
 			this.rbGapsAppended.UseVisualStyleBackColor = true;
 			// 
 			// rbSingleFile
 			// 
-			this.rbSingleFile.AccessibleDescription = null;
-			this.rbSingleFile.AccessibleName = null;
 			resources.ApplyResources(this.rbSingleFile, "rbSingleFile");
-			this.rbSingleFile.BackgroundImage = null;
 			this.rbSingleFile.Checked = true;
-			this.rbSingleFile.Font = null;
 			this.rbSingleFile.Name = "rbSingleFile";
 			this.rbSingleFile.TabStop = true;
 			this.toolTip1.SetToolTip(this.rbSingleFile, resources.GetString("rbSingleFile.ToolTip"));
@@ -255,22 +193,13 @@ namespace JDP {
 			// 
 			// btnAbout
 			// 
-			this.btnAbout.AccessibleDescription = null;
-			this.btnAbout.AccessibleName = null;
 			resources.ApplyResources(this.btnAbout, "btnAbout");
-			this.btnAbout.BackgroundImage = null;
-			this.btnAbout.Font = null;
 			this.btnAbout.Name = "btnAbout";
-			this.toolTip1.SetToolTip(this.btnAbout, resources.GetString("btnAbout.ToolTip"));
 			this.btnAbout.UseVisualStyleBackColor = true;
 			this.btnAbout.Click += new System.EventHandler(this.btnAbout_Click);
 			// 
 			// grpOutputPathGeneration
 			// 
-			this.grpOutputPathGeneration.AccessibleDescription = null;
-			this.grpOutputPathGeneration.AccessibleName = null;
-			resources.ApplyResources(this.grpOutputPathGeneration, "grpOutputPathGeneration");
-			this.grpOutputPathGeneration.BackgroundImage = null;
 			this.grpOutputPathGeneration.Controls.Add(this.txtCustomFormat);
 			this.grpOutputPathGeneration.Controls.Add(this.rbCustomFormat);
 			this.grpOutputPathGeneration.Controls.Add(this.txtCreateSubdirectory);
@@ -278,130 +207,89 @@ namespace JDP {
 			this.grpOutputPathGeneration.Controls.Add(this.rbCreateSubdirectory);
 			this.grpOutputPathGeneration.Controls.Add(this.rbAppendFilename);
 			this.grpOutputPathGeneration.Controls.Add(this.txtAppendFilename);
-			this.grpOutputPathGeneration.Font = null;
+			resources.ApplyResources(this.grpOutputPathGeneration, "grpOutputPathGeneration");
 			this.grpOutputPathGeneration.Name = "grpOutputPathGeneration";
 			this.grpOutputPathGeneration.TabStop = false;
-			this.toolTip1.SetToolTip(this.grpOutputPathGeneration, resources.GetString("grpOutputPathGeneration.ToolTip"));
 			// 
 			// txtCustomFormat
 			// 
-			this.txtCustomFormat.AccessibleDescription = null;
-			this.txtCustomFormat.AccessibleName = null;
 			resources.ApplyResources(this.txtCustomFormat, "txtCustomFormat");
-			this.txtCustomFormat.BackgroundImage = null;
-			this.txtCustomFormat.Font = null;
 			this.txtCustomFormat.Name = "txtCustomFormat";
-			this.toolTip1.SetToolTip(this.txtCustomFormat, resources.GetString("txtCustomFormat.ToolTip"));
 			this.txtCustomFormat.TextChanged += new System.EventHandler(this.txtCustomFormat_TextChanged);
 			// 
 			// rbCustomFormat
 			// 
-			this.rbCustomFormat.AccessibleDescription = null;
-			this.rbCustomFormat.AccessibleName = null;
 			resources.ApplyResources(this.rbCustomFormat, "rbCustomFormat");
-			this.rbCustomFormat.BackgroundImage = null;
-			this.rbCustomFormat.Font = null;
 			this.rbCustomFormat.Name = "rbCustomFormat";
 			this.rbCustomFormat.TabStop = true;
-			this.toolTip1.SetToolTip(this.rbCustomFormat, resources.GetString("rbCustomFormat.ToolTip"));
 			this.rbCustomFormat.UseVisualStyleBackColor = true;
 			this.rbCustomFormat.CheckedChanged += new System.EventHandler(this.rbCustomFormat_CheckedChanged);
 			// 
 			// txtCreateSubdirectory
 			// 
-			this.txtCreateSubdirectory.AccessibleDescription = null;
-			this.txtCreateSubdirectory.AccessibleName = null;
 			resources.ApplyResources(this.txtCreateSubdirectory, "txtCreateSubdirectory");
-			this.txtCreateSubdirectory.BackgroundImage = null;
-			this.txtCreateSubdirectory.Font = null;
 			this.txtCreateSubdirectory.Name = "txtCreateSubdirectory";
-			this.toolTip1.SetToolTip(this.txtCreateSubdirectory, resources.GetString("txtCreateSubdirectory.ToolTip"));
 			this.txtCreateSubdirectory.TextChanged += new System.EventHandler(this.txtCreateSubdirectory_TextChanged);
 			// 
 			// rbDontGenerate
 			// 
-			this.rbDontGenerate.AccessibleDescription = null;
-			this.rbDontGenerate.AccessibleName = null;
 			resources.ApplyResources(this.rbDontGenerate, "rbDontGenerate");
-			this.rbDontGenerate.BackgroundImage = null;
-			this.rbDontGenerate.Font = null;
 			this.rbDontGenerate.Name = "rbDontGenerate";
-			this.toolTip1.SetToolTip(this.rbDontGenerate, resources.GetString("rbDontGenerate.ToolTip"));
 			this.rbDontGenerate.UseVisualStyleBackColor = true;
 			// 
 			// rbCreateSubdirectory
 			// 
-			this.rbCreateSubdirectory.AccessibleDescription = null;
-			this.rbCreateSubdirectory.AccessibleName = null;
 			resources.ApplyResources(this.rbCreateSubdirectory, "rbCreateSubdirectory");
-			this.rbCreateSubdirectory.BackgroundImage = null;
 			this.rbCreateSubdirectory.Checked = true;
-			this.rbCreateSubdirectory.Font = null;
 			this.rbCreateSubdirectory.Name = "rbCreateSubdirectory";
 			this.rbCreateSubdirectory.TabStop = true;
-			this.toolTip1.SetToolTip(this.rbCreateSubdirectory, resources.GetString("rbCreateSubdirectory.ToolTip"));
 			this.rbCreateSubdirectory.UseVisualStyleBackColor = true;
 			this.rbCreateSubdirectory.CheckedChanged += new System.EventHandler(this.rbCreateSubdirectory_CheckedChanged);
 			// 
 			// rbAppendFilename
 			// 
-			this.rbAppendFilename.AccessibleDescription = null;
-			this.rbAppendFilename.AccessibleName = null;
 			resources.ApplyResources(this.rbAppendFilename, "rbAppendFilename");
-			this.rbAppendFilename.BackgroundImage = null;
-			this.rbAppendFilename.Font = null;
 			this.rbAppendFilename.Name = "rbAppendFilename";
-			this.toolTip1.SetToolTip(this.rbAppendFilename, resources.GetString("rbAppendFilename.ToolTip"));
 			this.rbAppendFilename.UseVisualStyleBackColor = true;
 			this.rbAppendFilename.CheckedChanged += new System.EventHandler(this.rbAppendFilename_CheckedChanged);
 			// 
 			// txtAppendFilename
 			// 
-			this.txtAppendFilename.AccessibleDescription = null;
-			this.txtAppendFilename.AccessibleName = null;
 			resources.ApplyResources(this.txtAppendFilename, "txtAppendFilename");
-			this.txtAppendFilename.BackgroundImage = null;
-			this.txtAppendFilename.Font = null;
 			this.txtAppendFilename.Name = "txtAppendFilename";
-			this.toolTip1.SetToolTip(this.txtAppendFilename, resources.GetString("txtAppendFilename.ToolTip"));
 			this.txtAppendFilename.TextChanged += new System.EventHandler(this.txtAppendFilename_TextChanged);
 			// 
 			// grpAudioOutput
 			// 
-			this.grpAudioOutput.AccessibleDescription = null;
-			this.grpAudioOutput.AccessibleName = null;
-			resources.ApplyResources(this.grpAudioOutput, "grpAudioOutput");
-			this.grpAudioOutput.BackgroundImage = null;
+			this.grpAudioOutput.Controls.Add(this.chkLossyWAV);
 			this.grpAudioOutput.Controls.Add(this.rbAPE);
 			this.grpAudioOutput.Controls.Add(this.rbNoAudio);
 			this.grpAudioOutput.Controls.Add(this.rbWavPack);
 			this.grpAudioOutput.Controls.Add(this.rbFLAC);
 			this.grpAudioOutput.Controls.Add(this.rbWAV);
-			this.grpAudioOutput.Font = null;
+			resources.ApplyResources(this.grpAudioOutput, "grpAudioOutput");
 			this.grpAudioOutput.Name = "grpAudioOutput";
 			this.grpAudioOutput.TabStop = false;
-			this.toolTip1.SetToolTip(this.grpAudioOutput, resources.GetString("grpAudioOutput.ToolTip"));
+			// 
+			// chkLossyWAV
+			// 
+			resources.ApplyResources(this.chkLossyWAV, "chkLossyWAV");
+			this.chkLossyWAV.Name = "chkLossyWAV";
+			this.toolTip1.SetToolTip(this.chkLossyWAV, resources.GetString("chkLossyWAV.ToolTip"));
+			this.chkLossyWAV.UseVisualStyleBackColor = true;
+			this.chkLossyWAV.CheckedChanged += new System.EventHandler(this.chkLossyWAV_CheckedChanged);
 			// 
 			// rbAPE
 			// 
-			this.rbAPE.AccessibleDescription = null;
-			this.rbAPE.AccessibleName = null;
 			resources.ApplyResources(this.rbAPE, "rbAPE");
-			this.rbAPE.BackgroundImage = null;
-			this.rbAPE.Font = null;
 			this.rbAPE.Name = "rbAPE";
 			this.rbAPE.TabStop = true;
-			this.toolTip1.SetToolTip(this.rbAPE, resources.GetString("rbAPE.ToolTip"));
 			this.rbAPE.UseVisualStyleBackColor = true;
 			this.rbAPE.CheckedChanged += new System.EventHandler(this.rbAPE_CheckedChanged);
 			// 
 			// rbNoAudio
 			// 
-			this.rbNoAudio.AccessibleDescription = null;
-			this.rbNoAudio.AccessibleName = null;
 			resources.ApplyResources(this.rbNoAudio, "rbNoAudio");
-			this.rbNoAudio.BackgroundImage = null;
-			this.rbNoAudio.Font = null;
 			this.rbNoAudio.Name = "rbNoAudio";
 			this.toolTip1.SetToolTip(this.rbNoAudio, resources.GetString("rbNoAudio.ToolTip"));
 			this.rbNoAudio.UseVisualStyleBackColor = true;
@@ -409,135 +297,84 @@ namespace JDP {
 			// 
 			// rbWavPack
 			// 
-			this.rbWavPack.AccessibleDescription = null;
-			this.rbWavPack.AccessibleName = null;
 			resources.ApplyResources(this.rbWavPack, "rbWavPack");
-			this.rbWavPack.BackgroundImage = null;
-			this.rbWavPack.Font = null;
 			this.rbWavPack.Name = "rbWavPack";
-			this.toolTip1.SetToolTip(this.rbWavPack, resources.GetString("rbWavPack.ToolTip"));
 			this.rbWavPack.UseVisualStyleBackColor = true;
 			this.rbWavPack.CheckedChanged += new System.EventHandler(this.rbWavPack_CheckedChanged);
 			// 
 			// rbFLAC
 			// 
-			this.rbFLAC.AccessibleDescription = null;
-			this.rbFLAC.AccessibleName = null;
 			resources.ApplyResources(this.rbFLAC, "rbFLAC");
-			this.rbFLAC.BackgroundImage = null;
-			this.rbFLAC.Font = null;
 			this.rbFLAC.Name = "rbFLAC";
-			this.toolTip1.SetToolTip(this.rbFLAC, resources.GetString("rbFLAC.ToolTip"));
 			this.rbFLAC.UseVisualStyleBackColor = true;
 			this.rbFLAC.CheckedChanged += new System.EventHandler(this.rbFLAC_CheckedChanged);
 			// 
 			// rbWAV
 			// 
-			this.rbWAV.AccessibleDescription = null;
-			this.rbWAV.AccessibleName = null;
 			resources.ApplyResources(this.rbWAV, "rbWAV");
-			this.rbWAV.BackgroundImage = null;
 			this.rbWAV.Checked = true;
-			this.rbWAV.Font = null;
 			this.rbWAV.Name = "rbWAV";
 			this.rbWAV.TabStop = true;
-			this.toolTip1.SetToolTip(this.rbWAV, resources.GetString("rbWAV.ToolTip"));
 			this.rbWAV.UseVisualStyleBackColor = true;
 			this.rbWAV.CheckedChanged += new System.EventHandler(this.rbWAV_CheckedChanged);
 			// 
 			// btnBatch
 			// 
-			this.btnBatch.AccessibleDescription = null;
-			this.btnBatch.AccessibleName = null;
 			resources.ApplyResources(this.btnBatch, "btnBatch");
-			this.btnBatch.BackgroundImage = null;
-			this.btnBatch.Font = null;
 			this.btnBatch.Name = "btnBatch";
-			this.toolTip1.SetToolTip(this.btnBatch, resources.GetString("btnBatch.ToolTip"));
 			this.btnBatch.UseVisualStyleBackColor = true;
 			this.btnBatch.Click += new System.EventHandler(this.btnBatch_Click);
 			// 
 			// btnFilenameCorrector
 			// 
-			this.btnFilenameCorrector.AccessibleDescription = null;
-			this.btnFilenameCorrector.AccessibleName = null;
 			resources.ApplyResources(this.btnFilenameCorrector, "btnFilenameCorrector");
-			this.btnFilenameCorrector.BackgroundImage = null;
-			this.btnFilenameCorrector.Font = null;
 			this.btnFilenameCorrector.Name = "btnFilenameCorrector";
-			this.toolTip1.SetToolTip(this.btnFilenameCorrector, resources.GetString("btnFilenameCorrector.ToolTip"));
 			this.btnFilenameCorrector.UseVisualStyleBackColor = true;
 			this.btnFilenameCorrector.Click += new System.EventHandler(this.btnFilenameCorrector_Click);
 			// 
 			// btnSettings
 			// 
-			this.btnSettings.AccessibleDescription = null;
-			this.btnSettings.AccessibleName = null;
 			resources.ApplyResources(this.btnSettings, "btnSettings");
-			this.btnSettings.BackgroundImage = null;
-			this.btnSettings.Font = null;
 			this.btnSettings.Name = "btnSettings";
-			this.toolTip1.SetToolTip(this.btnSettings, resources.GetString("btnSettings.ToolTip"));
 			this.btnSettings.UseVisualStyleBackColor = true;
 			this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
 			// 
 			// grpAccurateRip
 			// 
-			this.grpAccurateRip.AccessibleDescription = null;
-			this.grpAccurateRip.AccessibleName = null;
-			resources.ApplyResources(this.grpAccurateRip, "grpAccurateRip");
-			this.grpAccurateRip.BackgroundImage = null;
 			this.grpAccurateRip.Controls.Add(this.label1);
 			this.grpAccurateRip.Controls.Add(this.txtDataTrackLength);
 			this.grpAccurateRip.Controls.Add(this.rbArApplyOffset);
 			this.grpAccurateRip.Controls.Add(this.rbArVerify);
 			this.grpAccurateRip.Controls.Add(this.rbArNone);
-			this.grpAccurateRip.Font = null;
+			resources.ApplyResources(this.grpAccurateRip, "grpAccurateRip");
 			this.grpAccurateRip.Name = "grpAccurateRip";
 			this.grpAccurateRip.TabStop = false;
-			this.toolTip1.SetToolTip(this.grpAccurateRip, resources.GetString("grpAccurateRip.ToolTip"));
 			// 
 			// label1
 			// 
-			this.label1.AccessibleDescription = null;
-			this.label1.AccessibleName = null;
 			resources.ApplyResources(this.label1, "label1");
-			this.label1.Font = null;
 			this.label1.Name = "label1";
-			this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip"));
 			// 
 			// txtDataTrackLength
 			// 
-			this.txtDataTrackLength.AccessibleDescription = null;
-			this.txtDataTrackLength.AccessibleName = null;
-			resources.ApplyResources(this.txtDataTrackLength, "txtDataTrackLength");
-			this.txtDataTrackLength.BackgroundImage = null;
 			this.txtDataTrackLength.Culture = new System.Globalization.CultureInfo("");
 			this.txtDataTrackLength.CutCopyMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals;
-			this.txtDataTrackLength.Font = null;
 			this.txtDataTrackLength.InsertKeyMode = System.Windows.Forms.InsertKeyMode.Overwrite;
+			resources.ApplyResources(this.txtDataTrackLength, "txtDataTrackLength");
 			this.txtDataTrackLength.Name = "txtDataTrackLength";
 			this.txtDataTrackLength.TextMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals;
 			this.toolTip1.SetToolTip(this.txtDataTrackLength, resources.GetString("txtDataTrackLength.ToolTip"));
 			// 
 			// rbArApplyOffset
 			// 
-			this.rbArApplyOffset.AccessibleDescription = null;
-			this.rbArApplyOffset.AccessibleName = null;
 			resources.ApplyResources(this.rbArApplyOffset, "rbArApplyOffset");
-			this.rbArApplyOffset.BackgroundImage = null;
-			this.rbArApplyOffset.Font = null;
 			this.rbArApplyOffset.Name = "rbArApplyOffset";
 			this.toolTip1.SetToolTip(this.rbArApplyOffset, resources.GetString("rbArApplyOffset.ToolTip"));
 			this.rbArApplyOffset.UseVisualStyleBackColor = true;
 			// 
 			// rbArVerify
 			// 
-			this.rbArVerify.AccessibleDescription = null;
-			this.rbArVerify.AccessibleName = null;
 			resources.ApplyResources(this.rbArVerify, "rbArVerify");
-			this.rbArVerify.BackgroundImage = null;
-			this.rbArVerify.Font = null;
 			this.rbArVerify.Name = "rbArVerify";
 			this.toolTip1.SetToolTip(this.rbArVerify, resources.GetString("rbArVerify.ToolTip"));
 			this.rbArVerify.UseVisualStyleBackColor = true;
@@ -545,12 +382,8 @@ namespace JDP {
 			// 
 			// rbArNone
 			// 
-			this.rbArNone.AccessibleDescription = null;
-			this.rbArNone.AccessibleName = null;
 			resources.ApplyResources(this.rbArNone, "rbArNone");
-			this.rbArNone.BackgroundImage = null;
 			this.rbArNone.Checked = true;
-			this.rbArNone.Font = null;
 			this.rbArNone.Name = "rbArNone";
 			this.rbArNone.TabStop = true;
 			this.toolTip1.SetToolTip(this.rbArNone, resources.GetString("rbArNone.ToolTip"));
@@ -558,44 +391,32 @@ namespace JDP {
 			// 
 			// statusStrip1
 			// 
-			this.statusStrip1.AccessibleDescription = null;
-			this.statusStrip1.AccessibleName = null;
-			resources.ApplyResources(this.statusStrip1, "statusStrip1");
-			this.statusStrip1.BackgroundImage = null;
-			this.statusStrip1.Font = null;
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.toolStripStatusLabel1,
            this.toolStripProgressBar1,
            this.toolStripProgressBar2});
+			resources.ApplyResources(this.statusStrip1, "statusStrip1");
 			this.statusStrip1.Name = "statusStrip1";
 			this.statusStrip1.SizingGrip = false;
-			this.toolTip1.SetToolTip(this.statusStrip1, resources.GetString("statusStrip1.ToolTip"));
 			// 
 			// toolStripStatusLabel1
 			// 
-			this.toolStripStatusLabel1.AccessibleDescription = null;
-			this.toolStripStatusLabel1.AccessibleName = null;
-			resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1");
-			this.toolStripStatusLabel1.BackgroundImage = null;
 			this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+			resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1");
 			this.toolStripStatusLabel1.Spring = true;
 			// 
 			// toolStripProgressBar1
 			// 
-			this.toolStripProgressBar1.AccessibleDescription = null;
-			this.toolStripProgressBar1.AccessibleName = null;
-			resources.ApplyResources(this.toolStripProgressBar1, "toolStripProgressBar1");
 			this.toolStripProgressBar1.AutoToolTip = true;
 			this.toolStripProgressBar1.Name = "toolStripProgressBar1";
+			resources.ApplyResources(this.toolStripProgressBar1, "toolStripProgressBar1");
 			this.toolStripProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
 			// 
 			// toolStripProgressBar2
 			// 
-			this.toolStripProgressBar2.AccessibleDescription = null;
-			this.toolStripProgressBar2.AccessibleName = null;
-			resources.ApplyResources(this.toolStripProgressBar2, "toolStripProgressBar2");
 			this.toolStripProgressBar2.AutoToolTip = true;
 			this.toolStripProgressBar2.Name = "toolStripProgressBar2";
+			resources.ApplyResources(this.toolStripProgressBar2, "toolStripProgressBar2");
 			this.toolStripProgressBar2.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
 			// 
 			// toolTip1
@@ -606,59 +427,36 @@ namespace JDP {
 			// 
 			// btnCUECreator
 			// 
-			this.btnCUECreator.AccessibleDescription = null;
-			this.btnCUECreator.AccessibleName = null;
 			resources.ApplyResources(this.btnCUECreator, "btnCUECreator");
-			this.btnCUECreator.BackgroundImage = null;
-			this.btnCUECreator.Font = null;
 			this.btnCUECreator.Name = "btnCUECreator";
-			this.toolTip1.SetToolTip(this.btnCUECreator, resources.GetString("btnCUECreator.ToolTip"));
 			this.btnCUECreator.UseVisualStyleBackColor = true;
 			this.btnCUECreator.Click += new System.EventHandler(this.btnCUECreator_Click);
 			// 
 			// btnStop
 			// 
-			this.btnStop.AccessibleDescription = null;
-			this.btnStop.AccessibleName = null;
 			resources.ApplyResources(this.btnStop, "btnStop");
-			this.btnStop.BackgroundImage = null;
-			this.btnStop.Font = null;
 			this.btnStop.Name = "btnStop";
-			this.toolTip1.SetToolTip(this.btnStop, resources.GetString("btnStop.ToolTip"));
 			this.btnStop.UseVisualStyleBackColor = true;
 			this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
 			// 
 			// btnPause
 			// 
-			this.btnPause.AccessibleDescription = null;
-			this.btnPause.AccessibleName = null;
 			resources.ApplyResources(this.btnPause, "btnPause");
-			this.btnPause.BackgroundImage = null;
-			this.btnPause.Font = null;
 			this.btnPause.Name = "btnPause";
-			this.toolTip1.SetToolTip(this.btnPause, resources.GetString("btnPause.ToolTip"));
 			this.btnPause.UseVisualStyleBackColor = true;
 			this.btnPause.Click += new System.EventHandler(this.btnPause_Click);
 			// 
 			// btnResume
 			// 
-			this.btnResume.AccessibleDescription = null;
-			this.btnResume.AccessibleName = null;
 			resources.ApplyResources(this.btnResume, "btnResume");
-			this.btnResume.BackgroundImage = null;
-			this.btnResume.Font = null;
 			this.btnResume.Name = "btnResume";
-			this.toolTip1.SetToolTip(this.btnResume, resources.GetString("btnResume.ToolTip"));
 			this.btnResume.UseVisualStyleBackColor = true;
 			this.btnResume.Click += new System.EventHandler(this.btnPause_Click);
 			// 
 			// frmCUETools
 			// 
-			this.AccessibleDescription = null;
-			this.AccessibleName = null;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackgroundImage = null;
 			this.Controls.Add(this.btnResume);
 			this.Controls.Add(this.btnPause);
 			this.Controls.Add(this.btnStop);
@@ -675,10 +473,8 @@ namespace JDP {
 			this.Controls.Add(this.grpCUEPaths);
 			this.Controls.Add(this.btnConvert);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.Icon = null;
 			this.MaximizeBox = false;
 			this.Name = "frmCUETools";
-			this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip"));
 			this.Load += new System.EventHandler(this.frmCUETools_Load);
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.frmCUETools_FormClosed);
 			this.grpCUEPaths.ResumeLayout(false);
@@ -747,6 +543,7 @@ namespace JDP {
 		private System.Windows.Forms.Button btnStop;
 		private System.Windows.Forms.Button btnPause;
 		private System.Windows.Forms.Button btnResume;
+		private System.Windows.Forms.CheckBox chkLossyWAV;
 	}
 }

--- a/CUETools/frmCUETools.cs
+++ b/CUETools/frmCUETools.cs
@@ -250,7 +250,7 @@ namespace JDP {
 				
 				UpdateOutputPath(cueSheet.Artist != "" ? cueSheet.Artist : "Unknown Artist", cueSheet.Title != "" ? cueSheet.Title : "Unknown Title");
 				pathOut = txtOutputPath.Text;
-				cueSheet.GenerateFilenames(SelectedOutputAudioFormat, pathOut);
+				cueSheet.GenerateFilenames(SelectedOutputAudioFormat, pathOut, chkLossyWAV.Checked);
 				outDir = Path.GetDirectoryName(pathOut);
 				if (cueStyle == CUEStyle.SingleFileWithCUE)
 					cueSheet.SingleFilename = Path.GetFileName (pathOut);
@@ -503,6 +503,7 @@ namespace JDP {
 			_writeOffset = sr.LoadInt32("WriteOffset", null, null) ?? 0;
 			_usePregapForFirstTrackInSingleFile = sr.LoadBoolean("UsePregapForFirstTrackInSingleFile") ?? false;
 			_reducePriority = sr.LoadBoolean("ReducePriority") ?? true;
+			chkLossyWAV.Checked = sr.LoadBoolean("LossyWav") ?? false;
 			_config.Load(sr);
 		}

@@ -518,6 +519,7 @@ namespace JDP {
 			sw.Save("WriteOffset", _writeOffset);
 			sw.Save("UsePregapForFirstTrackInSingleFile", _usePregapForFirstTrackInSingleFile);
 			sw.Save("ReducePriority", _reducePriority);
+			sw.Save("LossyWav", chkLossyWAV.Checked);
 			_config.Save(sw);
 			sw.Close();
 		}
@@ -768,9 +770,12 @@ namespace JDP {
 					file = Path.GetFileNameWithoutExtension(pathIn);
 				}
 				ext = ".cue";
-
 				if (rbEmbedCUE.Checked)
 					ext = General.FormatExtension (SelectedOutputAudioFormat);
+				if (chkLossyWAV.Checked)
+					ext = ".lossy" + ext;
+				if (_config.detectHDCD && _config.decodeHDCD)
+					ext = ".24bit" + ext;
 				
 				if (rbCreateSubdirectory.Checked) {
 					pathOut = Path.Combine(Path.Combine(dir, txtCreateSubdirectory.Text), file + ext);
@@ -802,7 +807,10 @@ namespace JDP {
 		private void updateOutputStyles()
 		{
 			rbEmbedCUE.Enabled = rbFLAC.Checked || rbWavPack.Checked || rbAPE.Checked;
-			rbNoAudio.Enabled = rbWAV.Enabled = !rbEmbedCUE.Checked;
+			chkLossyWAV.Enabled = rbFLAC.Checked || rbWavPack.Checked || rbWAV.Checked;
+			rbNoAudio.Enabled = !rbEmbedCUE.Checked && !chkLossyWAV.Checked;
+			rbWAV.Enabled = !rbEmbedCUE.Checked;
+			rbAPE.Enabled = !chkLossyWAV.Checked;
 		}

 		private void rbWAV_CheckedChanged(object sender, EventArgs e)
@@ -813,11 +821,13 @@ namespace JDP {
 		private void rbFLAC_CheckedChanged(object sender, EventArgs e)
 		{
 			updateOutputStyles();
+			UpdateOutputPath();
 		}

 		private void rbWavPack_CheckedChanged(object sender, EventArgs e)
 		{
 			updateOutputStyles();
+			UpdateOutputPath();
 		}

 		private void rbEmbedCUE_CheckedChanged(object sender, EventArgs e)
@@ -886,6 +896,7 @@ namespace JDP {
 		private void rbAPE_CheckedChanged(object sender, EventArgs e)
 		{
 			updateOutputStyles();
+			UpdateOutputPath();
 		}

 		private void btnStop_Click(object sender, EventArgs e)
@@ -903,6 +914,12 @@ namespace JDP {
 				btnResume.Visible = !btnResume.Visible;
 			}
 		}
+
+		private void chkLossyWAV_CheckedChanged(object sender, EventArgs e)
+		{
+			updateOutputStyles();
+			UpdateOutputPath();
+		}
 	}

 	enum OutputPathGeneration {
--- a/CUETools/frmCUETools.resx
+++ b/CUETools/frmCUETools.resx
--- a/CUETools/frmCUETools.ru-RU.resx
+++ b/CUETools/frmCUETools.ru-RU.resx
@@ -143,7 +143,7 @@
    <value>&amp;Вход:</value>
  </data>
  <data name="grpOutputStyle.Size" type="System.Drawing.Size, System.Drawing">
-    <value>130, 118</value>
+    <value>130, 137</value>
  </data>
  <data name="grpOutputStyle.Text" xml:space="preserve">
    <value>Стиль CUE</value>
@@ -257,7 +257,7 @@
    <value>250, 211</value>
  </data>
  <data name="grpAccurateRip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>154, 118</value>
+    <value>154, 137</value>
  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>47, 13</value>
--- a/CUETools/frmSettings.Designer.cs
+++ b/CUETools/frmSettings.Designer.cs
@@ -27,6 +27,7 @@ namespace JDP {
 			System.Windows.Forms.Button btnCancel;
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSettings));
 			this.grpGeneral = new System.Windows.Forms.GroupBox();
+			this.chkReducePriority = new System.Windows.Forms.CheckBox();
 			this.chkTruncateExtra4206Samples = new System.Windows.Forms.CheckBox();
 			this.chkCreateCUEFileWhenEmbedded = new System.Windows.Forms.CheckBox();
 			this.chkCreateM3U = new System.Windows.Forms.CheckBox();
@@ -89,10 +90,12 @@ namespace JDP {
 			this.groupBox3 = new System.Windows.Forms.GroupBox();
 			this.chkWriteARLogOnVerify = new System.Windows.Forms.CheckBox();
 			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.numericLossyWAVQuality = new System.Windows.Forms.NumericUpDown();
+			this.label1 = 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.chkReducePriority = new System.Windows.Forms.CheckBox();
 			btnCancel = new System.Windows.Forms.Button();
 			this.grpGeneral.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit();
@@ -112,19 +115,30 @@ namespace JDP {
 			this.tabPage2.SuspendLayout();
 			this.groupBox3.SuspendLayout();
 			this.tabPage3.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).BeginInit();
 			this.tabPage4.SuspendLayout();
 			this.grpHDCD.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// btnCancel
 			// 
-			btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			btnCancel.AccessibleDescription = null;
+			btnCancel.AccessibleName = null;
 			resources.ApplyResources(btnCancel, "btnCancel");
+			btnCancel.BackgroundImage = null;
+			btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			btnCancel.Font = null;
 			btnCancel.Name = "btnCancel";
+			this.toolTip1.SetToolTip(btnCancel, resources.GetString("btnCancel.ToolTip"));
 			btnCancel.UseVisualStyleBackColor = true;
 			// 
 			// grpGeneral
 			// 
+			this.grpGeneral.AccessibleDescription = null;
+			this.grpGeneral.AccessibleName = null;
+			resources.ApplyResources(this.grpGeneral, "grpGeneral");
+			this.grpGeneral.BackgroundImage = null;
 			this.grpGeneral.Controls.Add(this.chkReducePriority);
 			this.grpGeneral.Controls.Add(this.chkTruncateExtra4206Samples);
 			this.grpGeneral.Controls.Add(this.chkCreateCUEFileWhenEmbedded);
@@ -135,45 +149,83 @@ namespace JDP {
 			this.grpGeneral.Controls.Add(this.chkAutoCorrectFilenames);
 			this.grpGeneral.Controls.Add(this.chkPreserveHTOA);
 			this.grpGeneral.Controls.Add(this.lblWriteOffset);
-			resources.ApplyResources(this.grpGeneral, "grpGeneral");
+			this.grpGeneral.Font = null;
 			this.grpGeneral.Name = "grpGeneral";
 			this.grpGeneral.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpGeneral, resources.GetString("grpGeneral.ToolTip"));
+			// 
+			// chkReducePriority
+			// 
+			this.chkReducePriority.AccessibleDescription = null;
+			this.chkReducePriority.AccessibleName = null;
+			resources.ApplyResources(this.chkReducePriority, "chkReducePriority");
+			this.chkReducePriority.BackgroundImage = null;
+			this.chkReducePriority.Font = null;
+			this.chkReducePriority.Name = "chkReducePriority";
+			this.toolTip1.SetToolTip(this.chkReducePriority, resources.GetString("chkReducePriority.ToolTip"));
+			this.chkReducePriority.UseVisualStyleBackColor = true;
 			// 
 			// chkTruncateExtra4206Samples
 			// 
+			this.chkTruncateExtra4206Samples.AccessibleDescription = null;
+			this.chkTruncateExtra4206Samples.AccessibleName = null;
 			resources.ApplyResources(this.chkTruncateExtra4206Samples, "chkTruncateExtra4206Samples");
+			this.chkTruncateExtra4206Samples.BackgroundImage = null;
+			this.chkTruncateExtra4206Samples.Font = null;
 			this.chkTruncateExtra4206Samples.Name = "chkTruncateExtra4206Samples";
 			this.toolTip1.SetToolTip(this.chkTruncateExtra4206Samples, resources.GetString("chkTruncateExtra4206Samples.ToolTip"));
 			this.chkTruncateExtra4206Samples.UseVisualStyleBackColor = true;
 			// 
 			// chkCreateCUEFileWhenEmbedded
 			// 
+			this.chkCreateCUEFileWhenEmbedded.AccessibleDescription = null;
+			this.chkCreateCUEFileWhenEmbedded.AccessibleName = null;
 			resources.ApplyResources(this.chkCreateCUEFileWhenEmbedded, "chkCreateCUEFileWhenEmbedded");
+			this.chkCreateCUEFileWhenEmbedded.BackgroundImage = null;
+			this.chkCreateCUEFileWhenEmbedded.Font = null;
 			this.chkCreateCUEFileWhenEmbedded.Name = "chkCreateCUEFileWhenEmbedded";
+			this.toolTip1.SetToolTip(this.chkCreateCUEFileWhenEmbedded, resources.GetString("chkCreateCUEFileWhenEmbedded.ToolTip"));
 			this.chkCreateCUEFileWhenEmbedded.UseVisualStyleBackColor = true;
 			// 
 			// chkCreateM3U
 			// 
+			this.chkCreateM3U.AccessibleDescription = null;
+			this.chkCreateM3U.AccessibleName = null;
 			resources.ApplyResources(this.chkCreateM3U, "chkCreateM3U");
+			this.chkCreateM3U.BackgroundImage = null;
+			this.chkCreateM3U.Font = null;
 			this.chkCreateM3U.Name = "chkCreateM3U";
+			this.toolTip1.SetToolTip(this.chkCreateM3U, resources.GetString("chkCreateM3U.ToolTip"));
 			this.chkCreateM3U.UseVisualStyleBackColor = true;
 			// 
 			// chkFillUpCUE
 			// 
+			this.chkFillUpCUE.AccessibleDescription = null;
+			this.chkFillUpCUE.AccessibleName = null;
 			resources.ApplyResources(this.chkFillUpCUE, "chkFillUpCUE");
+			this.chkFillUpCUE.BackgroundImage = null;
+			this.chkFillUpCUE.Font = null;
 			this.chkFillUpCUE.Name = "chkFillUpCUE";
+			this.toolTip1.SetToolTip(this.chkFillUpCUE, resources.GetString("chkFillUpCUE.ToolTip"));
 			this.chkFillUpCUE.UseVisualStyleBackColor = true;
 			// 
 			// chkEmbedLog
 			// 
+			this.chkEmbedLog.AccessibleDescription = null;
+			this.chkEmbedLog.AccessibleName = null;
 			resources.ApplyResources(this.chkEmbedLog, "chkEmbedLog");
+			this.chkEmbedLog.BackgroundImage = null;
+			this.chkEmbedLog.Font = null;
 			this.chkEmbedLog.Name = "chkEmbedLog";
 			this.toolTip1.SetToolTip(this.chkEmbedLog, resources.GetString("chkEmbedLog.ToolTip"));
 			this.chkEmbedLog.UseVisualStyleBackColor = true;
 			// 
 			// numericWriteOffset
 			// 
+			this.numericWriteOffset.AccessibleDescription = null;
+			this.numericWriteOffset.AccessibleName = null;
 			resources.ApplyResources(this.numericWriteOffset, "numericWriteOffset");
+			this.numericWriteOffset.Font = null;
 			this.numericWriteOffset.Maximum = new decimal(new int[] {
            99999,
            0,
@@ -185,43 +237,66 @@ namespace JDP {
            0,
            -2147483648});
 			this.numericWriteOffset.Name = "numericWriteOffset";
+			this.toolTip1.SetToolTip(this.numericWriteOffset, resources.GetString("numericWriteOffset.ToolTip"));
 			// 
 			// chkAutoCorrectFilenames
 			// 
+			this.chkAutoCorrectFilenames.AccessibleDescription = null;
+			this.chkAutoCorrectFilenames.AccessibleName = null;
 			resources.ApplyResources(this.chkAutoCorrectFilenames, "chkAutoCorrectFilenames");
+			this.chkAutoCorrectFilenames.BackgroundImage = null;
+			this.chkAutoCorrectFilenames.Font = null;
 			this.chkAutoCorrectFilenames.Name = "chkAutoCorrectFilenames";
 			this.toolTip1.SetToolTip(this.chkAutoCorrectFilenames, resources.GetString("chkAutoCorrectFilenames.ToolTip"));
 			this.chkAutoCorrectFilenames.UseVisualStyleBackColor = true;
 			// 
 			// chkPreserveHTOA
 			// 
+			this.chkPreserveHTOA.AccessibleDescription = null;
+			this.chkPreserveHTOA.AccessibleName = null;
 			resources.ApplyResources(this.chkPreserveHTOA, "chkPreserveHTOA");
+			this.chkPreserveHTOA.BackgroundImage = null;
+			this.chkPreserveHTOA.Font = null;
 			this.chkPreserveHTOA.Name = "chkPreserveHTOA";
+			this.toolTip1.SetToolTip(this.chkPreserveHTOA, resources.GetString("chkPreserveHTOA.ToolTip"));
 			this.chkPreserveHTOA.UseVisualStyleBackColor = true;
 			// 
 			// lblWriteOffset
 			// 
+			this.lblWriteOffset.AccessibleDescription = null;
+			this.lblWriteOffset.AccessibleName = null;
 			resources.ApplyResources(this.lblWriteOffset, "lblWriteOffset");
+			this.lblWriteOffset.Font = null;
 			this.lblWriteOffset.Name = "lblWriteOffset";
+			this.toolTip1.SetToolTip(this.lblWriteOffset, resources.GetString("lblWriteOffset.ToolTip"));
 			// 
 			// grpFLAC
 			// 
+			this.grpFLAC.AccessibleDescription = null;
+			this.grpFLAC.AccessibleName = null;
+			resources.ApplyResources(this.grpFLAC, "grpFLAC");
+			this.grpFLAC.BackgroundImage = null;
 			this.grpFLAC.Controls.Add(this.numericFLACCompressionLevel);
 			this.grpFLAC.Controls.Add(this.lblFLACCompressionLevel);
 			this.grpFLAC.Controls.Add(this.chkFLACVerify);
-			resources.ApplyResources(this.grpFLAC, "grpFLAC");
+			this.grpFLAC.Font = null;
 			this.grpFLAC.Name = "grpFLAC";
 			this.grpFLAC.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpFLAC, resources.GetString("grpFLAC.ToolTip"));
 			// 
 			// numericFLACCompressionLevel
 			// 
+			this.numericFLACCompressionLevel.AccessibleDescription = null;
+			this.numericFLACCompressionLevel.AccessibleName = null;
 			resources.ApplyResources(this.numericFLACCompressionLevel, "numericFLACCompressionLevel");
+			this.numericFLACCompressionLevel.Font = null;
 			this.numericFLACCompressionLevel.Maximum = new decimal(new int[] {
            8,
            0,
            0,
            0});
 			this.numericFLACCompressionLevel.Name = "numericFLACCompressionLevel";
+			this.toolTip1.SetToolTip(this.numericFLACCompressionLevel, resources.GetString("numericFLACCompressionLevel.ToolTip"));
 			this.numericFLACCompressionLevel.Value = new decimal(new int[] {
            5,
            0,
@@ -230,25 +305,43 @@ namespace JDP {
 			// 
 			// lblFLACCompressionLevel
 			// 
+			this.lblFLACCompressionLevel.AccessibleDescription = null;
+			this.lblFLACCompressionLevel.AccessibleName = null;
 			resources.ApplyResources(this.lblFLACCompressionLevel, "lblFLACCompressionLevel");
+			this.lblFLACCompressionLevel.Font = null;
 			this.lblFLACCompressionLevel.Name = "lblFLACCompressionLevel";
+			this.toolTip1.SetToolTip(this.lblFLACCompressionLevel, resources.GetString("lblFLACCompressionLevel.ToolTip"));
 			// 
 			// chkFLACVerify
 			// 
+			this.chkFLACVerify.AccessibleDescription = null;
+			this.chkFLACVerify.AccessibleName = null;
 			resources.ApplyResources(this.chkFLACVerify, "chkFLACVerify");
+			this.chkFLACVerify.BackgroundImage = null;
+			this.chkFLACVerify.Font = null;
 			this.chkFLACVerify.Name = "chkFLACVerify";
+			this.toolTip1.SetToolTip(this.chkFLACVerify, resources.GetString("chkFLACVerify.ToolTip"));
 			this.chkFLACVerify.UseVisualStyleBackColor = true;
 			// 
 			// btnOK
 			// 
-			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOK.AccessibleDescription = null;
+			this.btnOK.AccessibleName = null;
 			resources.ApplyResources(this.btnOK, "btnOK");
+			this.btnOK.BackgroundImage = null;
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOK.Font = null;
 			this.btnOK.Name = "btnOK";
+			this.toolTip1.SetToolTip(this.btnOK, resources.GetString("btnOK.ToolTip"));
 			this.btnOK.UseVisualStyleBackColor = true;
 			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
 			// 
 			// grpWavPack
 			// 
+			this.grpWavPack.AccessibleDescription = null;
+			this.grpWavPack.AccessibleName = null;
+			resources.ApplyResources(this.grpWavPack, "grpWavPack");
+			this.grpWavPack.BackgroundImage = null;
 			this.grpWavPack.Controls.Add(this.chkWVStoreMD5);
 			this.grpWavPack.Controls.Add(this.numWVExtraMode);
 			this.grpWavPack.Controls.Add(this.chkWVExtraMode);
@@ -256,19 +349,28 @@ namespace JDP {
 			this.grpWavPack.Controls.Add(this.rbWVHigh);
 			this.grpWavPack.Controls.Add(this.rbWVNormal);
 			this.grpWavPack.Controls.Add(this.rbWVFast);
-			resources.ApplyResources(this.grpWavPack, "grpWavPack");
+			this.grpWavPack.Font = null;
 			this.grpWavPack.Name = "grpWavPack";
 			this.grpWavPack.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpWavPack, resources.GetString("grpWavPack.ToolTip"));
 			// 
 			// chkWVStoreMD5
 			// 
+			this.chkWVStoreMD5.AccessibleDescription = null;
+			this.chkWVStoreMD5.AccessibleName = null;
 			resources.ApplyResources(this.chkWVStoreMD5, "chkWVStoreMD5");
+			this.chkWVStoreMD5.BackgroundImage = null;
+			this.chkWVStoreMD5.Font = null;
 			this.chkWVStoreMD5.Name = "chkWVStoreMD5";
+			this.toolTip1.SetToolTip(this.chkWVStoreMD5, resources.GetString("chkWVStoreMD5.ToolTip"));
 			this.chkWVStoreMD5.UseVisualStyleBackColor = true;
 			// 
 			// numWVExtraMode
 			// 
+			this.numWVExtraMode.AccessibleDescription = null;
+			this.numWVExtraMode.AccessibleName = null;
 			resources.ApplyResources(this.numWVExtraMode, "numWVExtraMode");
+			this.numWVExtraMode.Font = null;
 			this.numWVExtraMode.Maximum = new decimal(new int[] {
            6,
            0,
@@ -280,6 +382,7 @@ namespace JDP {
            0,
            0});
 			this.numWVExtraMode.Name = "numWVExtraMode";
+			this.toolTip1.SetToolTip(this.numWVExtraMode, resources.GetString("numWVExtraMode.ToolTip"));
 			this.numWVExtraMode.Value = new decimal(new int[] {
            1,
            0,
@@ -288,39 +391,68 @@ namespace JDP {
 			// 
 			// chkWVExtraMode
 			// 
+			this.chkWVExtraMode.AccessibleDescription = null;
+			this.chkWVExtraMode.AccessibleName = null;
 			resources.ApplyResources(this.chkWVExtraMode, "chkWVExtraMode");
+			this.chkWVExtraMode.BackgroundImage = null;
+			this.chkWVExtraMode.Font = null;
 			this.chkWVExtraMode.Name = "chkWVExtraMode";
+			this.toolTip1.SetToolTip(this.chkWVExtraMode, resources.GetString("chkWVExtraMode.ToolTip"));
 			this.chkWVExtraMode.UseVisualStyleBackColor = true;
 			this.chkWVExtraMode.CheckedChanged += new System.EventHandler(this.chkWVExtraMode_CheckedChanged);
 			// 
 			// rbWVVeryHigh
 			// 
+			this.rbWVVeryHigh.AccessibleDescription = null;
+			this.rbWVVeryHigh.AccessibleName = null;
 			resources.ApplyResources(this.rbWVVeryHigh, "rbWVVeryHigh");
+			this.rbWVVeryHigh.BackgroundImage = null;
+			this.rbWVVeryHigh.Font = null;
 			this.rbWVVeryHigh.Name = "rbWVVeryHigh";
+			this.toolTip1.SetToolTip(this.rbWVVeryHigh, resources.GetString("rbWVVeryHigh.ToolTip"));
 			this.rbWVVeryHigh.UseVisualStyleBackColor = true;
 			// 
 			// rbWVHigh
 			// 
+			this.rbWVHigh.AccessibleDescription = null;
+			this.rbWVHigh.AccessibleName = null;
 			resources.ApplyResources(this.rbWVHigh, "rbWVHigh");
+			this.rbWVHigh.BackgroundImage = null;
+			this.rbWVHigh.Font = null;
 			this.rbWVHigh.Name = "rbWVHigh";
+			this.toolTip1.SetToolTip(this.rbWVHigh, resources.GetString("rbWVHigh.ToolTip"));
 			this.rbWVHigh.UseVisualStyleBackColor = true;
 			// 
 			// rbWVNormal
 			// 
+			this.rbWVNormal.AccessibleDescription = null;
+			this.rbWVNormal.AccessibleName = null;
 			resources.ApplyResources(this.rbWVNormal, "rbWVNormal");
+			this.rbWVNormal.BackgroundImage = null;
 			this.rbWVNormal.Checked = true;
+			this.rbWVNormal.Font = null;
 			this.rbWVNormal.Name = "rbWVNormal";
 			this.rbWVNormal.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbWVNormal, resources.GetString("rbWVNormal.ToolTip"));
 			this.rbWVNormal.UseVisualStyleBackColor = true;
 			// 
 			// rbWVFast
 			// 
+			this.rbWVFast.AccessibleDescription = null;
+			this.rbWVFast.AccessibleName = null;
 			resources.ApplyResources(this.rbWVFast, "rbWVFast");
+			this.rbWVFast.BackgroundImage = null;
+			this.rbWVFast.Font = null;
 			this.rbWVFast.Name = "rbWVFast";
+			this.toolTip1.SetToolTip(this.rbWVFast, resources.GetString("rbWVFast.ToolTip"));
 			this.rbWVFast.UseVisualStyleBackColor = true;
 			// 
 			// groupBox1
 			// 
+			this.groupBox1.AccessibleDescription = null;
+			this.groupBox1.AccessibleName = null;
+			resources.ApplyResources(this.groupBox1, "groupBox1");
+			this.groupBox1.BackgroundImage = null;
 			this.groupBox1.Controls.Add(this.chkEncodeWhenZeroOffset);
 			this.groupBox1.Controls.Add(this.chkArFixOffset);
 			this.groupBox1.Controls.Add(this.chkWriteArLogOnConvert);
@@ -334,61 +466,89 @@ namespace JDP {
 			this.groupBox1.Controls.Add(this.numFixWhenConfidence);
 			this.groupBox1.Controls.Add(this.labelFixWhenPercent);
 			this.groupBox1.Controls.Add(this.numFixWhenPercent);
-			resources.ApplyResources(this.groupBox1, "groupBox1");
+			this.groupBox1.Font = null;
 			this.groupBox1.Name = "groupBox1";
 			this.groupBox1.TabStop = false;
+			this.toolTip1.SetToolTip(this.groupBox1, resources.GetString("groupBox1.ToolTip"));
 			// 
 			// chkEncodeWhenZeroOffset
 			// 
+			this.chkEncodeWhenZeroOffset.AccessibleDescription = null;
+			this.chkEncodeWhenZeroOffset.AccessibleName = null;
 			resources.ApplyResources(this.chkEncodeWhenZeroOffset, "chkEncodeWhenZeroOffset");
+			this.chkEncodeWhenZeroOffset.BackgroundImage = null;
+			this.chkEncodeWhenZeroOffset.Font = null;
 			this.chkEncodeWhenZeroOffset.Name = "chkEncodeWhenZeroOffset";
+			this.toolTip1.SetToolTip(this.chkEncodeWhenZeroOffset, resources.GetString("chkEncodeWhenZeroOffset.ToolTip"));
 			this.chkEncodeWhenZeroOffset.UseVisualStyleBackColor = true;
 			// 
 			// chkArFixOffset
 			// 
+			this.chkArFixOffset.AccessibleDescription = null;
+			this.chkArFixOffset.AccessibleName = null;
 			resources.ApplyResources(this.chkArFixOffset, "chkArFixOffset");
+			this.chkArFixOffset.BackgroundImage = null;
 			this.chkArFixOffset.Checked = true;
 			this.chkArFixOffset.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkArFixOffset.Font = null;
 			this.chkArFixOffset.Name = "chkArFixOffset";
+			this.toolTip1.SetToolTip(this.chkArFixOffset, resources.GetString("chkArFixOffset.ToolTip"));
 			this.chkArFixOffset.UseVisualStyleBackColor = true;
 			this.chkArFixOffset.CheckedChanged += new System.EventHandler(this.chkArFixOffset_CheckedChanged);
 			// 
 			// chkWriteArLogOnConvert
 			// 
+			this.chkWriteArLogOnConvert.AccessibleDescription = null;
+			this.chkWriteArLogOnConvert.AccessibleName = null;
 			resources.ApplyResources(this.chkWriteArLogOnConvert, "chkWriteArLogOnConvert");
+			this.chkWriteArLogOnConvert.BackgroundImage = null;
 			this.chkWriteArLogOnConvert.Checked = true;
 			this.chkWriteArLogOnConvert.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkWriteArLogOnConvert.Font = null;
 			this.chkWriteArLogOnConvert.Name = "chkWriteArLogOnConvert";
+			this.toolTip1.SetToolTip(this.chkWriteArLogOnConvert, resources.GetString("chkWriteArLogOnConvert.ToolTip"));
 			this.chkWriteArLogOnConvert.UseVisualStyleBackColor = true;
 			// 
 			// chkWriteArTagsOnConvert
 			// 
+			this.chkWriteArTagsOnConvert.AccessibleDescription = null;
+			this.chkWriteArTagsOnConvert.AccessibleName = null;
 			resources.ApplyResources(this.chkWriteArTagsOnConvert, "chkWriteArTagsOnConvert");
+			this.chkWriteArTagsOnConvert.BackgroundImage = null;
 			this.chkWriteArTagsOnConvert.Checked = true;
 			this.chkWriteArTagsOnConvert.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkWriteArTagsOnConvert.Font = null;
 			this.chkWriteArTagsOnConvert.Name = "chkWriteArTagsOnConvert";
 			this.toolTip1.SetToolTip(this.chkWriteArTagsOnConvert, resources.GetString("chkWriteArTagsOnConvert.ToolTip"));
 			this.chkWriteArTagsOnConvert.UseVisualStyleBackColor = true;
 			// 
 			// labelEncodeWhenPercent
 			// 
+			this.labelEncodeWhenPercent.AccessibleDescription = null;
+			this.labelEncodeWhenPercent.AccessibleName = null;
 			resources.ApplyResources(this.labelEncodeWhenPercent, "labelEncodeWhenPercent");
+			this.labelEncodeWhenPercent.Font = null;
 			this.labelEncodeWhenPercent.Name = "labelEncodeWhenPercent";
+			this.toolTip1.SetToolTip(this.labelEncodeWhenPercent, resources.GetString("labelEncodeWhenPercent.ToolTip"));
 			// 
 			// numEncodeWhenPercent
 			// 
+			this.numEncodeWhenPercent.AccessibleDescription = null;
+			this.numEncodeWhenPercent.AccessibleName = null;
+			resources.ApplyResources(this.numEncodeWhenPercent, "numEncodeWhenPercent");
+			this.numEncodeWhenPercent.Font = null;
 			this.numEncodeWhenPercent.Increment = new decimal(new int[] {
            5,
            0,
            0,
            0});
-			resources.ApplyResources(this.numEncodeWhenPercent, "numEncodeWhenPercent");
 			this.numEncodeWhenPercent.Minimum = new decimal(new int[] {
            1,
            0,
            0,
            0});
 			this.numEncodeWhenPercent.Name = "numEncodeWhenPercent";
+			this.toolTip1.SetToolTip(this.numEncodeWhenPercent, resources.GetString("numEncodeWhenPercent.ToolTip"));
 			this.numEncodeWhenPercent.Value = new decimal(new int[] {
            100,
            0,
@@ -397,18 +557,26 @@ namespace JDP {
 			// 
 			// labelEncodeWhenConfidence
 			// 
+			this.labelEncodeWhenConfidence.AccessibleDescription = null;
+			this.labelEncodeWhenConfidence.AccessibleName = null;
 			resources.ApplyResources(this.labelEncodeWhenConfidence, "labelEncodeWhenConfidence");
+			this.labelEncodeWhenConfidence.Font = null;
 			this.labelEncodeWhenConfidence.Name = "labelEncodeWhenConfidence";
+			this.toolTip1.SetToolTip(this.labelEncodeWhenConfidence, resources.GetString("labelEncodeWhenConfidence.ToolTip"));
 			// 
 			// numEncodeWhenConfidence
 			// 
+			this.numEncodeWhenConfidence.AccessibleDescription = null;
+			this.numEncodeWhenConfidence.AccessibleName = null;
 			resources.ApplyResources(this.numEncodeWhenConfidence, "numEncodeWhenConfidence");
+			this.numEncodeWhenConfidence.Font = null;
 			this.numEncodeWhenConfidence.Minimum = new decimal(new int[] {
            1,
            0,
            0,
            0});
 			this.numEncodeWhenConfidence.Name = "numEncodeWhenConfidence";
+			this.toolTip1.SetToolTip(this.numEncodeWhenConfidence, resources.GetString("numEncodeWhenConfidence.ToolTip"));
 			this.numEncodeWhenConfidence.Value = new decimal(new int[] {
            1,
            0,
@@ -417,27 +585,40 @@ namespace JDP {
 			// 
 			// chkArNoUnverifiedAudio
 			// 
+			this.chkArNoUnverifiedAudio.AccessibleDescription = null;
+			this.chkArNoUnverifiedAudio.AccessibleName = null;
 			resources.ApplyResources(this.chkArNoUnverifiedAudio, "chkArNoUnverifiedAudio");
+			this.chkArNoUnverifiedAudio.BackgroundImage = null;
 			this.chkArNoUnverifiedAudio.Checked = true;
 			this.chkArNoUnverifiedAudio.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkArNoUnverifiedAudio.Font = null;
 			this.chkArNoUnverifiedAudio.Name = "chkArNoUnverifiedAudio";
+			this.toolTip1.SetToolTip(this.chkArNoUnverifiedAudio, resources.GetString("chkArNoUnverifiedAudio.ToolTip"));
 			this.chkArNoUnverifiedAudio.UseVisualStyleBackColor = true;
 			this.chkArNoUnverifiedAudio.CheckedChanged += new System.EventHandler(this.chkArNoUnverifiedAudio_CheckedChanged);
 			// 
 			// labelFixWhenConfidence
 			// 
+			this.labelFixWhenConfidence.AccessibleDescription = null;
+			this.labelFixWhenConfidence.AccessibleName = null;
 			resources.ApplyResources(this.labelFixWhenConfidence, "labelFixWhenConfidence");
+			this.labelFixWhenConfidence.Font = null;
 			this.labelFixWhenConfidence.Name = "labelFixWhenConfidence";
+			this.toolTip1.SetToolTip(this.labelFixWhenConfidence, resources.GetString("labelFixWhenConfidence.ToolTip"));
 			// 
 			// numFixWhenConfidence
 			// 
+			this.numFixWhenConfidence.AccessibleDescription = null;
+			this.numFixWhenConfidence.AccessibleName = null;
 			resources.ApplyResources(this.numFixWhenConfidence, "numFixWhenConfidence");
+			this.numFixWhenConfidence.Font = null;
 			this.numFixWhenConfidence.Minimum = new decimal(new int[] {
            1,
            0,
            0,
            0});
 			this.numFixWhenConfidence.Name = "numFixWhenConfidence";
+			this.toolTip1.SetToolTip(this.numFixWhenConfidence, resources.GetString("numFixWhenConfidence.ToolTip"));
 			this.numFixWhenConfidence.Value = new decimal(new int[] {
            1,
            0,
@@ -446,23 +627,31 @@ namespace JDP {
 			// 
 			// labelFixWhenPercent
 			// 
+			this.labelFixWhenPercent.AccessibleDescription = null;
+			this.labelFixWhenPercent.AccessibleName = null;
 			resources.ApplyResources(this.labelFixWhenPercent, "labelFixWhenPercent");
+			this.labelFixWhenPercent.Font = null;
 			this.labelFixWhenPercent.Name = "labelFixWhenPercent";
+			this.toolTip1.SetToolTip(this.labelFixWhenPercent, resources.GetString("labelFixWhenPercent.ToolTip"));
 			// 
 			// numFixWhenPercent
 			// 
+			this.numFixWhenPercent.AccessibleDescription = null;
+			this.numFixWhenPercent.AccessibleName = null;
+			resources.ApplyResources(this.numFixWhenPercent, "numFixWhenPercent");
+			this.numFixWhenPercent.Font = null;
 			this.numFixWhenPercent.Increment = new decimal(new int[] {
            5,
            0,
            0,
            0});
-			resources.ApplyResources(this.numFixWhenPercent, "numFixWhenPercent");
 			this.numFixWhenPercent.Minimum = new decimal(new int[] {
            1,
            0,
            0,
            0});
 			this.numFixWhenPercent.Name = "numFixWhenPercent";
+			this.toolTip1.SetToolTip(this.numFixWhenPercent, resources.GetString("numFixWhenPercent.ToolTip"));
 			this.numFixWhenPercent.Value = new decimal(new int[] {
            51,
            0,
@@ -477,7 +666,11 @@ namespace JDP {
 			// 
 			// chkFilenamesANSISafe
 			// 
+			this.chkFilenamesANSISafe.AccessibleDescription = null;
+			this.chkFilenamesANSISafe.AccessibleName = null;
 			resources.ApplyResources(this.chkFilenamesANSISafe, "chkFilenamesANSISafe");
+			this.chkFilenamesANSISafe.BackgroundImage = null;
+			this.chkFilenamesANSISafe.Font = null;
 			this.chkFilenamesANSISafe.Name = "chkFilenamesANSISafe";
 			this.toolTip1.SetToolTip(this.chkFilenamesANSISafe, resources.GetString("chkFilenamesANSISafe.ToolTip"));
 			this.chkFilenamesANSISafe.UseVisualStyleBackColor = true;
@@ -485,29 +678,45 @@ namespace JDP {
 			// 
 			// chkWriteARTagsOnVerify
 			// 
+			this.chkWriteARTagsOnVerify.AccessibleDescription = null;
+			this.chkWriteARTagsOnVerify.AccessibleName = null;
 			resources.ApplyResources(this.chkWriteARTagsOnVerify, "chkWriteARTagsOnVerify");
+			this.chkWriteARTagsOnVerify.BackgroundImage = null;
 			this.chkWriteARTagsOnVerify.Checked = true;
 			this.chkWriteARTagsOnVerify.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkWriteARTagsOnVerify.Font = null;
 			this.chkWriteARTagsOnVerify.Name = "chkWriteARTagsOnVerify";
 			this.toolTip1.SetToolTip(this.chkWriteARTagsOnVerify, resources.GetString("chkWriteARTagsOnVerify.ToolTip"));
 			this.chkWriteARTagsOnVerify.UseVisualStyleBackColor = true;
 			// 
 			// chkHDCDDecode
 			// 
+			this.chkHDCDDecode.AccessibleDescription = null;
+			this.chkHDCDDecode.AccessibleName = null;
 			resources.ApplyResources(this.chkHDCDDecode, "chkHDCDDecode");
+			this.chkHDCDDecode.BackgroundImage = null;
+			this.chkHDCDDecode.Font = null;
 			this.chkHDCDDecode.Name = "chkHDCDDecode";
 			this.toolTip1.SetToolTip(this.chkHDCDDecode, resources.GetString("chkHDCDDecode.ToolTip"));
 			this.chkHDCDDecode.UseVisualStyleBackColor = true;
 			// 
 			// chkHDCDStopLooking
 			// 
+			this.chkHDCDStopLooking.AccessibleDescription = null;
+			this.chkHDCDStopLooking.AccessibleName = null;
 			resources.ApplyResources(this.chkHDCDStopLooking, "chkHDCDStopLooking");
+			this.chkHDCDStopLooking.BackgroundImage = null;
+			this.chkHDCDStopLooking.Font = null;
 			this.chkHDCDStopLooking.Name = "chkHDCDStopLooking";
 			this.toolTip1.SetToolTip(this.chkHDCDStopLooking, resources.GetString("chkHDCDStopLooking.ToolTip"));
 			this.chkHDCDStopLooking.UseVisualStyleBackColor = true;
 			// 
 			// grpAudioFilenames
 			// 
+			this.grpAudioFilenames.AccessibleDescription = null;
+			this.grpAudioFilenames.AccessibleName = null;
+			resources.ApplyResources(this.grpAudioFilenames, "grpAudioFilenames");
+			this.grpAudioFilenames.BackgroundImage = null;
 			this.grpAudioFilenames.Controls.Add(this.chkFilenamesANSISafe);
 			this.grpAudioFilenames.Controls.Add(this.chkKeepOriginalFilenames);
 			this.grpAudioFilenames.Controls.Add(this.txtSpecialExceptions);
@@ -517,204 +726,359 @@ namespace JDP {
 			this.grpAudioFilenames.Controls.Add(this.lblTrackFilenameFormat);
 			this.grpAudioFilenames.Controls.Add(this.lblSingleFilenameFormat);
 			this.grpAudioFilenames.Controls.Add(this.txtSingleFilenameFormat);
-			resources.ApplyResources(this.grpAudioFilenames, "grpAudioFilenames");
+			this.grpAudioFilenames.Font = null;
 			this.grpAudioFilenames.Name = "grpAudioFilenames";
 			this.grpAudioFilenames.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpAudioFilenames, resources.GetString("grpAudioFilenames.ToolTip"));
 			// 
 			// chkKeepOriginalFilenames
 			// 
+			this.chkKeepOriginalFilenames.AccessibleDescription = null;
+			this.chkKeepOriginalFilenames.AccessibleName = null;
 			resources.ApplyResources(this.chkKeepOriginalFilenames, "chkKeepOriginalFilenames");
+			this.chkKeepOriginalFilenames.BackgroundImage = null;
 			this.chkKeepOriginalFilenames.Checked = true;
 			this.chkKeepOriginalFilenames.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkKeepOriginalFilenames.Font = null;
 			this.chkKeepOriginalFilenames.Name = "chkKeepOriginalFilenames";
+			this.toolTip1.SetToolTip(this.chkKeepOriginalFilenames, resources.GetString("chkKeepOriginalFilenames.ToolTip"));
 			this.chkKeepOriginalFilenames.UseVisualStyleBackColor = true;
 			// 
 			// txtSpecialExceptions
 			// 
+			this.txtSpecialExceptions.AccessibleDescription = null;
+			this.txtSpecialExceptions.AccessibleName = null;
 			resources.ApplyResources(this.txtSpecialExceptions, "txtSpecialExceptions");
+			this.txtSpecialExceptions.BackgroundImage = null;
+			this.txtSpecialExceptions.Font = null;
 			this.txtSpecialExceptions.Name = "txtSpecialExceptions";
+			this.toolTip1.SetToolTip(this.txtSpecialExceptions, resources.GetString("txtSpecialExceptions.ToolTip"));
 			// 
 			// chkRemoveSpecial
 			// 
+			this.chkRemoveSpecial.AccessibleDescription = null;
+			this.chkRemoveSpecial.AccessibleName = null;
 			resources.ApplyResources(this.chkRemoveSpecial, "chkRemoveSpecial");
+			this.chkRemoveSpecial.BackgroundImage = null;
 			this.chkRemoveSpecial.Checked = true;
 			this.chkRemoveSpecial.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkRemoveSpecial.Font = null;
 			this.chkRemoveSpecial.Name = "chkRemoveSpecial";
+			this.toolTip1.SetToolTip(this.chkRemoveSpecial, resources.GetString("chkRemoveSpecial.ToolTip"));
 			this.chkRemoveSpecial.UseVisualStyleBackColor = true;
 			this.chkRemoveSpecial.CheckedChanged += new System.EventHandler(this.chkRemoveSpecial_CheckedChanged);
 			// 
 			// chkReplaceSpaces
 			// 
+			this.chkReplaceSpaces.AccessibleDescription = null;
+			this.chkReplaceSpaces.AccessibleName = null;
 			resources.ApplyResources(this.chkReplaceSpaces, "chkReplaceSpaces");
+			this.chkReplaceSpaces.BackgroundImage = null;
 			this.chkReplaceSpaces.Checked = true;
 			this.chkReplaceSpaces.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkReplaceSpaces.Font = null;
 			this.chkReplaceSpaces.Name = "chkReplaceSpaces";
+			this.toolTip1.SetToolTip(this.chkReplaceSpaces, resources.GetString("chkReplaceSpaces.ToolTip"));
 			this.chkReplaceSpaces.UseVisualStyleBackColor = true;
 			// 
 			// txtTrackFilenameFormat
 			// 
+			this.txtTrackFilenameFormat.AccessibleDescription = null;
+			this.txtTrackFilenameFormat.AccessibleName = null;
 			resources.ApplyResources(this.txtTrackFilenameFormat, "txtTrackFilenameFormat");
+			this.txtTrackFilenameFormat.BackgroundImage = null;
+			this.txtTrackFilenameFormat.Font = null;
 			this.txtTrackFilenameFormat.Name = "txtTrackFilenameFormat";
+			this.toolTip1.SetToolTip(this.txtTrackFilenameFormat, resources.GetString("txtTrackFilenameFormat.ToolTip"));
 			// 
 			// lblTrackFilenameFormat
 			// 
+			this.lblTrackFilenameFormat.AccessibleDescription = null;
+			this.lblTrackFilenameFormat.AccessibleName = null;
 			resources.ApplyResources(this.lblTrackFilenameFormat, "lblTrackFilenameFormat");
+			this.lblTrackFilenameFormat.Font = null;
 			this.lblTrackFilenameFormat.Name = "lblTrackFilenameFormat";
+			this.toolTip1.SetToolTip(this.lblTrackFilenameFormat, resources.GetString("lblTrackFilenameFormat.ToolTip"));
 			// 
 			// lblSingleFilenameFormat
 			// 
+			this.lblSingleFilenameFormat.AccessibleDescription = null;
+			this.lblSingleFilenameFormat.AccessibleName = null;
 			resources.ApplyResources(this.lblSingleFilenameFormat, "lblSingleFilenameFormat");
+			this.lblSingleFilenameFormat.Font = null;
 			this.lblSingleFilenameFormat.Name = "lblSingleFilenameFormat";
+			this.toolTip1.SetToolTip(this.lblSingleFilenameFormat, resources.GetString("lblSingleFilenameFormat.ToolTip"));
 			// 
 			// txtSingleFilenameFormat
 			// 
+			this.txtSingleFilenameFormat.AccessibleDescription = null;
+			this.txtSingleFilenameFormat.AccessibleName = null;
 			resources.ApplyResources(this.txtSingleFilenameFormat, "txtSingleFilenameFormat");
+			this.txtSingleFilenameFormat.BackgroundImage = null;
+			this.txtSingleFilenameFormat.Font = null;
 			this.txtSingleFilenameFormat.Name = "txtSingleFilenameFormat";
+			this.toolTip1.SetToolTip(this.txtSingleFilenameFormat, resources.GetString("txtSingleFilenameFormat.ToolTip"));
 			// 
 			// groupBox2
 			// 
+			this.groupBox2.AccessibleDescription = null;
+			this.groupBox2.AccessibleName = null;
+			resources.ApplyResources(this.groupBox2, "groupBox2");
+			this.groupBox2.BackgroundImage = null;
 			this.groupBox2.Controls.Add(this.rbAPEinsane);
 			this.groupBox2.Controls.Add(this.rbAPEextrahigh);
 			this.groupBox2.Controls.Add(this.rbAPEhigh);
 			this.groupBox2.Controls.Add(this.rbAPEnormal);
 			this.groupBox2.Controls.Add(this.rbAPEfast);
-			resources.ApplyResources(this.groupBox2, "groupBox2");
+			this.groupBox2.Font = null;
 			this.groupBox2.Name = "groupBox2";
 			this.groupBox2.TabStop = false;
+			this.toolTip1.SetToolTip(this.groupBox2, resources.GetString("groupBox2.ToolTip"));
 			// 
 			// rbAPEinsane
 			// 
+			this.rbAPEinsane.AccessibleDescription = null;
+			this.rbAPEinsane.AccessibleName = null;
 			resources.ApplyResources(this.rbAPEinsane, "rbAPEinsane");
+			this.rbAPEinsane.BackgroundImage = null;
+			this.rbAPEinsane.Font = null;
 			this.rbAPEinsane.Name = "rbAPEinsane";
 			this.rbAPEinsane.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbAPEinsane, resources.GetString("rbAPEinsane.ToolTip"));
 			this.rbAPEinsane.UseVisualStyleBackColor = true;
 			// 
 			// rbAPEextrahigh
 			// 
+			this.rbAPEextrahigh.AccessibleDescription = null;
+			this.rbAPEextrahigh.AccessibleName = null;
 			resources.ApplyResources(this.rbAPEextrahigh, "rbAPEextrahigh");
+			this.rbAPEextrahigh.BackgroundImage = null;
+			this.rbAPEextrahigh.Font = null;
 			this.rbAPEextrahigh.Name = "rbAPEextrahigh";
 			this.rbAPEextrahigh.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbAPEextrahigh, resources.GetString("rbAPEextrahigh.ToolTip"));
 			this.rbAPEextrahigh.UseVisualStyleBackColor = true;
 			// 
 			// rbAPEhigh
 			// 
+			this.rbAPEhigh.AccessibleDescription = null;
+			this.rbAPEhigh.AccessibleName = null;
 			resources.ApplyResources(this.rbAPEhigh, "rbAPEhigh");
+			this.rbAPEhigh.BackgroundImage = null;
+			this.rbAPEhigh.Font = null;
 			this.rbAPEhigh.Name = "rbAPEhigh";
 			this.rbAPEhigh.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbAPEhigh, resources.GetString("rbAPEhigh.ToolTip"));
 			this.rbAPEhigh.UseVisualStyleBackColor = true;
 			// 
 			// rbAPEnormal
 			// 
+			this.rbAPEnormal.AccessibleDescription = null;
+			this.rbAPEnormal.AccessibleName = null;
 			resources.ApplyResources(this.rbAPEnormal, "rbAPEnormal");
+			this.rbAPEnormal.BackgroundImage = null;
+			this.rbAPEnormal.Font = null;
 			this.rbAPEnormal.Name = "rbAPEnormal";
 			this.rbAPEnormal.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbAPEnormal, resources.GetString("rbAPEnormal.ToolTip"));
 			this.rbAPEnormal.UseVisualStyleBackColor = true;
 			// 
 			// rbAPEfast
 			// 
+			this.rbAPEfast.AccessibleDescription = null;
+			this.rbAPEfast.AccessibleName = null;
 			resources.ApplyResources(this.rbAPEfast, "rbAPEfast");
+			this.rbAPEfast.BackgroundImage = null;
+			this.rbAPEfast.Font = null;
 			this.rbAPEfast.Name = "rbAPEfast";
 			this.rbAPEfast.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbAPEfast, resources.GetString("rbAPEfast.ToolTip"));
 			this.rbAPEfast.UseVisualStyleBackColor = true;
 			// 
 			// tabControl1
 			// 
+			this.tabControl1.AccessibleDescription = null;
+			this.tabControl1.AccessibleName = null;
 			resources.ApplyResources(this.tabControl1, "tabControl1");
+			this.tabControl1.BackgroundImage = null;
 			this.tabControl1.Controls.Add(this.tabPage1);
 			this.tabControl1.Controls.Add(this.tabPage2);
 			this.tabControl1.Controls.Add(this.tabPage3);
 			this.tabControl1.Controls.Add(this.tabPage4);
+			this.tabControl1.Font = null;
 			this.tabControl1.HotTrack = true;
 			this.tabControl1.Multiline = true;
 			this.tabControl1.Name = "tabControl1";
 			this.tabControl1.SelectedIndex = 0;
+			this.toolTip1.SetToolTip(this.tabControl1, resources.GetString("tabControl1.ToolTip"));
 			// 
 			// tabPage1
 			// 
+			this.tabPage1.AccessibleDescription = null;
+			this.tabPage1.AccessibleName = null;
+			resources.ApplyResources(this.tabPage1, "tabPage1");
 			this.tabPage1.BackColor = System.Drawing.Color.Transparent;
+			this.tabPage1.BackgroundImage = null;
 			this.tabPage1.Controls.Add(this.grpGeneral);
 			this.tabPage1.Controls.Add(this.grpAudioFilenames);
-			resources.ApplyResources(this.tabPage1, "tabPage1");
+			this.tabPage1.Font = null;
 			this.tabPage1.Name = "tabPage1";
+			this.toolTip1.SetToolTip(this.tabPage1, resources.GetString("tabPage1.ToolTip"));
 			// 
 			// tabPage2
 			// 
+			this.tabPage2.AccessibleDescription = null;
+			this.tabPage2.AccessibleName = null;
+			resources.ApplyResources(this.tabPage2, "tabPage2");
 			this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
+			this.tabPage2.BackgroundImage = null;
 			this.tabPage2.Controls.Add(this.groupBox3);
 			this.tabPage2.Controls.Add(this.groupBox1);
-			resources.ApplyResources(this.tabPage2, "tabPage2");
+			this.tabPage2.Font = null;
 			this.tabPage2.Name = "tabPage2";
+			this.toolTip1.SetToolTip(this.tabPage2, resources.GetString("tabPage2.ToolTip"));
 			// 
 			// groupBox3
 			// 
+			this.groupBox3.AccessibleDescription = null;
+			this.groupBox3.AccessibleName = null;
+			resources.ApplyResources(this.groupBox3, "groupBox3");
+			this.groupBox3.BackgroundImage = null;
 			this.groupBox3.Controls.Add(this.chkWriteARLogOnVerify);
 			this.groupBox3.Controls.Add(this.chkWriteARTagsOnVerify);
-			resources.ApplyResources(this.groupBox3, "groupBox3");
+			this.groupBox3.Font = null;
 			this.groupBox3.Name = "groupBox3";
 			this.groupBox3.TabStop = false;
+			this.toolTip1.SetToolTip(this.groupBox3, resources.GetString("groupBox3.ToolTip"));
 			// 
 			// chkWriteARLogOnVerify
 			// 
+			this.chkWriteARLogOnVerify.AccessibleDescription = null;
+			this.chkWriteARLogOnVerify.AccessibleName = null;
 			resources.ApplyResources(this.chkWriteARLogOnVerify, "chkWriteARLogOnVerify");
+			this.chkWriteARLogOnVerify.BackgroundImage = null;
 			this.chkWriteARLogOnVerify.Checked = true;
 			this.chkWriteARLogOnVerify.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkWriteARLogOnVerify.Font = null;
 			this.chkWriteARLogOnVerify.Name = "chkWriteARLogOnVerify";
+			this.toolTip1.SetToolTip(this.chkWriteARLogOnVerify, resources.GetString("chkWriteARLogOnVerify.ToolTip"));
 			this.chkWriteARLogOnVerify.UseVisualStyleBackColor = true;
 			// 
 			// tabPage3
 			// 
+			this.tabPage3.AccessibleDescription = null;
+			this.tabPage3.AccessibleName = null;
+			resources.ApplyResources(this.tabPage3, "tabPage3");
 			this.tabPage3.BackColor = System.Drawing.SystemColors.Control;
+			this.tabPage3.BackgroundImage = null;
+			this.tabPage3.Controls.Add(this.groupBox4);
 			this.tabPage3.Controls.Add(this.grpWavPack);
 			this.tabPage3.Controls.Add(this.groupBox2);
 			this.tabPage3.Controls.Add(this.grpFLAC);
-			resources.ApplyResources(this.tabPage3, "tabPage3");
+			this.tabPage3.Font = null;
 			this.tabPage3.Name = "tabPage3";
+			this.toolTip1.SetToolTip(this.tabPage3, resources.GetString("tabPage3.ToolTip"));
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.AccessibleDescription = null;
+			this.groupBox4.AccessibleName = null;
+			resources.ApplyResources(this.groupBox4, "groupBox4");
+			this.groupBox4.BackgroundImage = null;
+			this.groupBox4.Controls.Add(this.numericLossyWAVQuality);
+			this.groupBox4.Controls.Add(this.label1);
+			this.groupBox4.Font = null;
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.TabStop = false;
+			this.toolTip1.SetToolTip(this.groupBox4, resources.GetString("groupBox4.ToolTip"));
+			// 
+			// numericLossyWAVQuality
+			// 
+			this.numericLossyWAVQuality.AccessibleDescription = null;
+			this.numericLossyWAVQuality.AccessibleName = null;
+			resources.ApplyResources(this.numericLossyWAVQuality, "numericLossyWAVQuality");
+			this.numericLossyWAVQuality.Font = null;
+			this.numericLossyWAVQuality.Maximum = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+			this.numericLossyWAVQuality.Name = "numericLossyWAVQuality";
+			this.toolTip1.SetToolTip(this.numericLossyWAVQuality, resources.GetString("numericLossyWAVQuality.ToolTip"));
+			this.numericLossyWAVQuality.Value = new decimal(new int[] {
+            5,
+            0,
+            0,
+            0});
+			// 
+			// label1
+			// 
+			this.label1.AccessibleDescription = null;
+			this.label1.AccessibleName = null;
+			resources.ApplyResources(this.label1, "label1");
+			this.label1.Font = null;
+			this.label1.Name = "label1";
+			this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip"));
 			// 
 			// tabPage4
 			// 
+			this.tabPage4.AccessibleDescription = null;
+			this.tabPage4.AccessibleName = null;
+			resources.ApplyResources(this.tabPage4, "tabPage4");
 			this.tabPage4.BackColor = System.Drawing.SystemColors.Control;
+			this.tabPage4.BackgroundImage = null;
 			this.tabPage4.Controls.Add(this.grpHDCD);
 			this.tabPage4.Controls.Add(this.chkHDCDDetect);
-			resources.ApplyResources(this.tabPage4, "tabPage4");
+			this.tabPage4.Font = null;
 			this.tabPage4.Name = "tabPage4";
+			this.toolTip1.SetToolTip(this.tabPage4, resources.GetString("tabPage4.ToolTip"));
 			// 
 			// grpHDCD
 			// 
+			this.grpHDCD.AccessibleDescription = null;
+			this.grpHDCD.AccessibleName = null;
+			resources.ApplyResources(this.grpHDCD, "grpHDCD");
+			this.grpHDCD.BackgroundImage = null;
 			this.grpHDCD.Controls.Add(this.chkHDCDStopLooking);
 			this.grpHDCD.Controls.Add(this.chkHDCDDecode);
-			resources.ApplyResources(this.grpHDCD, "grpHDCD");
+			this.grpHDCD.Font = null;
 			this.grpHDCD.Name = "grpHDCD";
 			this.grpHDCD.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpHDCD, resources.GetString("grpHDCD.ToolTip"));
 			// 
 			// chkHDCDDetect
 			// 
+			this.chkHDCDDetect.AccessibleDescription = null;
+			this.chkHDCDDetect.AccessibleName = null;
 			resources.ApplyResources(this.chkHDCDDetect, "chkHDCDDetect");
+			this.chkHDCDDetect.BackgroundImage = null;
+			this.chkHDCDDetect.Font = null;
 			this.chkHDCDDetect.Name = "chkHDCDDetect";
+			this.toolTip1.SetToolTip(this.chkHDCDDetect, resources.GetString("chkHDCDDetect.ToolTip"));
 			this.chkHDCDDetect.UseVisualStyleBackColor = true;
 			this.chkHDCDDetect.CheckedChanged += new System.EventHandler(this.chkHDCDDetect_CheckedChanged);
 			// 
-			// chkReducePriority
-			// 
-			resources.ApplyResources(this.chkReducePriority, "chkReducePriority");
-			this.chkReducePriority.Name = "chkReducePriority";
-			this.chkReducePriority.UseVisualStyleBackColor = true;
-			// 
 			// frmSettings
 			// 
 			this.AcceptButton = this.btnOK;
+			this.AccessibleDescription = null;
+			this.AccessibleName = null;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BackgroundImage = null;
 			this.CancelButton = btnCancel;
 			this.ControlBox = false;
 			this.Controls.Add(this.tabControl1);
 			this.Controls.Add(btnCancel);
 			this.Controls.Add(this.btnOK);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.Icon = null;
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
 			this.Name = "frmSettings";
 			this.ShowIcon = false;
 			this.ShowInTaskbar = false;
+			this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip"));
 			this.Load += new System.EventHandler(this.frmSettings_Load);
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmSettings_FormClosing);
 			this.grpGeneral.ResumeLayout(false);
@@ -742,6 +1106,9 @@ namespace JDP {
 			this.groupBox3.ResumeLayout(false);
 			this.groupBox3.PerformLayout();
 			this.tabPage3.ResumeLayout(false);
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).EndInit();
 			this.tabPage4.ResumeLayout(false);
 			this.tabPage4.PerformLayout();
 			this.grpHDCD.ResumeLayout(false);
@@ -819,6 +1186,9 @@ namespace JDP {
 		private System.Windows.Forms.CheckBox chkCreateCUEFileWhenEmbedded;
 		private System.Windows.Forms.CheckBox chkTruncateExtra4206Samples;
 		private System.Windows.Forms.CheckBox chkReducePriority;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private System.Windows.Forms.NumericUpDown numericLossyWAVQuality;
+		private System.Windows.Forms.Label label1;

 	}
 }
--- a/CUETools/frmSettings.cs
+++ b/CUETools/frmSettings.cs
@@ -65,6 +65,7 @@ namespace JDP {
 			chkCreateM3U.Checked = _config.createM3U;
 			chkCreateCUEFileWhenEmbedded.Checked = _config.createCUEFileWhenEmbedded;
 			chkTruncateExtra4206Samples.Checked = _config.truncate4608ExtraSamples;
+			numericLossyWAVQuality.Value = _config.lossyWAVQuality;
 		}

 		private void frmSettings_FormClosing(object sender, FormClosingEventArgs e) {
@@ -97,6 +98,7 @@ namespace JDP {
 			_config.preserveHTOA = chkPreserveHTOA.Checked;
 			_config.autoCorrectFilenames = chkAutoCorrectFilenames.Checked;
 			_config.flacCompressionLevel = (uint)numericFLACCompressionLevel.Value;
+			_config.lossyWAVQuality = (int)numericLossyWAVQuality.Value;
 			_config.fixWhenPercent = (uint)numFixWhenPercent.Value;
 			_config.fixWhenConfidence = (uint)numFixWhenConfidence.Value;
 			_config.encodeWhenPercent = (uint)numEncodeWhenPercent.Value;
--- a/CUETools/frmSettings.resx
+++ b/CUETools/frmSettings.resx
--- a/CUETools/frmSettings.ru-RU.resx
+++ b/CUETools/frmSettings.ru-RU.resx
@@ -124,12 +124,24 @@
    <value />
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="chkReducePriority.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 17</value>
+  </data>
+  <data name="chkReducePriority.Text" xml:space="preserve">
+    <value>Понизить приоритет процесса</value>
+  </data>
+  <data name="chkReducePriority.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkTruncateExtra4206Samples.Size" type="System.Drawing.Size, System.Drawing">
    <value>202, 17</value>
  </data>
  <data name="chkTruncateExtra4206Samples.Text" xml:space="preserve">
    <value>Выкидывать лишние 4206 сэмплов</value>
  </data>
+  <data name="chkTruncateExtra4206Samples.ToolTip" xml:space="preserve">
+    <value>Некоторые FLAC-кодировщики добавляют лишние 4206 пустых сэмплов в конце файла. Эту ситуацию можно легко обнаружить и исправить.</value>
+  </data>
  <data name="chkCreateCUEFileWhenEmbedded.Size" type="System.Drawing.Size, System.Drawing">
    <value>224, 17</value>
  </data>
@@ -203,13 +215,13 @@
    <value />
  </data>
  <data name="numericFLACCompressionLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>147, 88</value>
+    <value>113, 44</value>
  </data>
  <data name="numericFLACCompressionLevel.ToolTip" xml:space="preserve">
    <value />
  </data>
  <data name="lblFLACCompressionLevel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 90</value>
+    <value>9, 46</value>
  </data>
  <data name="lblFLACCompressionLevel.Size" type="System.Drawing.Size, System.Drawing">
    <value>94, 13</value>
@@ -588,6 +600,21 @@
  <data name="tabPage2.ToolTip" xml:space="preserve">
    <value />
  </data>
+  <data name="numericLossyWAVQuality.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 13</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Качество:</value>
+  </data>
+  <data name="label1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="groupBox4.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="tabPage3.Text" xml:space="preserve">
    <value>Форматы</value>
  </data>
--- a/CUEToolsLib/AudioReadWrite.cs
+++ b/CUEToolsLib/AudioReadWrite.cs
@@ -4,15 +4,16 @@ using FLACDotNet;
 using WavPackDotNet;
 using APEDotNet;
 using ALACDotNet;
+using LossyWAVDotNet;
 using AudioCodecsDotNet;
 using System.Collections.Generic;
 using System.Collections.Specialized;

 namespace CUEToolsLib {
 	public static class AudioReadWrite {
-		public static IAudioSource GetAudioSource(string path, Stream IO)
+		public static IAudioSource GetAudioSource(string path, Stream IO, string extension)
 		{
-			switch (Path.GetExtension(path).ToLower())
+			switch (extension)
 			{
 				case ".wav":
 					return new WAVReader(path, IO);
@@ -31,20 +32,46 @@ namespace CUEToolsLib {
 			}
 		}

-		public static IAudioDest GetAudioDest(string path, int bitsPerSample, int channelCount, int sampleRate, long finalSampleCount) {
+		public static IAudioSource GetAudioSource(string path, Stream IO)
+		{
+			string extension = Path.GetExtension(path).ToLower();
+			string filename = Path.GetFileNameWithoutExtension(path);
+			string secondExtension = Path.GetExtension(filename).ToLower();
+			if (secondExtension != ".lossy" && secondExtension != ".lwcdf")
+				return GetAudioSource(path, IO, extension);
+
+			string lossyPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lossy" + extension);
+			string lwcdfPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lwcdf" + extension);
+			IAudioSource lossySource = GetAudioSource(lossyPath, null, extension);
+			IAudioSource lwcdfSource = GetAudioSource(lwcdfPath, null, extension);
+			return new LossyWAVReader(lossySource, lwcdfSource);
+		}
+
+		public static IAudioDest GetAudioDest(string path, int bitsPerSample, int channelCount, int sampleRate, long finalSampleCount, string extension, CUEConfig config) {
 			IAudioDest dest;
-			switch (Path.GetExtension(path).ToLower()) {
+			switch (extension) {
 				case ".wav":
-					dest = new WAVWriter(path, bitsPerSample, channelCount, sampleRate); break;
+					dest = new WAVWriter(path, bitsPerSample, channelCount, sampleRate); 
+					break;
 #if !MONO
 				case ".flac":
-					dest = new FLACWriter(path, bitsPerSample, channelCount, sampleRate); break;
+					dest = new FLACWriter(path, bitsPerSample, channelCount, sampleRate);
+					((FLACWriter)dest).CompressionLevel = (int)config.flacCompressionLevel;
+					((FLACWriter)dest).Verify = config.flacVerify;
+					break;
 				case ".wv":
-					dest = new WavPackWriter(path, bitsPerSample, channelCount, sampleRate); break;
+					dest = new WavPackWriter(path, bitsPerSample, channelCount, sampleRate);
+					((WavPackWriter)dest).CompressionMode = config.wvCompressionMode;
+					((WavPackWriter)dest).ExtraMode = config.wvExtraMode;
+					((WavPackWriter)dest).MD5Sum = config.wvStoreMD5;
+					break;
 				case ".ape":
-					dest = new APEWriter(path, bitsPerSample, channelCount, sampleRate); break;
+					dest = new APEWriter(path, bitsPerSample, channelCount, sampleRate);
+					((APEWriter)dest).CompressionLevel = (int)config.apeCompressionLevel;
+					break;
 				case ".dummy":
-					dest = new DummyWriter(path, bitsPerSample, channelCount, sampleRate); break;
+					dest = new DummyWriter(path, bitsPerSample, channelCount, sampleRate); 
+					break;
 #endif
 				default:
 					throw new Exception("Unsupported audio type.");
@@ -52,5 +79,18 @@ namespace CUEToolsLib {
 			dest.FinalSampleCount = finalSampleCount;
 			return dest;
 		}
+
+		public static IAudioDest GetAudioDest(string path, int bitsPerSample, int channelCount, int sampleRate, long finalSampleCount, CUEConfig config)
+		{
+			string extension = Path.GetExtension(path).ToLower();
+			string filename = Path.GetFileNameWithoutExtension(path);
+			if (Path.GetExtension(filename).ToLower() != ".lossy")
+				return GetAudioDest(path, bitsPerSample, channelCount, sampleRate, finalSampleCount, extension, config);
+
+			string lwcdfPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lwcdf" + extension);
+			IAudioDest lossyDest = GetAudioDest(path, bitsPerSample, channelCount, sampleRate, finalSampleCount, extension, config);
+			IAudioDest lwcdfDest = GetAudioDest(lwcdfPath, bitsPerSample, channelCount, sampleRate, finalSampleCount, extension, config);
+			return new LossyWAVWriter(lossyDest, lwcdfDest, bitsPerSample, channelCount, sampleRate, config.lossyWAVQuality);
+		}
 	}
 }
--- a/CUEToolsLib/CUEToolsLib.csproj
+++ b/CUEToolsLib/CUEToolsLib.csproj
@@ -109,6 +109,10 @@
      <Project>{32338A04-5B6B-4C63-8EE7-C6400F73B5D7}</Project>
      <Name>HDCDDotNet</Name>
    </ProjectReference>
+    <ProjectReference Include="..\LossyWAVDotNet\LossyWAVDotNet.csproj">
+      <Project>{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}</Project>
+      <Name>LossyWAVDotNet</Name>
+    </ProjectReference>
    <ProjectReference Include="..\UnRarDotNet\UnRarDotNet.csproj">
      <Project>{8427CAA5-80B8-4952-9A68-5F3DFCFBDF40}</Project>
      <Name>UnRarDotNet</Name>
--- a/CUEToolsLib/Main.cs
+++ b/CUEToolsLib/Main.cs
@@ -31,6 +31,7 @@ using System.Threading;
 using System.Xml;
 using AudioCodecsDotNet;
 using HDCDDotNet;
+using LossyWAVDotNet;
 #if !MONO
 using UnRarDotNet;
 using FLACDotNet;
@@ -241,6 +242,7 @@ namespace CUEToolsLib
 		public bool createTOC;
 		public bool createCUEFileWhenEmbedded;
 		public bool truncate4608ExtraSamples;
+		public int lossyWAVQuality;

 		public CUEConfig()
 		{
@@ -281,6 +283,7 @@ namespace CUEToolsLib
 			createTOC = false;
 			createCUEFileWhenEmbedded = false;
 			truncate4608ExtraSamples = true;
+			lossyWAVQuality = 5;
 		}

 		public void Save (SettingsWriter sw)
@@ -322,6 +325,7 @@ namespace CUEToolsLib
 			sw.Save("CreateTOC", createTOC);
 			sw.Save("CreateCUEFileWhenEmbedded", createCUEFileWhenEmbedded);
 			sw.Save("Truncate4608ExtraSamples", truncate4608ExtraSamples);
+			sw.Save("LossyWAVQuality", lossyWAVQuality);
 		}

 		public void Load(SettingsReader sr)
@@ -363,6 +367,7 @@ namespace CUEToolsLib
 			createTOC = sr.LoadBoolean("CreateTOC") ?? false;
 			createCUEFileWhenEmbedded = sr.LoadBoolean("CreateCUEFileWhenEmbedded") ?? false;
 			truncate4608ExtraSamples = sr.LoadBoolean("Truncate4608ExtraSamples") ?? true;
+			lossyWAVQuality = sr.LoadInt32("LossyWAVQuality", 0, 10) ?? 5;
 		}

 		public string CleanseString (string s)
@@ -982,7 +987,7 @@ namespace CUEToolsLib
 			return null;
 		}

-		public void GenerateFilenames (OutputAudioFormat format, string outputPath)
+		public void GenerateFilenames (OutputAudioFormat format, string outputPath, bool lossyWAV)
 		{
 			_cuePath = outputPath;

@@ -1008,6 +1013,8 @@ namespace CUEToolsLib
 			replace.Add(null);
 			replace.Add(Path.GetFileNameWithoutExtension(outputPath));

+			if (lossyWAV)
+				extension = ".lossy" + extension;
 			if (_config.detectHDCD && hdcdDecoder != null && _config.decodeHDCD)
 				extension = ".24bit" + extension;

@@ -2534,28 +2541,7 @@ namespace CUEToolsLib
 			if (noOutput)
 				return new DummyWriter(path, bitsPerSample, 2, 44100);

-			IAudioDest dest = AudioReadWrite.GetAudioDest(path, bitsPerSample, 2, 44100, finalSampleCount);
-
-#if !MONO
-			if (dest is FLACWriter) {
-				FLACWriter w = (FLACWriter)dest;
-				w.CompressionLevel = (int) _config.flacCompressionLevel;
-				w.Verify = _config.flacVerify;
-			}
-			if (dest is WavPackWriter) {
-				WavPackWriter w = (WavPackWriter)dest;
-				w.CompressionMode = _config.wvCompressionMode;
-				w.ExtraMode = _config.wvExtraMode;
-				w.MD5Sum = _config.wvStoreMD5;
-			}
-			if (dest is APEWriter)
-			{
-				APEWriter w = (APEWriter)dest;
-				w.CompressionLevel = (int) _config.apeCompressionLevel;
-			}
-#endif
-
-			return dest;
+			return AudioReadWrite.GetAudioDest(path, bitsPerSample, 2, 44100, finalSampleCount, _config);
 		}

 		private IAudioSource GetAudioSource(int sourceIndex) {
--- a/FLACDotNet/flacdotnet.cpp
+++ b/FLACDotNet/flacdotnet.cpp
@@ -468,6 +468,7 @@ namespace FLACDotNet {
 			_compressionLevel = 5;
 			_paddingLength = 8192;
 			_verify = false;
+			_blockSize = 0;
 			_tags = gcnew NameValueCollection();

 			_encoder = FLAC__stream_encoder_new();
@@ -517,6 +518,14 @@ namespace FLACDotNet {
 			}
 		}

+		virtual property Int64 BlockSize
+		{
+			void set(Int64 value) 
+			{
+				_blockSize = value;
+			}
+		}
+
 		virtual bool SetTags (NameValueCollection^ tags) 
 		{
 			_tags = tags;
@@ -580,7 +589,7 @@ namespace FLACDotNet {
 		FLAC__StreamEncoder *_encoder;
 		bool _initialized;
 		String^ _path;
-		Int64 _finalSampleCount, _samplesWritten;
+		Int64 _finalSampleCount, _samplesWritten, _blockSize;
 		Int32 _bitsPerSample, _channelCount, _sampleRate;
 		Int32 _compressionLevel;
 		Int32 _paddingLength;
@@ -657,6 +666,9 @@ namespace FLACDotNet {

 			FLAC__stream_encoder_set_compression_level(_encoder, _compressionLevel);

+			if (_blockSize > 0)
+				FLAC__stream_encoder_set_blocksize(_encoder, (unsigned)_blockSize);
+
 			pathChars = Marshal::StringToHGlobalUni(_path);
 			hFile = _wfopen((const wchar_t*)pathChars.ToPointer(), L"w+b");
 			Marshal::FreeHGlobal(pathChars);
--- a/LossyWAVDotNet/LossyWAV.cs
+++ b/LossyWAVDotNet/LossyWAV.cs
@@ -29,15 +29,37 @@ using AudioCodecsDotNet;

 namespace LossyWAVDotNet
 {
-	public class LossyWAV : IAudioDest
+	public class LossyWAVWriter : IAudioDest
 	{
 		#region Public Methods

-		public bool SetTags(NameValueCollection tags)
+		public LossyWAVWriter(IAudioDest audioDest, IAudioDest lwcdfDest, int bitsPerSample, int channelCount, int sampleRate, double quality)
 		{
-			if (_audioDest != null) _audioDest.SetTags(tags);
-			if (_lwcdfDest != null) _lwcdfDest.SetTags(tags);
-			return true;
+			_audioDest = audioDest;
+			_lwcdfDest = lwcdfDest;
+			channels = channelCount;
+			samplerate = sampleRate;
+			bitspersample = bitsPerSample;
+
+			int quality_integer = (int)Math.Floor(quality);
+
+			fft_analysis_string = new string[4] { "0100010", "0110010", "0111010", "0111110" };
+			bool[] quality_auto_fft32_on = { false, false, false, true, true, true, true, true, true, true, true };
+			double[] quality_noise_threshold_shifts = { 20, 16, 9, 6, 3, 0, -2.4, -4.8, -7.2, -9.6, -12 };
+			double[] quality_signal_to_noise_ratio = { -18, -22, -23.5, -23.5, -23.5, -25, -28, -31, -34, -37, -40 };
+			double[] quality_dynamic_minimum_bits_to_keep = { 2.5, 2.75, 3.00, 3.25, 3.50, 3.75, 4.0, 4.25, 4.5, 4.75, 5.00 };
+			double[] quality_maximum_clips_per_channel = { 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0 };
+
+			this_analysis_number = 2;
+			impulse = quality_auto_fft32_on[quality_integer];
+			linkchannels = false;
+			noise_threshold_shift = Math.Round(interpolate_param(quality_noise_threshold_shifts, quality) * 1000) / 1000;
+			snr_value = Math.Round(interpolate_param(quality_signal_to_noise_ratio, quality) * 1000) / 1000;
+			dynamic_minimum_bits_to_keep = Math.Round(interpolate_param(quality_dynamic_minimum_bits_to_keep, quality) * 1000) / 1000;
+			maximum_clips_per_channel = (int)Math.Round(interpolate_param(quality_maximum_clips_per_channel, quality));
+			scaling_factor = 1.0;
+			shaping_factor = Math.Min(1, quality / 10);
+			shaping_is_on = shaping_factor > 0;
 		}

 		public void Close()
@@ -60,26 +82,6 @@ namespace LossyWAVDotNet
 			if (_lwcdfDest != null) _lwcdfDest.Close();
 		}

-		public void Delete()
-		{
-			if (_audioDest != null) _audioDest.Delete();
-			if (_lwcdfDest != null) _lwcdfDest.Delete();
-		}
-
-		public long FinalSampleCount
-		{
-			set
-			{
-				if (_audioDest != null) _audioDest.FinalSampleCount = value;
-				if (_lwcdfDest != null) _lwcdfDest.FinalSampleCount = value;
-			}
-		}
-
-		public long BlockSize
-		{
-			set { }
-		}
-
 		public void Write(int[,] buff, uint sampleCount)
 		{
 			if (!initialized)
@@ -107,35 +109,33 @@ namespace LossyWAVDotNet
 			}
 		}

+		public bool SetTags(NameValueCollection tags)
+		{
+			if (_audioDest != null) _audioDest.SetTags(tags);
+			if (_lwcdfDest != null) _lwcdfDest.SetTags(tags);
+			return true;
+		}
+
 		public string Path { get { return _audioDest.Path; } }

-		public LossyWAV(IAudioDest audioDest, IAudioDest lwcdfDest, int bitsPerSample, int channelCount, int sampleRate, double quality)
+		public void Delete()
 		{
-			_audioDest = audioDest;
-			_lwcdfDest = lwcdfDest;
-			channels = channelCount;
-			samplerate = sampleRate;
-			bitspersample = bitsPerSample;
+			if (_audioDest != null) _audioDest.Delete();
+			if (_lwcdfDest != null) _lwcdfDest.Delete();
+		}

-			int quality_integer = (int)Math.Floor(quality);
+		public long FinalSampleCount
+		{
+			set
+			{
+				if (_audioDest != null) _audioDest.FinalSampleCount = value;
+				if (_lwcdfDest != null) _lwcdfDest.FinalSampleCount = value;
+			}
+		}

-			fft_analysis_string = new string[4] { "0100010", "0110010", "0111010", "0111110" };
-			bool[] quality_auto_fft32_on = { false, false, false, true, true, true, true, true, true, true, true };
-			double[] quality_noise_threshold_shifts = { 20, 16, 9, 6, 3, 0, -2.4, -4.8, -7.2, -9.6, -12 };
-			double[] quality_signal_to_noise_ratio = { -18, -22, -23.5, -23.5, -23.5, -25, -28, -31, -34, -37, -40 };
-			double[] quality_dynamic_minimum_bits_to_keep = { 2.5, 2.75, 3.00, 3.25, 3.50, 3.75, 4.0, 4.25, 4.5, 4.75, 5.00 };
-			double[] quality_maximum_clips_per_channel = { 3, 3, 3, 3, 2, 1, 0, 0, 0, 0, 0 };
-
-			this_analysis_number = 2;
-			impulse = quality_auto_fft32_on[quality_integer];
-			linkchannels = false;
-			noise_threshold_shift = Math.Round(interpolate_param(quality_noise_threshold_shifts, quality) * 1000) / 1000;
-			snr_value = Math.Round(interpolate_param(quality_signal_to_noise_ratio, quality) * 1000) / 1000;
-			dynamic_minimum_bits_to_keep = Math.Round(interpolate_param(quality_dynamic_minimum_bits_to_keep, quality) * 1000) / 1000;
-			maximum_clips_per_channel = (int)Math.Round(interpolate_param(quality_maximum_clips_per_channel, quality));
-			scaling_factor = 1.0;
-			shaping_factor = Math.Min(1, quality / 10);
-			shaping_is_on = shaping_factor > 0;
+		public long BlockSize
+		{
+			set { }
 		}

 		public int Analysis
@@ -193,17 +193,6 @@ namespace LossyWAVDotNet
 				frequency_limit = value;
 			}
 		}
-
-		//public void Process()
-		//{
-		//    read_codec_next_block();
-		//    while (next_codec_block_size > 0)
-		//    {
-		//        shift_codec_blocks();
-		//        read_codec_next_block();
-		//        process_this_codec_block();
-		//    }
-		//}
 		#endregion

 		#region Private Methods
@@ -424,7 +413,7 @@ namespace LossyWAVDotNet
 			if (_audioDest != null && _audioDest is WAVWriter) ((WAVWriter)_audioDest).WriteChunk(fccFact, new ASCIIEncoding().GetBytes(factString));
 			if (_lwcdfDest != null && _lwcdfDest is WAVWriter) ((WAVWriter)_lwcdfDest).WriteChunk(fccFact, new ASCIIEncoding().GetBytes(factString));
 			_audioDest.BlockSize = codec_block_size;
-			_lwcdfDest.BlockSize = codec_block_size;
+			_lwcdfDest.BlockSize = codec_block_size * 2;
 		}

 		double fill_fft_input(int actual_analysis_block_start, int this_fft_length, int channel)
@@ -692,12 +681,6 @@ namespace LossyWAVDotNet
 			}
 		}

-		//void read_codec_next_block()
-		//{
-		//    uint size = Math.Min((uint)(_audioSource.Length - _audioSource.Position), codec_block_size);
-		//    next_codec_block_size = (int)_audioSource.Read(rotating_blocks_ptr[3], size);
-		//}
-
 		unsafe static void shuffle_in_place_dcomplex(double* fft_ptr, int* reversedbits_ptr, int bits)
 		{
 			for (int i = 0; i < 1 << bits; i++)
@@ -856,5 +839,121 @@ namespace LossyWAVDotNet
 		public short bits_lost;
 		public short clipped_samples;
 	}
+
+	public class LossyWAVReader : IAudioSource
+	{
+		public LossyWAVReader(IAudioSource audioSource, IAudioSource lwcdfSource)
+		{
+			_audioSource = audioSource;
+			_lwcdfSource = lwcdfSource;
+
+			if (_audioSource.Length != _lwcdfSource.Length)
+				throw new Exception("Data not same length");
+			if (_audioSource.BitsPerSample != _lwcdfSource.BitsPerSample
+				|| _audioSource.ChannelCount != _lwcdfSource.ChannelCount
+				|| _audioSource.SampleRate != _lwcdfSource.SampleRate)
+				throw new Exception("FMT Data mismatch");
+
+			scaling_factor = 1.0; // !!!! Need to read 'fact' chunks or tags here
+		}
+
+		public uint Read(int[,] buff, uint sampleCount)
+		{
+			if (sampleBuffer == null || sampleBuffer.Length < sampleCount)
+				sampleBuffer = new int[sampleCount, _audioSource.ChannelCount];
+			sampleCount = _audioSource.Read(buff, sampleCount);
+			if (sampleCount != _lwcdfSource.Read(sampleBuffer, sampleCount))
+				throw new Exception("size mismatch");
+			for (uint i = 0; i < sampleCount; i++)
+				for (int c = 0; c < _audioSource.ChannelCount; c++)
+					buff[i,c] = (int)Math.Round(buff[i, c] / scaling_factor + sampleBuffer[i, c]);
+			return sampleCount;
+		}
+
+		public ulong Length
+		{
+			get
+			{
+				return _audioSource.Length;
+			}
+		}
+
+		public ulong Position
+		{
+			get
+			{
+				return _audioSource.Position;
+			}
+			set
+			{
+				_audioSource.Position = value;
+				_lwcdfSource.Position = value;
+			}
+		}
+
+		public ulong Remaining
+		{
+			get
+			{
+				return _audioSource.Remaining;
+			}
+		}
+
+		public int BitsPerSample
+		{
+			get
+			{
+				return _audioSource.BitsPerSample;
+			}
+		}
+
+		public int ChannelCount
+		{
+			get
+			{
+				return _audioSource.ChannelCount;
+			}
+		}
+
+		public int SampleRate
+		{
+			get
+			{
+				return _audioSource.SampleRate;
+			}
+		}
+
+		public NameValueCollection Tags
+		{
+			get
+			{
+				return _audioSource.Tags;
+			}
+			set
+			{
+				_audioSource.Tags = value;
+			}
+		}
+
+		public string Path
+		{
+			get
+			{
+				return _audioSource.Path;
+			}
+		}
+
+
+		public void Close()
+		{
+			_audioSource.Close();
+			_lwcdfSource.Close();
+		}
+
+		IAudioSource _audioSource, _lwcdfSource;
+		double scaling_factor;
+		int[,] sampleBuffer;
+	}
+
 	#endregion
 }
--- a/WavPackDotNet/WavPackDotNet.cpp
+++ b/WavPackDotNet/WavPackDotNet.cpp
@@ -322,6 +322,7 @@ namespace WavPackDotNet {

 			_compressionMode = 1;
 			_extraMode = 0;
+			_blockSize = 0;

 			_bitsPerSample = bitsPerSample;
 			_channelCount = channelCount;
@@ -385,6 +386,14 @@ namespace WavPackDotNet {
 			}
 		}

+		virtual property Int64 BlockSize
+		{
+			void set(Int64 value) 
+			{
+				_blockSize = value;
+			}
+		}
+
 		virtual void Write(array<Int32, 2>^ sampleBuffer, UInt32 sampleCount) 
 		{
 			if (!_initialized) 
@@ -467,7 +476,7 @@ namespace WavPackDotNet {
 		WavpackContext *_wpc;
 		Int32 _finalSampleCount, _samplesWritten;
 		Int32 _bitsPerSample, _channelCount, _sampleRate, _blockAlign;
-		Int32 _compressionMode, _extraMode;
+		Int32 _compressionMode, _extraMode, _blockSize;
 		NameValueCollection^ _tags;
 		String^ _path;
 		bool _md5Sum;
@@ -500,6 +509,9 @@ namespace WavPackDotNet {
 				_md5hasher = gcnew MD5CryptoServiceProvider ();
 				config.flags |= CONFIG_MD5_CHECKSUM;
 			}
+			config.block_samples = (int)_blockSize;
+			if (_blockSize > 0 && _blockSize < 2048)
+				config.flags |= CONFIG_MERGE_BLOCKS;

 			if (!WavpackSetConfiguration(_wpc, &config, (_finalSampleCount == 0) ? -1 : _finalSampleCount)) {
 				throw gcnew Exception("Invalid configuration setting.");