Version 1.15.2

README.md

@@ -45,15 +45,15 @@ The application requires .Net Framework 4.7.1 to be installed. On Windows 10 sys
 AAX Audio Converter is configured to support high DPI monitors under Windows 10. It will scale properly when the user changes the DPI or scale factor. 
 
 ## Download
-Windows setup package version 1.15.1, English and German, with manuals, plus FFmpeg executable:
+Windows setup package version 1.15.2, English and German, with manuals, plus FFmpeg executable:
 
-**[AaxAudioConverter-1.15.1-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter-1.15.1-Setup.exe)**
+**[AaxAudioConverter-1.15.2-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter-1.15.2-Setup.exe)**
 
 Manuals (also included in the setup package):
 
-**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter.pdf)**
+**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter.pdf)**
 
-**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter.de.pdf)**
+**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter.de.pdf)**
 
 
 ## Dependencies

res/Setup.dat

@@ -1,2 +1,2 @@
-https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter-1.15.1-Setup.exe
-MD5: 88515ace13cc6c0184684bd937cf0d7b
+https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter-1.15.2-Setup.exe
+MD5: bfe415a3278376a0f096bef51a200c87

src/AaxAudioConverter/AaxAudioConverter.latest.de.rtf

@@ -205,19 +205,15 @@
 {\s206\sbasedon100\snext206\widctlpar\tldot\tqr\tx7374\hyphpar0\li2264\ri0\lin2264\rin0\fi0\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f3\fs24\lang1031 User Index 9;}
 {\s207\sbasedon100\snext207\widctlpar\tldot\tqr\tx7091\hyphpar0\li2547\ri0\lin2547\rin0\fi0\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f3\fs24\lang1031 User Index 10;}
 {\s208\sbasedon96\snext208\widctlpar\hyphpar0\sb240\sa120\keepn\cf0\b\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f9\fs32\lang1031 User Index Heading;}
