* This library provides basic functions for threads to interact with user
* interface, such as command line.
*****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2004 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
#include <string.h> /* strerror() */
#include <vlc/vlc.h>
-
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include <vlc/input.h>
#include "audio_output.h"
#include "vlc_interface.h"
-
#include "vlc_video.h"
#include "video_output.h"
+#ifdef SYS_DARWIN
+# include "Cocoa/Cocoa.h"
+#endif /* SYS_DARWIN */
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int AddIntfCallback( vlc_object_t *, char const *,
vlc_value_t , vlc_value_t , void * );
+#ifdef SYS_DARWIN
+/*****************************************************************************
+ * VLCApplication interface
+ *****************************************************************************/
+@interface VLCApplication : NSApplication
+{
+ vlc_t *o_vlc;
+}
+
+- (void)setVLC: (vlc_t *)p_vlc;
+
+@end
+#endif
+
/*****************************************************************************
* intf_Create: prepare interface before main loop
*****************************************************************************
p_intf->pf_release_window = NULL;
p_intf->pf_control_window = NULL;
p_intf->b_play = VLC_FALSE;
+ p_intf->b_interaction = VLC_FALSE;
/* Choose the best module */
p_intf->p_module = module_Need( p_intf, "interface", psz_module, 0 );
*/
int intf_RunThread( intf_thread_t *p_intf )
{
+#ifdef SYS_DARWIN
+ NSAutoreleasePool * o_pool;
+
if( p_intf->b_block )
{
+ /* This is the primary intf */
/* Run a manager thread, launch the interface, kill the manager */
if( vlc_thread_create( p_intf, "manager", Manager,
VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
msg_Err( p_intf, "cannot spawn manager thread" );
return VLC_EGENERIC;
}
+ }
- RunInterface( p_intf );
+ if( p_intf->b_block && strncmp( p_intf->p_vlc->psz_object_name,
+ "clivlc", 6) )
+ {
+ o_pool = [[NSAutoreleasePool alloc] init];
+ [VLCApplication sharedApplication];
+ [NSApp setVLC: p_intf->p_vlc];
+ }
+ if( p_intf->b_block &&
+ ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
+ !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
+ {
+ /* VLC in normal primary interface mode */
+ RunInterface( p_intf );
p_intf->b_die = VLC_TRUE;
+ }
+ else
+ {
+ /* Run the interface in a separate thread */
+ if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) )
+ {
+ msg_Err( p_intf, "You cannot run the MacOS X module as an extrainterface. Please read the README.MacOSX.rtf file");
+ return VLC_EGENERIC;
+ }
+ if( vlc_thread_create( p_intf, "interface", RunInterface,
+ VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+ {
+ msg_Err( p_intf, "cannot spawn interface thread" );
+ return VLC_EGENERIC;
+ }
+ if( p_intf->b_block )
+ {
+ /* VLC in primary interface mode with a working macosx vout */
+ [NSApp run];
+ p_intf->b_die = VLC_TRUE;
+ }
+ }
+#else
+ if( p_intf->b_block )
+ {
+ /* Run a manager thread, launch the interface, kill the manager */
+ if( vlc_thread_create( p_intf, "manager", Manager,
+ VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+ {
+ msg_Err( p_intf, "cannot spawn manager thread" );
+ return VLC_EGENERIC;
+ }
+
+ RunInterface( p_intf );
+
+ p_intf->b_die = VLC_TRUE;
/* Do not join the thread... intf_StopThread will do it for us */
}
else
return VLC_EGENERIC;
}
}
+#endif
return VLC_SUCCESS;
}
if( p_intf->p_vlc->b_die )
{
p_intf->b_die = VLC_TRUE;
+#ifdef SYS_DARWIN
+ if( strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) )
+ {
+ [NSApp stop: NULL];
+ }
+#endif
return;
}
}
{
static char *ppsz_interfaces[] =
{
- "skins", "Skins",
"skins2", "Skins 2",
- "wxwindows", "wxWindows",
+ "wxwidgets", "wxWidgets",
NULL, NULL
};
char **ppsz_parser;
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "logger"; text.psz_string = "Debug logging";
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "sap"; text.psz_string = "SAP Playlist";
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "gestures"; text.psz_string = "Mouse Gestures";
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
break;
}
+ /* Make sure the old interface is completely uninitialized */
+ module_Unneed( p_intf, p_intf->p_module );
+
/* Provide ability to switch the main interface on the fly */
psz_intf = p_intf->psz_switch_intf;
p_intf->psz_switch_intf = NULL;
- p_intf->b_die = VLC_FALSE;
- /* Make sure the old interface is completely uninitialized */
- module_Unneed( p_intf, p_intf->p_module );
+ vlc_mutex_lock( &p_intf->object_lock );
+ p_intf->b_die = VLC_FALSE;
+ p_intf->b_dead = VLC_FALSE;
+ vlc_mutex_unlock( &p_intf->object_lock );
p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
free( psz_intf );
return VLC_SUCCESS;
}
+
+#ifdef SYS_DARWIN
+/*****************************************************************************
+ * VLCApplication implementation
+ *****************************************************************************/
+@implementation VLCApplication
+
+- (void)setVLC: (vlc_t *) p_vlc
+{
+ o_vlc = p_vlc;
+}
+
+- (void)stop: (id)sender
+{
+ NSEvent *o_event;
+ NSAutoreleasePool *o_pool;
+ [super stop:sender];
+
+ o_pool = [[NSAutoreleasePool alloc] init];
+ /* 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];
+ [o_pool release];
+}
+
+- (void)terminate: (id)sender
+{
+ o_vlc->b_die = VLC_TRUE;
+}
+
+@end
+#endif
+
projects / vlc / blobdiff