Skip to content

Commit 58a9bc1

Browse files
audiamusaudiamus
committed
Version 1.15.2
1 parent b1a9943 commit 58a9bc1

File tree

12 files changed

+33
-32
lines changed

12 files changed

+33
-32
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ The application requires .Net Framework 4.7.1 to be installed. On Windows 10 sys
4545
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.
4646

4747
## Download
48-
Windows setup package version 1.15.1, English and German, with manuals, plus FFmpeg executable:
48+
Windows setup package version 1.15.2, English and German, with manuals, plus FFmpeg executable:
4949

50-
**[AaxAudioConverter-1.15.1-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter-1.15.1-Setup.exe)**
50+
**[AaxAudioConverter-1.15.2-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter-1.15.2-Setup.exe)**
5151

5252
Manuals (also included in the setup package):
5353

54-
**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter.pdf)**
54+
**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter.pdf)**
5555

56-
**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter.de.pdf)**
56+
**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter.de.pdf)**
5757

5858

5959
## Dependencies

‎res/Setup.dat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.1/AaxAudioConverter-1.15.1-Setup.exe
2-
MD5: 88515ace13cc6c0184684bd937cf0d7b
1+
https://github.com/audiamus/AaxAudioConverter/releases/download/v1.15.2/AaxAudioConverter-1.15.2-Setup.exe
2+
MD5: bfe415a3278376a0f096bef51a200c87

‎src/AaxAudioConverter/AaxAudioConverter.de.odt‎

550 Bytes
Binary file not shown.

‎src/AaxAudioConverter/AaxAudioConverter.latest.de.rtf‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,15 @@
205205
{\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;}
206206
{\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;}
207207
{\s208\sbasedon96\snext208\widctlpar\hyphpar0\sb240\sa120\keepn\cf0\b\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f9\fs32\lang1031 User Index Heading;}
208-
}{\*\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
208+
}{\*\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
209209
\hyphauto0\viewscale100
210210
{\*\pgdsctbl
211211
{\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default Style;}}
212212
\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
213213
{\*\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
214-
Version 1.15.1 (11/2020)}
215-
\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
216-
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. }
217-
\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
218-
Es wird eine neue Version von }{\rtlch \ltrch\loch
219-
ATL.net}{\rtlch \ltrch\loch
220-
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. }
214+
Version 1.15.}{\rtlch \ltrch\loch
215+
2}{\rtlch \ltrch\loch
216+
(11/2020)}
221217
\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
222-
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. }
218+
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.}
223219
\par }

‎src/AaxAudioConverter/AaxAudioConverter.latest.rtf‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,15 @@
205205
{\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;}
206206
{\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;}
207207
{\s208\sbasedon96\snext208\widctlpar\hyphpar0\sb240\sa120\keepn\cf0\b\kerning1\dbch\af11\langfe1033\dbch\af11\afs24\loch\f9\fs32\lang1033 User Index Heading;}
208-
}{\*\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
208+
}{\*\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
209209
\hyphauto0\viewscale100
210210
{\*\pgdsctbl
211211
{\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default Style;}}
212212
\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
213213
{\*\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
214-
Version 1.15.1 (11/2020)}
215-
\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
216-
Bugfix: Version 1.15 erroneously no longer set track duration as meta data for MP3}{\rtlch \ltrch\loch
217-
}{\rtlch \ltrch\loch
218-
files, which is expected by some players. Brought back by reverting to FFmpeg for adding MP3 chapter meta data.}
219-
\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
220-
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.}
214+
Version 1.15.}{\rtlch \ltrch\loch
215+
2}{\rtlch \ltrch\loch
216+
(11/2020)}
221217
\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
222-
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.}
218+
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.}
223219
\par }

‎src/AaxAudioConverter/AaxAudioConverter.odt‎

130 Bytes
Binary file not shown.

‎src/AaxAudioConverter/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion ("1.15.1.0")]
37-
[assembly: AssemblyFileVersion ("1.15.1.0")]
36+
[assembly: AssemblyVersion ("1.15.2.0")]
37+
[assembly: AssemblyFileVersion ("1.15.2.0")]
3838
[assembly: NeutralResourcesLanguage ("en")]
3939

‎src/AaxAudioConverterLib/Book.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ public bool HasUniqueChapterNames (EConvMode convMode) {
101101
if (!hasNamedChaptersAll ())
102102
return false;
103103

104-
var chapterNames = Parts.SelectMany (p => p.NamedChapters).Select (c => c.Name.Prune());
104+
var chapterNames = Parts
105+
.SelectMany (p => p.NamedChapters)
106+
.Where(c => !c.Name.IsNullOrWhiteSpace ())
107+
.Select (c => c.Name.Prune());
105108
var chapterNamesDistinct = chapterNames.Distinct();
106109

107110
bool unique = chapterNames.Count () == chapterNamesDistinct.Count ();

‎src/AaxAudioConverterLib/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion ("1.15.1.0")]
36-
[assembly: AssemblyFileVersion ("1.15.1.0")]
35+
[assembly: AssemblyVersion ("1.15.2.0")]
36+
[assembly: AssemblyFileVersion ("1.15.2.0")]

‎src/AuxLib/ExtensionMethods.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ public static string[] SplitTrim (this string value, char[] separators = null) {
7777
static readonly char[] InvalidFileNameChars = Path.GetInvalidFileNameChars ();
7878

7979
public static string Prune (this string s, char[] invalid) {
80+
if (s is null)
81+
return null;
8082
if (invalid is null)
8183
invalid = InvalidFileNameChars;
8284
StringBuilder sb = new StringBuilder ();
@@ -91,6 +93,8 @@ public static string Prune (this string s, char[] invalid) {
9193
}
9294

9395
public static string Prune (this string s) {
96+
if (s is null)
97+
return null;
9498
string pruned = s.Prune (null);
9599
pruned = pruned.Trim ('.');
96100
return pruned;
@@ -110,6 +114,8 @@ public static string SubstitUser (this string s) {
110114
const int MAXLEN_SHORTSTRING = 40;
111115

112116
public static string Shorten (this string s, int maxlen = 0) {
117+
if (s is null)
118+
return null;
113119
if (maxlen == 0)
114120
maxlen = MAXLEN_SHORTSTRING;
115121
if (maxlen < 0 || s.Length <= maxlen)

0 commit comments

Comments
 (0)