Skip to content
This repository was archived by the owner on Nov 24, 2021. It is now read-only.

Commit 80c9ec4

Browse files
wieslawsolteswieslawsoltes
authored
Merge pull request #3 from wieslawsoltes/7.0
7.0
2 parents 0067489 + fe3f523 commit 80c9ec4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2761
-3705
lines changed

‎CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
## Changelog
22

3+
### Version 7.0:
4+
5+
- Added default configuration files to installer version.
6+
- Added default configuration files to portable version.
7+
- Added support for loading language files from relative path to settings folder.
8+
- Added portable mode to installer.
9+
- Fixed encoder error when running for the second time.
10+
- Refactored encoder worker thread as class.
11+
- Refactored encoder worker thread error handling.
12+
- Use nullptr instead of NULL macro.
13+
- Use class instead of typedef for lists.
14+
- Refactored Aften api code.
15+
- Removed unused code and comments.
16+
- Added Avisynth 5.1+LFE preset.
17+
- Fixed browse dialog title.
18+
- Changed language files encoding to UTF-8.
19+
- Changed configuration files encoding to UTF-8.
20+
321
### Version 6.0:
422

523
- Added dynamic layout for dialogs.

‎README.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ WAV to AC3 Encoder an audio encoder which generates compressed audio streams bas
1818

