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
6e6873d3
Commit
6e6873d3
authored
Jun 18, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input: remove antilogy, add error handling and simplify
parent
63506d5a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
17 deletions
+9
-17
src/input/control.c
src/input/control.c
+9
-17
No files found.
src/input/control.c
View file @
6e6873d3
...
@@ -360,34 +360,26 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
...
@@ -360,34 +360,26 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
case
INPUT_GET_FULL_TITLE_INFO
:
case
INPUT_GET_FULL_TITLE_INFO
:
{
{
input_title_t
**
*
array
=
(
input_title_t
***
)
va_arg
(
args
,
input_title_t
***
)
;
input_title_t
**
array
;
int
*
count
=
(
int
*
)
va_arg
(
args
,
int
*
)
;
unsigned
count
;
vlc_mutex_lock
(
&
p_input
->
p
->
p_item
->
lock
);
vlc_mutex_lock
(
&
p_input
->
p
->
p_item
->
lock
);
count
=
p_input
->
p
->
i_title
;
array
=
malloc
(
count
*
sizeof
(
*
array
)
);
const
int
i_titles
=
p_input
->
p
->
i_title
;
if
(
count
>
0
&&
unlikely
(
array
==
NULL
)
)
*
count
=
i_titles
;
if
(
i_titles
==
0
)
{
vlc_mutex_unlock
(
&
p_input
->
p
->
p_item
->
lock
);
return
VLC_EGENERIC
;
}
*
array
=
calloc
(
i_titles
,
sizeof
(
**
array
)
);
if
(
!
array
)
{
{
vlc_mutex_unlock
(
&
p_input
->
p
->
p_item
->
lock
);
vlc_mutex_unlock
(
&
p_input
->
p
->
p_item
->
lock
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
for
(
int
i
=
0
;
i
<
i_titles
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
count
;
i
++
)
{
array
[
i
]
=
vlc_input_title_Duplicate
(
p_input
->
p
->
title
[
i
]
);
(
*
array
)[
i
]
=
vlc_input_title_Duplicate
(
p_input
->
p
->
title
[
i
]
);
}
vlc_mutex_unlock
(
&
p_input
->
p
->
p_item
->
lock
);
vlc_mutex_unlock
(
&
p_input
->
p
->
p_item
->
lock
);
*
va_arg
(
args
,
input_title_t
***
)
=
array
;
*
va_arg
(
args
,
int
*
)
=
count
;
return
VLC_SUCCESS
;
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