*****************************************************************************/
extern "C"
{
-#include <vlc/vlc.h>
-#include <stdlib.h> /* atexit() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
}
#include <qapplication.h>
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static void QteMain ( qte_thread_t * );
+static void* QteMain( vlc_object_t * );
/*****************************************************************************
* Local variables (mutex-protected).
"from normal Qt.")
vlc_module_begin();
- set_description( _("Qt Embedded GUI helper") );
+ set_description( N_("Qt Embedded GUI helper") );
set_capability( "gui-helper", 90 );
- add_bool( "qte-guiserver", 0, NULL, STANDALONE_TEXT, STANDALONE_LONGTEXT, VLC_FALSE );
+ add_bool( "qte-guiserver", 0, NULL, STANDALONE_TEXT, STANDALONE_LONGTEXT, false );
add_shortcut( "qte" );
set_callbacks( Open, Close );
vlc_module_end();
} /* extern "C" */
+static vlc_mutex_t qte_lock = VLC_STATIC_MUTEX;
+
/*****************************************************************************
* Open: initialize and create window
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- vlc_value_t lockval;
-
- /* FIXME: put this in the module (de)initialization ASAP */
- var_Create( p_this->p_libvlc_global, "qte", VLC_VAR_MUTEX );
-
- var_Get( p_this->p_libvlc_global, "qte", &lockval );
- vlc_mutex_lock( (vlc_mutex_t *) lockval.p_address );
+ vlc_mutex_lock( &qte_lock );
if( i_refcount > 0 )
{
i_refcount++;
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
+ vlc_mutex_unlock( &qte_lock );
return VLC_SUCCESS;
}
/* Launch the QApplication::exec() thread. It will not return until the
* application is properly initialized, which ensures us thread safety. */
if( vlc_thread_create( p_qte_main, "qte_main", QteMain,
- VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_LOW, true ) )
{
- vlc_object_destroy( p_qte_main );
+ vlc_object_release( p_qte_main );
i_refcount--;
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
- var_Destroy( p_this->p_libvlc_global, "qte" );
+ vlc_mutex_unlock( lock );
return VLC_ETHREAD;
}
i_refcount++;
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
+ vlc_mutex_unlock( &qte_lock );
vlc_object_attach( p_qte_main, p_this );
msg_Dbg( p_this, "qte_main running" );
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- vlc_value_t lockval;
-
- var_Get( p_this->p_libvlc_global, "qte", &lockval );
- vlc_mutex_lock( (vlc_mutex_t *) lockval.p_address );
+ vlc_mutex_lock( &qte_lock );
i_refcount--;
if( i_refcount > 0 )
{
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
- var_Destroy( p_this->p_libvlc_global, "qte" );
+ vlc_mutex_unlock( lock );
return;
}
p_qte_main->p_qte_application->quit();
msg_Dbg( p_this, "Detaching qte_main" );
vlc_object_detach( p_qte_main );
- vlc_object_destroy( p_qte_main );
+ vlc_object_release( p_qte_main );
p_qte_main = NULL;
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
- var_Destroy( p_this->p_libvlc_global, "qte" );
+ vlc_mutex_unlock( &qte_lock );
}
/*****************************************************************************
* this part of the interface is in a separate thread so that we can call
* qte_main() from within it without annoying the rest of the program.
*****************************************************************************/
-static void QteMain( qte_thread_t *p_this )
+static void* QteMain( vlc_object_t* p_vlc_obj )
{
+ qte_thread_t *p_this = (qte_thread_t*)p_vlc_obj;
int i_argc = 1;
+ int canc = vlc_savecancel ();
- p_this->b_gui_server = VLC_FALSE;
+ p_this->b_gui_server = false;
if( config_GetInt( p_this, "qte-guiserver" ) )
{
msg_Dbg( p_this, "Running as Qt Embedded standalone GuiServer" );
- p_this->b_gui_server = VLC_TRUE;
+ p_this->b_gui_server = true;
}
/* Run as standalone GuiServer or as GuiClient. */
QApplication* pApp = new QApplication(i_argc, NULL,
(p_this->b_gui_server ? (QApplication::GuiServer):(QApplication::GuiClient)) );
- if(pApp)
+ if( pApp )
{
p_this->p_qte_application = pApp;
}
QWidget* pWidget = new QWidget(0, _("video") );
- if(pWidget)
+ if( pWidget )
{
p_this->p_qte_widget = pWidget;
}
vlc_thread_ready( p_this );
p_this->p_qte_application->exec();
-}
+ vlc_restorecancel (canc);
+ return NULL;
+}