diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-27 19:31:13 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-09 14:33:28 +0000 |
| commit | 89f4db5857ea0c30c52510785f505a9217750db5 (patch) | |
| tree | 9f8ed97cddf1ae0c21a8a5d829e61ee8401a8fcd /examples/multimedia/audiodevices/audiodevicesbase.ui | |
| parent | c401a0dc71dc49cd34f8a5dd2fd7320f451e98bf (diff) | |
Cleanup QAudioFormat and friends
Reduce the amount of available formats, and always
use host endianness.
Return both sample rate and channel count as a range,
not a list of values.
Change-Id: I88389b49ace077764fb647f50834236448e55c0e
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/multimedia/audiodevices/audiodevicesbase.ui')
| -rw-r--r-- | examples/multimedia/audiodevices/audiodevicesbase.ui | 185 |
1 files changed, 72 insertions, 113 deletions
diff --git a/examples/multimedia/audiodevices/audiodevicesbase.ui b/examples/multimedia/audiodevices/audiodevicesbase.ui index 5d5ef4835..9618a3d22 100644 --- a/examples/multimedia/audiodevices/audiodevicesbase.ui +++ b/examples/multimedia/audiodevices/audiodevicesbase.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>679</width> - <height>598</height> + <width>646</width> + <height>528</height> </rect> </property> <property name="windowTitle"> @@ -31,8 +31,8 @@ <rect> <x>0</x> <y>0</y> - <width>653</width> - <height>545</height> + <width>626</width> + <height>480</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_4"> @@ -72,134 +72,72 @@ <item row="2" column="0" colspan="2"> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="testFormatTab"> <attribute name="title"> <string>Test format</string> </attribute> <layout class="QGridLayout" name="gridLayout"> - <item row="14" column="1"> + <item row="12" column="1"> <widget class="QPushButton" name="testButton"> <property name="text"> <string>Test</string> </property> </widget> </item> - <item row="0" column="2"> - <widget class="QLabel" name="nearestLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="text"> - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Nearest Settings</span></p></body></html></string> - </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="8" column="2"> - <widget class="QLineEdit" name="nearestSampleSize"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="14" column="2"> + <item row="12" column="2"> <widget class="QLabel" name="testResult"> <property name="text"> <string/> </property> </widget> </item> - <item row="5" column="0"> - <widget class="QLabel" name="actualSampleTypeLabel"> - <property name="text"> - <string>SampleType</string> - </property> - </widget> - </item> - <item row="8" column="0"> - <widget class="QLabel" name="actualSampleSizeLabel"> - <property name="text"> - <string>Sample size (bits)</string> - </property> - </widget> - </item> - <item row="13" column="0"> - <widget class="QLabel" name="actualEndianLabel"> + <item row="4" column="0"> + <widget class="QLabel" name="actualChannelLabel"> <property name="text"> - <string>Endianness</string> + <string>Channels</string> </property> </widget> </item> - <item row="5" column="2"> - <widget class="QLineEdit" name="nearestSampleType"> + <item row="2" column="2"> + <widget class="QLineEdit" name="nearestSampleRate"> <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="5" column="1"> - <widget class="QComboBox" name="sampleTypesBox"/> - </item> - <item row="4" column="2"> - <widget class="QLineEdit" name="nearestChannel"> + <item row="5" column="2"> + <widget class="QLineEdit" name="nearestSampleFormat"> <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="4" column="0"> - <widget class="QLabel" name="actualChannelLabel"> + <item row="5" column="0"> + <widget class="QLabel" name="actualSampleTypeLabel"> <property name="text"> - <string>Channels</string> + <string>Sample Format</string> </property> </widget> </item> - <item row="13" column="1"> - <widget class="QComboBox" name="endianBox"/> - </item> - <item row="8" column="1"> - <widget class="QComboBox" name="sampleSizesBox"/> - </item> - <item row="2" column="2"> - <widget class="QLineEdit" name="nearestSampleRate"> + <item row="4" column="2"> + <widget class="QLineEdit" name="nearestChannel"> <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="2" column="1"> - <widget class="QComboBox" name="sampleRateBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item row="5" column="1"> + <widget class="QComboBox" name="sampleFormatBox"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="actualFreqLabel"> + <property name="text"> + <string>Frequency (Hz)</string> </property> </widget> </item> - <item row="4" column="1"> - <widget class="QComboBox" name="channelsBox"/> - </item> <item row="0" column="1"> <widget class="QLabel" name="actualLabel"> <property name="sizePolicy"> @@ -225,19 +163,53 @@ p, li { white-space: pre-wrap; } </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="actualFreqLabel"> + <item row="0" column="2"> + <widget class="QLabel" name="nearestLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> <property name="text"> - <string>Frequency (Hz)</string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Nearest Settings</span></p></body></html></string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="13" column="2"> - <widget class="QLineEdit" name="nearestEndian"> - <property name="enabled"> - <bool>false</bool> + <item row="13" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - </widget> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="1"> + <widget class="QSpinBox" name="sampleRateSpinBox"/> + </item> + <item row="4" column="1"> + <widget class="QSpinBox" name="channelsSpinBox"/> </item> </layout> </widget> @@ -280,7 +252,7 @@ p, li { white-space: pre-wrap; } <bool>false</bool> </property> <property name="columnCount"> - <number>5</number> + <number>3</number> </property> <attribute name="horizontalHeaderHighlightSections"> <bool>false</bool> @@ -296,15 +268,7 @@ p, li { white-space: pre-wrap; } </attribute> <column> <property name="text"> - <string>Frequency (Hz)</string> - </property> - <property name="textAlignment"> - <set>AlignCenter</set> - </property> - </column> - <column> - <property name="text"> - <string>Channels</string> + <string>Sample Format</string> </property> <property name="textAlignment"> <set>AlignCenter</set> @@ -312,7 +276,7 @@ p, li { white-space: pre-wrap; } </column> <column> <property name="text"> - <string>Sample type</string> + <string>Frequency (Hz)</string> </property> <property name="textAlignment"> <set>AlignCenter</set> @@ -320,17 +284,12 @@ p, li { white-space: pre-wrap; } </column> <column> <property name="text"> - <string>Sample size (bits)</string> + <string>Channels</string> </property> <property name="textAlignment"> <set>AlignCenter</set> </property> </column> - <column> - <property name="text"> - <string>Endianness</string> - </property> - </column> </widget> </item> </layout> |