* include/aout_internal.h: added a b_restart field to aout_input_t.

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index ee23c5d3d3fc995d979dfd2125ef3220b7c21ef2..1e4d9adea8d98453257ea58782d15a82d0583cb6 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * vlc.c: the vlc player
  *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: vlc.c,v 1.14 2002/10/11 22:32:56 sam Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id: vlc.c,v 1.21 2004/01/25 17:16:05 zorglub Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -24,11 +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 */
-#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>
 
@@ -46,7 +51,7 @@ int main( int i_argc, char *ppsz_argv[] )
 {
     int i_ret;
 
-    fprintf( stderr, "VideoLAN Client %s\n", VLC_Version() );
+    fprintf( stderr, "VLC media player %s\n", VLC_Version() );
 
 #ifdef HAVE_PUTENV
 #   ifdef DEBUG
@@ -96,17 +101,6 @@ int main( int i_argc, char *ppsz_argv[] )
     /* Run libvlc, in non-blocking mode */
     i_ret = VLC_Play( 0 );
 
-    /* Add background interfaces */
-#if 0
-    { int i; for( i=10; i--; ) VLC_AddIntf( 0, "dummy", 0 ); }
-    VLC_AddIntf( 0, "dummy", VLC_FALSE );
-    VLC_AddIntf( 0, "logger", VLC_FALSE );
-    VLC_AddIntf( 0, "xosd", VLC_FALSE );
-    VLC_AddIntf( 0, "gtk", VLC_FALSE );
-    VLC_AddIntf( 0, "kde", VLC_FALSE );
-    VLC_AddIntf( 0, "rc", VLC_FALSE );
-#endif
-
     /* Add a blocking interface and keep the return value */
     i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE );