Add lame options to ConvertToMp3

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -21,6 +21,7 @@ namespace AaxDecrypter
 		public event EventHandler<string> FileCreated;
 
 		public bool IsCanceled { get; set; }
+		public string TempFilePath { get; }
 
 		protected string OutputFileName { get; private set; }
 		protected DownloadOptions DownloadOptions { get; }
@@ -33,7 +34,6 @@ namespace AaxDecrypter
 		private NetworkFileStreamPersister nfsPersister;
 
 		private string jsonDownloadState { get; }
-		public string TempFilePath { get; }
 
 		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, DownloadOptions dlLic)
 		{
@@ -65,7 +65,7 @@ namespace AaxDecrypter
 
 		public bool Run()
 		{
-			var (IsSuccess, Elapsed) = Steps.Run();
+			var (IsSuccess, _) = Steps.Run();
 
 			if (!IsSuccess)
 				Serilog.Log.Logger.Error("Conversion failed");
@@ -79,10 +79,8 @@ namespace AaxDecrypter
 			=> RetrievedAuthors?.Invoke(this, authors);
 		protected void OnRetrievedNarrators(string narrators)
 			=> RetrievedNarrators?.Invoke(this, narrators);
-
 		protected void OnRetrievedCoverArt(byte[] coverArt)
 			=> RetrievedCoverArt?.Invoke(this, coverArt);
-
 		protected void OnDecryptProgressUpdate(DownloadProgress downloadProgress) 
 			=> DecryptProgressUpdate?.Invoke(this, downloadProgress);
 		protected void OnDecryptTimeRemaining(TimeSpan timeRemaining)

Source/FileLiberator/AudioDecodable.cs

@@ -1,4 +1,6 @@
-using System;
+using LibationFileManager;
+using NAudio.Lame;
+using System;
 
 namespace FileLiberator
 {
@@ -12,6 +14,30 @@ namespace FileLiberator
         public event EventHandler<byte[]> CoverImageDiscovered;
         public abstract void Cancel();
 
+        protected LameConfig GetLameOptions(Configuration config)
+        {
+            LameConfig lameConfig = new();
+            lameConfig.Mode = MPEGMode.Mono;
+
+            if (config.LameTargetBitrate)
+            {
+                if (config.LameConstantBitrate)
+                    lameConfig.BitRate = config.LameBitrate;
+                else
+                {
+                    lameConfig.ABRRateKbps = config.LameBitrate;
+                    lameConfig.VBR = VBRMode.ABR;
+                    lameConfig.WriteVBRTag = true;
+                }
+            }
+            else
+            {
+                lameConfig.VBR = VBRMode.Default;
+                lameConfig.VBRQuality = config.LameVBRQuality;
+                lameConfig.WriteVBRTag = true;
+            }
+            return lameConfig;
+        }
         protected void OnTitleDiscovered(string title) => OnTitleDiscovered(null, title);
         protected void OnTitleDiscovered(object _, string title)
 		{

Source/FileLiberator/ConvertToMp3.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
 using DataLayer;
-using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Net.Http;
 using FileManager;
@@ -51,8 +50,8 @@ namespace FileLiberator
 				OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
 				using var mp3File = File.OpenWrite(Path.GetTempFileName());
-
+				var lameConfig = GetLameOptions(Configuration.Instance);
-                var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File));
+				var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File, lameConfig));
 				m4bBook.InputStream.Close();
 				mp3File.Close();
 

Source/FileLiberator/DownloadDecryptBook.cs

@@ -111,10 +111,11 @@ namespace FileLiberator
 			else
 			{
 				AaxcDownloadConvertBase converter
-                    = config.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
+					= config.SplitFilesByChapter ? 
+					new AaxcDownloadMultiConverter(
 						outFileName, cacheDir, audiobookDlLic,
-                        AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook))
+						AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook)) :
-                    : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic);
+					new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic);
 
 				if (config.AllowLibationFixup)
 					converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames());
@@ -136,7 +137,7 @@ namespace FileLiberator
 			return success;
 		}
 
-        private static DownloadOptions BuildDownloadOptions(Configuration config, AudibleApi.Common.ContentLicense contentLic)
+		private DownloadOptions BuildDownloadOptions(Configuration config, AudibleApi.Common.ContentLicense contentLic)
 		{
 			//I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
 			//I also assume that if DrmType != Adrm, the file will be an mp3.
@@ -147,7 +148,7 @@ namespace FileLiberator
 			var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
 					 OutputFormat.Mp3 : OutputFormat.M4b;
 
-            var audiobookDlLic = new DownloadOptions
+			var dlOptions = new DownloadOptions
 				 (
 				 contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
 				 Resources.USER_AGENT
@@ -161,15 +162,16 @@ namespace FileLiberator
 				StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
 				Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
 				MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
-                CreateCueSheet = config.CreateCueSheet
+				CreateCueSheet = config.CreateCueSheet,
+				LameConfig = GetLameOptions(config)
 			};
 
 			if (config.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
 			{
-                long startMs = audiobookDlLic.TrimOutputToChapterLength ?
+				long startMs = dlOptions.TrimOutputToChapterLength ?
 					contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
 
-                audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
+				dlOptions.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
 
 				for (int i = 0; i < contentLic.ContentMetadata.ChapterInfo.Chapters.Length; i++)
 				{
@@ -182,32 +184,11 @@ namespace FileLiberator
 					if (config.StripAudibleBrandAudio && i == contentLic.ContentMetadata.ChapterInfo.Chapters.Length - 1)
 						chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
 
-                    audiobookDlLic.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+					dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
 				}
 			}
 
-            audiobookDlLic.LameConfig = new();
+			return dlOptions;
-            audiobookDlLic.LameConfig.Mode = NAudio.Lame.MPEGMode.Mono;
-
-            if (config.LameTargetBitrate)
-			{
-                if (config.LameConstantBitrate)
-                    audiobookDlLic.LameConfig.BitRate = config.LameBitrate;
-                else
-                {
-                    audiobookDlLic.LameConfig.ABRRateKbps = config.LameBitrate;
-                    audiobookDlLic.LameConfig.VBR = NAudio.Lame.VBRMode.ABR;
-                    audiobookDlLic.LameConfig.WriteVBRTag = true;
-                }
-			}
-			else
-			{
-                audiobookDlLic.LameConfig.VBR = NAudio.Lame.VBRMode.Default;
-                audiobookDlLic.LameConfig.VBRQuality = config.LameVBRQuality;
-                audiobookDlLic.LameConfig.WriteVBRTag = true;
-            }
-
-            return audiobookDlLic;
 		}
 
 		private static void downloadValidation(LibraryBook libraryBook)