X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=2f2750ad55f4d6b391a7ed8696e48b346563b6d5;hb=83f23b6686543887f908d184387782bf018c35d5;hp=7a77b71dc5ee9b0d6319ea419ae41f6e3ee5594a;hpb=9de9dd0534dc5d374c3edd3128906852c22ce62d;p=vlc

diff --git a/src/vlc.c b/src/vlc.c
index 7a77b71dc5..2f2750ad55 100644
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -1,12 +1,13 @@
 /*****************************************************************************
  * vlc.c: the vlc player
  *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: vlc.c,v 1.13 2002/10/08 18:10:09 sam Exp $
+ * 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
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,34 +22,42 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <signal.h>                               /* SIGHUP, SIGINT, SIGKILL */
+#include "config.h"
+
 #include <stdio.h>                                              /* fprintf() */
 #include <stdlib.h>                                  /* putenv(), strtol(),  */
-#include <signal.h>                               /* SIGHUP, SIGINT, SIGKILL */
-#include <time.h>                                                  /* time() */
+#ifdef HAVE_SIGNAL_H
+#   include <signal.h>                            /* SIGHUP, SIGINT, SIGKILL */
+#endif
+#ifdef HAVE_TIME_H
+#   include <time.h>                                               /* time() */
+#endif
 
 #include <vlc/vlc.h>
 
-#include "config.h"
-
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
-#ifndef WIN32
+#if !defined(WIN32) && !defined(UNDER_CE)
 static void SigHandler  ( int i_signal );
 #endif
 
+extern void rootwrap( void );
+
 /*****************************************************************************
- * main: parse command line, start interface and spawn threads
+ * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
 int main( int i_argc, char *ppsz_argv[] )
 {
-    vlc_error_t err;
+    int i_ret;
 
-    fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
+#ifndef __APPLE__
+    /* This clutters OSX GUI error logs */
+    fprintf( stderr, "VLC media player %s\n", VLC_Version() );
+#endif
 
 #ifdef HAVE_PUTENV
 #   ifdef DEBUG
@@ -66,14 +75,16 @@ int main( int i_argc, char *ppsz_argv[] )
     }
 #endif
 
+    rootwrap ();
+    
     /* Create a libvlc structure */
-    err = vlc_create();
-    if( err != VLC_SUCCESS )
+    i_ret = VLC_Create();
+    if( i_ret < 0 )
     {
-        return err;
+        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.
@@ -88,40 +99,25 @@ int main( int i_argc, char *ppsz_argv[] )
 #endif
 
     /* Initialize libvlc */
-    err = vlc_init( i_argc, ppsz_argv );
-    if( err != VLC_SUCCESS )
+    i_ret = VLC_Init( 0, i_argc, ppsz_argv );
+    if( i_ret < 0 )
     {
-        vlc_destroy();
-        return err;
+        VLC_Destroy( 0 );
+        return i_ret == VLC_EEXITSUCCESS ? 0 : i_ret;
     }
 
-    /* Run libvlc, in non-blocking mode */
-    err = vlc_play();
-
-    /* Add background interfaces */
-#if 0
-    { int i; for( i=10; i--; ) vlc_add_intf( NULL, "dummy", 0 ); }
-    vlc_add_intf( NULL, "dummy", VLC_FALSE );
-    vlc_add_intf( NULL, "logger", VLC_FALSE );
-    vlc_add_intf( NULL, "xosd", VLC_FALSE );
-    vlc_add_intf( NULL, "gtk", VLC_FALSE );
-    vlc_add_intf( NULL, "kde", VLC_FALSE );
-    vlc_add_intf( "rc", VLC_FALSE );
-#endif
-
-    /* Add a blocking interface and keep the return value */
-    err = vlc_add_intf( NULL, VLC_TRUE );
+    i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
 
     /* Finish the threads */
-    vlc_stop();
+    VLC_CleanUp( 0 );
 
     /* Destroy the libvlc structure */
-    vlc_destroy();
+    VLC_Destroy( 0 );
 
-    return err;
+    return i_ret;
 }
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(UNDER_CE)
 /*****************************************************************************
  * SigHandler: system signal handler
  *****************************************************************************
@@ -146,7 +142,7 @@ static void SigHandler( int i_signal )
                          "again in case it gets stuck\n", i_signal );
 
         /* Acknowledge the signal received */
-        vlc_die();
+        VLC_Die( 0 );
     }
     else if( time( NULL ) > abort_time + 2 )
     {
@@ -164,3 +160,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