-}{\*\generator LibreOffice/6.2.5.2$Windows_x86 LibreOffice_project/1ec314fa52f458adc18c4f025c545a4e8b22c159}{\info{\creatim\yr2020\mo7\dy28\hr18\min16}{\revtim\yr2020\mo11\dy1\hr10\min24}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709
+}{\*\generator LibreOffice/6.2.5.2$Windows_x86 LibreOffice_project/1ec314fa52f458adc18c4f025c545a4e8b22c159}{\info{\creatim\yr2020\mo7\dy28\hr18\min16}{\revtim\yr2020\mo11\dy5\hr18\min57}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709
 \hyphauto0\viewscale100
 {\*\pgdsctbl
 {\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default Style;}}
 \formshade{\*\pgdscno0}\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
 {\*\ftnsep\chftnsep}\pgndec\pard\plain \s4\widctlpar\hyphpar0\sb238\sa102\keepn\cf0\b0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f5\fs28\lang1031\sb238\sa102{\rtlch \ltrch\loch
-Version 1.15.1 (11/2020)}
-\par \pard\plain \s97\sl276\slmult1\widctlpar\hyphpar0\sb0\sa140\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f10\fs22\lang1031\sl276\slmult1\li720\ri0\lin720\rin0\fi0{\rtlch \ltrch\loch
-Fehlerbehebung: Unbeabsichtigt war in Version 1.15 bei MP3-Dateien die Spieldauer als Metainformation nicht mehr gesetzt worden. Diese wird von einigen Medienspielern erwartet. Ist jetzt dadurch beseitigt, dass die Kapitel-Metadaten f\u252\'fcr MP3 wieder von FFmpeg geschrieben werden.    }
-\par \pard\plain \s97\sl276\slmult1\widctlpar\hyphpar0\sb0\sa140\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f10\fs22\lang1031\sl276\slmult1\li720\ri0\lin720\rin0\fi0{\rtlch \ltrch\loch
-Es wird eine neue Version von }{\rtlch \ltrch\loch
-ATL.net}{\rtlch \ltrch\loch
- benutzt, die die Kapitel-Metadaten f\u252\'fcr MP4 in einem effizienten gepufferten Modus im Hauptspeicher setzt, was schneller ist als der bisherige direkte Dateizugriff auf Festplatte. }
+Version 1.15.}{\rtlch \ltrch\loch
+2}{\rtlch \ltrch\loch
+ (11/2020)}
 \par \pard\plain \s97\sl276\slmult1\widctlpar\hyphpar0\sb0\sa140\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f10\fs22\lang1031\sl276\slmult1\li720\ri0\lin720\rin0\fi0\sb0\sa140{\rtlch \ltrch\loch
-Verbesserung: Tempor\u228\'e4re Audiodateien mit einer Spieldauer von 0 werden normalerweise abgefangen. Unter bestimmten Umst\u228\'e4nden k\u246\'f6nnen sie jedoch erhalten bleiben. Sie werden  nun geeignet verarbeitet. }
+Fehlerbehebung: Wurden in Version 1.15 und 1.15.1 bei einem mehrteiligen Buch nur einzelne Teile zur Konvertierung ausgew\u228\'e4hlt, so konnte es passieren, dass bei der Initialisierung der Zielverzeichnisse tempor\u228\'e4re Kapitel ohne Namen verarbeitet werden sollten. Dies l\u246\'f6ste eine NullReferenceException aus. Solche Kapitel werden jetzt an dieser Stelle ignoriert.}
 \par }

src/AaxAudioConverter/AaxAudioConverter.latest.rtf

@@ -205,19 +205,15 @@
 {\s206\sbasedon100\snext206\widctlpar\tldot\tqr\tx7374\hyphpar0\li2264\ri0\lin2264\rin0\fi0\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f3\fs24\lang1033 User Index 9;}
 {\s207\sbasedon100\snext207\widctlpar\tldot\tqr\tx7091\hyphpar0\li2547\ri0\lin2547\rin0\fi0\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f3\fs24\lang1033 User Index 10;}
 {\s208\sbasedon96\snext208\widctlpar\hyphpar0\sb240\sa120\keepn\cf0\b\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f9\fs32\lang1033 User Index Heading;}
-}{\*\generator LibreOffice/6.2.5.2$Windows_x86 LibreOffice_project/1ec314fa52f458adc18c4f025c545a4e8b22c159}{\info{\creatim\yr2020\mo7\dy28\hr18\min16}{\revtim\yr2020\mo11\dy1\hr10\min28}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709
+}{\*\generator LibreOffice/6.2.5.2$Windows_x86 LibreOffice_project/1ec314fa52f458adc18c4f025c545a4e8b22c159}{\info{\creatim\yr2020\mo7\dy28\hr18\min16}{\revtim\yr2020\mo11\dy5\hr18\min48}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709
 \hyphauto0\viewscale100
 {\*\pgdsctbl
 {\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default Style;}}
 \formshade{\*\pgdscno0}\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
 {\*\ftnsep\chftnsep}\pgndec\pard\plain \s4\widctlpar\hyphpar0\sb238\sa102\keepn\cf0\b0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f5\fs28\lang1033\sb238\sa102{\rtlch \ltrch\loch
-Version 1.15.1 (11/2020)}
-\par \pard\plain \s97\sl276\slmult1\widctlpar\hyphpar0\sb0\sa140\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f10\fs22\lang1033\sl276\slmult1\li720\ri0\lin720\rin0\fi0{\rtlch \ltrch\loch
-Bugfix: Version 1.15 erroneously no longer set track duration as meta data for MP3}{\rtlch \ltrch\loch
- }{\rtlch \ltrch\loch
-files, which is expected by some players. Brought back by reverting to FFmpeg for adding MP3 chapter meta data.}
-\par \pard\plain \s97\sl276\slmult1\widctlpar\hyphpar0\sb0\sa140\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f10\fs22\lang1033\sl276\slmult1\li720\ri0\lin720\rin0\fi0{\rtlch \ltrch\loch
-A new version of ATL.net is used which now adds MP4 chapter meta data in an efficient buffered memory mode, which is faster than working directly with the file on disk as before.}
+Version 1.15.}{\rtlch \ltrch\loch
+2}{\rtlch \ltrch\loch
+ (11/2020)}
 \par \pard\plain \s97\sl276\slmult1\widctlpar\hyphpar0\sb0\sa140\cf0\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f10\fs22\lang1033\sl276\slmult1\li720\ri0\lin720\rin0\fi0\sb0\sa140{\rtlch \ltrch\loch
-Enhancement: Temporary audio files with a track duration of zero will normally be intercepted. Under certain conditions, they can survive, though. They are now handled properly.}
+Bugfix: In version 1.15 and 1.15.1, conversion of only a subset of a multipart book could erroneously encounter temporary chapters without a name when initializing target directories. This triggered a NullReferenceException. Such chapters will now be ignored at this stage.}
 \par }

