/*****************************************************************************
* qte_main.c : QT Embedded wrapper for gte_main
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: qte_main.cpp,v 1.3 2003/02/14 13:48:41 jpsaman Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
*
- * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
+ * Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 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.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
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>
typedef struct qte_thread_t
{
- VLC_COMMON_MEMBERS
+ VLC_COMMON_MEMBERS
QApplication* p_qte_application;
- QWidget* p_qte_widget;
+ QWidget* p_qte_widget;
+ bool b_gui_server;
} qte_thread_t;
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+#define STANDALONE_TEXT N_("Run as standalone Qt/Embedded GUI Server")
+#define STANDALONE_LONGTEXT N_("Use this option to run as standalone " \
+ "Qt/Embedded GUI Server. This option is equivalent to the -qws option " \
+ "from normal Qt.")
+
vlc_module_begin();
- set_description( _("Qt Embedded helper module") );
- set_capability( "qte_main", 90 );
+ set_description( N_("Qt Embedded GUI helper") );
+ set_capability( "gui-helper", 90 );
+ add_bool( "qte-guiserver", 0, NULL, STANDALONE_TEXT, STANDALONE_LONGTEXT, false );
add_shortcut( "qte" );
set_callbacks( Open, Close );
vlc_module_end();
*****************************************************************************/
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, "qte", VLC_VAR_MUTEX );
+ vlc_mutex_t *lock;
- var_Get( p_this->p_libvlc, "qte", &lockval );
- vlc_mutex_lock( (vlc_mutex_t *) lockval.p_address );
+ lock = var_AcquireMutex( "qte" );
if( i_refcount > 0 )
{
i_refcount++;
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
+ vlc_mutex_unlock( lock );
return VLC_SUCCESS;
}
p_qte_main = (qte_thread_t *) vlc_object_create( p_this, sizeof(qte_thread_t) );
- /* Launch the gtk_main() thread. It will not return until it has
- * called gdk_threads_enter(), which ensures us thread safety. */
+ /* 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, "qte" );
+ vlc_mutex_unlock( lock );
return VLC_ETHREAD;
}
i_refcount++;
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
+ vlc_mutex_unlock( lock );
+
+ vlc_object_attach( p_qte_main, p_this );
+ msg_Dbg( p_this, "qte_main running" );
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- vlc_value_t lockval;
+ vlc_mutex_t *lock;
- var_Get( p_this->p_libvlc, "qte", &lockval );
- vlc_mutex_lock( (vlc_mutex_t *) lockval.p_address );
+ lock = var_AcquireMutex( "qte" );
i_refcount--;
if( i_refcount > 0 )
{
- vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
- var_Destroy( p_this->p_libvlc, "qte" );
+ vlc_mutex_unlock( lock );
return;
}
p_qte_main->p_qte_application->quit();
delete p_qte_main->p_qte_widget;
delete p_qte_main->p_qte_application;
- vlc_object_destroy( p_qte_main );
+ msg_Dbg( p_this, "Detaching qte_main" );
+ vlc_object_detach( 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, "qte" );
+ vlc_mutex_unlock( lock );
}
/*****************************************************************************
*****************************************************************************/
static void QteMain( qte_thread_t *p_this )
{
- int argc = 0;
+ int i_argc = 1;
- QApplication* pApp = new QApplication(argc, NULL);
- if(pApp)
+ 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 = 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 )
{
p_this->p_qte_application = pApp;
}
- QWidget* pWidget = new QWidget();
- if(pWidget)
+ QWidget* pWidget = new QWidget(0, _("video") );
+ if( pWidget )
{
p_this->p_qte_widget = pWidget;
}
/* signal the creation of the window */
p_this->p_qte_application->setMainWidget(p_this->p_qte_widget);
+ p_this->p_qte_widget->show();
vlc_thread_ready( p_this );
p_this->p_qte_application->exec();
}
-