1919
| Platforn | Type | Version | Download |
2020
|-----------------------|-------------|---------------|----------------------------------------------------------------------------------------------------------------------------------------|
21-
| Windows 32-bit | Installer | 6.0 | [EncWAVtoAC3-6.0-Win32.exe](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/6.0/EncWAVtoAC3-6.0-Win32.exe) |
22-
| Windows 64-bit | Installer | 6.0 | [EncWAVtoAC3-6.0-x64.exe](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/6.0/EncWAVtoAC3-6.0-x64.exe) |
23-
| Windows 32-bit | Portable | 6.0 | [EncWAVtoAC3-6.0-Win32.zip](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/6.0/EncWAVtoAC3-6.0-Win32.zip) |
24-
| Windows 64-bit | Portable | 6.0 | [EncWAVtoAC3-6.0-x64.zip](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/6.0/EncWAVtoAC3-6.0-x64.zip) |
21+
| Windows 32-bit | Installer | 7.0 | [EncWAVtoAC3-7.0-Win32.exe](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/7.0/EncWAVtoAC3-7.0-Win32.exe) |
22+
| Windows 64-bit | Installer | 7.0 | [EncWAVtoAC3-7.0-x64.exe](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/7.0/EncWAVtoAC3-7.0-x64.exe) |
23+
| Windows 32-bit | Portable | 7.0 | [EncWAVtoAC3-7.0-Win32.zip](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/7.0/EncWAVtoAC3-7.0-Win32.zip) |
24+
| Windows 64-bit | Portable | 7.0 | [EncWAVtoAC3-7.0-x64.zip](https://github.com/wieslawsoltes/wavtoac3encoder/releases/download/7.0/EncWAVtoAC3-7.0-x64.zip) |
2525

2626
## System requirements
2727

@@ -39,10 +39,6 @@ Minimum supported Linux version is Ubutnu 16.10 (using Wine 2.0).
3939

4040
[![Softpedia Download Mirror](http://www.softpedia.com/_img/softpedia_100_free.png)](http://www.softpedia.com/get/Multimedia/Audio/Audio-CD-Rippers-Encoders/WAV-to-AC3-Encoder.shtml)
4141

42-
## Aften
43-
44-
Download latest version of the aften for windows from [here](https://github.com/wieslawsoltes/AftenWindowsBuilds/releases).
45-
4642
## About
4743

4844
WAV to AC3 Encoder is an audio encoder which generates compressed
@@ -146,7 +142,7 @@ automaticaly loaded/saved by program every time the program is started/closed.
146142
* Presets for encoder are stored in `EncWAVtoAC3.presets` file.
147143
* Paths to libaften.dll engines are stored in `EncWAVtoAC3-x86.engines` and `EncWAVtoAC3-x64.engines` file.
148144
* User interface trasnlation files are located in `lang` sub-directory.
149-
* Translation files must be saved with `Unicode` charset and `BOM header`.
145+
* Translation files must be saved with `UTF-8` charset and `BOM header`.
150146

151147
## AviSynth Support
152148

@@ -209,15 +205,17 @@ Open EncWAVtoAC3.sln in Visual Studios 2017 or above.
209205
* [Aften Website](http://aften.sourceforge.net/)
210206
* [Aften Sources](http://sourceforge.net/projects/aften/)
211207

212-
## Copyrights
213-
214-
WAV to AC3 Encoder, Copyright (C) 2007-2016 Wiesław Šoltés
208+
## Aften
215209

210+
```
216211
Aften, Copyright (c) 2006-2007 Justin Ruggles <justinruggles@bellsouth.net>
217212
2006-2007 Prakash Punnoor <prakash@punnoor.de>
213+
```
214+
Download latest version of the aften for windows from [here](https://github.com/wieslawsoltes/AftenWindowsBuilds/releases).
218215

219216
## License
220217

218+
```
221219
WAV to AC3 Encoder
222220
Copyright (C) 2007-2017 Wiesław Šoltés <wieslaw.soltes@gmail.com>
223221
@@ -233,3 +231,4 @@ GNU General Public License for more details.
233231
You should have received a copy of the GNU General Public License
234232
along with this program; if not, write to the Free Software
235233
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
234+
```

‎build.cake

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,26 @@ var packageBinariesAction = new Action<string,string> ((configuration, platform)
7575
var outputDir = artifactsDir.Combine(output);
7676
var outputZip = artifactsDir.CombineWithFilePath(output + ".zip");
7777
var langDir = outputDir.Combine("lang");
78-
var exeFile = File(path + "EncWAVtoAC3.exe");
79-
var portableFile = File("./setup/EncWAVtoAC3.portable");
8078

8179
CleanDirectory(outputDir);
8280
CopyFileToDirectory(File("README.md"), outputDir);
8381
CopyFileToDirectory(File("COPYING.TXT"), outputDir);
84-
CopyFileToDirectory(exeFile, outputDir);
85-
CopyFileToDirectory(portableFile, outputDir);
82+
CopyFileToDirectory(File(path + "EncWAVtoAC3.exe"), outputDir);
83+
CopyFileToDirectory(File("./config/EncWAVtoAC3.portable"), outputDir);
84+
CopyFileToDirectory(File("./config/EncWAVtoAC3.config"), outputDir);
85+
CopyFileToDirectory(File("./config/EncWAVtoAC3.files"), outputDir);
86+
CopyFileToDirectory(File("./config/EncWAVtoAC3.lang"), outputDir);
87+
CopyFileToDirectory(File("./config/EncWAVtoAC3.presets"), outputDir);
88+
8689
CleanDirectory(langDir);
8790
CopyFiles("./config/lang/*.txt", langDir);
8891

8992
var aftenBinDir = (DirectoryPath)Directory("./src/aften/windows/output");
9093
var aftenDll = "libaften.dll";
9194
var aftenDllsWin32 = new [] { "libaftendll_x86", "libaftendll_x86_SSE", "libaftendll_x86_SSE2", "libaftendll_x86_SSE3" };
9295
var aftenDllsX64 = new [] { "libaftendll_AMD64", "libaftendll_AMD64_SSE2", "libaftendll_AMD64_SSE3" };
93-
var enginesFileWin32 = File("./config/engines/EncWAVtoAC3-x86.engines");
94-
var enginesFileX64 = File("./config/engines/EncWAVtoAC3-x64.engines");
96+
var enginesFileWin32 = File("./config/EncWAVtoAC3-x86.engines");
97+
var enginesFileX64 = File("./config/EncWAVtoAC3-x64.engines");
9598

9699
if (platform == "Win32")
97100
{

‎config/EncWAVtoAC3-x64.engines

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Aften 20091226=libaftendll_AMD64\libaften.dll
2+
Aften 20091226 SSE2=libaftendll_AMD64_SSE2\libaften.dll
3+
Aften 20091226 SSE3=libaftendll_AMD64_SSE3\libaften.dll

‎config/EncWAVtoAC3-x86.engines

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Aften 20091226=libaftendll_x86\libaften.dll
2+
Aften 20091226 SSE=libaftendll_x86_SSE\libaften.dll
3+
Aften 20091226 SSE2=libaftendll_x86_SSE2\libaften.dll
4+
Aften 20091226 SSE3=libaftendll_x86_SSE3\libaften.dll

‎config/EncWAVtoAC3.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
OutputPath=
2+
OutputFile=
3+
SelectedPreset=0
4+
MultipleMonoInput=false
5+
DisableAllWarnings=false
6+
SaveConfig=true

‎config/EncWAVtoAC3.files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


‎config/EncWAVtoAC3.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lang\en-US.txt

‎setup/EncWAVtoAC3.portable renamed to ‎config/EncWAVtoAC3.portable

File renamed without changes.

‎config/EncWAVtoAC3.presets

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
1.1.0.0
2+
[Default]
3+
engine=0
4+
threads=0
5+
mmx=1
6+
sse=1
7+
sse2=1
8+
sse3=1
9+
mode=0
10+
b=0
11+
q=240
12+
raw_fmt=0
13+
raw_sr=0
14+
raw_ch=0
15+
fba=0
16+
exps=7
17+
pad=1
18+
w=0
19+
wmin=0
20+
wmax=60
21+
m=1
22+
s=0
23+
cmix=0
24+
smix=0
25+
dsur=0
26+
dnorm=31
27+
dynrng=5
28+
acmod=8
29+
lfe=2
30+
chconfig=16
31+
chmap=0
32+
readtoeof=0
33+
bwfilter=0
34+
dcfilter=0
35+
lfefilter=0
36+
xbsi1=2
37+
dmixmod=0
38+
ltrtcmix=4
39+
ltrtsmix=4
40+
lorocmix=4
41+
lorosmix=4
42+
xbsi2=2
43+
dsurexmod=0
44+
dheadphon=0
45+
adconvtyp=0
46+
[Avisynth 5.1+LFE]
47+
engine=0
48+
threads=0
49+
mmx=1
50+
sse=1
51+
sse2=1
52+
sse3=1
53+
mode=0
54+
b=0
55+
q=240
56+
raw_fmt=0
57+
raw_sr=0
58+
raw_ch=0
59+
fba=0
60+
exps=7
61+
pad=1
62+
w=0
63+
wmin=0
64+
wmax=60
65+
m=1
66+
s=0
67+
cmix=0
68+
smix=0
69+
dsur=0
70+
dnorm=31
71+
dynrng=5
72+
acmod=7
73+
lfe=1
74+
chconfig=15
75+
chmap=0
76+
readtoeof=1
77+
bwfilter=0
78+
dcfilter=0
79+
lfefilter=0
80+
xbsi1=2
81+
dmixmod=0
82+
ltrtcmix=4
83+
ltrtsmix=4
84+
lorocmix=4
85+
lorosmix=4
86+
xbsi2=2
87+
dsurexmod=0
88+
dheadphon=0
89+
adconvtyp=0

0 commit comments

Comments
 (0)