/*****************************************************************************
* vlc.c: the vlc player
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: vlc.c,v 1.12 2002/10/03 18:56:09 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>
+ * 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
* 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
+#ifdef HAVE_STRINGS_H
+# include <strings.h> /* strncmp() */
+#endif
#include <vlc/vlc.h>
-#include "config.h"
+#ifdef SYS_DARWIN
+#include <Cocoa/Cocoa.h>
+#endif
/*****************************************************************************
* Local prototypes.
static void SigHandler ( int i_signal );
#endif
+#ifdef SYS_DARWIN
+/*****************************************************************************
+ * VLCApplication interface
+ *****************************************************************************/
+@interface VLCApplication : NSApplication
+{
+}
+
+@end
+
/*****************************************************************************
- * main: parse command line, start interface and spawn threads
+ * 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[] )
{
- vlc_error_t err;
+ int i_ret;
+ int b_cli = VLC_FALSE ;
- fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
+#ifndef SYS_DARWIN
+ /* This clutters OSX GUI error logs */
+ fprintf( stderr, "VLC media player %s\n", VLC_Version() );
+#endif
#ifdef HAVE_PUTENV
# ifdef DEBUG
putenv( "GNOME_DISABLE_CRASH_DIALOG=1" );
# endif
- /* If the user isn't using VLC_VERBOSE, set it to 1 by default */
+ /* If the user isn't using VLC_VERBOSE, set it to 0 by default */
if( getenv( "VLC_VERBOSE" ) == NULL )
{
- putenv( "VLC_VERBOSE=1" );
+ 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
#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_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 );
+#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
- /* Add a blocking interface and keep the return value */
- err = vlc_add_intf( NULL, VLC_TRUE );
+#ifdef SYS_DARWIN
+ if( !b_cli )
+ {
+ [VLCApplication sharedApplication];
+ }
+
+ 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_stop();
+ VLC_CleanUp( 0 );
/* Destroy the libvlc structure */
- vlc_destroy();
+ VLC_Destroy( 0 );
+
+#ifdef SYS_DARWIN
+ if( !b_cli )
+ {
+ [NSApp terminate:NULL];
+ }
+#endif /* SYS_DARWIN */
- return err;
+ return i_ret;
}
#ifndef WIN32
"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 )
{
projects / vlc / blobdiff