/*****************************************************************************
* qte_main.c : QT Embedded wrapper for gte_main
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: qte_main.cpp,v 1.7 2003/06/09 19:56:26 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() */
}
#include <qapplication.h>
QApplication* p_qte_application;
QWidget* p_qte_widget;
- bool b_gui_server;
+ 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.")
+#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 GUI helper") );
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- vlc_value_t lockval;
+ vlc_mutex_t *lock;
- /* FIXME: put this in the module (de)initialization ASAP */
- var_Create( p_this->p_libvlc, "qte", VLC_VAR_MUTEX );
-
- 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;
}
{
vlc_object_destroy( 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;
+ msg_Dbg( p_this, "Detaching qte_main" );
+ vlc_object_detach( p_qte_main );
+
vlc_object_destroy( 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 i_argc = 1;
- char *p_args[] = {"-qws", NULL};
- char **pp_args = p_args;
p_this->b_gui_server = VLC_FALSE;
if( config_GetInt( p_this, "qte-guiserver" ) )
{
- msg_Dbg( p_this, "Running as Qt Embedded standalone GuiServer" );
+ msg_Dbg( p_this, "Running as Qt Embedded standalone GuiServer" );
p_this->b_gui_server = VLC_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();
- if(pWidget)
+ QWidget* pWidget = new QWidget(0, _("video") );
+ if( pWidget )
{
p_this->p_qte_widget = pWidget;
}
- if (p_this->b_gui_server) {
- p_this->p_qte_application->desktop()->setFixedSize(240, 320);
- }
/* 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();
}
-