* This library provides basic functions for threads to interact with user
* interface, such as command line.
*****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
- * $Id: interface.c,v 1.114 2004/03/03 20:39:53 gbazin Exp $
+ * Copyright (C) 1998-2007 the VideoLAN team
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/**
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free(), strtol() */
-#include <stdio.h> /* FILE */
-#include <string.h> /* strerror() */
#include <vlc/vlc.h>
-#include "stream_control.h"
-#include "input_ext-intf.h"
-
-#include "audio_output.h"
+#include <vlc_aout.h>
+#include <vlc_vout.h>
#include "vlc_interface.h"
+#include "modules/modules.h" // Gruik!
-#include "vlc_video.h"
-#include "video_output.h"
+#ifdef __APPLE__
+# include <Cocoa/Cocoa.h>
+#endif
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void Manager( intf_thread_t *p_intf );
static void RunInterface( intf_thread_t *p_intf );
static int SwitchIntfCallback( vlc_object_t *, char const *,
static int AddIntfCallback( vlc_object_t *, char const *,
vlc_value_t , vlc_value_t , void * );
+#ifdef __APPLE__
+static void Manager( intf_thread_t *p_intf );
+/*****************************************************************************
+ * VLCApplication interface
+ *****************************************************************************/
+@interface VLCApplication : NSApplication
+{
+ libvlc_int_t *o_libvlc;
+}
+
+- (void)setVLC: (libvlc_int_t *)p_libvlc;
+
+@end
+#endif
+
/*****************************************************************************
* intf_Create: prepare interface before main loop
*****************************************************************************
*****************************************************************************/
/**
* Create the interface, and prepare it for main loop.
+ * 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 )
+intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
+ int i_options, const char *const *ppsz_options )
{
intf_thread_t * p_intf;
- char *psz_intf;
+ int i;
/* Allocate structure */
p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
msg_Err( p_this, "out of memory" );
return NULL;
}
+ p_intf->pf_request_window = NULL;
+ p_intf->pf_release_window = NULL;
+ p_intf->pf_control_window = NULL;
+ p_intf->b_play = VLC_FALSE;
+ p_intf->b_interaction = VLC_FALSE;
- /* XXX: workaround for a bug in VLC 0.5.0 where the dvdplay plugin was
- * registering itself in $interface, which we do not want to happen. */
- psz_intf = config_GetPsz( p_intf, "intf" );
- if( psz_intf )
+ for( i = 0 ; i< i_options; i++ )
{
- if( !strcasecmp( psz_intf, "dvdplay" ) )
- {
- config_PutPsz( p_intf, "intf", "" );
- }
- free( psz_intf );
+ var_OptionParse( p_intf, ppsz_options[i] );
}
/* Choose the best module */
- p_intf->p_module = module_Need( p_intf, "interface", psz_module, 0 );
+ p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE );
if( p_intf->p_module == NULL )
{
- msg_Err( p_intf, "no suitable intf module" );
+ msg_Err( p_intf, "no suitable interface module" );
vlc_object_destroy( p_intf );
return NULL;
}
/* Initialize mutexes */
vlc_mutex_init( p_intf, &p_intf->change_lock );
- msg_Dbg( p_intf, "interface initialized" );
-
/* Attach interface to its parent object */
vlc_object_attach( p_intf, p_this );
*/
int intf_RunThread( intf_thread_t *p_intf )
{
+#ifdef __APPLE__
+ NSAutoreleasePool * o_pool;
+
+ /* 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->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 )
{
- /* Run a manager thread, launch the interface, kill the manager */
- if( vlc_thread_create( p_intf, "manager", Manager,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+ /* 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, "cannot spawn manager thread" );
+ msg_Err( p_intf, "You cannot run the MacOS X module as an "
+ "interface in clivlc mode. Please read the "
+ "README.MacOSX.rtf file.");
return VLC_EGENERIC;
}
-
- RunInterface( p_intf );
-
- p_intf->b_die = VLC_TRUE;
-
- /* Do not join the thread... intf_StopThread will do it for us */
+
+ /* If the main interface does not have a run function,
+ * implement a waiting loop ourselves
+ */
+ if( p_intf->pf_run )
+ RunInterface( p_intf );
+ else
+ {
+ while( !intf_ShouldDie( p_intf ) )
+ msleep( INTF_IDLE_SLEEP * 2);
+ }
+ vlc_object_kill( p_intf );
}
else
{
+ /* This interface doesn't need to be run */
+ 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 ) )
/* 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 );
+ }
}
-
- /* Wait for the thread to exit */
- vlc_thread_join( p_intf );
}
/**
*/
void intf_Destroy( intf_thread_t *p_intf )
{
- /* Unlock module */
- module_Unneed( p_intf, p_intf->p_module );
+ /* Unlock module if present (a switch may have failed) */
+ if( p_intf->p_module )
+ {
+ module_Unneed( p_intf, p_intf->p_module );
+ }
vlc_mutex_destroy( &p_intf->change_lock );
/* Following functions are local */
/*****************************************************************************
- * Manager: helper thread for blocking interfaces
- *****************************************************************************
- * If the interface is launched in the main thread, it will not listen to
- * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die.
- * This thread takes care of the matter.
+ * Manager: helper thread for blocking OS X
*****************************************************************************/
-/**
- * \brief Helper thread for blocking interfaces.
- * \ingroup vlc_interface
- *
- * This is a local function
- * If the interface is launched in the main thread, it will not listen to
- * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die.
- * This thread takes care of the matter.
- * \see intf_RunThread
- * \param p_intf an interface thread
- * \return nothing
- */
+#ifdef __APPLE__
static void Manager( intf_thread_t *p_intf )
{
while( !p_intf->b_die )
{
msleep( INTF_IDLE_SLEEP );
- if( p_intf->p_vlc->b_die )
+ if( p_intf->p_libvlc->b_die )
{
p_intf->b_die = VLC_TRUE;
+ if( strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) )
+ {
+ [NSApp stop: NULL];
+ }
return;
}
}
}
+#endif
/*****************************************************************************
* RunInterface: setups necessary data and give control to the interface
*****************************************************************************/
static void RunInterface( intf_thread_t *p_intf )
{
+ static const char *ppsz_interfaces[] =
+ {
+ "skins2", "Skins 2",
+#ifndef WIN32
+ "wxwidgets", "wxWidgets",
+#endif
+ NULL, NULL
+ };
+ const char **ppsz_parser;
+
+ vlc_list_t *p_list;
+ int i;
vlc_value_t val, text;
+ char *psz_intf;
/* Variable used for interface switching */
p_intf->psz_switch_intf = NULL;
text.psz_string = _("Switch interface");
var_Change( p_intf, "intf-switch", VLC_VAR_SETTEXT, &text, NULL );
- val.psz_string = "skins"; text.psz_string = "Skins";
- var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "skins2"; text.psz_string = "Skins 2";
- var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "wxwin"; text.psz_string = "wxWindows";
- var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text );
+ /* Only fill the list with available modules */
+ p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ for( ppsz_parser = ppsz_interfaces; *ppsz_parser; ppsz_parser += 2 )
+ {
+ for( i = 0; i < p_list->i_count; 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 = (char *)ppsz_parser[0];
+ text.psz_string = (char *)_(ppsz_parser[1]);
+ var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE,
+ &val, &text );
+ break;
+ }
+ }
+ }
+ vlc_list_release( p_list );
var_AddCallback( p_intf, "intf-switch", SwitchIntfCallback, NULL );
/* Variable used for interface spawning */
var_Create( p_intf, "intf-add", VLC_VAR_STRING |
VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
- text.psz_string = _("Add interface");
+ 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 = "logger"; text.psz_string = "Debug logging";
+ 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 = "HTTP remote control";
+ 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 = "sap"; text.psz_string = "SAP interface";
+ 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 control";
+ 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 );
- /* Give control to the interface */
- p_intf->pf_run( p_intf );
-
- /* Provide ability to switch the main interface on the fly */
- while( p_intf->psz_switch_intf )
+ do
{
- char *psz_intf = p_intf->psz_switch_intf;
- p_intf->psz_switch_intf = NULL;
- p_intf->b_die = VLC_FALSE;
+ /* Give control to the interface */
+ p_intf->pf_run( p_intf );
+
+ /* Reset play on start status */
+ p_intf->b_play = VLC_FALSE;
+
+ if( !p_intf->psz_switch_intf )
+ {
+ break;
+ }
- /* Make sure the old interface is completely uninitialised */
+ /* 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;
+
+ vlc_mutex_lock( &p_intf->object_lock );
+ p_intf->b_die = VLC_FALSE; /* FIXME */
+ 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 );
-
- if( p_intf->p_module )
- {
- p_intf->pf_run( p_intf );
- }
- else break;
}
+ while( p_intf->p_module );
}
static int SwitchIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
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_vlc, psz_intf );
+ p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
free( psz_intf );
if( p_intf == NULL )
{
return VLC_SUCCESS;
}
+
+#ifdef __APPLE__
+/*****************************************************************************
+ * VLCApplication implementation
+ *****************************************************************************/
+@implementation VLCApplication
+
+- (void)setVLC: (libvlc_int_t *) p_libvlc
+{
+ o_libvlc = p_libvlc;
+}
+
+- (void)terminate: (id)sender
+{
+ vlc_object_kill( o_libvlc );
+ [super terminate: sender];
+}
+
+@end
+#endif
+
projects / vlc / blobdiff