Commit 90d26397 authored by Olivier Aubert's avatar Olivier Aubert

mediacontrol_core.c: prepend the argv[0] here, since libvlc_new no

longer does.
parent 8ce89e1a
...@@ -59,6 +59,8 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc ...@@ -59,6 +59,8 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc
{ {
mediacontrol_Instance* retval; mediacontrol_Instance* retval;
libvlc_exception_t ex; libvlc_exception_t ex;
char** ppsz_argv = NULL;
int i_index;
libvlc_exception_init( &ex ); libvlc_exception_init( &ex );
exception=mediacontrol_exception_init( exception ); exception=mediacontrol_exception_init( exception );
...@@ -67,7 +69,18 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc ...@@ -67,7 +69,18 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc
if( !retval ) if( !retval )
RAISE_NULL( mediacontrol_InternalException, "Out of memory" ); RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
retval->p_instance = libvlc_new( argc, argv, &ex ); /* 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_playlist = retval->p_instance->p_libvlc_int->p_playlist;
HANDLE_LIBVLC_EXCEPTION_NULL( &ex ); HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
return retval; return retval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment