* share/skins2/winamp2.xml: A few more controls

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index 36cf1f322cd6f97c23901a65a3767805d7273d3b..67e9a19b5c32b2a00a51499754d0c1f404711e82 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -1,12 +1,12 @@
 /*****************************************************************************
  * vlc.c: the vlc player
  *****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2004 the VideoLAN team
  * $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
  *
@@ -35,70 +35,22 @@
 #ifdef HAVE_TIME_H
 #   include <time.h>                                               /* time() */
 #endif
-#ifdef HAVE_STRINGS_H
-#   include <strings.h>                                         /* strncmp() */
-#endif
 
 #include <vlc/vlc.h>
 
-#ifdef SYS_DARWIN
-#include <Cocoa/Cocoa.h>
-#endif
-
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
-#ifndef WIN32
+#if !defined(WIN32) && !defined(UNDER_CE)
 static void SigHandler  ( int i_signal );
 #endif
 
-#ifdef SYS_DARWIN
-/*****************************************************************************
- * VLCApplication interface
- *****************************************************************************/
-@interface VLCApplication : NSApplication
-{
-}
-
-@end
-
-/*****************************************************************************
- * VLCApplication implementation 
- *****************************************************************************/
-@implementation VLCApplication 
-
-- (void)stop: (id)sender
-{
-    NSEvent *o_event;
-    [super stop:sender];
-
-    /* send a dummy event to break out of the event loop */
-    o_event = [NSEvent mouseEventWithType: NSLeftMouseDown
-                location: NSMakePoint( 1, 1 ) modifierFlags: 0
-                timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber]
-                context: [NSGraphicsContext currentContext] eventNumber: 1
-                clickCount: 1 pressure: 0.0];
-    [NSApp postEvent: o_event atStart: YES];
-}
-
-- (void)terminate: (id)sender
-{
-    if( [NSApp isRunning] )
-        [NSApp stop:sender];
-    [super terminate: sender];
-}
-
-@end
-
-#endif /* SYS_DARWIN */
-
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
 int main( int i_argc, char *ppsz_argv[] )
 {
     int i_ret;
-    int b_cli = VLC_FALSE ;
 
 #ifndef SYS_DARWIN
     /* This clutters OSX GUI error logs */
@@ -128,7 +80,7 @@ int main( int i_argc, char *ppsz_argv[] )
         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.
@@ -147,42 +99,10 @@ int main( int i_argc, char *ppsz_argv[] )
     if( i_ret < 0 )
     {
         VLC_Destroy( 0 );
-        return i_ret;
-    }
-
-#ifdef HAVE_STRINGS_H
-    /* if first 3 chars of argv[0] are cli, then this is clivlc
-     * We detect this specifically for Mac OS X, so you can launch vlc
-     * from the commandline even if you are not logged in on the GUI */
-    if( i_argc > 0 )
-    {
-        char *psz_temp;
-        char *psz_program = psz_temp = ppsz_argv[0];
-        while( *psz_temp )
-        {
-            if( *psz_temp == '/' ) psz_program = ++psz_temp;
-            else ++psz_temp;
-        }
-        b_cli = !strncmp( psz_program, "cli", 3 );
-    }
-#endif
-
-#ifdef SYS_DARWIN
-    if( !b_cli )
-    {
-        [VLCApplication sharedApplication];
+        return i_ret == VLC_EEXITSUCCESS ? 0 : i_ret;
     }
 
     i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
-    
-    if( !b_cli )
-    {
-        /* This is a blocking call */
-        [NSApp run];
-    }
-#else
-    i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
-#endif /* SYS_DARWIN */
 
     /* Finish the threads */
     VLC_CleanUp( 0 );
@@ -190,17 +110,10 @@ int main( int i_argc, char *ppsz_argv[] )
     /* Destroy the libvlc structure */
     VLC_Destroy( 0 );
 
-#ifdef SYS_DARWIN
-    if( !b_cli )
-    {
-        [NSApp terminate:NULL];
-    }
-#endif /* SYS_DARWIN */
-
     return i_ret;
 }
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(UNDER_CE)
 /*****************************************************************************
  * SigHandler: system signal handler
  *****************************************************************************
@@ -243,3 +156,32 @@ static void SigHandler( int i_signal )
 }
 #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