From 3b994332268e965838cd00bc0cc0626391421e48 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Fri, 18 Jan 2013 02:42:37 +0100 Subject: [PATCH] Expose "disable resampling" option for Opus decoder in the GUI. --- etc/Translation/Blank.ts | 279 +++++++++++++++++----------------- etc/Translation/LameXP_DE.ts | 4 + etc/Translation/LameXP_ES.ts | 4 + etc/Translation/LameXP_FR.ts | 4 + etc/Translation/LameXP_IT.ts | 4 + etc/Translation/LameXP_KR.ts | 4 + etc/Translation/LameXP_PL.ts | 279 +++++++++++++++++----------------- etc/Translation/LameXP_RU.ts | 4 + etc/Translation/LameXP_SV.ts | 279 +++++++++++++++++----------------- etc/Translation/LameXP_TW.ts | 4 + etc/Translation/LameXP_UK.ts | 4 + etc/Translation/LameXP_ZH.ts | 4 + gui/MainWindow.ui | 135 +++++++++------- res/localization/LameXP_DE.qm | Bin 84416 -> 84690 bytes src/Config.h | 2 +- src/Dialog_CueImport.cpp | 10 +- src/Dialog_CueImport.h | 5 +- src/Dialog_MainWindow.cpp | 10 +- 18 files changed, 558 insertions(+), 477 deletions(-) diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 5efcd947..8af490ef 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -431,188 +431,188 @@ CueImportDialog - + Import Cue Sheet - + The following Cue Sheet will be split and imported into LameXP. - + Loading Cue Sheet file, please be patient... - - + + Failed to load the Cue Sheet file: - + The specified file could not be found! - - - + + + Cue Sheet Error - + (System Default) - + Select ANSI Codepage for Cue Sheet file: - + OK - + Cancel - + New Folder - + An unknown error has occured! - + The file could not be opened for reading. Make sure you have the required rights! - + The provided file does not look like a valid Cue Sheet disc image file! - + Could not find any supported audio track in the Cue Sheet image! - + Note that LameXP can not handle "binary" Cue Sheet images. - + The selected Cue Sheet file contains inconsistent information. Take care! - + Unknown Artist - + Unknown Album - - + + Choose Output Directory - - + + LameXP - + Error: The selected output directory could not be created! - + Error: The selected output directory is not writable! - + Low Diskspace Warning - + There are less than %1 GB of free diskspace available in the selected output directory. - + It is highly recommend to free up more diskspace before proceeding with the import! - + Analyzing file(s), please wait... - + Analysis Failed - + Warning: The format of some of the input files could not be determined! - + Continue Anyway - + Abort - + Splitting file(s), please wait... - + Process was aborted by the user after %1 track(s)! - + An unexpected error has occured while splitting the Cue Sheet! - + Imported %1 track(s) from the Cue Sheet and skipped %2 track(s). - + Cue Sheet Completed @@ -714,17 +714,17 @@ DecoderRegistry - + All supported types - + Playlists - + All files @@ -835,7 +835,7 @@ - + Source Files @@ -862,7 +862,7 @@ - + Output Directory @@ -913,7 +913,7 @@ - + Meta Data @@ -954,7 +954,7 @@ - + Compression @@ -1045,7 +1045,7 @@ - + Advanced Options @@ -1481,114 +1481,119 @@ - + Encoding Complexity: - + Frame Size: - + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + + + Overwrite Mode - + Overwrite Existing File - + Skip File - + Keep Both Files (Default) - + If Target File Already Exists: - + Reset Advanced Options - + Encode Now! - - + + About... - + Exit Program - + File - + ? - + View - + Style - + Language - + Tools - + Configuration - + Quit - + Open File(s)... - - + + Visit Official Web-Site - + @@ -1596,124 +1601,124 @@ - + Open Folder... - + Clear All - + Plastique - + Cleanlooks - + Windows Vista ("Aero") - + Windows Classic - + Windows XP ("Luna") - + Disable Update Reminder - + Disable Sound Effects - + Install WMA Decoder - + Disable Nero AAC Notifications - + Show DropBox - + From File... - + Encode! - + Disable Shell Integration - + Frequently Asked Questions - + Changelog - + Translator's Guide - + Help && Support - + Open Folder Recursively... - + Check for Beta Updates - + Import Cue Sheet - + Disable Slow Startup Notifications - + Hibernate Computer On Shutdown @@ -3053,186 +3058,186 @@ - + Show details for selected job - + Browse Output File Location - + Filter Log Items - + Show Running Only - + Show Succeeded Only - + Show Failed Only - + Show Skipped Only - + Show All Items - + Encoding Files - + Your files are being encoded, please be patient... - + Encoding files, please wait... - + Multi-threading enabled: Running %1 instances in parallel! - + Aborted! Waiting for running jobs to terminate... - + Encoding: %1 files of %2 completed so far, please wait... - + Creating the playlist file, please wait... - + Process was aborted by the user after %1 file(s)! - + Process was aborted prematurely by the user! - + LameXP - Aborted - + Process was aborted by the user. - + Process finished after %1. - + Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - + Error: %1 of %2 files failed. Double-click failed items for detailed information! - + LameXP - Error - + At least one file has failed! - + All files completed successfully. Skipped %1 files. - - + + All files completed successfully. - + LameXP - Done - + None of the items matches the current filtering rules - + Playlist creation failed - + The playlist file could not be created: - + Warning: Computer will shutdown in %1 seconds... - - + + Cancel Shutdown - + hour(s) - - + + minute(s) - - + + second(s) - + millisecond(s) diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 49717fb0..10d58947 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -1986,6 +1986,10 @@ Go To Parent Directory Zum übergeordneten Verzeichnis wechseln + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + Opus-Dekodierer Abtastratenkonvertierung deaktivieren (d.h. immer 48.000 Hz ausgeben) + MetaInfo diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index 5fac1c6b..8285f5c2 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -1985,6 +1985,10 @@ Go To Parent Directory + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 7d21342d..635ff591 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -1995,6 +1995,10 @@ Ouvrir le dossier récursivement... Go To Parent Directory + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index ee08894e..bc24e6f2 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -1986,6 +1986,10 @@ Go To Parent Directory + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index 3eb771a1..82df0871 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -1985,6 +1985,10 @@ Go To Parent Directory + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 808e11e0..f4b936af 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -431,188 +431,188 @@ CueImportDialog - + Import Cue Sheet Importuj Cue Sheet - + The following Cue Sheet will be split and imported into LameXP. Dany plik Cue Sheet będzie podzielony i zaimortowany do LameXP. - + Loading Cue Sheet file, please be patient... Ładowanie pliku Cue Sheet, prosze być cierpliwy... - - + + Failed to load the Cue Sheet file: Ładowanie pliku Cue Sheet zakończone niepowodzeniem: - + The specified file could not be found! Podany plik nie może być odnaleziony! - - - + + + Cue Sheet Error Błąd pliku Cue Sheet - + (System Default) (Domyślne systemowe) - + Select ANSI Codepage for Cue Sheet file: Wybierz kodowanie ANSI dla piku Cue: - + OK OK - + Cancel Anuluj - + New Folder Nowy folder - + An unknown error has occured! Wystąpił nieokreśłony błąd! - + The file could not be opened for reading. Make sure you have the required rights! Plik nie mógł zostać odczytany. Upewnij się że masz prawo odczytu! - + The provided file does not look like a valid Cue Sheet disc image file! Dany plik nie wydaje się prawidłowym plikiem obrazu Cue Sheet! - + Could not find any supported audio track in the Cue Sheet image! Nie znaleziono obsługiwanego formatu dźwięku w żadnej ze ścieżek obrazu Cue Sheet! - + Note that LameXP can not handle "binary" Cue Sheet images. LameXP nie radzi sobie z formatem "binarnym" obrazu Cue Sheet. - + The selected Cue Sheet file contains inconsistent information. Take care! Wybrany plik Cue Sheet zawiera niespójne informacje. Prosze zachować ostrożność! - + Unknown Artist Nieznany Artysta - + Unknown Album Nieznany Album - - + + Choose Output Directory Wybierz folder wyjściowy - - + + LameXP LameXP - + Error: The selected output directory could not be created! Błąd: Wybrana lokalizacja wyjściowa nie może zostać utworzona! - + Error: The selected output directory is not writable! Błąd: Nie można zapisać w wybranej lokalizacji wyjściowej! - + Low Diskspace Warning Ostrzeżenie o małej ilości miejsca na dysku - + There are less than %1 GB of free diskspace available in the selected output directory. Jest mniej niż %1 GB wolnego miejsca w wybranej lokalizacji wyjściowej. - + It is highly recommend to free up more diskspace before proceeding with the import! Jest wysoce zalecane zwolnić miejsce na dysku zanim zaczniesz importować! - + Analyzing file(s), please wait... Analizowanie pliku/ów, prosze czekać... - + Analysis Failed Analiza zakończona niepowodzeniem - + Warning: The format of some of the input files could not be determined! Ostrzeżenie: Nie można rozpoznać formatu kilku plików wejściowych! - + Continue Anyway Kontynuuj pomimo to - + Abort Przerwij - + Splitting file(s), please wait... Dzielenie pliku/ów, prosze czekać... - + Process was aborted by the user after %1 track(s)! Proces został przerwany przez użytkownika po imporcie %1 ścieżek! - + An unexpected error has occured while splitting the Cue Sheet! Wystąpił nieoczekiwany błąd podczas podziału pliku Cue Sheet! - + Imported %1 track(s) from the Cue Sheet and skipped %2 track(s). Zaimportowano %1 ścieżek i opuszczono %2 ścieżek z pliku Cue Sheet. - + Cue Sheet Completed Stworzono plik Cue Sheet @@ -714,17 +714,17 @@ DecoderRegistry - + All supported types Wszystkie obsługiwane pliki - + Playlists Playlisty - + All files Wszystkie pliki @@ -835,7 +835,7 @@ - + Source Files Pliki źródłowe @@ -862,7 +862,7 @@ - + Output Directory Folder docelowy @@ -898,7 +898,7 @@ - + Meta Data Tagi @@ -939,7 +939,7 @@ - + Compression Kompresja @@ -990,7 +990,7 @@ - + Advanced Options Opcje zaawansowane @@ -1482,114 +1482,119 @@ Opcje kodera Opus - + Encoding Complexity: Złożoność kompresji: - + Frame Size: Rozmiar ramki: - + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + + + Overwrite Mode - + Overwrite Existing File - + Skip File - + Keep Both Files (Default) - + If Target File Already Exists: - + Reset Advanced Options Resetuj opcje zaawansowane - + Encode Now! Kompresuj! - - + + About... Info... - + Exit Program Wyjdź z programu - + File Plik - + ? ? - + View Widok - + Style Styl - + Language Język - + Tools Narzędzia - + Configuration Konfiguracja - + Quit Zamknij - + Open File(s)... Otwórz plik(i)... - - + + Visit Official Web-Site Odwiedź oficjalną stronę - + @@ -1597,124 +1602,124 @@ Sprawdź aktualizacje - + Open Folder... Otwórz folder... - + Clear All Wyczyść wszystko - + Plastique Plastique - + Cleanlooks Cleanlooks - + Windows Vista ("Aero") Windows Vista ("Aero") - + Windows Classic Windows Classic - + Windows XP ("Luna") Windows XP ("Luna") - + Disable Update Reminder Wyłącz przypominanie o aktualizacji - + Disable Sound Effects Wyłącz efekty dźwiękowe - + Install WMA Decoder Zainstaluj Dekoder WMA - + Disable Nero AAC Notifications Wyłącz powiadomienia Nero AAC - + Show DropBox Pokaż DropBoxa - + From File... Z pliku... - + Encode! Kompresuj! - + Disable Shell Integration Wyłącz integrację z systemem - + Frequently Asked Questions Pytania i Odpowiedzi - + Changelog Lista zmian - + Translator's Guide Przewodnik tłumacza - + Help && Support Pomoc i Wsparcie - + Open Folder Recursively... Otwórz folder rekurencyjnie... - + Check for Beta Updates Sprawdzaj czy jest Beta - + Import Cue Sheet Importuj plik Cue - + Disable Slow Startup Notifications Wyłącz powiadomienia o powolnym starcie - + Hibernate Computer On Shutdown Hibernuj zamiast zamykać @@ -3054,186 +3059,186 @@ Powrót - + Show details for selected job Pokaż szczegóły wybranego zadania - + Browse Output File Location Wybierz lokalizację dla plików wyjściowych - + Filter Log Items - + Show Running Only - + Show Succeeded Only - + Show Failed Only - + Show Skipped Only - + Show All Items - + Encoding Files Kompresowanie plików - + Your files are being encoded, please be patient... Twoje pliki są właśnie kompresowane, prosze być cierpliwy... - + Encoding files, please wait... Kompresowanie plików, prosze czekać... - + Multi-threading enabled: Running %1 instances in parallel! Wielowątkowosć włączona: Równolegle wykonywanych jest %1 kodowań! - + Aborted! Waiting for running jobs to terminate... Przerwano! Czekanie na wyłączenie procesu... - + Encoding: %1 files of %2 completed so far, please wait... Kompresja: Prosze czekać, jak dotąd wykonano %1 z %2 plików... - + Creating the playlist file, please wait... Tworzenie pliku playlisty, prosze czekać... - + Process was aborted by the user after %1 file(s)! Proces został przerwany przez użytkownika po wykonaniu %1 plików! - + Process was aborted prematurely by the user! Proces został przedwcześnie zakończony przez użytkownika! - + LameXP - Aborted LameXP - Przerwano - + Process was aborted by the user. Proces został przerwany przez użytkownika. - + Process finished after %1. Proces został zakończony po %1. - + Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - + Error: %1 of %2 files failed. Double-click failed items for detailed information! Błąd: %1 z %2 plików nie zostało skompresowanych. Kliknij dwukrotnie na plik aby zobaczyć szczegóły! - + LameXP - Error LameXP - Błąd - + At least one file has failed! Przynajmniej jeden plik nie został skompresowany! - + All files completed successfully. Skipped %1 files. - - + + All files completed successfully. Kompresja wszystkich plików zakończona powodzeniem. - + LameXP - Done LameXP - Zrobione - + None of the items matches the current filtering rules - + Playlist creation failed Tworzenie playlisty zakończone niepowodzeniem - + The playlist file could not be created: Playlista nie mogła zostać utworzona: - + Warning: Computer will shutdown in %1 seconds... Ostrzeżenie: Komputer zostanie zamknięty za %1 sekund/y... - - + + Cancel Shutdown Anuluj wyłączenie komputera - + hour(s) godzinie/ach - - + + minute(s) minutach - - + + second(s) sekundach - + millisecond(s) milisekundach diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index b2a80d3c..c04655ad 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -1991,6 +1991,10 @@ Go To Parent Directory + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts index 981100d5..0a65b437 100644 --- a/etc/Translation/LameXP_SV.ts +++ b/etc/Translation/LameXP_SV.ts @@ -432,188 +432,188 @@ CueImportDialog - + Import Cue Sheet Importera .cue-fil - + The following Cue Sheet will be split and imported into LameXP. Följande cue-fil kommer att delas och importeras till LameXP. - + Loading Cue Sheet file, please be patient... Läser in cue-fil. Vänta... - - + + Failed to load the Cue Sheet file: Kunde inte läsa in cue-fil: - + The specified file could not be found! Den specificerade filen kunde inte hittas! - - - + + + Cue Sheet Error Cue-fel - + (System Default) (Systemstandard) - + Select ANSI Codepage for Cue Sheet file: Välj ANSI som teckentabell för cue-fil: - + OK OK - + Cancel Avbryt - + New Folder Ny mapp - + An unknown error has occured! Ett okänt fel har uppstått! - + The file could not be opened for reading. Make sure you have the required rights! Filen kunde inte läsas in. Tillse att du har növändig behörighet! - + The provided file does not look like a valid Cue Sheet disc image file! Den specificerade filen verkar inte vara någon giltig cue-fil för skivavbildningar! - + Could not find any supported audio track in the Cue Sheet image! Kunde inte hitta något ljudspår som stöds i cue-filen! - + Note that LameXP can not handle "binary" Cue Sheet images. Notera att LameXP inte kan hantera "binära" cue-avbilder. - + The selected Cue Sheet file contains inconsistent information. Take care! Den specificerade cue-filen innehåller inkonsekvent information. Undersök det! - + Unknown Artist Okänd artist - + Unknown Album Okänt album - - + + Choose Output Directory Välj målmapp för utdata - - + + LameXP LameXP - + Error: The selected output directory could not be created! Fel: Den specificerade målmappen kunde inte skapas! - + Error: The selected output directory is not writable! Fel: Den specificerade målmappen är skrivskyddad! - + Low Diskspace Warning Varning för lågt diskutrymme - + There are less than %1 GB of free diskspace available in the selected output directory. Det finns mindre än %1 GB ledigt diskutrymme på den specificerade måladressen. - + It is highly recommend to free up more diskspace before proceeding with the import! Du bör frigöra mer diskutrymme innan du fortsätter med importen! - + Analyzing file(s), please wait... Analyserar fil(er), vänta... - + Analysis Failed Analys misslyckades - + Warning: The format of some of the input files could not be determined! Varning! Formatet på vissa filer kunde inte avgöras! - + Continue Anyway Fortsätt ändå - + Abort Avbryt - + Splitting file(s), please wait... Delar fil(er), vänta... - + Process was aborted by the user after %1 track(s)! Åtgärden avbröts av användaren efter %1 spår! - + An unexpected error has occured while splitting the Cue Sheet! Ett oväntat fel uppstod vid delningen av cue-filen! - + Imported %1 track(s) from the Cue Sheet and skipped %2 track(s). Importerade %1 spår från cue-filen och hoppade över %2 spår. - + Cue Sheet Completed cue-fil färdigbearbetad @@ -715,17 +715,17 @@ DecoderRegistry - + All supported types Alla typer som stöds - + Playlists Spelningslistor - + All files Alla filer @@ -836,7 +836,7 @@ - + Source Files Källfiler @@ -863,7 +863,7 @@ - + Output Directory Målmapp @@ -914,7 +914,7 @@ - + Meta Data Metadata @@ -955,7 +955,7 @@ - + Compression Komprimering @@ -1046,7 +1046,7 @@ - + Advanced Options Avancerat @@ -1482,114 +1482,119 @@ Opus-alternativ - + Encoding Complexity: Kodningskomplexitet: - + Frame Size: Ramstorlek: - + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + + + Overwrite Mode - + Overwrite Existing File - + Skip File - + Keep Both Files (Default) - + If Target File Already Exists: - + Reset Advanced Options Återställ avancerade inställningar - + Encode Now! Koda om nu! - - + + About... Om... - + Exit Program Avsluta LameXP - + File Arkiv - + ? ? - + View Visa - + Style Stil - + Language Språk - + Tools Verktyg - + Configuration Inställningar - + Quit Avsluta - + Open File(s)... Öppna fil(er)... - - + + Visit Official Web-Site Besök hemsidan - + @@ -1597,124 +1602,124 @@ Sök efter uppdateringar - + Open Folder... Öppna mapp... - + Clear All Rensa alla - + Plastique Plastique - + Cleanlooks Cleanlooks - + Windows Vista ("Aero") Windows Vista ("Aero") - + Windows Classic Windows Classic - + Windows XP ("Luna") Windows XP ("Luna") - + Disable Update Reminder Inaktivera uppdateringsmeddelande - + Disable Sound Effects Inaktivera ljudeffekter - + Install WMA Decoder Installera WMA-avkodare - + Disable Nero AAC Notifications Inaktivera Nero AAC-meddelanden - + Show DropBox Visa DropBox - + From File... Från fil... - + Encode! Koda om! - + Disable Shell Integration Inaktivera utforskarintegration - + Frequently Asked Questions Vanliga frågor - + Changelog Ändringslogg - + Translator's Guide Översättningsguide - + Help && Support Hjälp && support - + Open Folder Recursively... Öppna mapp rekursivt... - + Check for Beta Updates Sök efter beta-uppdateringar - + Import Cue Sheet Importera cue-fil - + Disable Slow Startup Notifications Inaktivera meddelanden om långsam uppstart - + Hibernate Computer On Shutdown Försätt datorn i viloläge vid avslut @@ -3055,186 +3060,186 @@ Stäng - + Show details for selected job Visa detaljerad info för markerad åtgärd - + Browse Output File Location Öppna utdatamnappen - + Filter Log Items - + Show Running Only - + Show Succeeded Only - + Show Failed Only - + Show Skipped Only - + Show All Items - + Encoding Files Kodar om filer - + Your files are being encoded, please be patient... Dina filer kodas om, vänta... - + Encoding files, please wait... Kodar om filer, vänta... - + Multi-threading enabled: Running %1 instances in parallel! Flertrådskörning aktiverad: Kör %1 parallella instanser! - + Aborted! Waiting for running jobs to terminate... Avbrutet! Väntar på att aktiva processer skall avslutas... - + Encoding: %1 files of %2 completed so far, please wait... Omkodning: %1 fil(er) av %2 bearbetade hittills, vänta... - + Creating the playlist file, please wait... Skapar spelningslista, vänta... - + Process was aborted by the user after %1 file(s)! Åtgärden avbröts av användaren efter %1 fil(er)! - + Process was aborted prematurely by the user! Åtgärden avbröts i förtid av användaren! - + LameXP - Aborted LameXP - Avbrutet - + Process was aborted by the user. Åtgärden avbröts av användaren. - + Process finished after %1. Åtgärden slutförd efter %1. - + Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information! - + Error: %1 of %2 files failed. Double-click failed items for detailed information! Fel: %1 av %2 filer misslyckades. Dubbelklicka på det misslyckade objektet för detaljerad information! - + LameXP - Error LameXP - Fel - + At least one file has failed! Minst en fil har misslyckats! - + All files completed successfully. Skipped %1 files. - - + + All files completed successfully. Alla filer korrekt omkodade. - + LameXP - Done LameXP - Klar - + None of the items matches the current filtering rules - + Playlist creation failed Kunde inte skapa spelningslista - + The playlist file could not be created: Spelningslistan kunde inte skapas: - + Warning: Computer will shutdown in %1 seconds... Varning! Datorn kommer att stängas av om %1 sekunder... - - + + Cancel Shutdown Avbryt avstängning - + hour(s) timma(r) - - + + minute(s) minut(er) - - + + second(s) sekund(er) - + millisecond(s) millisekund(er) diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts index dea20f44..b98c6d24 100644 --- a/etc/Translation/LameXP_TW.ts +++ b/etc/Translation/LameXP_TW.ts @@ -1985,6 +1985,10 @@ Go To Parent Directory + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 909a1027..7554e755 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -1986,6 +1986,10 @@ Go To Parent Directory Перейти до кореневої теки + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index e29a5083..215806f2 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -1985,6 +1985,10 @@ Go To Parent Directory + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + MetaInfo diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index d8278ebf..23613cb4 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -823,14 +823,14 @@ - + AAC/MP4 - + PCM/Wave @@ -853,14 +853,14 @@ - + A/52 - + DCA @@ -880,7 +880,7 @@ - + Qt::Horizontal @@ -893,7 +893,7 @@ - + Qt::Horizontal @@ -906,7 +906,7 @@ - + Qt::Horizontal @@ -919,7 +919,7 @@ - + Qt::Horizontal @@ -932,7 +932,7 @@ - + Qt::Horizontal @@ -945,15 +945,15 @@ - + FLAC - - + + Qt::Horizontal @@ -965,15 +965,15 @@ - + Opus - - + + Qt::Horizontal @@ -1420,7 +1420,7 @@ 0 0 604 - 1724 + 1759 @@ -3639,39 +3639,7 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - + Qt::Vertical @@ -3687,7 +3655,7 @@ - + Qt::Vertical @@ -3703,14 +3671,14 @@ - + Encoding Complexity: - + @@ -3732,7 +3700,7 @@ - + Qt::Horizontal @@ -3745,7 +3713,7 @@ - + Frame Size: @@ -3755,7 +3723,7 @@ - + @@ -3804,7 +3772,7 @@ - + Qt::Horizontal @@ -3817,6 +3785,61 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 6 + + + + + + + + Disable Opus-Decoder Resampling (i.e. always output as 48.000 Hz) + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 9de562dfa139ade83b47b63999fa22df7d604295..169c3185e76e021ae114af1a0f86fc84db22daac 100644 GIT binary patch delta 4880 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 TFA@td3%e6d7avbs->>lhq^gnO diff --git a/src/Config.h b/src/Config.h index aa354f76..462a6ef0 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 7 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 1227 +#define VER_LAMEXP_BUILD 1228 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_CueImport.cpp b/src/Dialog_CueImport.cpp index 5cd461e8..7e5de9ff 100644 --- a/src/Dialog_CueImport.cpp +++ b/src/Dialog_CueImport.cpp @@ -32,6 +32,7 @@ #include "Dialog_WorkingBanner.h" #include "Thread_FileAnalyzer.h" #include "Thread_CueSplitter.h" +#include "Registry_Decoder.h" #include "LockedFile.h" //Qt includes @@ -51,12 +52,13 @@ // Constructor & Destructor //////////////////////////////////////////////////////////// -CueImportDialog::CueImportDialog(QWidget *parent, FileListModel *fileList, const QString &cueFile) +CueImportDialog::CueImportDialog(QWidget *parent, FileListModel *fileList, const QString &cueFile, const SettingsModel *settings) : QDialog(parent), ui(new Ui::CueSheetImport), + m_fileList(fileList), m_cueFileName(cueFile), - m_fileList(fileList) + m_settings(settings) { //Init the dialog, from the .ui file ui->setupUi(this); @@ -398,10 +400,12 @@ void CueImportDialog::splitFiles(void) connect(splitter, SIGNAL(progressMaxChanged(unsigned int)), progress, SLOT(setProgressMax(unsigned int)), Qt::QueuedConnection); connect(progress, SIGNAL(userAbort()), splitter, SLOT(abortProcess()), Qt::DirectConnection); + DecoderRegistry::configureDecoders(m_settings); + progress->show(tr("Splitting file(s), please wait..."), splitter); progress->close(); - if(splitter->getAborted()) + if(splitter->getAborted()) { QMessageBox::warning(this, tr("Cue Sheet Error"), tr("Process was aborted by the user after %1 track(s)!").arg(QString::number(splitter->getTracksSuccess()))); } diff --git a/src/Dialog_CueImport.h b/src/Dialog_CueImport.h index 59939f16..4086e59b 100644 --- a/src/Dialog_CueImport.h +++ b/src/Dialog_CueImport.h @@ -27,6 +27,7 @@ class CueSheetModel; class LockedFile; class AudioFileModel; class FileListModel; +class SettingsModel; //UIC forward declartion namespace Ui { @@ -39,7 +40,7 @@ class CueImportDialog : public QDialog Q_OBJECT public: - CueImportDialog(QWidget *parent, FileListModel *fileList, const QString &cueFile); + CueImportDialog(QWidget *parent, FileListModel *fileList, const QString &cueFile, const SettingsModel *settings); ~CueImportDialog(void); int exec(void); @@ -64,6 +65,8 @@ private: CueSheetModel *m_model; FileListModel *m_fileList; + const SettingsModel *m_settings; + QList m_locks; QList m_fileInfo; QString m_cueFileName; diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index ceba2a18..5bb8a15d 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -403,6 +403,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S SET_CHECKBOX_STATE(ui->checkBoxUseSystemTempFolder, !m_settings->customTempPathEnabled()); SET_CHECKBOX_STATE(ui->checkBoxRenameOutput, m_settings->renameOutputFilesEnabled()); SET_CHECKBOX_STATE(ui->checkBoxForceStereoDownmix, m_settings->forceStereoDownmix()); + SET_CHECKBOX_STATE(ui->checkBoxOpusDisableResample, m_settings->opusDisableResample()); ui->checkBoxNeroAAC2PassMode->setEnabled(!(m_fhgEncoderAvailable || m_qaacEncoderAvailable)); ui->lineEditCustomParamLAME->setText(m_settings->customParametersLAME()); @@ -468,8 +469,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S connect(ui->checkBoxForceStereoDownmix, SIGNAL(clicked(bool)), this, SLOT(forceStereoDownmixEnabledChanged(bool))); connect(ui->comboBoxOpusFramesize, SIGNAL(currentIndexChanged(int)), this, SLOT(opusSettingsChanged())); connect(ui->spinBoxOpusComplexity, SIGNAL(valueChanged(int)), this, SLOT(opusSettingsChanged())); - //connect(comboBoxOpusOptimize, SIGNAL(currentIndexChanged(int)), SLOT(opusSettingsChanged())); - //connect(checkBoxOpusExpAnalysis, SIGNAL(clicked(bool)), this, SLOT(opusSettingsChanged())); + connect(ui->checkBoxOpusDisableResample, SIGNAL(clicked(bool)), SLOT(opusSettingsChanged())); connect(m_overwriteButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(overwriteModeChanged(int))); connect(m_evenFilterCustumParamsHelp, SIGNAL(eventOccurred(QWidget*, QEvent*)), this, SLOT(customParamsHelpRequested(QWidget*, QEvent*))); @@ -1950,7 +1950,7 @@ void MainWindow::importCueSheetActionTriggered(bool checked) if(!selectedCueFile.isEmpty()) { m_settings->mostRecentInputPath(QFileInfo(selectedCueFile).canonicalPath()); - CueImportDialog *cueImporter = new CueImportDialog(this, m_fileListModel, selectedCueFile); + CueImportDialog *cueImporter = new CueImportDialog(this, m_fileListModel, selectedCueFile, m_settings); result = cueImporter->exec(); LAMEXP_DELETE(cueImporter); } @@ -3655,7 +3655,7 @@ void MainWindow::opusSettingsChanged(void) { m_settings->opusFramesize(ui->comboBoxOpusFramesize->currentIndex()); m_settings->opusComplexity(ui->spinBoxOpusComplexity->value()); - //m_settings->opusOptimizeFor(comboBoxOpusOptimize->currentIndex()); + m_settings->opusDisableResample(ui->checkBoxOpusDisableResample->isChecked()); } /* @@ -4028,7 +4028,6 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void) ui->comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingModeDefault()); ui->comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompressionDefault()); ui->comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEqualizationModeDefault()); - //comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeForDefault()); ui->comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesizeDefault()); SET_CHECKBOX_STATE(ui->checkBoxBitrateManagement, m_settings->bitrateManagementEnabledDefault()); SET_CHECKBOX_STATE(ui->checkBoxNeroAAC2PassMode, m_settings->neroAACEnable2PassDefault()); @@ -4038,6 +4037,7 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void) SET_CHECKBOX_STATE(ui->checkBoxAftenFastAllocation, m_settings->aftenFastBitAllocationDefault()); SET_CHECKBOX_STATE(ui->checkBoxRenameOutput, m_settings->renameOutputFilesEnabledDefault()); SET_CHECKBOX_STATE(ui->checkBoxForceStereoDownmix, m_settings->forceStereoDownmixDefault()); + SET_CHECKBOX_STATE(ui->checkBoxOpusDisableResample, m_settings->opusDisableResampleDefault()); ui->lineEditCustomParamLAME->setText(m_settings->customParametersLAMEDefault()); ui->lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEncDefault()); ui->lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEncDefault());