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

Added more advanced options: MP3 channel mode, sampling rate, Nero AAC profile, Nero AAC 2-Pass mode.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-01-22 22:19:20 +01:00
parent 3f0796d288
commit 6c43678b7f
12 changed files with 1188 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/NSIS/setup.nsi
View File

@ -445,7 +445,10 @@ Function CheckForUpdate
IfFileExists "$INSTDIR\*.*" +2
Return
IfFileExists "$INSTDIR\LameXP.exe" EnableUpdateMode
StrCmp "$EXEDIR" "$INSTDIR" 0 +2
Return
IfFileExists "$INSTDIR\LameXP.exe" +2
Return
EnableUpdateMode:

112
etc/Translation/Blank.ts
View File

@ -401,18 +401,6 @@
<source>Advanced Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> LAME Algorithm Quality </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Faster Processing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Better quality</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> Bitrate Management (LAME and OggEnc2) </source>
<translation type="unfinished"></translation>
@ -429,6 +417,106 @@
<source>Maximum (kbps):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> LAME Algorithm Quality </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Faster Processing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Better quality</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channel Mode / Sampling Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto Select (Default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forced Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simple</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dual Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MP3 Channel Mode:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>16.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>22.050</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>24.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>32.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>44.100</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>48.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sampling Rate (Hz):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Nero AAC Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable 2-Pass Processing (ABR Mode)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select AAC Profile:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto (Recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce LC-AAC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC (AAC + SBR)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC v2 (AAC +SBR + PS)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> Encode Now!</source>
<translation type="unfinished"></translation>

88
etc/Translation/LameXP_DE.ts
View File

@ -942,6 +942,94 @@
<source>Maximum (kbps):</source>
<translation>Maximum (kbps):</translation>
</message>
<message>
<source>Channel Mode / Sampling Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto Select (Default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forced Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simple</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dual Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MP3 Channel Mode:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>16.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>22.050</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>24.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>32.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>44.100</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>48.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sampling Rate (Hz):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Nero AAC Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable 2-Pass Processing (ABR Mode)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select AAC Profile:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto (Recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce LC-AAC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC (AAC + SBR)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC v2 (AAC +SBR + PS)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MetaInfo</name>

88
etc/Translation/LameXP_ES.ts
View File

@ -942,6 +942,94 @@
<source>Maximum (kbps):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channel Mode / Sampling Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto Select (Default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forced Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simple</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dual Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MP3 Channel Mode:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>16.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>22.050</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>24.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>32.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>44.100</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>48.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sampling Rate (Hz):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Nero AAC Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable 2-Pass Processing (ABR Mode)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select AAC Profile:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto (Recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce LC-AAC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC (AAC + SBR)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC v2 (AAC +SBR + PS)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MetaInfo</name>

88
etc/Translation/LameXP_FR.ts
View File

@ -946,6 +946,94 @@ Votre dossier TEMP est situé ici:</translation>
<source>Maximum (kbps):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channel Mode / Sampling Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto Select (Default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forced Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simple</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dual Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MP3 Channel Mode:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>16.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>22.050</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>24.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>32.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>44.100</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>48.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sampling Rate (Hz):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Nero AAC Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable 2-Pass Processing (ABR Mode)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select AAC Profile:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto (Recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce LC-AAC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC (AAC + SBR)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC v2 (AAC +SBR + PS)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MetaInfo</name>

88
etc/Translation/LameXP_IT.ts
View File

@ -942,6 +942,94 @@
<source>Maximum (kbps):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Channel Mode / Sampling Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto Select (Default)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forced Joint Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Simple</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dual Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MP3 Channel Mode:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>16.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>22.050</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>24.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>32.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>44.100</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>48.000</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sampling Rate (Hz):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Nero AAC Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable 2-Pass Processing (ABR Mode)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select AAC Profile:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto (Recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce LC-AAC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC (AAC + SBR)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enforce HE-AAC v2 (AAC +SBR + PS)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MetaInfo</name>

661
gui/MainWindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>667</width>
<height>459</height>
<height>407</height>
</rect>
</property>
<property name="windowTitle">
@ -970,147 +970,22 @@
</attribute>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_7">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>604</width>
<height>399</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_22">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_5">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="title">
<string> LAME Algorithm Quality </string>
</property>
<layout class="QGridLayout" name="gridLayout_17">
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_16">
<item row="7" column="1" colspan="3">
<widget class="QSlider" name="sliderLameAlgoQuality">
<property name="maximum">
<number>4</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>3</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
<item row="7" column="0">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="4">
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Faster Processing</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="labelLameAlgoQuality">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">(VALUE)</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="8" column="3">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Better quality</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="1" colspan="3">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<layout class="QGridLayout" name="gridLayout_7">
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_6">
<property name="font">
@ -1203,7 +1078,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>8</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -1219,7 +1094,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>8</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -1256,6 +1131,505 @@
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_5">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="title">
<string> LAME Algorithm Quality </string>
</property>
<layout class="QGridLayout" name="gridLayout_17">
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_16">
<item row="7" column="0">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="4">
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Faster Processing</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="labelLameAlgoQuality">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">(VALUE)</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="8" column="3">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Better quality</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="1" colspan="3">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="1" colspan="3">
<widget class="QSlider" name="sliderLameAlgoQuality">
<property name="maximum">
<number>4</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>3</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_8">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="title">
<string>Channel Mode / Sampling Rate</string>
</property>
<layout class="QGridLayout" name="gridLayout_24">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_23">
<item row="1" column="2">
<widget class="QComboBox" name="comboBoxMP3ChannelMode">
<item>
<property name="text">
<string>Auto Select (Default)</string>
</property>
</item>
<item>
<property name="text">
<string>Joint Stereo</string>
</property>
</item>
<item>
<property name="text">
<string>Forced Joint Stereo</string>
</property>
</item>
<item>
<property name="text">
<string>Simple</string>
</property>
</item>
<item>
<property name="text">
<string>Dual Mono</string>
</property>
</item>
<item>
<property name="text">
<string>Mono</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="9">
<spacer name="horizontalSpacer_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
<string>MP3 Channel Mode:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" colspan="4">
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1" colspan="4">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="8">
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="5">
<spacer name="horizontalSpacer_21">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="7">
<widget class="QComboBox" name="comboBoxSamplingRate">
<item>
<property name="text">
<string>Auto Select (Default)</string>
</property>
</item>
<item>
<property name="text">
<string>16.000</string>
</property>
</item>
<item>
<property name="text">
<string>22.050</string>
</property>
</item>
<item>
<property name="text">
<string>24.000</string>
</property>
</item>
<item>
<property name="text">
<string>32.000</string>
</property>
</item>
<item>
<property name="text">
<string>44.100</string>
</property>
</item>
<item>
<property name="text">
<string>48.000</string>
</property>
</item>
</widget>
</item>
<item row="1" column="6">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Sampling Rate (Hz):</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_7">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="title">
<string>Nero AAC Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_25">
<item row="3" column="1">
<layout class="QGridLayout" name="gridLayout_21">
<item row="1" column="1">
<widget class="QCheckBox" name="checkBoxNeroAAC2PassMode">
<property name="text">
<string>Enable 2-Pass Processing (ABR Mode)</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_23">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>73</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Select AAC Profile:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBoxNeroAACProfile">
<item>
<property name="text">
<string>Auto (Recommended)</string>
</property>
</item>
<item>
<property name="text">
<string>Enforce LC-AAC</string>
</property>
</item>
<item>
<property name="text">
<string>Enforce HE-AAC (AAC + SBR)</string>
</property>
</item>
<item>
<property name="text">
<string>Enforce HE-AAC v2 (AAC +SBR + PS)</string>
</property>
</item>
</widget>
</item>
<item row="1" column="5">
<spacer name="horizontalSpacer_22">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>75</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="6">
<spacer name="horizontalSpacer_16">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" colspan="5">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1" colspan="5">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
@ -1701,6 +2075,7 @@
<include location="../res/Icons.qrc"/>
<include location="../res/Icons.qrc"/>
<include location="../res/Icons.qrc"/>
<include location="../res/Icons.qrc"/>
</resources>
<connections>
<connection>

2
src/Config.h
View File

@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 0
#define VER_LAMEXP_BUILD 246
#define VER_LAMEXP_BUILD 249
#define VER_LAMEXP_SUFFIX Beta-1
/*

54
src/Dialog_MainWindow.cpp
View File

@ -216,11 +216,19 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
sliderLameAlgoQuality->setValue(m_settings->lameAlgoQuality());
spinBoxBitrateManagementMin->setValue(m_settings->bitrateManagementMinRate());
spinBoxBitrateManagementMax->setValue(m_settings->bitrateManagementMaxRate());
comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelMode());
comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRate());
comboBoxNeroAACProfile->setCurrentIndex(m_settings->neroAACProfile());
while(checkBoxBitrateManagement->isChecked() != m_settings->bitrateManagementEnabled()) checkBoxBitrateManagement->click();
while(checkBoxNeroAAC2PassMode->isChecked() != m_settings->neroAACEnable2Pass()) checkBoxNeroAAC2PassMode->click();
connect(sliderLameAlgoQuality, SIGNAL(valueChanged(int)), this, SLOT(updateLameAlgoQuality(int)));
connect(checkBoxBitrateManagement, SIGNAL(clicked(bool)), this, SLOT(bitrateManagementEnabledChanged(bool)));
connect(spinBoxBitrateManagementMin, SIGNAL(valueChanged(int)), this, SLOT(bitrateManagementMinChanged(int)));
connect(spinBoxBitrateManagementMax, SIGNAL(valueChanged(int)), this, SLOT(bitrateManagementMaxChanged(int)));
connect(comboBoxMP3ChannelMode, SIGNAL(currentIndexChanged(int)), this, SLOT(channelModeChanged(int)));
connect(comboBoxSamplingRate, SIGNAL(currentIndexChanged(int)), this, SLOT(samplingRateChanged(int)));
connect(checkBoxNeroAAC2PassMode, SIGNAL(clicked(bool)), this, SLOT(neroAAC2PassChanged(bool)));
connect(comboBoxNeroAACProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(neroAACProfileChanged(int)));
updateLameAlgoQuality(sliderLameAlgoQuality->value());
//Activate file menu actions
@ -447,19 +455,34 @@ void MainWindow::changeEvent(QEvent *e)
{
if(e->type() == QEvent::LanguageChange)
{
int comboBoxIndex[3];
//Backup combobox indices
comboBoxIndex[0] = comboBoxMP3ChannelMode->currentIndex();
comboBoxIndex[1] = comboBoxSamplingRate->currentIndex();
comboBoxIndex[2] = comboBoxNeroAACProfile->currentIndex();
//Re.translate from UIC
Ui::MainWindow::retranslateUi(this);
//Restore combobox indices
comboBoxMP3ChannelMode->setCurrentIndex(comboBoxIndex[0]);
comboBoxSamplingRate->setCurrentIndex(comboBoxIndex[1]);
comboBoxNeroAACProfile->setCurrentIndex(comboBoxIndex[2]);
if(lamexp_version_demo())
{
setWindowTitle(QString("%1 [%2]").arg(windowTitle(), tr("DEMO VERSION")));
}
//Manual re-translate
m_dropNoteLabel->setText(QString("» %1 «").arg(tr("You can drop in audio files here!")));
m_showDetailsContextAction->setText(tr("Show Details"));
m_previewContextAction->setText(tr("Open File in External Application"));
m_findFileContextAction->setText(tr("Browse File Location"));
m_showFolderContextAction->setText(tr("Browse Selected Folder"));
//Force GUI update
m_metaInfoModel->clearData();
updateEncoder(m_settings->compressionEncoder());
updateLameAlgoQuality(sliderLameAlgoQuality->value());
@ -1633,6 +1656,37 @@ void MainWindow::bitrateManagementMaxChanged(int value)
}
}
/*
* Channel mode has changed
*/
void MainWindow::channelModeChanged(int value)
{
if(value >= 0) m_settings->lameChannelMode(value);
}
/*
* Sampling rate has changed
*/
void MainWindow::samplingRateChanged(int value)
{
if(value >= 0) m_settings->samplingRate(value);
}
/*
* Nero AAC 2-Pass mode changed
*/
void MainWindow::neroAAC2PassChanged(bool checked)
{
m_settings->neroAACEnable2Pass(checked);
}
/*
* Nero AAC profile mode changed
*/
void MainWindow::neroAACProfileChanged(int value)
{
if(value >= 0) m_settings->neroAACProfile(value);
}
/*
* Model reset

4
src/Dialog_MainWindow.h
View File

@ -83,6 +83,10 @@ private slots:
void bitrateManagementEnabledChanged(bool checked);
void bitrateManagementMinChanged(int value);
void bitrateManagementMaxChanged(int value);
void samplingRateChanged(int value);
void channelModeChanged(int value);
void neroAACProfileChanged(int value);
void neroAAC2PassChanged(bool checked);
void sourceModelChanged(void);
void metaTagsEnabledChanged(void);
void playlistEnabledChanged(void);

9
src/Model_Settings.cpp
View File

@ -51,9 +51,13 @@ static const char *g_settingsId_wmaDecoderNotificationsEnabled = "Flags/EnableWm
static const char *g_settingsId_dropBoxWidgetEnabled = "Flags/EnableDropBoxWidget";
static const char *g_settingsId_currentLanguage = "Localization/Language";
static const char *g_settingsId_lameAlgoQuality = "AdvancedOptions/LAME/AlgorithmQuality";
static const char *g_settingsId_lameChannelMode = "AdvancedOptions/LAME/ChannelMode";
static const char *g_settingsId_bitrateManagementEnabled = "AdvancedOptions/BitrateManagement/Enabled";
static const char *g_settingsId_bitrateManagementMinRate = "AdvancedOptions/BitrateManagement/MinRate";
static const char *g_settingsId_bitrateManagementMaxRate = "AdvancedOptions/BitrateManagement/MaxRate";
static const char *g_settingsId_samplingRate = "AdvancedOptions/Common/Resampling";
static const char *g_settingsId_neroAACEnable2Pass = "AdvancedOptions/NeroAAC/Enable2Pass";
static const char *g_settingsId_neroAACProfile = "AdvancedOptions/NeroAAC/ForceProfile";
//Macros
#define MAKE_OPTION1(OPT,DEF) \
@ -70,6 +74,7 @@ void SettingsModel::OPT(bool value) { m_settings->setValue(g_settingsId_##OPT, v
//LUT
const int SettingsModel::mp3Bitrates[15] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1};
const int SettingsModel::samplingRates[7] = {16000, 22050, 24000, 32000, 44100, 48000, -1};
////////////////////////////////////////////////////////////
// Constructor
@ -191,6 +196,10 @@ MAKE_OPTION3(wmaDecoderNotificationsEnabled, true)
MAKE_OPTION3(dropBoxWidgetEnabled, true)
MAKE_OPTION2(currentLanguage, defaultLanguage());
MAKE_OPTION1(lameAlgoQuality, 3)
MAKE_OPTION1(lameChannelMode, 0);
MAKE_OPTION3(bitrateManagementEnabled, false)
MAKE_OPTION1(bitrateManagementMinRate, 32)
MAKE_OPTION1(bitrateManagementMaxRate, 500)
MAKE_OPTION1(samplingRate, 0)
MAKE_OPTION3(neroAACEnable2Pass, true)
MAKE_OPTION1(neroAACProfile, 0)

6
src/Model_Settings.h
View File

@ -60,6 +60,7 @@ public:
//Consts
static const int mp3Bitrates[15];
static const int samplingRates[7];
//Getters & setters
MAKE_OPTION_DEC1(licenseAccepted);
@ -80,10 +81,13 @@ public:
MAKE_OPTION_DEC3(dropBoxWidgetEnabled)
MAKE_OPTION_DEC2(currentLanguage);
MAKE_OPTION_DEC1(lameAlgoQuality);
MAKE_OPTION_DEC1(lameChannelMode);
MAKE_OPTION_DEC3(bitrateManagementEnabled);
MAKE_OPTION_DEC1(bitrateManagementMinRate);
MAKE_OPTION_DEC1(bitrateManagementMaxRate);
MAKE_OPTION_DEC1(samplingRate)
MAKE_OPTION_DEC3(neroAACEnable2Pass)
MAKE_OPTION_DEC1(neroAACProfile)
//Misc
void validate(void);