Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Added detection of 64-Bit QAAC encoder + fixed a regression in def8a9cd6e.

Browse Source
This commit is contained in:
LoRd_MuldeR 2015-05-12 00:29:17 +02:00
parent a70919dcbe
commit f2dae69676
34 changed files with 152 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/Translation/Blank.ts
View File

@ -763,7 +763,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2629,32 +2629,32 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

44
etc/Translation/LameXP_DE.ts
View File

@ -762,22 +762,22 @@
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="140"/> <location filename="../../src/Model_FileExts.cpp" line="140"/>
<source>File Extension</source> <source>File Extension</source>
<translation type="unfinished"></translation> <translation>Dateinamenserweiterung</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation>Ersetzen durch</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="189"/> <location filename="../../src/Model_FileExts.cpp" line="189"/>
<source>Select file extensions to overwrite:</source> <source>Select file extensions to overwrite:</source>
<translation type="unfinished"></translation> <translation>Dateinamenserweiterung zum Überschreiben:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="208"/> <location filename="../../src/Model_FileExts.cpp" line="208"/>
<source>Enter the new file extension:</source> <source>Enter the new file extension:</source>
<translation type="unfinished"></translation> <translation>Neue Dateinamenserweiterung eingeben:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1019,57 +1019,57 @@
<message> <message>
<location filename="../../gui/MainWindow.ui" line="3776"/> <location filename="../../gui/MainWindow.ui" line="3776"/>
<source>Replacement:</source> <source>Replacement:</source>
<translation type="unfinished"></translation> <translation>Ersetzung:</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="3789"/> <location filename="../../gui/MainWindow.ui" line="3789"/>
<source>Search Pattern:</source> <source>Search Pattern:</source>
<translation type="unfinished"></translation> <translation>Suchmuster:</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="3818"/> <location filename="../../gui/MainWindow.ui" line="3818"/>
<source>&lt;a href=&quot;regexp&quot;&gt;Regular Expression Info&lt;/a&gt;</source> <source>&lt;a href=&quot;regexp&quot;&gt;Regular Expression Info&lt;/a&gt;</source>
<translation type="unfinished"></translation> <translation>&lt;a href=&quot;regexp&quot;&gt;Info zu regulären Ausrücken&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="3844"/> <location filename="../../gui/MainWindow.ui" line="3844"/>
<source>Replace all Matching Elements</source> <source>Replace all Matching Elements</source>
<translation type="unfinished"></translation> <translation>Alle übereinstimmenden Elemente ersetzen</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="3894"/> <location filename="../../gui/MainWindow.ui" line="3894"/>
<source>Enter the desired search pattern (regular expression) here!</source> <source>Enter the desired search pattern (regular expression) here!</source>
<translation type="unfinished"></translation> <translation>Bitte geben Sie den gewünschten regulären Ausdruck hier ein!</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="3941"/> <location filename="../../gui/MainWindow.ui" line="3941"/>
<source>Enter replacement text here! It may contain backreferences.</source> <source>Enter replacement text here! It may contain backreferences.</source>
<translation type="unfinished"></translation> <translation>Ersetzung hier eingeben! Kann Rückwärtsreferenzen enthalten.</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="3992"/> <location filename="../../gui/MainWindow.ui" line="3992"/>
<source>Add Overwrite </source> <source>Add Overwrite </source>
<translation type="unfinished"></translation> <translation>Eintrag hinzufügen</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="4003"/> <location filename="../../gui/MainWindow.ui" line="4003"/>
<source>Remove Overwrite </source> <source>Remove Overwrite </source>
<translation type="unfinished"></translation> <translation>Eintrag entfernen</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="4040"/> <location filename="../../gui/MainWindow.ui" line="4040"/>
<source>Rename Files </source> <source>Rename Files </source>
<translation type="unfinished"></translation> <translation>Dateien umbenennen</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="4057"/> <location filename="../../gui/MainWindow.ui" line="4057"/>
<source>Regular Expressions </source> <source>Regular Expressions </source>
<translation type="unfinished"></translation> <translation>Reguläre Ausdrücke</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="4071"/> <location filename="../../gui/MainWindow.ui" line="4071"/>
<source>File Extensions </source> <source>File Extensions </source>
<translation type="unfinished"></translation> <translation>Dateinamenserweiterungen</translation>
</message> </message>
<message> <message>
<location filename="../../gui/MainWindow.ui" line="4590"/> <location filename="../../gui/MainWindow.ui" line="4590"/>
@ -1360,7 +1360,7 @@
<translation>Verzeichnis konnte nicht erstellt werden</translation> <translation>Verzeichnis konnte nicht erstellt werden</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP wird bereits ausgeführt. Bitte benutzen Sie die laufende Instanz!</translation> <translation>LameXP wird bereits ausgeführt. Bitte benutzen Sie die laufende Instanz!</translation>
</message> </message>
@ -1562,7 +1562,7 @@
<translation>Diese Demo (Test) Version von LameXP ist am %1. abgelaufen.</translation> <translation>Diese Demo (Test) Version von LameXP ist am %1. abgelaufen.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Wird bereits ausgeführt</translation> <translation>Wird bereits ausgeführt</translation>
</message> </message>
@ -2528,22 +2528,22 @@
<translation>Bei existierender Zieldatei:</translation> <translation>Bei existierender Zieldatei:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>Überschreiben Modus</translation> <translation>Überschreiben Modus</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>Achtung: Dieser Modus überschreibt möglicherweise existierende Dateien!</translation> <translation>Achtung: Dieser Modus überschreibt möglicherweise existierende Dateien!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>Fortfahren</translation> <translation>Fortfahren</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>Zurück</translation> <translation>Zurück</translation>
</message> </message>

