Skip to content

Commit

Permalink
Version 1.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
audiamus committed Sep 29, 2023
1 parent 3fdae89 commit 4656aa3
Show file tree
Hide file tree
Showing 13 changed files with 645 additions and 602 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Convert Audible aax files to mp3 and m4a/m4b
- Creates additional playlist if more than one output file is created per book.
- Handles books with multiple parts.
- Manages and preserves all meta-tag information, including chapter meta data.
- Supports named chapters, for .aax files downloaded with the Audible App.
- Supports named chapters, for .aax files downloaded with Book Lib Connect.
- Can adjust inaccurate chapter marks.
- Allows customization of output naming: files, folders and tags.
- Special functions:
Expand Down Expand Up @@ -51,15 +51,15 @@ The application requires .Net Framework 4.8 to be installed. On Windows 10/11 sy
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.18.1, English and German, with manuals, plus FFmpeg executable:
Windows setup package version 1.18.2, English and German, with manuals, plus FFmpeg executable:

**[AaxAudioConverter-1.18.1-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter-1.18.1-Setup.exe)**
**[AaxAudioConverter-1.18.2-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.2/AaxAudioConverter-1.18.2-Setup.exe)**

Manuals (also included in the setup package):

**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter.pdf)**
**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.2/AaxAudioConverter.pdf)**

**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter.de.pdf)**
**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.2/AaxAudioConverter.de.pdf)**


## Dependencies
Expand Down
4 changes: 2 additions & 2 deletions res/Setup.dat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter-1.18.1-Setup.exe
MD5: 2757398570df456f8d9cdd4f88687498
https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.2/AaxAudioConverter-1.18.2-Setup.exe
MD5: caacf818b0c41f2280ea3d1c5982351b
6 changes: 3 additions & 3 deletions res/Setup.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[
{
"Url": "https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter-1.18.1-Setup.exe",
"Url": "https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.2/AaxAudioConverter-1.18.2-Setup.exe",
"AppName": "AaxAudioConverter",
"Version": "1.18.1",
"Version": "1.18.2",
"Preview": false,
"Descript": null,
"Md5": "2757398570df456f8d9cdd4f88687498"
"Md5": "caacf818b0c41f2280ea3d1c5982351b"
},
{
"AppName": "BookLibConnect",
Expand Down
Binary file modified src/AaxAudioConverter/AaxAudioConverter.de.odt
Binary file not shown.
585 changes: 300 additions & 285 deletions src/AaxAudioConverter/AaxAudioConverter.latest.de.rtf

Large diffs are not rendered by default.

607 changes: 313 additions & 294 deletions src/AaxAudioConverter/AaxAudioConverter.latest.rtf

Large diffs are not rendered by default.

Binary file modified src/AaxAudioConverter/AaxAudioConverter.odt
Binary file not shown.
4 changes: 3 additions & 1 deletion src/AaxAudioConverter/FileDetailsForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ public override void Set (AaxFileItem fileItem) {
richTextBoxMeta.Rtf = rtf;

var converter = new ImageConverter ();
pictureBox.Image = converter.ConvertFrom (fileItem.Cover) as Image;
try {
pictureBox.Image = converter.ConvertFrom (fileItem.Cover) as Image;
} catch { }

richTextBoxAbstract.Clear ();
richTextBoxAbstract.Text = fileItem.Abstract;
Expand Down
4 changes: 2 additions & 2 deletions src/AaxAudioConverter/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.18.1.0")]
[assembly: AssemblyFileVersion ("1.18.1.0")]
[assembly: AssemblyVersion ("1.18.2.0")]
[assembly: AssemblyFileVersion ("1.18.2.0")]
[assembly: NeutralResourcesLanguage ("en")]

6 changes: 3 additions & 3 deletions src/AaxAudioConverterLib/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public enum ETrackNumbering {
track,
chapter_a_track,
track_b_chapter_c,
track_b_nTrks_c,
chapter_a_track_b_nTrks_c,
track_b_chapter_c_b_nTrks_c,
//track_b_nTrks_c,
//chapter_a_track_b_nTrks_c,
//track_b_chapter_c_b_nTrks_c,
}

public enum ELongTitle { no, book_series, series_book, as_is }
Expand Down
4 changes: 2 additions & 2 deletions src/AaxAudioConverterLib/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.18.1.0")]
[assembly: AssemblyFileVersion ("1.18.1.0")]
[assembly: AssemblyVersion ("1.18.2.0")]
[assembly: AssemblyFileVersion ("1.18.2.0")]
15 changes: 11 additions & 4 deletions src/AaxAudioConverterLib/TagAndFileNamingHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -616,7 +617,7 @@ private bool readMetadataAtlAax () {
return true;
}

private static void getCoverImage (AaxFileItem afi, ATL.Track tags) {
private void getCoverImage (AaxFileItem afi, ATL.Track tags) {
var pic = tags.EmbeddedPictures.FirstOrDefault ();
if (pic != null) {
afi.Cover = pic.PictureData;
Expand All @@ -628,7 +629,9 @@ private static void getCoverImage (AaxFileItem afi, ATL.Track tags) {
afi.CoverExt = EXT_PNG;
break;
}
}
Log (3, this, () => $"Cover image {afi.CoverExt}, {afi.Cover.Length} bytes");
} else
Log (3, this, () => "No cover image");
}

private string atlCustomTag (ATL.Track tags, string key) {
Expand Down Expand Up @@ -723,8 +726,12 @@ private bool writeMetaDataAtl (IRoleTagAssigmentSettings settings, bool withChap
tags.TrackTotal = _numbers.nTrks;

// cover picture
var pi = ATL.PictureInfo.fromBinaryData (afi.Cover, ATL.PictureInfo.PIC_TYPE.Front);
tags.EmbeddedPictures.Add (pi);
try {
var pi = ATL.PictureInfo.fromBinaryData (afi.Cover, ATL.PictureInfo.PIC_TYPE.Front);
tags.EmbeddedPictures.Add (pi);
} catch (Exception exc) {
Log (3, this, () => $"No or invalid cover image: {exc.ToShortString ()}");
}

if (withChapters)
writeChapters (tags, chapters);
Expand Down
2 changes: 1 addition & 1 deletion src/InnoSetup/AaxAudioConverter setup.iss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define MyAppSetupName 'AAX Audio Converter'
#define MyAppVersion '1.18.1'
#define MyAppVersion '1.18.2'
#define MyProgramExe = 'AaxAudioConverter.exe'
#define MyCompany = 'audiamus'
#define MyAppName = 'AaxAudioConverter'
Expand Down

0 comments on commit 4656aa3

Please sign in to comment.