#endif
#define UNICODE
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include "../libvlc.h"
#include <vlc_playlist.h>
#include <vlc_charset.h>
*****************************************************************************/
void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( pi_argc ); VLC_UNUSED( ppsz_argv );
WSADATA Data;
/* Get our full path */
}
#endif
- vlc_global()->psz_vlcpath = strdup( psz_path );
+ psz_vlcpath = strdup( psz_path );
/* Set the default file-translation mode */
#if !defined( UNDER_CE )
/*****************************************************************************
* system_Configure: check for system specific configuration options.
*****************************************************************************/
-static void IPCHelperThread( vlc_object_t * );
+static unsigned __stdcall IPCHelperThread( void * );
LRESULT CALLBACK WMCOPYWNDPROC( HWND, UINT, WPARAM, LPARAM );
+static vlc_object_t *p_helper = NULL;
+static unsigned long hIPCHelper;
+static HANDLE hIPCHelperReady;
+
typedef struct
{
int argc;
int enqueue;
- char data[0];
+ char data[];
} vlc_ipc_data_t;
void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
if( GetLastError() != ERROR_ALREADY_EXISTS )
{
/* We are the 1st instance. */
- vlc_object_t *p_helper =
- (vlc_object_t *)vlc_object_create( p_this, sizeof(vlc_object_t) );
+ static const char typename[] = "ipc helper";
+ p_helper =
+ vlc_custom_create( p_this, sizeof(vlc_object_t),
+ VLC_OBJECT_GENERIC, typename );
/* Run the helper thread */
- if( vlc_thread_create( p_helper, "IPC helper", IPCHelperThread,
- VLC_THREAD_PRIORITY_LOW, true ) )
+ hIPCHelperReady = CreateEvent( NULL, FALSE, FALSE, NULL );
+ hIPCHelper = _beginthreadex( NULL, 0, IPCHelperThread, p_helper,
+ 0, NULL );
+ if( hIPCHelper )
+ WaitForSingleObject( hIPCHelperReady, INFINITE );
+ else
{
msg_Err( p_this, "one instance mode DISABLED "
"(IPC helper thread couldn't be created)" );
-
+ vlc_object_release (p_helper);
+ p_helper = NULL;
}
+ vlc_object_attach (p_helper, p_this);
+ CloseHandle( hIPCHelperReady );
/* Initialization done.
* Release the mutex to unblock other instances */
#endif
}
-static void IPCHelperThread( vlc_object_t *p_this )
+static unsigned __stdcall IPCHelperThread( void *data )
{
+ vlc_object_t *p_this = data;
HWND ipcwindow;
MSG message;
SetWindowLongPtr( ipcwindow, GWLP_USERDATA, (LONG_PTR)p_this );
/* Signal the creation of the thread and events queue */
- vlc_thread_ready( p_this );
+ SetEvent( hIPCHelperReady );
while( GetMessage( &message, NULL, 0, 0 ) )
{
TranslateMessage( &message );
DispatchMessage( &message );
}
+ return 0;
}
LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
if( !p_this ) return 0;
/* Add files to the playlist */
- p_playlist = pl_Yield( p_this );
+ p_playlist = pl_Hold( p_this );
if( !p_playlist ) return 0;
if( pwm_data->lpData )
NULL, PLAYLIST_APPEND |
( ( i_opt || p_data->enqueue ) ? 0 : PLAYLIST_GO ),
PLAYLIST_END, -1,
+ i_options,
(char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- i_options, true, false );
+ VLC_INPUT_OPTION_TRUSTED,
+ true, pl_Unlocked );
i_opt += i_options;
}
*****************************************************************************/
void system_End( libvlc_int_t *p_this )
{
- if( p_this && vlc_global() )
+ HWND ipcwindow;
+ if( p_this )
+ {
+ free( psz_vlcpath );
+ psz_vlcpath = NULL;
+ }
+
+ if( ( ipcwindow = FindWindow( 0, L"VLC ipc "VERSION ) ) != 0 )
+ {
+ SendMessage( ipcwindow, WM_QUIT, 0, 0 );
+ }
+
+ if (p_helper && p_helper->p_parent == VLC_OBJECT(p_this) )
{
- free( vlc_global()->psz_vlcpath );
- vlc_global()->psz_vlcpath = NULL;
+ /* FIXME: thread-safety... */
+ vlc_object_detach (p_helper);
+ vlc_object_release (p_helper);
+ p_helper = NULL;
}
#if !defined( UNDER_CE )