#include <stdlib.h> /* free() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
#include "vlc_playlist.h"
+#include "charset.h"
#ifdef WIN32 /* optind, getopt(), included in unistd.h */
# include "../extras/getopt.h"
/* Call mdate() once to make sure it is initialized properly */
mdate();
+ /* Replace argv[1..n] with unicode for Windows NT and above */
+ if( GetVersion() < 0x80000000 )
+ {
+ wchar_t **wargv, **wenvp;
+ int i,i_wargc;
+ int si = { 0 };
+ __wgetmainargs(&i_wargc, &wargv, &wenvp, 0, &si);
+
+ for( i = 1; i < i_wargc; i++ )
+ ppsz_argv[i] = FromWide( wargv[i] );
+ }
+
/* WinSock Library Init. */
if( !WSAStartup( MAKEWORD( 2, 2 ), &Data ) )
{
COPYDATASTRUCT wm_data;
int i_opt, i_data;
char *p_data;
- wchar_t **wargv, **wenvp;
- int si = { 0 };
i_data = sizeof(int);
- if( GetVersion() < 0x80000000 )
+ for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
{
- /* use unicode argv[] for Windows NT and above */
- __wgetmainargs(&i_opt, &wargv, &wenvp, 0, &si);
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
- {
- i_data += sizeof(int);
- i_data += WideCharToMultiByte( CP_UTF8, 0,
- wargv[ i_opt ], -1, NULL, 0, NULL, NULL ) + 1;
- }
- p_data = (char *)malloc( i_data );
- *((int *)&p_data[0]) = *pi_argc - optind;
- i_data = sizeof(int);
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
- {
- int i_len = WideCharToMultiByte( CP_UTF8, 0,
- wargv[ i_opt ], -1, NULL, 0, NULL, NULL ) + 1;
- *((int *)&p_data[i_data]) = i_len;
- i_data += sizeof(int);
- WideCharToMultiByte( CP_UTF8, 0, wargv[ i_opt ], -1,
- &p_data[i_data], i_len, NULL, NULL );
- i_data += i_len;
- }
-
+ i_data += sizeof(int);
+ i_data += strlen( ppsz_argv[ i_opt ] ) + 1;
}
- else
+
+ p_data = (char *)malloc( i_data );
+ *((int *)&p_data[0]) = *pi_argc - optind;
+ i_data = sizeof(int);
+ for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
{
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
- {
- i_data += sizeof(int);
- i_data += strlen( ppsz_argv[ i_opt ] ) + 1;
- }
-
- p_data = (char *)malloc( i_data );
- *((int *)&p_data[0]) = *pi_argc - optind;
- i_data = sizeof(int);
- for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
- {
- int i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
- *((int *)&p_data[i_data]) = i_len;
- i_data += sizeof(int);
- memcpy( &p_data[i_data], ppsz_argv[ i_opt ], i_len );
- i_data += i_len;
- }
+ int i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
+ *((int *)&p_data[i_data]) = i_len;
+ i_data += sizeof(int);
+ memcpy( &p_data[i_data], ppsz_argv[ i_opt ], i_len );
+ i_data += i_len;
}
/* Send our playlist items to the 1st instance */
}
if( i_opt || config_GetInt( p_this, "playlist-enqueue" ) )
{
- playlist_PlaylistAddExt( p_playlist, ppsz_argv[i_opt],
+ playlist_AddExt( p_playlist, ppsz_argv[i_opt],
NULL, PLAYLIST_APPEND ,
PLAYLIST_END, -1,
(char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- i_options );
+ i_options, VLC_TRUE );
} else {
- playlist_PlaylistAddExt( p_playlist, ppsz_argv[i_opt],
+ playlist_AddExt( p_playlist, ppsz_argv[i_opt],
NULL, PLAYLIST_APPEND | PLAYLIST_GO,
PLAYLIST_END, -1,
(char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- i_options );
+ i_options, VLC_TRUE );
}
i_opt += i_options;