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
e9d9cae0
Commit
e9d9cae0
authored
Apr 27, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mono: use var_Inherit*()
parent
b10613c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
modules/audio_filter/channel_mixer/mono.c
modules/audio_filter/channel_mixer/mono.c
+2
-7
No files found.
modules/audio_filter/channel_mixer/mono.c
View file @
e9d9cae0
...
@@ -364,9 +364,8 @@ static int OpenFilter( vlc_object_t *p_this )
...
@@ -364,9 +364,8 @@ static int OpenFilter( vlc_object_t *p_this )
if
(
p_sys
==
NULL
)
if
(
p_sys
==
NULL
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
p_sys
->
b_downmix
=
var_CreateGetBool
(
p_this
,
MONO_CFG
"downmix"
);
p_sys
->
b_downmix
=
var_InheritBool
(
p_this
,
MONO_CFG
"downmix"
);
p_sys
->
i_channel_selected
=
p_sys
->
i_channel_selected
=
var_InheritInteger
(
p_this
,
MONO_CFG
"channel"
);
(
unsigned
int
)
var_CreateGetInteger
(
p_this
,
MONO_CFG
"channel"
);
p_sys
->
i_nb_channels
=
aout_FormatNbChannels
(
&
(
p_filter
->
fmt_in
.
audio
)
);
p_sys
->
i_nb_channels
=
aout_FormatNbChannels
(
&
(
p_filter
->
fmt_in
.
audio
)
);
p_sys
->
i_bitspersample
=
p_filter
->
fmt_out
.
audio
.
i_bitspersample
;
p_sys
->
i_bitspersample
=
p_filter
->
fmt_out
.
audio
.
i_bitspersample
;
...
@@ -381,8 +380,6 @@ static int OpenFilter( vlc_object_t *p_this )
...
@@ -381,8 +380,6 @@ static int OpenFilter( vlc_object_t *p_this )
p_filter
->
fmt_in
.
audio
.
i_physical_channels
,
p_filter
->
fmt_in
.
audio
.
i_physical_channels
,
p_filter
->
fmt_in
.
audio
.
i_rate
)
<
0
)
p_filter
->
fmt_in
.
audio
.
i_rate
)
<
0
)
{
{
var_Destroy
(
p_this
,
MONO_CFG
"channel"
);
var_Destroy
(
p_this
,
MONO_CFG
"downmix"
);
free
(
p_sys
);
free
(
p_sys
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -421,8 +418,6 @@ static void CloseFilter( vlc_object_t *p_this)
...
@@ -421,8 +418,6 @@ static void CloseFilter( vlc_object_t *p_this)
filter_t
*
p_filter
=
(
filter_t
*
)
p_this
;
filter_t
*
p_filter
=
(
filter_t
*
)
p_this
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
var_Destroy
(
p_this
,
MONO_CFG
"channel"
);
var_Destroy
(
p_this
,
MONO_CFG
"downmix"
);
free
(
p_sys
->
p_atomic_operations
);
free
(
p_sys
->
p_atomic_operations
);
free
(
p_sys
->
p_overflow_buffer
);
free
(
p_sys
->
p_overflow_buffer
);
free
(
p_sys
);
free
(
p_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