Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
90cce4e0
Commit
90cce4e0
authored
Oct 02, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ALSA: remove variable callback (refs #5273)
parent
78231daf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
modules/audio_output/alsa.c
modules/audio_output/alsa.c
+10
-10
No files found.
modules/audio_output/alsa.c
View file @
90cce4e0
...
@@ -147,9 +147,8 @@ static void DumpDeviceStatus (vlc_object_t *obj, snd_pcm_t *pcm)
...
@@ -147,9 +147,8 @@ static void DumpDeviceStatus (vlc_object_t *obj, snd_pcm_t *pcm)
static
void
Probe
(
vlc_object_t
*
obj
)
static
void
Probe
(
vlc_object_t
*
obj
)
{
{
/* Due to design bug in audio output core, this hack is required: */
/* Due to design bug in audio output core, this hack is required: */
if
(
var_Type
(
obj
,
"audio-device"
))
if
(
var_Type
(
obj
,
"audio-device"
)
==
0
)
return
;
{
/* The variable does not exist - first call. */
/* The variable does not exist - first call. */
vlc_value_t
text
;
vlc_value_t
text
;
...
@@ -158,7 +157,7 @@ static void Probe (vlc_object_t *obj)
...
@@ -158,7 +157,7 @@ static void Probe (vlc_object_t *obj)
var_Change
(
obj
,
"audio-device"
,
VLC_VAR_SETTEXT
,
&
text
,
NULL
);
var_Change
(
obj
,
"audio-device"
,
VLC_VAR_SETTEXT
,
&
text
,
NULL
);
GetDevices
(
obj
,
NULL
);
GetDevices
(
obj
,
NULL
);
}
var_AddCallback
(
obj
,
"audio-device"
,
aout_ChannelsRestart
,
NULL
);
var_AddCallback
(
obj
,
"audio-device"
,
aout_ChannelsRestart
,
NULL
);
var_TriggerCallback
(
obj
,
"intf-change"
);
var_TriggerCallback
(
obj
,
"intf-change"
);
}
}
...
@@ -697,6 +696,7 @@ static void Close (vlc_object_t *obj)
...
@@ -697,6 +696,7 @@ static void Close (vlc_object_t *obj)
aout_sys_t
*
sys
=
aout
->
sys
;
aout_sys_t
*
sys
=
aout
->
sys
;
snd_pcm_t
*
pcm
=
aout
->
sys
->
pcm
;
snd_pcm_t
*
pcm
=
aout
->
sys
->
pcm
;
var_DelCallback
(
obj
,
"audio-device"
,
aout_ChannelsRestart
,
NULL
);
snd_pcm_drop
(
pcm
);
snd_pcm_drop
(
pcm
);
snd_pcm_close
(
pcm
);
snd_pcm_close
(
pcm
);
free
(
sys
);
free
(
sys
);
...
...
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