Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
53d10bb5
Commit
53d10bb5
authored
Apr 16, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audiobargraph_v: simplify Open
parent
e584696c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
14 deletions
+2
-14
modules/video_filter/audiobargraph_v.c
modules/video_filter/audiobargraph_v.c
+2
-14
No files found.
modules/video_filter/audiobargraph_v.c
View file @
53d10bb5
...
...
@@ -805,8 +805,6 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
{
filter_t
*
p_filter
=
(
filter_t
*
)
p_this
;
filter_sys_t
*
p_sys
;
BarGraph_t
*
p_BarGraph
;
char
*
i_values
=
NULL
;
/* */
if
(
!
b_sub
&&
!
es_format_IsSimilar
(
&
p_filter
->
fmt_in
,
&
p_filter
->
fmt_out
)
)
...
...
@@ -820,19 +818,15 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
p_filter
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
*
p_sys
)
);
if
(
!
p_sys
)
return
VLC_ENOMEM
;
p_BarGraph
=
&
(
p_sys
->
p_BarGraph
);
p_BarGraph
->
p_pic
=
NULL
;
/* */
p_sys
->
p_blend
=
NULL
;
if
(
!
b_sub
)
{
p_sys
->
p_blend
=
filter_NewBlend
(
VLC_OBJECT
(
p_filter
),
&
p_filter
->
fmt_in
.
video
);
if
(
!
p_sys
->
p_blend
)
{
//free( p_BarGraph );
free
(
p_sys
);
return
VLC_EGENERIC
;
}
...
...
@@ -846,11 +840,11 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
p_sys
->
i_pos
=
var_CreateGetIntegerCommand
(
p_filter
,
"audiobargraph_v-position"
);
p_sys
->
i_pos_x
=
var_CreateGetIntegerCommand
(
p_filter
,
"audiobargraph_v-x"
);
p_sys
->
i_pos_y
=
var_CreateGetIntegerCommand
(
p_filter
,
"audiobargraph_v-y"
);
BarGraph_t
*
p_BarGraph
=
&
p_sys
->
p_BarGraph
;
p_BarGraph
->
p_pic
=
NULL
;
p_BarGraph
->
i_alpha
=
var_CreateGetIntegerCommand
(
p_filter
,
"audiobargraph_v-transparency"
);
p_BarGraph
->
i_alpha
=
VLC_CLIP
(
p_BarGraph
->
i_alpha
,
0
,
255
);
//p_BarGraph->nbChannels = 0;
//p_BarGraph->i_values = NULL;
parse_i_values
(
p_BarGraph
,
&
(
char
){
0
});
p_BarGraph
->
alarm
=
false
;
...
...
@@ -878,17 +872,11 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
var_AddCallback
(
p_filter
,
ppsz_filter_callbacks
[
i
],
BarGraphCallback
,
p_sys
);
/* Misc init */
if
(
b_sub
)
{
p_filter
->
pf_sub_source
=
FilterSub
;
}
else
{
p_filter
->
pf_video_filter
=
FilterVideo
;
}
free
(
i_values
);
return
VLC_SUCCESS
;
}
...
...
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