Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
96b96301
Commit
96b96301
authored
Jul 11, 2017
by
Thomas Guillem
Committed by
Jean-Baptiste Kempf
Jul 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: hide aout_ChannelsRestart callback
parent
788c0561
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
include/vlc_aout.h
include/vlc_aout.h
+0
-10
src/audio_output/output.c
src/audio_output/output.c
+12
-2
No files found.
include/vlc_aout.h
View file @
96b96301
...
...
@@ -316,16 +316,6 @@ static inline void aout_RestartRequest(audio_output_t *aout, unsigned mode)
aout
->
event
.
restart_request
(
aout
,
mode
);
}
static
inline
int
aout_ChannelsRestart
(
vlc_object_t
*
obj
,
const
char
*
varname
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
data
)
{
audio_output_t
*
aout
=
(
audio_output_t
*
)
obj
;
(
void
)
varname
;
(
void
)
oldval
;
(
void
)
newval
;
(
void
)
data
;
aout_RestartRequest
(
aout
,
AOUT_RESTART_OUTPUT
);
return
0
;
}
/* Audio output filters */
typedef
struct
aout_filters
aout_filters_t
;
typedef
struct
aout_request_vout
aout_request_vout_t
;
...
...
src/audio_output/output.c
View file @
96b96301
...
...
@@ -171,6 +171,16 @@ static int FilterCallback (vlc_object_t *obj, const char *var,
return
VLC_SUCCESS
;
}
static
int
StereoModeCallback
(
vlc_object_t
*
obj
,
const
char
*
varname
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
data
)
{
audio_output_t
*
aout
=
(
audio_output_t
*
)
obj
;
(
void
)
varname
;
(
void
)
oldval
;
(
void
)
newval
;
(
void
)
data
;
aout_RestartRequest
(
aout
,
AOUT_RESTART_OUTPUT
);
return
0
;
}
#undef aout_New
/**
* Creates an audio output object and initializes an output module.
...
...
@@ -388,7 +398,7 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt)
}
/* The user may have selected a different channels configuration. */
var_AddCallback
(
aout
,
"stereo-mode"
,
aout_ChannelsRestart
,
NULL
);
var_AddCallback
(
aout
,
"stereo-mode"
,
StereoModeCallback
,
NULL
);
switch
(
var_GetInteger
(
aout
,
"stereo-mode"
))
{
case
AOUT_VAR_CHAN_RSTEREO
:
...
...
@@ -460,7 +470,7 @@ void aout_OutputDelete (audio_output_t *aout)
{
aout_OutputAssertLocked
(
aout
);
var_DelCallback
(
aout
,
"stereo-mode"
,
aout_ChannelsRestart
,
NULL
);
var_DelCallback
(
aout
,
"stereo-mode"
,
StereoModeCallback
,
NULL
);
if
(
aout
->
stop
!=
NULL
)
aout
->
stop
(
aout
);
}
...
...
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