Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
f063d3e1
Commit
f063d3e1
authored
17 years ago
by
Olivier Aubert
Browse files
Options
Downloads
Patches
Plain Diff
core/mediacontrol_core.c: do not prepend the dummy argv[0] since it is
done in libvlc_new now (since r22749)
parent
51c217e7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/control/mediacontrol_core.c
+3
-16
3 additions, 16 deletions
src/control/mediacontrol_core.c
with
3 additions
and
16 deletions
src/control/mediacontrol_core.c
+
3
−
16
View file @
f063d3e1
...
...
@@ -55,8 +55,6 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc
{
mediacontrol_Instance
*
retval
;
libvlc_exception_t
ex
;
char
**
ppsz_argv
=
NULL
;
int
i_index
;
libvlc_exception_init
(
&
ex
);
mediacontrol_exception_init
(
exception
);
...
...
@@ -65,22 +63,11 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc
if
(
!
retval
)
RAISE_NULL
(
mediacontrol_InternalException
,
"Out of memory"
);
/* Prepend a dummy argv[0] so that users of the API do not have to
do it themselves, and can simply provide the args list. */
ppsz_argv
=
malloc
(
(
argc
+
2
)
*
sizeof
(
char
*
)
)
;
if
(
!
ppsz_argv
)
RAISE_NULL
(
mediacontrol_InternalException
,
"Out of memory"
);
ppsz_argv
[
0
]
=
strdup
(
"vlc"
);
for
(
i_index
=
0
;
i_index
<
argc
;
i_index
++
)
ppsz_argv
[
i_index
+
1
]
=
argv
[
i_index
];
ppsz_argv
[
argc
+
1
]
=
NULL
;
retval
->
p_instance
=
libvlc_new
(
argc
+
1
,
ppsz_argv
,
&
ex
);
retval
->
p_playlist
=
retval
->
p_instance
->
p_libvlc_int
->
p_playlist
;
retval
->
p_instance
=
libvlc_new
(
argc
,
argv
,
&
ex
);
HANDLE_LIBVLC_EXCEPTION_NULL
(
&
ex
);
retval
->
p_playlist
=
retval
->
p_instance
->
p_libvlc_int
->
p_playlist
;
return
retval
;
}
;
}
void
mediacontrol_exit
(
mediacontrol_Instance
*
self
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment