* all: fix mpeg2 handling.

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index 4677528c63caf723b36cc1b9e9c7ed0a05e5ca03..622d8052214edacdec21d34c191e286c9fb255ae 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -2,7 +2,7 @@
  * vlc.c: the vlc player
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: vlc.c,v 1.9 2002/08/19 11:13:45 sam Exp $
+ * $Id: vlc.c,v 1.19 2002/12/25 23:39:01 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -24,10 +24,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, 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 */
+#ifdef HAVE_SIGNAL_H
+#   include <signal.h>                            /* SIGHUP, SIGINT, SIGKILL */
+#endif
+#ifdef HAVE_TIME_H
+#   include <time.h>                                               /* time() */
+#endif
 
 #include <vlc/vlc.h>
 
@@ -43,11 +49,11 @@ static void SigHandler  ( int i_signal );
  *****************************************************************************/
 int main( int i_argc, char *ppsz_argv[] )
 {
-    vlc_error_t err;
+    int i_ret;
 
-    fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
+    fprintf( stderr, "VideoLAN Client %s\n", VLC_Version() );
 
-#ifdef SYS_LINUX
+#ifdef HAVE_PUTENV
 #   ifdef DEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
     putenv( "MALLOC_CHECK_=2" );
@@ -55,13 +61,19 @@ int main( int i_argc, char *ppsz_argv[] )
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
     putenv( "GNOME_DISABLE_CRASH_DIALOG=1" );
 #   endif
+
+    /* If the user isn't using VLC_VERBOSE, set it to 0 by default */
+    if( getenv( "VLC_VERBOSE" ) == NULL )
+    {
+        putenv( "VLC_VERBOSE=0" );
+    }
 #endif
 
     /* 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
@@ -79,40 +91,26 @@ 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;
     }
 
     /* Run libvlc, in non-blocking mode */
-    err = vlc_run();
-
-    /* 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
+    i_ret = VLC_Play( 0 );
 
     /* Add a blocking interface and keep the return value */
-    err = vlc_add_intf( NULL, VLC_TRUE );
-
-    /* Finish the interface */
-    vlc_stop();
+    i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE );
 
-    /* Finish all threads */
-    vlc_end();
+    /* Finish the threads */
+    VLC_Stop( 0 );
 
     /* Destroy the libvlc structure */
-    vlc_destroy();
+    VLC_Destroy( 0 );
 
-    return err;
+    return i_ret;
 }
 
 #ifndef WIN32
@@ -124,7 +122,7 @@ int main( int i_argc, char *ppsz_argv[] )
  *****************************************************************************/
 static void SigHandler( int i_signal )
 {
-    static mtime_t abort_time = 0;
+    static time_t abort_time = 0;
     static volatile vlc_bool_t b_die = VLC_FALSE;
 
     /* Once a signal has been trapped, the termination sequence will be
@@ -134,17 +132,17 @@ static void SigHandler( int i_signal )
     if( !b_die )
     {
         b_die = VLC_TRUE;
-        abort_time = mdate();
+        abort_time = time( NULL );
 
         fprintf( stderr, "signal %d received, terminating vlc - do it "
                          "again in case it gets stuck\n", i_signal );
 
         /* Acknowledge the signal received */
-        vlc_die();
+        VLC_Die( 0 );
     }
-    else if( mdate() > abort_time + 1000000 )
+    else if( time( NULL ) > abort_time + 2 )
     {
-        /* If user asks again 1 second later, die badly */
+        /* If user asks again 1 or 2 seconds later, die badly */
         signal( SIGINT,  SIG_DFL );
         signal( SIGHUP,  SIG_DFL );
         signal( SIGQUIT, SIG_DFL );
@@ -153,7 +151,7 @@ static void SigHandler( int i_signal )
 
         fprintf( stderr, "user insisted too much, dying badly\n" );
 
-        exit( 1 );
+        abort();
     }
 }
 #endif