From 1d52b628d1016cf461715c5bf553c439a98af568 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Tue, 6 Mar 2012 22:29:55 +0100 Subject: [PATCH] Show which AAC encoder is being used in the GUI. --- etc/Translation/Blank.ts | 355 ++++++++++++++++++++++-------------------- etc/Translation/LameXP_DE.ts | 20 +++ etc/Translation/LameXP_ES.ts | 20 +++ etc/Translation/LameXP_FR.ts | 20 +++ etc/Translation/LameXP_IT.ts | 20 +++ etc/Translation/LameXP_KR.ts | 20 +++ etc/Translation/LameXP_PL.ts | 355 ++++++++++++++++++++++-------------------- etc/Translation/LameXP_RU.ts | 20 +++ etc/Translation/LameXP_TW.ts | 20 +++ etc/Translation/LameXP_UK.ts | 20 +++ etc/Translation/LameXP_ZH.ts | 20 +++ gui/MainWindow.ui | 29 ++++ res/localization/LameXP_DE.qm | Bin 77615 -> 77967 bytes src/Config.h | 2 +- src/Dialog_MainWindow.cpp | 11 ++ src/Dialog_SplashScreen.cpp | 2 +- 16 files changed, 602 insertions(+), 332 deletions(-) diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 204a2663..84839635 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -749,7 +749,7 @@ - + Source Files @@ -776,7 +776,7 @@ - + Output Directory @@ -812,7 +812,7 @@ - + Meta Data @@ -853,7 +853,7 @@ - + Compression @@ -933,505 +933,505 @@ - - + + Advanced Options - + Bitrate Management (LAME and OggEnc2) - + Enable Bitrate Management - + Minimum (kbps): - + Maximum (kbps): - + LAME Algorithm Quality - + Faster Processing - + Better quality - + Warning: Audio quality will be very poor. Please do <u>not</u> complain about audio quality! - + Warning: Processing speed will be very slow. Please do <u>not</u> complain about processing speed! - + Channel Mode / Sampling Rate - - + + Auto Select (Default) - + Joint Stereo - + Forced Joint Stereo - + Simple - + Dual Mono - + Mono - + MP3 Channel Mode: - + Sampling Rate (Hz): - + 16.000 - + 22.050 - + 24.000 - + 32.000 - + 44.100 - + 48.000 - + Enforce Stereo Downmix of Surround (Multi-Channel) Sources - + AAC Encoder-Options - + Enable 2-Pass Processing (ABR Mode) - + Select AAC Profile: - + Auto Select (Recommended) - + Enforce LC-AAC - + Enforce HE-AAC (AAC + SBR) - + Enforce HE-AAC v2 (AAC + SBR + PS) - + Volume Normalization - + Enable Normalization Filter - + Peak Volume (dB): - + None - + Peak Level - + RMS Level - + Equalization Mode: - + Tone Adjustment - + Adjust Treble (dB): - + Adjust Bass (dB): - + Custom Encoder Parameters - - - - - + + + + + You can enter custom parameters here! - + Lame MP3: - + OggEnc2: - + MPEG-4 AAC: - + FLAC: - + Warning: Custom parameters won't be checked at all. Use them at your own risk !!! - + Aften A/52: - + Multi-Threading - + Choose the number of parallel instances based on the number of CPU cores (Recommended) - + Fewer Instances - + More Instances - + Temp Directory - + Browse... - + Store temporary files in your system's default TEMP directory (Recommended) - + Aften A/52 Options - + Film Light - + Film Standard - + Music Light - + Music Standard - + Speech - + None (Default) - + Auto Select - + 1+1 (Ch1,Ch2) - + 1/0 (C) - + 2/0 (L,R) - + 3/0 (L,R,C) - + 2/1 (L,R,S) - + 3/1 (L,R,C,S) - + 2/2 (L,R,SL,SR) - + 3/2 (L,R,C,SL,SR) - + Audio Coding Mode: - + Dynamic Range Compression: - + Fast Bit Allocation (Less Accurate) - + Exponent Search Size: - + Rename Output Files - + Enter the pattern to rename the output files here! - + Rename Output Files - + <a href="reset">Reset</a> &nbsp; <a href="#">Show List of Macros</a> - + Rename Pattern: - + Example File Name: - + Reset Advanced Options - + Encode Now! - - + + About... - + Exit Program - + File - + ? - + View - + Style - + Language - + Tools - + Configuration - + Quit - + Open File(s)... - - + + Visit Official Web-Site - + @@ -1439,124 +1439,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 @@ -1567,7 +1567,7 @@ - + Access Denied @@ -1732,7 +1732,7 @@ - + Discard @@ -2248,114 +2248,139 @@ - - - - + + QAAC (Apple) + + + + + FHG AAC (Winamp) + + + + + Nero AAC + + + + + Not available! + + + + + Current AAC Encoder: %1 + + + + + + + Quality Level %1 - - - + + + Compression %1 - - - + + + Uncompressed - + Best Quality (Very Slow) - + High Quality (Recommended) - + Average Quality (Default) - + Low Quality (Fast) - + Poor Quality (Very Fast) - + File name without extension - + Track number with leading zero - + Track title - + Artist name - + Album name - + Year with (at least) four digits - + Comment - + Characters forbidden in file names: - + Rename Macros - + %1 Instance(s) - + Cannot write to the selected directory. Please choose another directory! - + Already Running - + LameXP is already running, please use the running instance! diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 488cf53c..10132288 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -1814,6 +1814,26 @@ CSV Import CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + Nicht verfügbar! + + + Current AAC Encoder: %1 + Aktueller AAC-Kodierer: %1 + MetaInfo diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index d3d1f32b..6610b6d9 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -1813,6 +1813,26 @@ CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 11992659..c0470362 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -1823,6 +1823,26 @@ Ouvrir le dossier récursivement... CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index e46e9e4e..1f26cc94 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -1814,6 +1814,26 @@ CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index d7c08254..14f69e1f 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -1813,6 +1813,26 @@ CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index b68b7d14..78822b2c 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -749,7 +749,7 @@ - + Source Files Pliki źródłowe @@ -776,7 +776,7 @@ - + Output Directory Folder docelowy @@ -812,7 +812,7 @@ - + Meta Data Tagi @@ -853,7 +853,7 @@ - + Compression Kompresja @@ -933,505 +933,505 @@ Maksymalny - - + + Advanced Options Opcje zaawansowane - + Bitrate Management (LAME and OggEnc2) Zarządzanie bitami (LAME i OggEnc2) - + Enable Bitrate Management Włącz zarządzanie bitami - + Minimum (kbps): Minimalny (kbps): - + Maximum (kbps): Maksymalny (kbps): - + LAME Algorithm Quality Jakość algorytmu LAME - + Faster Processing Szybsza kompresja - + Better quality Lepsza jakość - + Warning: Audio quality will be very poor. Please do <u>not</u> complain about audio quality! Ostrzeżnie: Jakość dźwięku będzie bardzo niska. Prosze <b>nie<b> kierować skarg do autora programu! - + Warning: Processing speed will be very slow. Please do <u>not</u> complain about processing speed! Ostrzeżenie: Kompresja może trwać bardzo długo. Prosze <b>nie<b> kierować skarg do autora programu! - + Channel Mode / Sampling Rate Tryb kanałów/Częstotliwość próbkowania - - + + Auto Select (Default) Automatycznie (Domyślnie) - + Joint Stereo Joint Stereo - + Forced Joint Stereo Wymuś Joint Stereo - + Simple Simple - + Dual Mono Dual Mono - + Mono Mono - + MP3 Channel Mode: Tryb kanałów MP3: - + Sampling Rate (Hz): Próbkowanie (Hz): - + 16.000 16.000 - + 22.050 22.050 - + 24.000 24.000 - + 32.000 32.000 - + 44.100 44.100 - + 48.000 48.000 - + Enforce Stereo Downmix of Surround (Multi-Channel) Sources Wymuś miksowanie plików wielokanałowych do stereo - + AAC Encoder-Options Opcje kodera AAC - + Enable 2-Pass Processing (ABR Mode) Włącz kompresję dwuprzebiegową (w trybie ABR) - + Select AAC Profile: Wybierz profil AAC: - + Auto Select (Recommended) Automatyczny (Zalecane) - + Enforce LC-AAC Wymuś LC-AAC - + Enforce HE-AAC (AAC + SBR) Wymuś HE-AAC (AAC + SBR) - + Enforce HE-AAC v2 (AAC + SBR + PS) Wymuś HE-AAC v2 (AAC + SBR + PS) - + Volume Normalization Normalizacja dźwięku - + Enable Normalization Filter Włącz filtr normalizacji - + Peak Volume (dB): Najwyższa głośność (dB): - + Peak Level - + RMS Level - + None Żaden - + Equalization Mode: Tryb korekcji: - + Tone Adjustment Zmiana tonów - + Adjust Treble (dB): Zmień tony wysokie (dB): - + Adjust Bass (dB): Zmień tony niskie (dB): - + Custom Encoder Parameters Własne parametry kodowania - - - - - + + + + + You can enter custom parameters here! Tutaj możesz wpisać własne parametry kodowania! - + Lame MP3: Lame MP3: - + OggEnc2: OggEnc2: - + MPEG-4 AAC: MPEG-4 AAC: - + FLAC: FLAC: - + Warning: Custom parameters won't be checked at all. Use them at your own risk !!! Ostrzeżenie: Włąśne parametry kompresji nie będą weryfikowane. Używasz je na własne ryzyko!!! - + Aften A/52: Aften A/52: - + Multi-Threading Wielowątkowość - + Choose the number of parallel instances based on the number of CPU cores (Recommended) Wybierz ilość równoległych kodowań na podstawie ilości wątków procesora (Zalecane) - + Fewer Instances Mniej - + More Instances Więcej - + Temp Directory Folder tymczasowy - + Browse... Wybierz... - + Store temporary files in your system's default TEMP directory (Recommended) Zapisuj pliki tymczasowe w systemowej lokalizacji TEMP (Zalecane) - + Aften A/52 Options Opcje A/52 - + Film Light - + Film Standard - + Music Light - + Music Standard - + Speech - + None (Default) Żadna (Domyślnie) - + Auto Select Automatycznie - + 1+1 (Ch1,Ch2) 1+1 (Ch1,Ch2) - + 1/0 (C) 1/0 (C) - + 2/0 (L,R) 2/0 (L,R) - + 3/0 (L,R,C) 3/0 (L,R,C) - + 2/1 (L,R,S) 2/1 (L,R,S) - + 3/1 (L,R,C,S) 3/1 (L,R,C,S) - + 2/2 (L,R,SL,SR) 2/2 (L,R,SL,SR) - + 3/2 (L,R,C,SL,SR) 3/2 (L,R,C,SL,SR) - + Audio Coding Mode: Ilość kanałów: - + Dynamic Range Compression: Kompresja dynamiki (DRC): - + Fast Bit Allocation (Less Accurate) Szybka alokacja bitów (Mniejsza dokładność) - + Exponent Search Size: - + Rename Output Files Zmiana nazwy plików wyjściowych - + Enter the pattern to rename the output files here! Zapisz tutaj wzór wg którego zmienisz nazwy! - + Rename Output Files Zmieniaj nazwy plików - + <a href="reset">Reset</a> &nbsp; <a href="#">Show List of Macros</a> <a href="reset">Resetuj</a> &nbsp; <a href="#">Pokaż listę makr</a> - + Rename Pattern: Format wyjściowy: - + Example File Name: Przykładowa nazwa pliku: - + 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ę - + @@ -1439,124 +1439,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ć @@ -1567,7 +1567,7 @@ - + Access Denied Dostęp zablokowany @@ -1717,7 +1717,7 @@ - + Discard Zamknij @@ -2248,114 +2248,139 @@ Dysk tylko do odczytu lub brak praw dostępu! - - - - + + QAAC (Apple) + + + + + FHG AAC (Winamp) + + + + + Nero AAC + + + + + Not available! + + + + + Current AAC Encoder: %1 + + + + + + + Quality Level %1 Poziom jakości %1 - - - + + + Compression %1 Kompresja %1 - - - + + + Uncompressed Nieskompresowany - + Best Quality (Very Slow) Najlepsza jakość (Bardzo wolno) - + High Quality (Recommended) Wysoka jakość (Zalecane) - + Average Quality (Default) Średnia jakość (Domyślnie) - + Low Quality (Fast) Niska jakość (Szybko) - + Poor Quality (Very Fast) Najniższa jakość (Bardzo szybko) - + File name without extension Nazwa pliku bez rozszerzenia - + Track number with leading zero Numer ścieżki z zerem na początku - + Track title Nazwa ścieżki - + Artist name Nazwa Artysty - + Album name Nazwa Albumu - + Year with (at least) four digits Rok z (przynajmniej) czterema cyframi - + Comment Komentarz - + Characters forbidden in file names: Zabronione znaki w nazwach plików: - + Rename Macros Zmień nazwy makr - + %1 Instance(s) %1 wątek/ki - + Cannot write to the selected directory. Please choose another directory! Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację! - + Already Running Już działa - + LameXP is already running, please use the running instance! LameXP już działa, przejdź do działającego programu! diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index e804a09b..d83a6dac 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -1819,6 +1819,26 @@ CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts index 0784c51c..92a30a5a 100644 --- a/etc/Translation/LameXP_TW.ts +++ b/etc/Translation/LameXP_TW.ts @@ -1813,6 +1813,26 @@ CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 1add1550..b8e5a2e6 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -1814,6 +1814,26 @@ CSV Import Імпорт CSV + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index d9f20530..e813c00f 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -1813,6 +1813,26 @@ CSV Import + + QAAC (Apple) + + + + FHG AAC (Winamp) + + + + Nero AAC + + + + Not available! + + + + Current AAC Encoder: %1 + + MetaInfo diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 1a46ad8f..3b0bcee7 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -1195,6 +1195,35 @@ + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 2 + + + + + + + + + 50 + false + + + + (Encoder Info) + + + + Qt::Vertical diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index fcf087999b2344eb7d86f5947bc36c7ec24af4ed..bbb971dcb66a665685bd01994a2fdcd9c9e7393d 100644 GIT binary patch delta 4507 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 lLkxR@%yOHLtQNi3yo@|!8=G5VZ{|6viZF~R# delta 4251 zcmX9>c|cA17ysP%?tROB@4nkciYcW;s!?dfU{pv5nUY2+Nip&Y z7--cM-BP;ZlW7zu1A7(#Q@z2+`q8syz=(EWRta$9IIw6c(EDCjET07F)MR?r0PHFH z-!&y*FR(!LwXRtH7uY-2K+G+0W9eLNQWZGgF?7LRaNFp?LkZw6g#wlz!2Nv<;H%H-N-}7`HnS=+oR4+x_9u|03{c zBgS8{0;Bp3o&)Hd@S*T@PJ$NY$zT7#+uW~_QE$NnE}SxNz=Sz#fR`4S=%WFCJcvnG z)&q50F~##bAy5pz(#w>H6Z~!_gE6d!|0Sv{ZxMb{QFQn2ij4vIY3?APXfS4)*8@+a zn7QtEDr64=Q}nff(+tcir~#zc5PHf9sO`Yd&VgWhm}21q6X0VkmVOfn>=F@eG6d*o zMqKkq;E&hX9+?hI`hb+pw}COIaln*fW*Lr^3Mlx*wf&i!s#Y+@Q<&Q?h|j)Y%Jx15R-`iJy+}|t-!l(uh_^Ts zrmETu7%O9{ZF&Qqdd%CQ=fS9pnYR&i>)D|a<{ye?mnE9XRlsUjiI{jExECb(CYfkW zER$IKL<95BO6;D^2fUw3Tnyt$h&vi39^(Ii;_H&YCj;q%4oO&4A(-ynBn!AEqKA>J z4kZ4H!z6L@sGMIONY<+k1H+pnTa<*xZ|fv!KhS}J<&vyzAA$NFk{mOl?~s$^)a) z_p6blWx588qDu0{qYO~Jkuo8nz=jy9;#n*3d7)HvpoHb2(w?h3iN<89Ri94a&0?v| z2+~2(9NiGsLHp*R)FZ_WnC&GUZ%B1|7fQXaM**Koq(9zcfW3ZFAHx`6T8MP|m*1yt zlKQ_AfblFvdjd3BIy;2aGPFV(`sMc@2T7wA5k6a3X|&Oo&wkRCU%y{1T{rYLu+Lt) zgKZ|@)1+xeS=4a3VbViYJAnJn((ICP)L>VnIrkjF=($PrJM_s??n+DV+yyqym)=TK z0Ha???@yyTF2qVJ9uxxl1Erm!12AYe%Y-ihN)uV`%LPgPtjs+SILEP?mhnK4KdaZ8 z0<@&EmUds5-pe`;`qrJ8Xl6&Rj07AE*)jcGfc3HLm|?@fi23Zq5!9(G8d=}ft4QxI zY(!5ls^B2IIBF-Do(tL74Rye&*SZ|eO!6pS_ZQdK|4|E@TJ$|2zGshQZ=`a3*^D4+ z%m3A|#{;bZ-)(HRoXTofusJ2`iT_7zL0ub_$FRk{F9S89>}5jOCLM&^rN)GFNv+W}_X;_5G&^*q_4Lyt@I+$l>}8y93x)cf~DsoZa*m zvb0EUustcOat}A+<0Yd09Ou37HMR!;^8{G-mWy~xzzp=_ z7PZkZDRbbWQYhI~e%vxw>Or?+E~f8c>ak^U+}1Rj7$a72+s0l24l`V$EA`5%W-jq& zH?lB$F6qWQieX%`!4H5-IhVZo81>R~ZvXg^Bz-&Xz-z*4-EA&yoHdYDz-3(63*-*w zj@~Aesx!G`TT5t4P2+N#MUa1TMMG#ZCHiwEznmlO#h7t7R5QSE8Qfpzq@*=x?tZxr zNRH&nTvh-te&)&^p8*1_xC$*DSTT)zm_vz7oW#}czYT_+$JMzl1Uz!MrW{KA)?2Rg z$3?(@Ei$nz6%1TumLie5rAB7yL>I^9$@;Ouzylwd)3M29_KSjLt{X|5eXq&fchOj? zF_DcoBjRc`GSBQkXewxAlSWxl7aGa@_YuVF#>xB-lPg({lg-Mdifd2Gf@j5pG1xAP z&ACUKHIStpcL4q!Aj?`sU2WbWJHBWLkp5bB$&Dy6-YmOn{tRGF$ZpzeiSx`=vcIz{ z$+Wl1?za&~FFR$`FGz0xY?3v4rUJt@c+2&D z>4J!fazmad(W{jkDT{zPKgs)c(*G}&%57#21Mc3F_d7sZxvr4+*Q=)j^5uhcVM-(I z^TqNR>A%teM)IKh3xKFz@;Q^p=3-XKmux2lrd7z7PMJ-Rj*u_iNqwT_<;x^%fQ!NM z4FQx$><9VIEfh1J%M+umXwI&aC*2|cvRo_QH}y8nXN^3)_*-B}cln_nqiNtno}nxy zU$&K>>Ngv@k4k;*la=!P58=SgGWqqVl)T+ldFi*dz^j4s>gQkdwMJg^XB@EelDvM$ zXWCx+$zPoR04&dxx2i@1YA1#4ACimi4~1z%E?LqNg;h5K_oxI9eZryxCsi;9JL zg(UFTiX{_Crx8ht zX;!T$y-87?r>Gc9^0@A(sPQxfR$kVPQ8{Rj%apy8^!28dN~?x;+91a&C;UQ>mjozh zrxGxCU6gZg5$OMhD(9c1{F?r!jEEun2ehH_7o85sRd%A+eN&8>r!S*;EPARnqM@C+lB#4F3g?Mf<6R^3w!5$TWqQ2A7Z{$oX%phfo5W`N18* zG(39qBV?3NhC4s1={`+)ecrEufb0JqKhv5LNqxu%fegXanhzPvQzJKToc2{V*3{p+~vOK=^QUzAJ0+OAoz*l5w(sW&t;GpdmuG()#!!0a9b+9&)nyN~5 zB>P_ybiJy`Ad6-Bp`XQYET;JsoIkf2OKvrmDApQavm0Lx#UXRll5) zJt3&-?*x(_->6!Ld(oV#RJC6v{rYFAI=rdc(0EnHiCEz3X*Fh9Lg%V6(YBpach}Ma zGSs#!w)(2OXSxHepVi-_HW7vKYO?@p!dJCw3kgw}^hs^;!WM8eQ`>YrBjX5DyEL4q z9BS0#w>8r1ONQFh-;tVnq1sy{$@tt?dk;?srs%1?edDQ?_^**M?ymMF4Qny+vwBG_ zC08Noij|$}m;n}Kq4DaCwnUwEx_VRgE1GUXSFEmAZ{AG@hPbMejb@Nrc&m>lrx0kl z>ddecv_S@|v)|I*A!%2i*i#6|o~qA+V!}Cfej91Cr=Tu48%+C#gZfIPi7r?))%K`V zKQgZYjuxpO+mNcP4b;yTFDKJfssH^NbJQ&wec;0=^}F@mfP;2|WN{ItG+I!U(f8Sz zf~jRI_2m)4GX8hk39E(vjU<*{OND_qBWb+&3(m6)0ELU-lJJ21>4-4>=q<8?u|m+^ z`xtt!N!}w|>`vvB+6#r(C>{AE;i?&> zziqH^_uyk-!e^l|(hYdGU1+{Y<5;#)Xt$%!hldKEod?pQ;wgN7Kw6KUt6_JKCzsPE zX!r`M$2>rz&&8AP)M(5%5Tr}}G}fmV0~n|2Z%MDTS&K9Sw3HZYudxrHiz6=RIDKbH z>1^EyeP`3_)tV!5(`jM6&=q&x(qzUFntAEE?fPcgd=pL6tv8f?p{A+f4!x3;YnlZ| z;BR-$Yv&SR?S9RNkz^4y`I-+&aWtU{L{(b?a4bg@E*_&bEI{n7XH9Pswqoz_7~1XJ zMaw^E#+#&xR<{XbTT%21&L@%vi$2CnDA~TEuRS$e>{)TTe+>zTxO``ST4+CrE3)Z%MT@8nBG|^g6t_FQ0@5~# z@gXe)bGDdfL9p(AAm*GVGOK*VQ~D!;^SNSvG|_gZOf1compressionEncoder() == SettingsModel::AACEncoder) + { + const QString encoderName = m_qaacEncoderAvailable ? tr("QAAC (Apple)") : (m_fhgEncoderAvailable ? tr("FHG AAC (Winamp)") : (m_neroEncoderAvailable ? tr("Nero AAC") : tr("Not available!"))); + labelEncoderInfo->setVisible(true); + labelEncoderInfo->setText(tr("Current AAC Encoder: %1").arg(encoderName)); + } + else + { + labelEncoderInfo->setVisible(false); + } + updateRCMode(m_modeButtonGroup->checkedId()); } diff --git a/src/Dialog_SplashScreen.cpp b/src/Dialog_SplashScreen.cpp index 2a449b93..130c1042 100644 --- a/src/Dialog_SplashScreen.cpp +++ b/src/Dialog_SplashScreen.cpp @@ -115,7 +115,7 @@ void SplashScreen::showSplash(QThread *thread) } //Start the timer - timer->start(15360); + timer->start(30720); //Loop while thread is running while(thread->isRunning()) -- 2.11.0