/*****************************************************************************
* vlc.c: the vlc player
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: vlc.c,v 1.17 2002/11/10 23:41:53 sam Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
+ * Derk-Jan Hartman <hartman at videolan dot org>
* Lots of other people, see the libvlc AUTHORS file
*
* This program is free software; you can redistribute it and/or modify
# include <time.h> /* time() */
#endif
-#ifdef UNDER_CE
- /* WinCE needs a WINAPI declaration */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
#include <vlc/vlc.h>
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-#ifndef WIN32
+#if !defined(WIN32) && !defined(UNDER_CE)
static void SigHandler ( int i_signal );
#endif
/*****************************************************************************
- * main: parse command line, start interface and spawn threads
+ * main: parse command line, start interface and spawn threads.
*****************************************************************************/
-#ifdef UNDER_CE
-int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
- LPTSTR lpCmdLine, int nCmdShow )
-#else
int main( int i_argc, char *ppsz_argv[] )
-#endif
{
int i_ret;
-#ifdef UNDER_CE
- int i_argc = 1;
- char *ppsz_argv[] = { lpCmdLine, NULL };
-#endif
- fprintf( stderr, "VideoLAN Client %s\n", VLC_Version() );
+#ifndef SYS_DARWIN
+ /* This clutters OSX GUI error logs */
+ fprintf( stderr, "VLC media player %s\n", VLC_Version() );
+#endif
#ifdef HAVE_PUTENV
# ifdef DEBUG
return i_ret;
}
-#ifndef WIN32
+#if !defined(WIN32) && !defined(UNDER_CE)
/* Set the signal handlers. SIGTERM is not intercepted, because we need at
* least one method to kill the program when all other methods failed, and
* when we don't want to use SIGKILL.
return i_ret;
}
- /* Run libvlc, in non-blocking mode */
- i_ret = VLC_Play( 0 );
-
- /* Add a blocking interface and keep the return value */
- i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE );
+ i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
/* Finish the threads */
- VLC_Stop( 0 );
+ VLC_CleanUp( 0 );
/* Destroy the libvlc structure */
VLC_Destroy( 0 );
return i_ret;
}
-#ifndef WIN32
+#if !defined(WIN32) && !defined(UNDER_CE)
/*****************************************************************************
* SigHandler: system signal handler
*****************************************************************************
}
#endif
+#if defined(UNDER_CE)
+# if defined( _MSC_VER ) && defined( UNDER_CE )
+# include "vlc_common.h"
+# endif
+/*****************************************************************************
+ * WinMain: parse command line, start interface and spawn threads. (WinCE only)
+ *****************************************************************************/
+int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
+ LPTSTR lpCmdLine, int nCmdShow )
+{
+ char **argv, psz_cmdline[MAX_PATH];
+ int argc, i_ret;
+
+ WideCharToMultiByte( CP_ACP, 0, lpCmdLine, -1,
+ psz_cmdline, MAX_PATH, NULL, NULL );
+
+ argv = vlc_parse_cmdline( psz_cmdline, &argc );
+ argv = realloc( argv, (argc + 1) * sizeof(char *) );
+ if( !argv ) return -1;
+
+ if( argc ) memmove( argv + 1, argv, argc * sizeof(char *) );
+ argv[0] = ""; /* Fake program path */
+
+ i_ret = main( argc + 1, argv );
+
+ /* No need to free the argv memory */
+ return i_ret;
+}
+#endif