14
etc/Translation/LameXP_ES.ts
View File

@ -767,7 +767,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1488,12 +1488,12 @@
<translation>¡El disco es de solo lectura o no se tienen los derechos suficientes!</translation> <translation>¡El disco es de solo lectura o no se tienen los derechos suficientes!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Ya se está ejecutando</translation> <translation>Ya se está ejecutando</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>¡LameXP ya se está ejecutando, use esa instancia por favor!</translation> <translation>¡LameXP ya se está ejecutando, use esa instancia por favor!</translation>
</message> </message>
@ -2528,22 +2528,22 @@
<translation>Si el archivo de destino ya existe:</translation> <translation>Si el archivo de destino ya existe:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>Modo de sobreescritura</translation> <translation>Modo de sobreescritura</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>Aviso: ¡Este modo sobreescribirá los archivos existentes sin ninguna posibilidad de recuperarlos!</translation> <translation>Aviso: ¡Este modo sobreescribirá los archivos existentes sin ninguna posibilidad de recuperarlos!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>Continuar</translation> <translation>Continuar</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>Revertir</translation> <translation>Revertir</translation>
</message> </message>

14
etc/Translation/LameXP_FR.ts
View File

@ -770,7 +770,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1493,12 +1493,12 @@ Votre dossier TEMP est situé ici:</translation>
<translation>Le lecteur est en lecture seule ou en droits d&apos;accès insuffisants!</translation> <translation>Le lecteur est en lecture seule ou en droits d&apos;accès insuffisants!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Déjà en cours d&apos;exécution</translation> <translation>Déjà en cours d&apos;exécution</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP est déjà en cours d&apos;exécution, veuillez utiliser cette instance!</translation> <translation>LameXP est déjà en cours d&apos;exécution, veuillez utiliser cette instance!</translation>
</message> </message>
@ -2536,22 +2536,22 @@ Ouvrir le dossier récursivement...</translation>
<translation>Si le fichier cible existe déjà :</translation> <translation>Si le fichier cible existe déjà :</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>Mode d&apos;écrasement</translation> <translation>Mode d&apos;écrasement</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>AVERTISSEMENT : Ce mode peut remplacer les fichiers existants sans aucun moyen de revenir en arrière !</translation> <translation>AVERTISSEMENT : Ce mode peut remplacer les fichiers existants sans aucun moyen de revenir en arrière !</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>Continuer</translation> <translation>Continuer</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>Revenir</translation> <translation>Revenir</translation>
</message> </message>

14
etc/Translation/LameXP_HU.ts
View File

