#include <vlc_vout.h>
#include "vlc_interface.h"
+#if defined( __APPLE__ ) || defined( WIN32 )
+#include "../control/libvlc_internal.h"
+#endif
#include "libvlc.h"
/*****************************************************************************
vlc_value_t , vlc_value_t , void * );
/**
- * \brief Destroy the interface after the main loop endeed.
+ * Destroy the interface after the main loop endeed.
*
- * \param p_intf the interface thread
- * \return nothing
+ * @param p_obj: the interface thread
*/
static void intf_Destroy( vlc_object_t *obj )
{
module_unneed( p_intf, p_intf->p_module );
free( p_intf->psz_intf );
+ config_ChainDestroy( p_intf->p_cfg );
vlc_mutex_destroy( &p_intf->change_lock );
}
-/*****************************************************************************
- * intf_Create: prepare interface before main loop
- *****************************************************************************
- * This function opens output devices and creates specific interfaces. It sends
- * its own error messages.
- *****************************************************************************/
+
/**
- * Create the interface, and prepare it for main loop.
+ * Create the interface, and prepare it for main loop. It opens ouput device
+ * and creates specific interfaces. Sends its own error messages.
*
- * \param p_this the calling vlc_object_t
- * \param psz_module a preferred interface module
- * \return a pointer to the created interface thread, NULL on error
+ * @param p_this the calling vlc_object_t
+ * @param psz_module a preferred interface module
+ * @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 )
{
p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
if( !p_intf )
return NULL;
- p_intf->b_interaction = false;
#if defined( __APPLE__ ) || defined( WIN32 )
p_intf->b_should_run_on_first_thread = false;
#endif
/* Choose the best module */
- p_intf->psz_intf = strdup( psz_module );
- p_intf->p_module = module_need( p_intf, "interface", psz_module, true );
+ p_intf->p_cfg = NULL;
+ char *psz_parser = *psz_module == '$'
+ ? var_CreateGetString(p_intf,psz_module+1)
+ : strdup( psz_module );
+ char *psz_tmp = config_ChainCreate( &p_intf->psz_intf, &p_intf->p_cfg,
+ psz_parser );
+ free( psz_tmp );
+ free( psz_parser );
+ p_intf->p_module = module_need( p_intf, "interface", p_intf->psz_intf, true );
if( p_intf->p_module == NULL )
{
return NULL;
}
- /* Initialize structure */
- p_intf->b_menu = false;
- p_intf->b_menu_change = false;
-
/* Initialize mutexes */
vlc_mutex_init( &p_intf->change_lock );
return p_intf;
}
-/*****************************************************************************
- * intf_RunThread: launch the interface thread
- *****************************************************************************
- * This function either creates a new thread and runs the interface in it.
- *****************************************************************************/
+
/**
* Starts and runs the interface thread.
*
- * \param p_intf the interface thread
- * \return VLC_SUCCESS on success, an error number else
+ * @param p_intf the interface thread
+ * @return VLC_SUCCESS on success, an error number else
*/
int intf_RunThread( intf_thread_t *p_intf )
{
if( p_intf->b_should_run_on_first_thread )
{
if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath,
- VLC_THREAD_PRIORITY_LOW, false ) )
+ VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
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_object_kill( p_intf->p_libvlc );
vlc_thread_join( p_intf );
vlc_object_detach( p_intf );
#endif
/* Run the interface in a separate thread */
if( vlc_thread_create( p_intf, "interface", RunInterface,
- VLC_THREAD_PRIORITY_LOW, false ) )
+ VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn interface thread" );
return VLC_EGENERIC;
return VLC_SUCCESS;
}
+
/**
* Stops the interface thread
*
* This function asks the interface thread to stop
- * \param p_intf the interface thread
- * \return nothing
+ * @param p_intf the interface thread
*/
void intf_StopThread( intf_thread_t *p_intf )
{
vlc_thread_join( p_intf );
}
+
+
/* Following functions are local */
-/*****************************************************************************
+/**
* RunInterface: setups necessary data and give control to the interface
- *****************************************************************************/
+ *
+ * @param p_this: interface object
+ */
static void* RunInterface( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
}
#if defined( __APPLE__ ) || defined( WIN32 )
-/*****************************************************************************
+#include "control/libvlc_internal.h" /* libvlc_InternalWait */
+/**
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
- *****************************************************************************/
+ *
+ * @param p_this: the interface object
+ */
static void * MonitorLibVLCDeath( vlc_object_t * p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
libvlc_int_t * p_libvlc = p_intf->p_libvlc;
int canc = vlc_savecancel ();
- vlc_object_lock( p_libvlc );
- while(vlc_object_alive( p_libvlc ) )
- {
- if(p_intf->b_die)
- {
- vlc_object_unlock( p_libvlc );
- return NULL;
- }
- vlc_object_wait( p_libvlc );
- }
- vlc_object_unlock( p_libvlc );
+ libvlc_InternalWait( 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 );
+ vlc_object_kill( p_intf ); /* Kill the stupid first thread interface */
vlc_restorecancel (canc);
return NULL;
}
projects / vlc / blobdiff