* This library provides basic functions for threads to interact with user
* interface, such as command line.
*****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free(), strtol() */
-#include <stdio.h> /* FILE */
-#include <string.h> /* strerror() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "audio_output.h"
+#include <vlc_aout.h>
+#include <vlc_vout.h>
#include "vlc_interface.h"
-#include "vlc_video.h"
-#include "video_output.h"
+#include "modules/modules.h" // Gruik!
#ifdef __APPLE__
# include <Cocoa/Cocoa.h>
* You can give some additional options to be used for interface initialization
*
* \param p_this the calling vlc_object_t
- * \param psz_module a prefered interface module
+ * \param psz_module a preferred interface module
* \param i_options number additional options
* \param ppsz_options additional option strings
* \return a pointer to the created interface thread, NULL on error
*/
intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
- int i_options, char **ppsz_options )
+ int i_options, const char *const *ppsz_options )
{
intf_thread_t * p_intf;
int i;
#ifdef __APPLE__
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, "manage", Manager,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
- {
- msg_Err( p_intf, "cannot spawn manager thread" );
- return VLC_EGENERIC;
- }
- }
-
+ /* If !clivlc, then run as a OS X application */
if( p_intf->b_block && strncmp( p_intf->p_libvlc->psz_object_name,
"clivlc", 6) )
{
o_pool = [[NSAutoreleasePool alloc] init];
[VLCApplication sharedApplication];
[NSApp setVLC: p_intf->p_libvlc];
- }
- if( p_intf->b_block &&
- ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
- !strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) ) )
- {
- /* VLC in normal primary interface mode */
- RunInterface( p_intf );
- p_intf->b_die = VLC_TRUE;
+ if( p_intf->pf_run )
+ RunInterface( p_intf );
+ else
+ {
+ [NSApp run];
+ while( !intf_ShouldDie( p_intf ) )
+ msleep( INTF_IDLE_SLEEP * 2);
+ }
+ vlc_object_kill( p_intf );
}
else
+#endif
+ if( p_intf->b_block )
{
- /* This interface doesn't need to be run */
- if( !p_intf->pf_run )
- return VLC_SUCCESS;
-
- /* Run the interface in a separate thread */
+ /* If we are clivlc+macosx, don't run the macosx GUI */
if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) )
{
msg_Err( p_intf, "You cannot run the MacOS X module as an "
- "extra interface. Please read the "
+ "interface in clivlc mode. 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 )
- {
+
/* If the main interface does not have a run function,
* implement a waiting loop ourselves
*/
while( !intf_ShouldDie( p_intf ) )
msleep( INTF_IDLE_SLEEP * 2);
}
- p_intf->b_die = VLC_TRUE;
- /* Do not join the thread... intf_StopThread will do it for us */
+ vlc_object_kill( p_intf );
}
else
{
if( !p_intf->pf_run )
return VLC_SUCCESS;
+ /* 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 "
+ "extra interface. Please read the "
+ "README.MacOSX.rtf file.");
+ return VLC_EGENERIC;
+ }
+
/* Run the interface in a separate thread */
if( vlc_thread_create( p_intf, "interface", RunInterface,
VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
return VLC_EGENERIC;
}
}
-#endif
return VLC_SUCCESS;
}
/* Tell the interface to die */
if( !p_intf->b_block )
{
- p_intf->b_die = VLC_TRUE;
+ vlc_object_kill( p_intf );
if( p_intf->pf_run )
+ {
+ vlc_cond_signal( &p_intf->object_wait );
vlc_thread_join( p_intf );
+ }
}
}
*****************************************************************************/
static void RunInterface( intf_thread_t *p_intf )
{
- static char *ppsz_interfaces[] =
+ static const char *ppsz_interfaces[] =
{
"skins2", "Skins 2",
#ifndef WIN32
#endif
NULL, NULL
};
- char **ppsz_parser;
+ const char **ppsz_parser;
vlc_list_t *p_list;
int i;
module_t *p_module = (module_t *)p_list->p_values[i].p_object;
if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) )
{
- val.psz_string = ppsz_parser[0];
- text.psz_string = ppsz_parser[1];
+ val.psz_string = (char *)ppsz_parser[0];
+ text.psz_string = (char *)_(ppsz_parser[1]);
var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE,
&val, &text );
break;
text.psz_string = _("Add Interface");
var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
- val.psz_string = "rc"; text.psz_string = "Console";
+ val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console";
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "telnet"; text.psz_string = "Telnet Interface";
+ val.psz_string = (char *)"telnet";
+ text.psz_string = (char *)_("Telnet Interface");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "http"; text.psz_string = "Web Interface";
+ val.psz_string = (char *)"http";
+ text.psz_string = (char *)_("Web Interface");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "logger"; text.psz_string = "Debug logging";
+ val.psz_string = (char *)"logger";
+ text.psz_string = (char *)_("Debug logging");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "gestures"; text.psz_string = "Mouse Gestures";
+ val.psz_string = (char *)"gestures";
+ text.psz_string = (char *)_("Mouse Gestures");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
p_intf->psz_switch_intf = NULL;
vlc_mutex_lock( &p_intf->object_lock );
- p_intf->b_die = VLC_FALSE;
+ p_intf->b_die = VLC_FALSE; /* FIXME */
p_intf->b_dead = VLC_FALSE;
vlc_mutex_unlock( &p_intf->object_lock );
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ (void)psz_cmd; (void)oldval; (void)p_data;
p_intf->psz_switch_intf =
malloc( strlen(newval.psz_string) + sizeof(",none") );
sprintf( p_intf->psz_switch_intf, "%s,none", newval.psz_string );
- p_intf->b_die = VLC_TRUE;
+ vlc_object_kill( p_intf );
return VLC_SUCCESS;
}
intf_thread_t *p_intf;
char *psz_intf = malloc( strlen(newval.psz_string) + sizeof(",none") );
+ (void)psz_cmd; (void)oldval; (void)p_data;
+
/* Try to create the interface */
sprintf( psz_intf, "%s,none", newval.psz_string );
p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
o_libvlc = p_libvlc;
}
-- (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_libvlc->b_die = VLC_TRUE;
+ vlc_object_kill( o_libvlc );
+ [super terminate: sender];
}
@end
projects / vlc / blobdiff