src/AaxAudioConverter/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.15.1.0")]
-[assembly: AssemblyFileVersion ("1.15.1.0")]
+[assembly: AssemblyVersion ("1.15.2.0")]
+[assembly: AssemblyFileVersion ("1.15.2.0")]
 [assembly: NeutralResourcesLanguage ("en")]
 

src/AaxAudioConverterLib/Book.cs

@@ -101,7 +101,10 @@ public bool HasUniqueChapterNames (EConvMode convMode) {
       if (!hasNamedChaptersAll ())
         return false;
 
-      var chapterNames = Parts.SelectMany (p => p.NamedChapters).Select (c => c.Name.Prune());
+      var chapterNames = Parts
+        .SelectMany (p => p.NamedChapters)
+        .Where(c => !c.Name.IsNullOrWhiteSpace ())
+        .Select (c => c.Name.Prune());
       var chapterNamesDistinct = chapterNames.Distinct();
 
       bool unique = chapterNames.Count () == chapterNamesDistinct.Count ();

src/AaxAudioConverterLib/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.15.1.0")]
-[assembly: AssemblyFileVersion ("1.15.1.0")]
+[assembly: AssemblyVersion ("1.15.2.0")]
+[assembly: AssemblyFileVersion ("1.15.2.0")]

src/AuxLib/ExtensionMethods.cs

@@ -77,6 +77,8 @@ public static string[] SplitTrim (this string value, char[] separators = null) {
     static readonly char[] InvalidFileNameChars = Path.GetInvalidFileNameChars ();
 
     public static string Prune (this string s, char[] invalid) {
+      if (s is null)
+        return null;
       if (invalid is null)
         invalid = InvalidFileNameChars;
       StringBuilder sb = new StringBuilder ();
@@ -91,6 +93,8 @@ public static string Prune (this string s, char[] invalid) {
     }
 
     public static string Prune (this string s) {
+      if (s is null)
+        return null;
       string pruned = s.Prune (null);
       pruned = pruned.Trim ('.');
       return pruned;
@@ -110,6 +114,8 @@ public static string SubstitUser (this string s) {
     const int MAXLEN_SHORTSTRING = 40;
 
     public static string Shorten (this string s, int maxlen = 0) {
+      if (s is null)
+        return null;
       if (maxlen == 0)
         maxlen = MAXLEN_SHORTSTRING;
       if (maxlen < 0 || s.Length <= maxlen)

src/AuxLib/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.5.0")]
-[assembly: AssemblyFileVersion("1.5.5.0")]
+[assembly: AssemblyVersion("1.5.6.0")]
+[assembly: AssemblyFileVersion("1.5.6.0")]

src/InnoSetup/AaxAudioConverter setup.iss

@@ -1,5 +1,5 @@
 #define MyAppSetupName 'AAX Audio Converter'
-#define MyAppVersion '1.15.1'
+#define MyAppVersion '1.15.2'
 #define MyProgramExe = 'AaxAudioConverter.exe'
 #define MyCompany = 'audiamus'