/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free(), strtol() */
-#include <stdio.h> /* FILE */
-#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_aout.h>
#include <vlc_vout.h>
#include "vlc_interface.h"
-
-#ifdef __APPLE__
-# include <Cocoa/Cocoa.h>
-#endif
+#include "modules/modules.h" // Gruik!
+#include "libvlc.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void RunInterface( intf_thread_t *p_intf );
-
-static int SwitchIntfCallback( vlc_object_t *, char const *,
- vlc_value_t , vlc_value_t , void * );
+#ifdef __APPLE__
+static void MonitorLibVLCDeath( intf_thread_t *p_intf );
+#endif
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
+/**
+ * \brief Destroy the interface after the main loop endeed.
+ *
+ * \param p_intf the interface thread
+ * \return nothing
+ */
+static void intf_Destroy( vlc_object_t *obj )
{
- libvlc_int_t *o_libvlc;
-}
+ intf_thread_t *p_intf = (intf_thread_t *)obj;
-- (void)setVLC: (libvlc_int_t *)p_libvlc;
+ /* Unlock module if present (a switch may have failed) */
+ if( p_intf->p_module )
+ module_Unneed( p_intf, p_intf->p_module );
-@end
-#endif
+ free( p_intf->psz_intf );
+ vlc_mutex_destroy( &p_intf->change_lock );
+}
/*****************************************************************************
* 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 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, const char *const *ppsz_options )
+intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
{
intf_thread_t * p_intf;
- int i;
/* Allocate structure */
p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
if( !p_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;
-
- for( i = 0 ; i< i_options; i++ )
- {
- var_OptionParse( p_intf, ppsz_options[i] );
- }
+ p_intf->b_interaction = false;
+#ifdef __APPLE__
+ p_intf->b_should_run_on_first_thread = false;
+#endif
/* Choose the best module */
- p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE );
+ p_intf->psz_intf = strdup( psz_module );
+ p_intf->p_module = module_Need( p_intf, "interface", psz_module, false );
if( p_intf->p_module == NULL )
{
msg_Err( p_intf, "no suitable interface module" );
- vlc_object_destroy( p_intf );
+ free( p_intf->psz_intf );
+ vlc_object_release( p_intf );
return NULL;
}
/* Initialize structure */
- p_intf->b_menu = VLC_FALSE;
- p_intf->b_menu_change = VLC_FALSE;
+ p_intf->b_menu = false;
+ p_intf->b_menu_change = false;
/* Initialize mutexes */
- vlc_mutex_init( p_intf, &p_intf->change_lock );
+ vlc_mutex_init( &p_intf->change_lock );
/* Attach interface to its parent object */
vlc_object_attach( p_intf, p_this );
+ vlc_object_set_destructor( p_intf, intf_Destroy );
return p_intf;
}
/*****************************************************************************
* intf_RunThread: launch the interface thread
*****************************************************************************
- * This function either creates a new thread and runs the interface in it,
- * or runs the interface in the current thread, depending on b_block.
+ * This function either creates a new thread and runs the interface in it.
*****************************************************************************/
/**
- * Run the interface thread.
+ * Starts and runs the interface thread.
*
- * If b_block is not set, runs the interface in the thread, else,
- * creates a new thread and runs the interface.
* \param p_intf the interface thread
* \return VLC_SUCCESS on success, an error number else
*/
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) )
+ /* Hack to get Mac OS X Cocoa runtime running
+ * (it needs access to the main thread) */
+ if( p_intf->b_should_run_on_first_thread )
{
- o_pool = [[NSAutoreleasePool alloc] init];
- [VLCApplication sharedApplication];
- [NSApp setVLC: p_intf->p_libvlc];
-
- if( p_intf->pf_run )
- RunInterface( p_intf );
- else
+ if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath,
+ VLC_THREAD_PRIORITY_LOW, false ) )
{
- [NSApp run];
- while( !intf_ShouldDie( p_intf ) )
- msleep( INTF_IDLE_SLEEP * 2);
- }
- p_intf->b_die = VLC_TRUE;
- }
- else
-#endif
- if( p_intf->b_block )
- {
- /* 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 "
- "interface in clivlc mode. Please read the "
- "README.MacOSX.rtf file.");
+ msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
return VLC_EGENERIC;
}
-
- /* 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);
- }
- p_intf->b_die = VLC_TRUE;
- }
- else
- {
- /* This interface doesn't need to be run */
- if( !p_intf->pf_run )
- return VLC_SUCCESS;
+ RunInterface( p_intf );
- /* 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;
- }
+ /* Make sure our MonitorLibVLCDeath thread exit */
+ vlc_object_kill( p_intf );
+ /* It is monitoring libvlc, not the p_intf */
+ vlc_object_signal( p_intf->p_libvlc );
+ vlc_thread_join( p_intf );
- /* Run the interface in a separate thread */
- 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;
- }
+ vlc_object_detach( p_intf );
+ vlc_object_release( p_intf );
+ return VLC_SUCCESS;
+ }
+#endif
+ /* Run the interface in a separate thread */
+ if( vlc_thread_create( p_intf, "interface", RunInterface,
+ VLC_THREAD_PRIORITY_LOW, false ) )
+ {
+ msg_Err( p_intf, "cannot spawn interface thread" );
+ return VLC_EGENERIC;
}
return VLC_SUCCESS;
void intf_StopThread( intf_thread_t *p_intf )
{
/* Tell the interface to die */
- if( !p_intf->b_block )
- {
- p_intf->b_die = VLC_TRUE;
- if( p_intf->pf_run )
- {
- vlc_cond_signal( &p_intf->object_wait );
- vlc_thread_join( p_intf );
- }
- }
-}
-
-/**
- * \brief Destroy the interface after the main loop endeed.
- *
- * Destroys interfaces and closes output devices
- * \param p_intf the interface thread
- * \return nothing
- */
-void intf_Destroy( intf_thread_t *p_intf )
-{
- /* 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 );
-
- /* Free structure */
- vlc_object_destroy( p_intf );
+ vlc_object_kill( p_intf );
+ vlc_thread_join( p_intf );
}
-
/* Following functions are local */
-/*****************************************************************************
- * Manager: helper thread for blocking OS X
- *****************************************************************************/
-#ifdef __APPLE__
-static void Manager( intf_thread_t *p_intf )
-{
- while( !p_intf->b_die )
- {
- msleep( INTF_IDLE_SLEEP );
-
- 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;
- var_Create( p_intf, "intf-switch", VLC_VAR_STRING |
- VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
- text.psz_string = _("Switch interface");
- var_Change( p_intf, "intf-switch", VLC_VAR_SETTEXT, &text, NULL );
-
- /* 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");
var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
- val.psz_string = (char *)"rc"; text.psz_string = (char *)"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 = (char *)"telnet";
text.psz_string = (char *)_("Telnet Interface");
do
{
/* 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->pf_run )
+ p_intf->pf_run( p_intf );
+ else
+ {
+ vlc_object_lock( p_intf );
+ while( vlc_object_alive( p_intf ) )
+ vlc_object_wait( p_intf );
+ vlc_object_unlock( p_intf );
+ }
if( !p_intf->psz_switch_intf )
{
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;
- p_intf->b_dead = VLC_FALSE;
- vlc_mutex_unlock( &p_intf->object_lock );
+ vlc_object_lock( p_intf );
+ p_intf->b_die = false; /* FIXME */
+ p_intf->b_dead = false;
+
+ vlc_object_unlock( p_intf );
+ p_intf->psz_intf = psz_intf;
p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
- free( psz_intf );
}
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 )
+#ifdef __APPLE__
+/*****************************************************************************
+ * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
+ *****************************************************************************/
+static void MonitorLibVLCDeath( intf_thread_t *p_intf )
{
- intf_thread_t *p_intf = (intf_thread_t *)p_this;
- (void)psz_cmd; (void)oldval; (void)p_data;
+ libvlc_int_t * p_libvlc = p_intf->p_libvlc;
+ vlc_object_lock( p_libvlc );
+ while(vlc_object_alive( p_libvlc ) )
+ {
+ if(p_intf->b_die)
+ {
+ vlc_object_unlock( p_libvlc );
+ return;
+ }
+ vlc_object_wait( p_libvlc );
+ }
+ vlc_object_unlock( p_libvlc );
- 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;
+ /* Someone killed libvlc */
- return VLC_SUCCESS;
+ /* Make sure we kill all interface objects, especially
+ * those that are blocking libvlc (running on main thread) */
+ vlc_list_t * p_list = vlc_list_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD );
+ for( int i = 0; i < p_list->i_count; i++ )
+ {
+ vlc_object_t * p_intf = p_list->p_values[i].p_object;
+ vlc_object_kill( p_intf );
+ }
+ vlc_list_release( p_list );
}
+#endif
static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, 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 );
+ p_intf = intf_Create( p_this->p_libvlc, psz_intf );
free( psz_intf );
if( p_intf == NULL )
{
}
/* Try to run the interface */
- p_intf->b_block = VLC_FALSE;
if( intf_RunThread( p_intf ) != VLC_SUCCESS )
{
vlc_object_detach( p_intf );
- intf_Destroy( p_intf );
+ vlc_object_release( p_intf );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
-#ifdef __APPLE__
-/*****************************************************************************
- * VLCApplication implementation
- *****************************************************************************/
-@implementation VLCApplication
-
-- (void)setVLC: (libvlc_int_t *) p_libvlc
-{
- o_libvlc = p_libvlc;
-}
-
-- (void)terminate: (id)sender
-{
- o_libvlc->b_die = VLC_TRUE;
- [super terminate: sender];
-}
-
-@end
-#endif
-