# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_aout.h>
#include <vlc_vout.h>
* Local prototypes
*****************************************************************************/
static void RunInterface( intf_thread_t *p_intf );
-
+#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 * );
*****************************************************************************/
/**
* 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 = false;
p_intf->b_interaction = false;
+#ifdef __APPLE__
p_intf->b_should_run_on_first_thread = false;
-
- for( i = 0 ; i< i_options; i++ )
- var_OptionParse( p_this, ppsz_options[i], true );
+#endif
/* Choose the best module */
p_intf->psz_intf = strdup( psz_module );
*/
int intf_RunThread( intf_thread_t *p_intf )
{
+#ifdef __APPLE__
/* 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 )
{
+ if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath,
+ VLC_THREAD_PRIORITY_LOW, false ) )
+ {
+ msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
+ return VLC_EGENERIC;
+ }
RunInterface( p_intf );
+
+ /* 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 );
+
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 ) )
{
/* Tell the interface to die */
vlc_object_kill( p_intf );
- vlc_cond_signal( &p_intf->object_wait );
vlc_thread_join( p_intf );
}
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");
if( p_intf->pf_run )
p_intf->pf_run( p_intf );
else
- while( vlc_object_lock_and_wait( p_intf ) == 0 );
-
- /* Reset play on start status */
- p_intf->b_play = false;
+ {
+ 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 );
+ vlc_object_lock( p_intf );
p_intf->b_die = false; /* FIXME */
p_intf->b_dead = false;
- vlc_mutex_unlock( &p_intf->object_lock );
+ vlc_object_unlock( p_intf );
p_intf->psz_intf = psz_intf;
p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
while( p_intf->p_module );
}
+#ifdef __APPLE__
+/*****************************************************************************
+ * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
+ *****************************************************************************/
+static void MonitorLibVLCDeath( intf_thread_t *p_intf )
+{
+ 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 );
+
+ /* Someone killed libvlc */
+
+ /* 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 )
{
projects / vlc / blobdiff