Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
0d2b87a9
Commit
0d2b87a9
authored
Apr 16, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code factorization.
parent
c67627c6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
23 deletions
+28
-23
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+28
-23
No files found.
modules/gui/qt4/components/simple_preferences.cpp
View file @
0d2b87a9
...
...
@@ -246,11 +246,28 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
#ifdef WIN32
audioControl
(
DirectX
);
optionWidgets
.
append
(
DirectXControl
);
CONFIG_GENERIC2
(
"directx-audio-device"
,
IntegerList
,
DirectXLabel
,
DirectXDevice
);
#else
audioControl
(
alsa
);
optionWidgets
.
append
(
alsaControl
);
audioControl2
(
OSS
);
optionWidgets
.
append
(
OSSControl
);
if
(
module_Exists
(
p_intf
,
"alsa"
)
)
{
audioControl
(
alsa
);
optionWidgets
.
append
(
alsaControl
);
CONFIG_GENERIC2
(
"alsadev"
,
StringList
,
alsaLabel
,
alsaDevice
);
}
else
optionWidgets
.
append
(
NULL
);
if
(
module_Exists
(
p_intf
,
"oss"
)
)
{
audioControl2
(
OSS
);
optionWidgets
.
append
(
OSSControl
);
CONFIG_GENERIC_FILE
(
"dspdev"
,
File
,
OSSLabel
,
OSSDevice
,
OSSBrowse
);
}
else
optionWidgets
.
append
(
NULL
);
#endif
/* General Audio Options */
...
...
@@ -279,23 +296,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONNECT
(
ui
.
outputModule
,
currentIndexChanged
(
int
),
this
,
updateAudioOptions
(
int
)
);
/* platform specifics */
#ifdef WIN32
CONFIG_GENERIC2
(
"directx-audio-device"
,
IntegerList
,
DirectXLabel
,
DirectXDevice
);
#else
if
(
module_Exists
(
p_intf
,
"alsa"
)
)
{
CONFIG_GENERIC2
(
"alsadev"
,
StringList
,
alsaLabel
,
alsaDevice
);
}
if
(
module_Exists
(
p_intf
,
"oss"
)
)
{
CONFIG_GENERIC_FILE
(
"dspdev"
,
File
,
OSSLabel
,
OSSDevice
,
OSSBrowse
);
}
#endif
// File exists everywhere
// File exists everywhere
CONFIG_GENERIC_FILE
(
"audiofile-file"
,
File
,
ui
.
fileLabel
,
ui
.
fileName
,
ui
.
fileBrowseButton
);
...
...
@@ -551,8 +552,12 @@ void SPrefsPanel::updateAudioOptions( int number)
#ifdef WIN32
optionWidgets
[
directxW
]
->
setVisible
(
(
value
==
"directx"
)
);
#else
optionWidgets
[
ossW
]
->
setVisible
(
(
value
==
"oss"
)
);
optionWidgets
[
alsaW
]
->
setVisible
(
(
value
==
"alsa"
)
);
/* optionWidgets[ossW] can be NULL */
if
(
optionWidgets
[
ossW
]
)
optionWidgets
[
ossW
]
->
setVisible
(
(
value
==
"oss"
)
);
/* optionWidgets[alsaW] can be NULL */
if
(
optionWidgets
[
alsaW
]
)
optionWidgets
[
alsaW
]
->
setVisible
(
(
value
==
"alsa"
)
);
#endif
optionWidgets
[
fileW
]
->
setVisible
(
(
value
==
"aout_file"
)
);
}
...
...
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