@ -763,7 +763,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2629,32 +2629,32 @@
<translation>Nem lehet írni a kiválasztott könyvtárba. Kérjük válasszon egy másik könyvtárat!</translation> <translation>Nem lehet írni a kiválasztott könyvtárba. Kérjük válasszon egy másik könyvtárat!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>Felülírási mód</translation> <translation>Felülírási mód</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>Figyelem: Ez a mód felülírja a már létező fájlokat, amelyeket azt követően nem tud visszaállítani!</translation> <translation>Figyelem: Ez a mód felülírja a már létező fájlokat, amelyeket azt követően nem tud visszaállítani!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>Folytatás</translation> <translation>Folytatás</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>Visszaállítás</translation> <translation>Visszaállítás</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Már fut</translation> <translation>Már fut</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>A LameXP már fut. Kérjük, használja a futó példányt!</translation> <translation>A LameXP már fut. Kérjük, használja a futó példányt!</translation>
</message> </message>

14
etc/Translation/LameXP_IT.ts
View File

@ -766,7 +766,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1360,7 +1360,7 @@
<translation>Creazione della cartella non riuscita</translation> <translation>Creazione della cartella non riuscita</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP è già in esecuzione, per favore usa la sessione già aperta!</translation> <translation>LameXP è già in esecuzione, per favore usa la sessione già aperta!</translation>
</message> </message>
@ -1562,7 +1562,7 @@
<translation type="unfinished">Questa versione dimostrativa (Test) di LameXP è scaduta il %1.</translation> <translation type="unfinished">Questa versione dimostrativa (Test) di LameXP è scaduta il %1.</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Già in Esecuzione</translation> <translation>Già in Esecuzione</translation>
</message> </message>
@ -2528,22 +2528,22 @@
<translation type="unfinished">Se il File di Destinazione Esiste Già:</translation> <translation type="unfinished">Se il File di Destinazione Esiste Già:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation type="unfinished"> Modalità Sovrascrittura </translation> <translation type="unfinished"> Modalità Sovrascrittura </translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation type="unfinished">Attenzione: Questa modalità potrebbe sovrascrivere i file esistenti senza possibilità di recupero!</translation> <translation type="unfinished">Attenzione: Questa modalità potrebbe sovrascrivere i file esistenti senza possibilità di recupero!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation type="unfinished">Continua</translation> <translation type="unfinished">Continua</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation type="unfinished">Annulla</translation> <translation type="unfinished">Annulla</translation>
</message> </message>

14
etc/Translation/LameXP_KR.ts
View File

@ -763,7 +763,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1791,12 +1791,12 @@
<translation type="unfinished">드라이버가 읽기-전용이거나 접근 권한이 없습니다!</translation> <translation type="unfinished">드라이버가 읽기-전용이거나 접근 권한이 없습니다!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation type="unfinished">이미 실행 중</translation> <translation type="unfinished">이미 실행 중</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation type="unfinished">LameXP가 이미 실행 중입니다. 실행 중인 인스턴스를 사용하십시오!</translation> <translation type="unfinished">LameXP가 이미 실행 중입니다. 실행 중인 인스턴스를 사용하십시오!</translation>
</message> </message>
@ -2524,22 +2524,22 @@
<translation type="unfinished">대상 파일이 이미 존재하면:</translation> <translation type="unfinished">대상 파일이 이미 존재하면:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation type="unfinished">대체 방식</translation> <translation type="unfinished">대체 방식</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation type="unfinished">경고: 이 방식은 기존 파일이 되돌릴 수 없는 방법으로 대체될 수 있습니다!</translation> <translation type="unfinished">경고: 이 방식은 기존 파일이 되돌릴 수 없는 방법으로 대체될 수 있습니다!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation type="unfinished">계속</translation> <translation type="unfinished">계속</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation type="unfinished">되돌리기</translation> <translation type="unfinished">되돌리기</translation>
</message> </message>

14
etc/Translation/LameXP_PL.ts
View File

@ -769,7 +769,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2646,32 +2646,32 @@
<translation type="unfinished">Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację!</translation> <translation type="unfinished">Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation type="unfinished">Tryb nadpisywania</translation> <translation type="unfinished">Tryb nadpisywania</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation type="unfinished">Ostrzeżenie: W tym trybie istniejące pliki będą nadpisywane bez możliwości ich odzyskania!</translation> <translation type="unfinished">Ostrzeżenie: W tym trybie istniejące pliki będą nadpisywane bez możliwości ich odzyskania!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation type="unfinished">Kontynuuj</translation> <translation type="unfinished">Kontynuuj</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation type="unfinished">Cofnij</translation> <translation type="unfinished">Cofnij</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation type="unfinished">Już działa</translation> <translation type="unfinished">Już działa</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation type="unfinished">LameXP już działa, przejdź do działającego procesu!</translation> <translation type="unfinished">LameXP już działa, przejdź do działającego procesu!</translation>
</message> </message>

14
etc/Translation/LameXP_RU.ts
View File

@ -774,7 +774,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1723,12 +1723,12 @@
<translation>Диск только для чтения или недостаточно прав для записи!</translation> <translation>Диск только для чтения или недостаточно прав для записи!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Уже запущено</translation> <translation>Уже запущено</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP уже запущена, пожалуйста, используйте запущенную копию программы!</translation> <translation>LameXP уже запущена, пожалуйста, используйте запущенную копию программы!</translation>
</message> </message>
@ -2538,22 +2538,22 @@
<translation>Если файл уже существует:</translation> <translation>Если файл уже существует:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>Ркжим перезаписи</translation> <translation>Ркжим перезаписи</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>Предупреждение: В этом режиме безвозвратно будут перезаписываться уже существующие файлы, если таковые есть!</translation> <translation>Предупреждение: В этом режиме безвозвратно будут перезаписываться уже существующие файлы, если таковые есть!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>Да</translation> <translation>Да</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>Отмена</translation> <translation>Отмена</translation>
</message> </message>

14
etc/Translation/LameXP_SV.ts
View File

@ -767,7 +767,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2638,32 +2638,32 @@
<translation>Kan inte skriva till den specificerade mappen. Välj en annan destination!</translation> <translation>Kan inte skriva till den specificerade mappen. Välj en annan destination!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>Överskrivningsläge</translation> <translation>Överskrivningsläge</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>Varning! Det här läget kan skriva över befintliga filer, utan möjlighet att återskapa!</translation> <translation>Varning! Det här läget kan skriva över befintliga filer, utan möjlighet att återskapa!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>Fortsätt</translation> <translation>Fortsätt</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>Återställ</translation> <translation>Återställ</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Körs redan</translation> <translation>Körs redan</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP körs redan, använd den redan startade instansen!</translation> <translation>LameXP körs redan, använd den redan startade instansen!</translation>
</message> </message>

14
etc/Translation/LameXP_TW.ts
View File

@ -763,7 +763,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1484,12 +1484,12 @@
<translation>驅動器是只讀的或沒有足夠的訪問權限 !</translation> <translation>驅動器是只讀的或沒有足夠的訪問權限 !</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>已在運行</translation> <translation>已在運行</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP 已在運行,請使用當前運行的實例 !</translation> <translation>LameXP 已在運行,請使用當前運行的實例 !</translation>
</message> </message>
@ -2524,22 +2524,22 @@
<translation>如果目標文件已存在: </translation> <translation>如果目標文件已存在: </translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>覆蓋模式</translation> <translation>覆蓋模式</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>警告: 這種模式可能會覆蓋現有的文件無法恢復!</translation> <translation>警告: 這種模式可能會覆蓋現有的文件無法恢復!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>繼續</translation> <translation>繼續</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>還原</translation> <translation>還原</translation>
</message> </message>

14
etc/Translation/LameXP_UK.ts
View File

@ -770,7 +770,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1687,12 +1687,12 @@
<translation>Носій в режимі &apos;лише для читання&apos; або використовуються недостатні права доступу!</translation> <translation>Носій в режимі &apos;лише для читання&apos; або використовуються недостатні права доступу!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>Вже запущено</translation> <translation>Вже запущено</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP вже запущено, тому використовуйте запущену копію програми!</translation> <translation>LameXP вже запущено, тому використовуйте запущену копію програми!</translation>
</message> </message>
@ -2531,22 +2531,22 @@
<translation>Якщо цільовий файл вже існує:</translation> <translation>Якщо цільовий файл вже існує:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>Режим перезапису</translation> <translation>Режим перезапису</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>Попередження: Цей режим може перезаписати існуючі файли без можливості відмінити зміни!</translation> <translation>Попередження: Цей режим може перезаписати існуючі файли без можливості відмінити зміни!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>Продовжити</translation> <translation>Продовжити</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>Відмінити</translation> <translation>Відмінити</translation>
</message> </message>

14
etc/Translation/LameXP_ZH.ts
View File

