Skip to content

V
vlc-1.1
Commit ef74dd1d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: sprefs, chipmunk options and audio rework

parent 592c1efc
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 113 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ ef74dd1d
...@@ -314,6 +314,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -314,6 +314,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
replayCombo ); replayCombo );
CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel, CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel,
visualisation); visualisation);
CONFIG_GENERIC( "audio-time-stretch", Bool, NULL, autoscaleBox );
/* Audio Output Specifics */ /* Audio Output Specifics */
CONFIG_GENERIC( "aout", Module, ui.outputLabel, outputModule ); CONFIG_GENERIC( "aout", Module, ui.outputLabel, outputModule );
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ ef74dd1d
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>643</width> <width>661</width>
<height>619</height> <height>670</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QCheckBox" name="enableAudio"> <widget class="QCheckBox" name="enableAudio">
<property name="text"> <property name="text">
...@@ -33,16 +33,7 @@ ...@@ -33,16 +33,7 @@
</item> </item>
<item> <item>
<widget class="QWidget" name="SPrefsAudio_zone" native="true"> <widget class="QWidget" name="SPrefsAudio_zone" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QGroupBox" name="audioBox"> <widget class="QGroupBox" name="audioBox">
<property name="title"> <property name="title">
...@@ -256,38 +247,41 @@ ...@@ -256,38 +247,41 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title"> <property name="title">
<string>Spatialization</string> <string>Effects</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin"> <item row="0" column="0">
<number>9</number> <widget class="QLabel" name="dolbyLabel">
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="horizontalSpacing">
<number>6</number>
</property>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="headphoneEffect">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Headphone surround effect</string> <string>Dolby Surround:</string>
</property>
<property name="buddy">
<cstring>detectionDolby</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="detectionDolby"> <widget class="QComboBox" name="detectionDolby">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
...@@ -300,10 +294,10 @@ ...@@ -300,10 +294,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="dolbyLabel"> <widget class="QCheckBox" name="volNormBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
...@@ -321,50 +315,32 @@ ...@@ -321,50 +315,32 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Dolby Surround:</string> <string>Normalize volume to:</string>
</property>
<property name="buddy">
<cstring>detectionDolby</cstring>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="1">
</widget> <widget class="QDoubleSpinBox" name="volNormSpin">
</item> <property name="enabled">
<item> <bool>true</bool>
<widget class="QGroupBox" name="groupBox"> </property>
<property name="title"> <property name="alignment">
<string>Processing</string> <set>Qt::AlignRight</set>
</property>
<layout class="QGridLayout">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="4" column="1" colspan="2">
<widget class="QComboBox" name="visualisation">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="2" column="2">
<widget class="QLabel" name="visuLabel"> <spacer name="horizontalSpacer">
<property name="minimumSize"> <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>250</width> <width>268</width>
<height>0</height> <height>20</height>
</size> </size>
</property> </property>
<property name="text"> </spacer>
<string>Visualization:</string>
</property>
<property name="buddy">
<cstring>visualisation</cstring>
</property>
</widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="replayLabel"> <widget class="QLabel" name="replayLabel">
...@@ -392,60 +368,49 @@ ...@@ -392,60 +368,49 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2"> <item row="4" column="0">
<widget class="QWidget" name="widget" native="true"> <widget class="QLabel" name="visuLabel">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="minimumSize">
<property name="margin"> <size>
<number>0</number> <width>250</width>
</property> <height>0</height>
<item> </size>
<widget class="QDoubleSpinBox" name="volNormSpin"> </property>
<property name="enabled"> <property name="text">
<bool>true</bool> <string>Visualization:</string>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignRight</set> <cstring>visualisation</cstring>
</property> </property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="volNormBox"> <widget class="QComboBox" name="visualisation">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> </widget>
<size> </item>
<width>250</width> <item row="5" column="0">
<height>0</height> <widget class="QCheckBox" name="headphoneEffect">
</size> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="text">
<size> <string>Headphone surround effect</string>
<width>250</width>
<height>16777215</height>
</size>
</property> </property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="autoscaleBox">
<property name="text"> <property name="text">
<string>Normalize volume to:</string> <string>Enable Time-Stretching audio</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -573,7 +538,6 @@ ...@@ -573,7 +538,6 @@
<tabstop>outputModule</tabstop> <tabstop>outputModule</tabstop>
<tabstop>fileName</tabstop> <tabstop>fileName</tabstop>
<tabstop>fileBrowseButton</tabstop> <tabstop>fileBrowseButton</tabstop>
<tabstop>visualisation</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment