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
b6fb07c7
Commit
b6fb07c7
authored
Dec 30, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OSS: kill config_Get
parent
90020f66
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
modules/audio_output/oss.c
modules/audio_output/oss.c
+4
-4
No files found.
modules/audio_output/oss.c
View file @
b6fb07c7
...
...
@@ -247,10 +247,10 @@ static void Probe( aout_instance_t * p_aout )
text
.
psz_string
=
_
(
"A/52 over S/PDIF"
);
var_Change
(
p_aout
,
"audio-device"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
if
(
config_GetInt
(
p_aout
,
"spdif"
)
)
if
(
var_InheritInteger
(
p_aout
,
"spdif"
)
)
var_Set
(
p_aout
,
"audio-device"
,
val
);
}
else
if
(
config_GetInt
(
p_aout
,
"spdif"
)
)
else
if
(
var_InheritInteger
(
p_aout
,
"spdif"
)
)
{
msg_Warn
(
p_aout
,
"S/PDIF not supported by card"
);
}
...
...
@@ -279,7 +279,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_ENOMEM
;
/*
Get
device
name
*/
if
(
(
psz_device
=
config_GetPsz
(
p_aout
,
"oss-audio-device"
))
==
NULL
)
if
(
(
psz_device
=
var_InheritString
(
p_aout
,
"oss-audio-device"
))
==
NULL
)
{
msg_Err
(
p_aout
,
"no audio device specified (maybe /dev/dsp?)"
);
free
(
p_sys
);
...
...
@@ -510,7 +510,7 @@ static int Open( vlc_object_t *p_this )
}
p_aout
->
output
.
p_sys
->
b_workaround_buggy_driver
=
config_GetInt
(
p_aout
,
"oss-buggy"
);
var_InheritInteger
(
p_aout
,
"oss-buggy"
);
/*
Create
OSS
thread
and
wait
for
its
readiness
.
*/
if
(
vlc_thread_create
(
p_aout
,
"aout"
,
OSSThread
,
...
...
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