@ -763,7 +763,7 @@
</message> </message>
<message> <message>
<location filename="../../src/Model_FileExts.cpp" line="142"/> <location filename="../../src/Model_FileExts.cpp" line="142"/>
<source>Repalce With</source> <source>Replace With</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1484,12 +1484,12 @@
<translation>驱动器是只读的或没有足够的访问权限!</translation> <translation>驱动器是只读的或没有足够的访问权限!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>Already Running</source> <source>Already Running</source>
<translation>已运行</translation> <translation>已运行</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4376"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4386"/>
<source>LameXP is already running, please use the running instance!</source> <source>LameXP is already running, please use the running instance!</source>
<translation>LameXP 已在运行,请使用当前运行的实例!</translation> <translation>LameXP 已在运行,请使用当前运行的实例!</translation>
</message> </message>
@ -2524,22 +2524,22 @@
<translation>如果目标文件已存在:</translation> <translation>如果目标文件已存在:</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Overwrite Mode</source> <source>Overwrite Mode</source>
<translation>覆盖模式</translation> <translation>覆盖模式</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Warning: This mode may overwrite existing files with no way to revert!</source> <source>Warning: This mode may overwrite existing files with no way to revert!</source>
<translation>警告: 这种模式可能会覆盖现有的文件且无法恢复!</translation> <translation>警告: 这种模式可能会覆盖现有的文件且无法恢复!</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Continue</source> <source>Continue</source>
<translation>继续</translation> <translation>继续</translation>
</message> </message>
<message> <message>
<location filename="../../src/Dialog_MainWindow.cpp" line="4292"/> <location filename="../../src/Dialog_MainWindow.cpp" line="4302"/>
<source>Revert</source> <source>Revert</source>
<translation>后退</translation> <translation>后退</translation>
</message> </message>

BIN
res/localization/LameXP_DE.qm
View File

Binary file not shown.

4
src/Config.h
View File

@ -34,8 +34,8 @@
#define VER_LAMEXP_MINOR_HI 1 #define VER_LAMEXP_MINOR_HI 1
#define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 3 #define VER_LAMEXP_PATCH 4
#define VER_LAMEXP_BUILD 1730 #define VER_LAMEXP_BUILD 1734
#define VER_LAMEXP_CONFG 1700 #define VER_LAMEXP_CONFG 1700
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

22
src/Dialog_MainWindow.cpp
View File

@ -4206,16 +4206,16 @@ void MainWindow::customParamsHelpRequested(QWidget *obj, QEvent *event)
} }
} }
if(obj == ui->helpCustomParamLAME) showCustomParamsHelpScreen("lame.exe", "--longhelp"); if(obj == ui->helpCustomParamLAME) showCustomParamsHelpScreen("lame.exe", "--longhelp");
else if(obj == ui->helpCustomParamOggEnc) showCustomParamsHelpScreen("oggenc2.exe", "--help"); else if(obj == ui->helpCustomParamOggEnc) showCustomParamsHelpScreen("oggenc2.exe", "--help");
else if(obj == ui->helpCustomParamNeroAAC) else if(obj == ui->helpCustomParamNeroAAC)
{ {
switch(EncoderRegistry::getAacEncoder()) switch(EncoderRegistry::getAacEncoder())
{ {
case SettingsModel::AAC_ENCODER_QAAC: showCustomParamsHelpScreen("qaac.exe", "--help"); break; case SettingsModel::AAC_ENCODER_QAAC: showCustomParamsHelpScreen("qaac64.exe|qaac.exe", "--help"); break;
case SettingsModel::AAC_ENCODER_FHG : showCustomParamsHelpScreen("fhgaacenc.exe", "" ); break; case SettingsModel::AAC_ENCODER_FHG : showCustomParamsHelpScreen("fhgaacenc.exe", "" ); break;
case SettingsModel::AAC_ENCODER_FDK : showCustomParamsHelpScreen("fdkaac.exe", "--help"); break; case SettingsModel::AAC_ENCODER_FDK : showCustomParamsHelpScreen("fdkaac.exe", "--help"); break;
case SettingsModel::AAC_ENCODER_NERO: showCustomParamsHelpScreen("neroAacEnc.exe", "-help" ); break; case SettingsModel::AAC_ENCODER_NERO: showCustomParamsHelpScreen("neroAacEnc.exe", "-help" ); break;
default: MUtils::Sound::beep(MUtils::Sound::BEEP_ERR); break; default: MUtils::Sound::beep(MUtils::Sound::BEEP_ERR); break;
} }
} }
@ -4230,7 +4230,17 @@ void MainWindow::customParamsHelpRequested(QWidget *obj, QEvent *event)
*/ */
void MainWindow::showCustomParamsHelpScreen(const QString &toolName, const QString &command) void MainWindow::showCustomParamsHelpScreen(const QString &toolName, const QString &command)
{ {
const QString binary = lamexp_tools_lookup(toolName); const QStringList toolNames = toolName.split('|', QString::SkipEmptyParts);
QString binary;
for(QStringList::ConstIterator iter = toolNames.constBegin(); iter != toolNames.constEnd(); iter++)
{
if(lamexp_tools_check(*iter))
{
binary = lamexp_tools_lookup(*iter);
break;
}
}
if(binary.isEmpty()) if(binary.isEmpty())
{ {
MUtils::Sound::beep(MUtils::Sound::BEEP_ERR); MUtils::Sound::beep(MUtils::Sound::BEEP_ERR);

1
src/Encoder_AAC.h
View File

@ -43,6 +43,7 @@ public:
virtual void setEnable2Pass(bool enabled); virtual void setEnable2Pass(bool enabled);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_AAC_FDK.h
View File

@ -41,6 +41,7 @@ public:
virtual void setProfile(int profile); virtual void setProfile(int profile);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_AAC_FHG.h
View File

@ -44,6 +44,7 @@ public:
virtual void setProfile(int profile); virtual void setProfile(int profile);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

11
src/Encoder_AAC_QAAC.cpp
View File

@ -134,11 +134,10 @@ static const g_qaacEncoderInfo;
QAACEncoder::QAACEncoder(void) QAACEncoder::QAACEncoder(void)
: :
m_binary_qaac(lamexp_tools_lookup("qaac.exe")), m_binary_qaac32(lamexp_tools_lookup("qaac.exe")),
m_binary_soxr(lamexp_tools_lookup("libsoxr.dll")), m_binary_qaac64(lamexp_tools_lookup("qaac64.exe"))
m_binary_soxc(lamexp_tools_lookup("libsoxconvolver.dll"))
{ {
if(m_binary_qaac.isEmpty() || m_binary_soxr.isEmpty() || m_binary_soxc.isEmpty()) if(m_binary_qaac32.isEmpty() && m_binary_qaac64.isEmpty())
{ {
MUTILS_THROW("Error initializing QAAC. Tool 'qaac.exe' is not registred!"); MUTILS_THROW("Error initializing QAAC. Tool 'qaac.exe' is not registred!");
} }
@ -152,6 +151,8 @@ QAACEncoder::~QAACEncoder(void)
bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag) bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag)
{ {
const QString qaac_bin = m_binary_qaac64.isEmpty() ? m_binary_qaac32 : m_binary_qaac64;
QProcess process; QProcess process;
QStringList args; QStringList args;
@ -203,7 +204,7 @@ bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInf
args << "-o" << QDir::toNativeSeparators(outputFile); args << "-o" << QDir::toNativeSeparators(outputFile);
args << QDir::toNativeSeparators(sourceFile); args << QDir::toNativeSeparators(sourceFile);
if(!startProcess(process, m_binary_qaac, args)) if(!startProcess(process, qaac_bin, args))
{ {
return false; return false;
} }

6
src/Encoder_AAC_QAAC.h
View File

@ -41,11 +41,11 @@ public:
virtual void setProfile(int profile); virtual void setProfile(int profile);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:
const QString m_binary_qaac; const QString m_binary_qaac32;
const QString m_binary_soxr; const QString m_binary_qaac64;
const QString m_binary_soxc;
int m_configProfile; int m_configProfile;
}; };

1
src/Encoder_AC3.h
View File

@ -46,6 +46,7 @@ public:
virtual void setFastBitAllocation(bool value); virtual void setFastBitAllocation(bool value);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_Abstract.h
View File

@ -78,6 +78,7 @@ public:
virtual void setCustomParams(const QString &customParams); virtual void setCustomParams(const QString &customParams);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const = 0;
static const AbstractEncoderInfo *getEncoderInfo(void) static const AbstractEncoderInfo *getEncoderInfo(void)
{ {
MUTILS_THROW("This method shall be re-implemented in derived classes!"); MUTILS_THROW("This method shall be re-implemented in derived classes!");

1
src/Encoder_DCA.h
View File

@ -41,6 +41,7 @@ public:
virtual const unsigned int *supportedSamplerates(void); virtual const unsigned int *supportedSamplerates(void);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_FLAC.h
View File

@ -40,6 +40,7 @@ public:
virtual const unsigned int *supportedBitdepths(void); virtual const unsigned int *supportedBitdepths(void);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_MAC.h
View File

@ -38,6 +38,7 @@ public:
virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_MP3.h
View File

@ -45,6 +45,7 @@ public:
virtual void setChannelMode(int value); virtual void setChannelMode(int value);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_Opus.h
View File

@ -46,6 +46,7 @@ public:
virtual void setFrameSize(int frameSize); virtual void setFrameSize(int frameSize);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_Vorbis.h
View File

@ -40,6 +40,7 @@ public:
virtual void setSamplingRate(int value); virtual void setSamplingRate(int value);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
private: private:

1
src/Encoder_Wave.h
View File

@ -38,5 +38,6 @@ public:
virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion); virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion);
//Encoder info //Encoder info
virtual const AbstractEncoderInfo *toEncoderInfo(void) const { return getEncoderInfo(); }
static const AbstractEncoderInfo *getEncoderInfo(void); static const AbstractEncoderInfo *getEncoderInfo(void);
}; };

2
src/Model_FileExts.cpp
View File

@ -139,7 +139,7 @@ QVariant FileExtsModel::headerData(int section, Qt::Orientation orientation, int
case 0: case 0:
return QVariant(tr("File Extension")); return QVariant(tr("File Extension"));
case 1: case 1:
return QVariant(tr("Repalce With")); return QVariant(tr("Replace With"));
default: default:
return QVariant(); return QVariant();
} }

4
src/Registry_Encoder.cpp
View File

@ -507,6 +507,10 @@ int EncoderRegistry::getAacEncoder(void)
{ {
return SettingsModel::AAC_ENCODER_QAAC; return SettingsModel::AAC_ENCODER_QAAC;
} }
else if(lamexp_tools_check("qaac64.exe") && lamexp_tools_check("libsoxr64.dll") && lamexp_tools_check("libsoxconvolver64.dll"))
{
return SettingsModel::AAC_ENCODER_QAAC;
}
else if(lamexp_tools_check("fdkaac.exe")) else if(lamexp_tools_check("fdkaac.exe"))
{ {
return SettingsModel::AAC_ENCODER_FDK; return SettingsModel::AAC_ENCODER_FDK;

2
src/Thread_Process.cpp
View File

@ -441,7 +441,7 @@ int ProcessThread::generateOutFileName(QString &outFileName)
//Generate full output path //Generate full output path
const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->getEncoderInfo()->extension()) : m_renameFileExt; const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt;
outFileName = QString("%1/%2.%3").arg(targetDir.canonicalPath(), fileName, fileExt); outFileName = QString("%1/%2.%3").arg(targetDir.canonicalPath(), fileName, fileExt);
//Skip file, if target file exists (optional!) //Skip file, if target file exists (optional!)

1
src/Tools.h
View File

@ -120,5 +120,6 @@ static const aac_encoder_t g_lamexp_aacenc[] =
{ "FhgAacEnc", { "fhgaacenc.exe", "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", "libsndfile-1.dll", NULL }, lamexp_toolver_fhgaacenc(), 1, 100000000, "????-??-??", "fhgaacenc version (\\d+) by tmkk", NULL }, { "FhgAacEnc", { "fhgaacenc.exe", "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", "libsndfile-1.dll", NULL }, lamexp_toolver_fhgaacenc(), 1, 100000000, "????-??-??", "fhgaacenc version (\\d+) by tmkk", NULL },
{ "FdkAacEnc", { "fdkaac.exe", NULL }, lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?", "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)", NULL }, { "FdkAacEnc", { "fdkaac.exe", NULL }, lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?", "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)", NULL },
{ "QAAC", { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL }, lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, { "QAAC", { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL }, lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL },
{ "QAACx64", { "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll", NULL }, lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL },
{ NULL, { NULL }, 0, 0, 0, NULL, NULL, NULL } { NULL, { NULL }, 0, 0, 0, NULL, NULL, NULL }
}; };