Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
b96c13d1
Commit
b96c13d1
authored
Oct 15, 2007
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4 simple preferences: only show the options of the selected audio output module
parent
c92f962f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
99 additions
and
25 deletions
+99
-25
modules/gui/qt4/components/preferences_widgets.cpp
modules/gui/qt4/components/preferences_widgets.cpp
+19
-1
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+61
-20
modules/gui/qt4/components/simple_preferences.hpp
modules/gui/qt4/components/simple_preferences.hpp
+15
-0
modules/gui/qt4/ui/sprefs_audio.ui
modules/gui/qt4/ui/sprefs_audio.ui
+4
-4
No files found.
modules/gui/qt4/components/preferences_widgets.cpp
View file @
b96c13d1
...
...
@@ -27,7 +27,6 @@
* Todo:
* - Finish implementation (see WX)
* - Improvements over WX
* - Password field implementation (through "pwd" bool param
* - Validator for modulelist
* - Implement update stuff using a general Updated signal
*/
...
...
@@ -232,6 +231,8 @@ void StringConfigControl::finish()
text
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
if
(
label
)
label
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
text
,
SIGNAL
(
textChanged
(
const
QString
&
)),
this
,
SIGNAL
(
Updated
())
);
}
/*********** File **************/
...
...
@@ -297,6 +298,8 @@ void FileConfigControl::finish()
text
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
if
(
label
)
label
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
text
,
SIGNAL
(
textChanged
(
const
QString
&
)),
this
,
SIGNAL
(
Updated
())
);
}
/********* String / Directory **********/
...
...
@@ -392,6 +395,8 @@ void StringListConfigControl::finish( bool bycat )
combo
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
if
(
label
)
label
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
combo
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SIGNAL
(
Updated
())
);
}
QString
StringListConfigControl
::
getValue
()
...
...
@@ -473,6 +478,8 @@ void ModuleConfigControl::finish( bool bycat )
combo
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
if
(
label
)
label
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
combo
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SIGNAL
(
Updated
())
);
}
QString
ModuleConfigControl
::
getValue
()
...
...
@@ -488,6 +495,8 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
{
groupBox
=
new
QGroupBox
(
qtr
(
p_item
->
psz_text
)
);
text
=
new
QLineEdit
();
connect
(
text
,
SIGNAL
(
textChanged
(
const
QString
&
)),
this
,
SIGNAL
(
Updated
())
);
QGridLayout
*
layoutGroupBox
=
new
QGridLayout
(
groupBox
);
finish
(
bycat
);
...
...
@@ -639,6 +648,7 @@ void ModuleListConfigControl::onUpdate( int value )
}
}
}
emit
Updated
();
}
/**************************************************************************
...
...
@@ -688,6 +698,8 @@ void IntegerConfigControl::finish()
spin
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
if
(
label
)
label
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
spin
,
SIGNAL
(
valueChanged
(
int
)),
this
,
SIGNAL
(
Updated
())
);
}
int
IntegerConfigControl
::
getValue
()
...
...
@@ -785,6 +797,8 @@ void IntegerListConfigControl::finish( bool bycat )
combo
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
if
(
label
)
label
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
combo
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SIGNAL
(
Updated
())
);
}
int
IntegerListConfigControl
::
getValue
()
...
...
@@ -829,6 +843,8 @@ void BoolConfigControl::finish()
checkbox
->
setCheckState
(
p_item
->
value
.
i
==
VLC_TRUE
?
Qt
::
Checked
:
Qt
::
Unchecked
);
checkbox
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
checkbox
,
SIGNAL
(
stateChanged
(
int
)),
this
,
SIGNAL
(
Updated
())
);
}
int
BoolConfigControl
::
getValue
()
...
...
@@ -886,6 +902,8 @@ void FloatConfigControl::finish()
spin
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
if
(
label
)
label
->
setToolTip
(
formatTooltip
(
qtr
(
p_item
->
psz_longtext
))
);
connect
(
spin
,
SIGNAL
(
valueChanged
(
double
)),
this
,
SIGNAL
(
Updated
())
);
}
float
FloatConfigControl
::
getValue
()
...
...
modules/gui/qt4/components/simple_preferences.cpp
View file @
b96c13d1
...
...
@@ -195,16 +195,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
/* Audio Panel Implementation */
START_SPREFS_CAT
(
Audio
,
qtr
(
"General audio settings"
)
);
#ifdef WIN32
ui
.
OSSBrowse
->
hide
();
ui
.
OSSDevice
->
hide
();
ui
.
OSSLabel
->
hide
();
ui
.
alsaDevice
->
hide
();
ui
.
alsaLabel
->
hide
();
#else
ui
.
DirectXLabel
->
setVisible
(
false
);
ui
.
DirectXDevice
->
setVisible
(
false
);
#endif
CONFIG_GENERIC
(
"audio"
,
Bool
,
NULL
,
enableAudio
);
CONFIG_GENERIC_NO_BOOL
(
"volume"
,
IntegerRangeSlider
,
NULL
,
...
...
@@ -217,15 +208,35 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
detectionDolby
);
CONFIG_GENERIC
(
"aout"
,
Module
,
NULL
,
outputModule
);
CONNECT
(
control
,
Updated
(),
this
,
AudioDeviceChanged
()
);
QString
aout_value
=
(
dynamic_cast
<
ModuleConfigControl
*>
(
control
))
->
getValue
();
#ifndef WIN32
CONFIG_GENERIC
(
"alsadev"
,
StringList
,
NULL
,
alsaDevice
);
CONFIG_GENERIC_FILE
(
"dspdev"
,
File
,
NULL
,
OSSDevice
,
OSSBrowse
);
CONFIG_GENERIC
(
"alsadev"
,
StringList
,
ui
.
alsaLabel
,
alsaDevice
);
alsa_options
=
control
;
CONFIG_GENERIC_FILE
(
"dspdev"
,
File
,
ui
.
OSSLabel
,
OSSDevice
,
OSSBrowse
);
oss_options
=
control
;
#else
CONFIG_GENERIC
(
"directx-audio-device"
,
IntegerList
,
NULL
,
CONFIG_GENERIC
(
"directx-audio-device"
,
IntegerList
,
ui
.
DirectXLabel
,
DirectXDevice
);
directx_options
=
control
;
#endif
CONFIG_GENERIC_FILE
(
"audiofile-file"
,
File
,
NULL
,
FileName
,
CONFIG_GENERIC_FILE
(
"audiofile-file"
,
File
,
ui
.
FileLabel
,
FileName
,
fileBrowseButton
);
file_options
=
control
;
#ifdef WIN32
ui
.
OSSBrowse
->
hide
();
ui
.
OSSDevice
->
hide
();
ui
.
OSSLabel
->
hide
();
ui
.
alsaDevice
->
hide
();
ui
.
alsaLabel
->
hide
();
#else
ui
.
DirectXLabel
->
setVisible
(
false
);
ui
.
DirectXDevice
->
setVisible
(
false
);
#endif
updateAudioOptions
(
aout_value
);
CONFIG_GENERIC
(
"headphone-dolby"
,
Bool
,
NULL
,
headphoneEffect
);
// CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME
...
...
@@ -321,6 +332,36 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
this
->
setLayout
(
panel_layout
);
}
void
SPrefsPanel
::
AudioDeviceChanged
()
{
ModuleConfigControl
*
module_config
=
dynamic_cast
<
ModuleConfigControl
*>
(
sender
()
);
updateAudioOptions
(
module_config
->
getValue
()
);
}
void
SPrefsPanel
::
updateAudioOptions
(
QString
value
)
{
#ifndef WIN32
alsa_options
->
hide
();
oss_options
->
hide
();
#else
directx_options
->
hide
();
#endif
file_options
->
hide
();
if
(
value
==
"aout_file"
)
file_options
->
show
();
#ifndef WIN32
else
if
(
value
==
"alsa"
)
alsa_options
->
show
();
else
if
(
value
==
"oss"
)
oss_options
->
show
();
#else
else
if
(
value
==
"directx"
)
directx_options
->
show
();
#endif
}
void
SPrefsPanel
::
apply
()
{
QList
<
ConfigControl
*>::
Iterator
i
;
...
...
modules/gui/qt4/components/simple_preferences.hpp
View file @
b96c13d1
...
...
@@ -67,6 +67,21 @@ public:
private:
intf_thread_t
*
p_intf
;
QList
<
ConfigControl
*>
controls
;
/* ConfigControl for audio output options */
#ifndef WIN32
ConfigControl
*
alsa_options
;
ConfigControl
*
oss_options
;
#else
ConfigControl
*
directx_options
;
#endif
ConfigControl
*
file_options
;
void
updateAudioOptions
(
QString
);
/* Display only the options for the selected audio output */
private
slots
:
void
AudioDeviceChanged
();
};
#endif
modules/gui/qt4/ui/sprefs_audio.ui
View file @
b96c13d1
...
...
@@ -141,7 +141,7 @@
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="
label_7
" >
<widget class="QLabel" name="
FileLabel
" >
<property name="text" >
<string>_("File")</string>
</property>
...
...
@@ -160,14 +160,14 @@
<item row="3" column="0" >
<widget class="QLabel" name="OSSLabel" >
<property name="text" >
<string>_("
OSS
Device")</string>
<string>_("Device")</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="DirectXLabel" >
<property name="text" >
<string>_("D
irectX D
evice")</string>
<string>_("Device")</string>
</property>
</widget>
</item>
...
...
@@ -177,7 +177,7 @@
<item row="1" column="0" >
<widget class="QLabel" name="alsaLabel" >
<property name="text" >
<string>_("
Alsa
Device")</string>
<string>_("Device")</string>
</property>
</widget>
</item>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment