/*****************************************************************************
* qt4.cpp : QT4 interface
****************************************************************************
- * Copyright © 2006-2008 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <QMutex>
#include <QMutexLocker>
#include <QWaitCondition>
-#include <QPointer>
#include "qt4.hpp"
-#include "dialogs_provider.hpp"
-#include "input_manager.hpp"
-#include "main_interface.hpp"
-#include "dialogs/help.hpp" /* update */
-#include "recents.hpp"
+
+#include "input_manager.hpp" /* THEMIM creation */
+#include "dialogs_provider.hpp" /* THEDP creation */
+#include "main_interface.hpp" /* MainInterface creation */
+#include "dialogs/help.hpp" /* Launch Update */
+#include "recents.hpp" /* Recents Item destruction */
+#include "util/qvlcapp.hpp" /* QVLCApplication definition */
#ifdef HAVE_X11_XLIB_H
-#include <X11/Xlib.h>
+ #include <X11/Xlib.h>
#endif
#include "../../../share/vlc32x32.xpm"
#ifdef WIN32
#include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg)
+ Q_IMPORT_PLUGIN(qtaccessiblewidgets)
#endif
/*****************************************************************************
static int OpenDialogs ( vlc_object_t * );
static int WindowOpen ( vlc_object_t * );
static void WindowClose ( vlc_object_t * );
-static void Run ( intf_thread_t * );
-static void *Init ( vlc_object_t * );
+static void *Thread ( void * );
static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
/*****************************************************************************
#define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \
"your taskbar" )
+#define KEEPSIZE_TEXT N_( "Resize interface to the native video size" )
+#define KEEPSIZE_LONGTEXT N_( "You have two choices:\n" \
+ " - The interface will resize to the native video size\n" \
+ " - The video will fit to the interface size\n " \
+ "By default, interface resize to the native video size." )
+
#define TITLE_TEXT N_( "Show playing item name in window title" )
#define TITLE_LONGTEXT N_( "Show the name of the song or video in the " \
"controler window title." )
-#define FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" )
-
#define NOTIFICATION_TEXT N_( "Show notification popup on track change" )
#define NOTIFICATION_LONGTEXT N_( \
"Show a notification popup with the artist and track name when " \
" This option only works with Windows and " \
"X11 with composite extensions." )
+#define OPACITY_FS_TEXT N_( "Fullscreen controller opacity opacity between 0.1 and 1." )
+#define OPACITY_FS_LONGTEXT N_( "Sets the fullscreen controller opacity between 0.1 and 1 " \
+ "for main interface, playlist and extended panel."\
+ " This option only works with Windows and " \
+ "X11 with composite extensions." )
+
+
#define ERROR_TEXT N_( "Show unimportant error and warnings dialogs" )
#define UPDATER_TEXT N_( "Activate the updates availability notification" )
#define SAVEVOL_TEXT N_( "Automatically save the volume on exit" )
-#define BLING_TEXT N_( "Use non native buttons and volume slider" )
-
#define PRIVACY_TEXT N_( "Ask for network policy at start" )
#define RECENTPLAY_TEXT N_( "Save the recently played items in the menu" )
"as lyrics, album arts...\n" \
" - minimal mode with limited controls" )
-#define QT_NORMAL_MODE_TEXT N_( "Classic look" )
-#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" )
-#define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" )
+#define QT_NORMAL_MODE_TEXT N_( "Classic" )
+#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete (with information area)" )
+#define QT_MINIMAL_MODE_TEXT N_( "Minimal (without menu)" )
#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" )
+#define QT_NATIVEOPEN_TEXT N_( "Embed the file browser in open dialog" )
+/* Various modes definition */
static const int i_mode_list[] =
{ QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE };
static const char *const psz_mode_list_text[] =
{ QT_NORMAL_MODE_TEXT, QT_ALWAYS_VIDEO_MODE_TEXT, QT_MINIMAL_MODE_TEXT };
-vlc_module_begin();
- set_shortname( "Qt" );
- set_description( N_("Qt interface") );
- set_category( CAT_INTERFACE ) ;
- set_subcategory( SUBCAT_INTERFACE_MAIN );
- set_capability( "interface", 151 );
- set_callbacks( Open, Close );
-
- add_shortcut("qt");
-
- add_submodule();
- set_description( "Dialogs provider" );
- set_capability( "dialogs provider", 51 );
-
- add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
- QT_MODE_TEXT, QT_MODE_LONGTEXT, false );
- change_integer_list( i_mode_list, psz_mode_list_text, NULL );
-
- add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
- NOTIFICATION_LONGTEXT, false );
-
- add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
- OPACITY_LONGTEXT, false );
- add_bool( "qt-blingbling", true, NULL, BLING_TEXT,
- BLING_TEXT, false );
-
- add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT,
- SYSTRAY_LONGTEXT, false);
- add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT,
- MINIMIZED_LONGTEXT, true);
- add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
- TITLE_LONGTEXT, false );
- add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
- QT_FULLSCREEN_TEXT, false );
-
- add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
- COMPLETEVOL_LONGTEXT, true );
- add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT,
- SAVEVOL_TEXT, true );
- add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
- FILEDIALOG_PATH_TEXT, true );
- change_autosave();
- change_internal();
-
- add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
- RECENTPLAY_TEXT, false );
- add_string( "qt-recentplay-filter", "xxx|porn", NULL,
- RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false );
-
- add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
- ADVANCED_OPTIONS_LONGTEXT, true );
- add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT,
- ADVANCED_PREFS_LONGTEXT, false );
- add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT,
- ERROR_TEXT, false );
+
+/**********************************************************************/
+vlc_module_begin ()
+ set_shortname( "Qt" )
+ set_description( N_("Qt interface") )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_MAIN )
+ set_capability( "interface", 151 )
+ set_callbacks( Open, Close )
+
+ add_shortcut("qt")
+ add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
+ QT_MODE_TEXT, QT_MODE_LONGTEXT, false )
+ change_integer_list( i_mode_list, psz_mode_list_text, NULL )
+
+ add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
+ NOTIFICATION_LONGTEXT, false )
+
+ add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
+ OPACITY_LONGTEXT, false )
+ add_float_with_range( "qt-fs-opacity", 0.8, 0.1, 1., NULL, OPACITY_FS_TEXT,
+ OPACITY_FS_LONGTEXT, false )
+
+ add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT,
+ SYSTRAY_LONGTEXT, false)
+ add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT,
+ MINIMIZED_LONGTEXT, true)
+ add_bool( "qt-video-autoresize", true, NULL, KEEPSIZE_TEXT,
+ KEEPSIZE_LONGTEXT, false )
+ add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
+ TITLE_LONGTEXT, false )
+ add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
+ QT_FULLSCREEN_TEXT, false )
+
+ add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
+ COMPLETEVOL_LONGTEXT, true )
+ add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT,
+ SAVEVOL_TEXT, true )
+
+ add_bool( "qt-embedded-open", false, NULL, QT_NATIVEOPEN_TEXT,
+ QT_NATIVEOPEN_TEXT, false )
+ add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
+ RECENTPLAY_TEXT, false )
+ add_string( "qt-recentplay-filter", "", NULL,
+ RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false )
+
+ add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
+ ADVANCED_OPTIONS_LONGTEXT, true )
+ add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT,
+ ADVANCED_PREFS_LONGTEXT, false )
+ add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT,
+ ERROR_TEXT, false )
#ifdef UPDATE_CHECK
- add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
- UPDATER_LONGTEXT, false );
- add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
- UPDATER_DAYS_TEXT, false );
+ add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
+ UPDATER_LONGTEXT, false )
+ add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
+ UPDATER_DAYS_TEXT, false )
#endif
- add_string( "qt-slider-colours",
- "255;255;255;20;226;20;255;176;15;235;30;20",
- NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false );
+ add_string( "qt-slider-colours",
+ "255;255;255;20;210;20;255;199;15;245;39;29",
+ NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false )
+
+ add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
+ false )
+ change_internal ()
- add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
- false );
- change_internal();
+ add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
- set_callbacks( OpenDialogs, Close );
+ add_submodule ()
+ set_description( "Dialogs provider" )
+ set_capability( "dialogs provider", 51 )
-#if !defined (Q_WS_X11) || HAS_QT43
- add_submodule();
- set_capability( "vout window", 50 );
- set_callbacks( WindowOpen, WindowClose );
+ set_callbacks( OpenDialogs, Close )
+
+#if defined(Q_WS_X11) || defined(WIN32)
+ add_submodule ()
+#if defined(Q_WS_X11)
+ set_capability( "vout window xid", 50 )
+#elif defined(WIN32)
+ set_capability( "vout window hwnd", 50 )
+#endif
+ set_callbacks( WindowOpen, WindowClose )
#endif
-vlc_module_end();
-#if defined(Q_WS_WIN)
-bool WinQtApp::winEventFilter( MSG *msg, long *result )
+vlc_module_end ()
+
+/*****************************************/
+
+/* Ugly, but the Qt4 interface assumes single instance anyway */
+static struct
{
- switch( msg->message )
- {
- case 0x0319: /* WM_APPCOMMAND 0x0319 */
- DefWindowProc( msg->hwnd, msg->message, msg->wParam, msg->lParam );
- break;
- }
- return false;
-}
-#endif /* Q_WS_WIN */
+ QMutex lock;
+ QWaitCondition ready;
+} iface;
/*****************************************************************************
* Module callbacks
*****************************************************************************/
+
+/* Open Interface */
static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
-#if defined Q_WS_X11 && defined HAVE_X11_XLIB_H
- /* Thanks for libqt4 calling exit() in QApplication::QApplication()
- * instead of returning an error, we have to check the X11 display */
- Display *p_display = XOpenDisplay( NULL );
+#ifdef Q_WS_X11
+ char *psz_display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+ Display *p_display = XOpenDisplay( psz_display );
+ free( psz_display );
if( !p_display )
{
msg_Err( p_intf, "Could not connect to X server" );
XCloseDisplay( p_display );
#endif
- /* Allocations */
- p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
- if( !p_intf->p_sys )
- return VLC_ENOMEM;
- memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
+ /* Allocations of p_sys */
+ intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t;
+ p_sys->b_isDialogProvider = false;
+ p_sys->p_popup_menu = NULL;
+ p_sys->p_mi = NULL;
+ p_sys->p_playlist = pl_Hold( p_intf );
- p_intf->pf_run = Run;
- p_intf->p_sys->p_mi = NULL;
+ /* */
+ if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
+ {
+ pl_Release (p_sys->p_playlist);
+ delete p_sys;
+ return VLC_ENOMEM;
+ }
- /* Access to the playlist */
- p_intf->p_sys->p_playlist = pl_Hold( p_intf );
- /* one settings to rule them all */
+ /* */
+ QMutexLocker locker (&iface.lock);
+ vlc_value_t val;
- var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
+ while( p_sys->p_mi == NULL && !p_sys->b_isDialogProvider )
+ iface.ready.wait( &iface.lock );
+ if( !p_sys->b_isDialogProvider )
+ {
+ var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS);
+ val.p_address = p_this;
+ var_Set (p_this->p_libvlc, "qt4-iface", val);
+ }
return VLC_SUCCESS;
}
+/* Open Dialog Provider */
static int OpenDialogs( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ p_intf->pf_show_dialog = ShowDialog;
+
int val = Open( p_this );
if( val )
return val;
- p_intf->pf_show_dialog = ShowDialog;
return VLC_SUCCESS;
}
static void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
- if( p_intf->p_sys->b_isDialogProvider )
- {
- if( DialogsProvider::isAlive() )
- {
- msg_Dbg( p_intf, "Asking the DP to quit nicely" );
- DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
- QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
- }
- vlc_thread_join( p_intf );
- }
-
- vlc_object_release( p_intf->p_sys->p_playlist );
- free( p_intf->p_sys );
-}
-
-
-/*****************************************************************************
- * Initialize the interface or the dialogs provider
- *****************************************************************************/
-static void Run( intf_thread_t *p_intf )
-{
- if( p_intf->pf_show_dialog )
- {
- if( vlc_thread_create( p_intf, "Qt dialogs", Init, 0, true ) )
- msg_Err( p_intf, "failed to create Qt dialogs thread" );
- }
- else
- {
- Init( VLC_OBJECT(p_intf) );
- }
-}
-
-static QMutex windowLock;
-static QWaitCondition windowWait;
+ var_Destroy (p_this->p_libvlc, "qt4-iface");
+ QVLCApp::triggerQuit();
-static void ThreadCleanup( void *param)
-{
- intf_thread_t *p_intf = (intf_thread_t *)param;
- QCloseEvent *event = new QCloseEvent();
- QApplication::postEvent( p_intf->p_sys->p_mi, event );
+ vlc_join (p_sys->thread, NULL);
+ pl_Release (p_this);
+ delete p_sys;
}
-static void *Init( vlc_object_t *obj )
+static void *Thread( void *obj )
{
intf_thread_t *p_intf = (intf_thread_t *)obj;
- vlc_value_t val;
- char dummy[] = "";
- char *argv[] = { dummy };
+ MainInterface *p_mi;
+ char dummy[] = "vlc"; /* for WM_CLASS */
+ char *argv[] = { dummy, NULL, };
int argc = 1;
- int canc = vlc_savecancel ();
- msg_Dbg( p_intf, "Setting ThreadCleanup");
- vlc_cleanup_push( ThreadCleanup, (void*)p_intf );
Q_INIT_RESOURCE( vlc );
-#if !defined(WIN32) && !defined(__APPLE__)
- /* KLUDGE:
- * disables icon theme use because that makes Cleanlooks style bug
- * because it asks gconf for some settings that timeout because of threads
- * see commits 21610 21622 21654 for reference */
-
- /* If you don't have a gconftool-2 binary, you should comment this line */
- if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */
- QApplication::setDesktopSettingsAware( false );
-#endif
-
/* Start the QApplication here */
+#ifdef Q_WS_X11
+ char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+ if( display )
+ {
+ argv[argc++] = const_cast<char *>("-display");
+ argv[argc++] = display;
+ argv[argc] = NULL;
+ }
+#endif
#ifdef WIN32
- WinQtApp *app = new WinQtApp( argc, argv , true );
+ QVLCApp app( p_intf, argc, argv );
#else
- QApplication *app = new QApplication( argc, argv , true );
+ QVLCApp app( argc, argv );
#endif
- p_intf->p_sys->p_app = app;
+ p_intf->p_sys->p_app = &app;
+
+ /* All the settings are in the .conf/.ini style */
p_intf->p_sys->mainSettings = new QSettings(
#ifdef WIN32
QSettings::IniFormat,
QSettings::UserScope, "vlc", "vlc-qt-interface" );
/* Icon setting */
- if( QDate::currentDate().dayOfYear() >= 354 )
- app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
+ if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
+ app.setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
else
- app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
+ app.setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
/* Initialize timers and the Dialog Provider */
DialogsProvider::getInstance( p_intf );
- QPointer<MainInterface> *miP = NULL;
+ /* Detect screensize for small screens like TV or EEEpc*/
+ p_intf->p_sys->i_screenHeight =
+ app.QApplication::desktop()->availableGeometry().height();
#ifdef UPDATE_CHECK
/* Checking for VLC updates */
/* Create the normal interface in non-DP mode */
if( !p_intf->pf_show_dialog )
- {
- p_intf->p_sys->p_mi = new MainInterface( p_intf );
- /* We don't show it because it is done in the MainInterface constructor
- p_mi->show(); */
- p_intf->p_sys->b_isDialogProvider = false;
-
- miP = new QPointer<MainInterface> (p_intf->p_sys->p_mi);
- val.p_address = miP;
- QMutexLocker locker (&windowLock);
- var_Set (p_intf, "window_widget", val);
- windowWait.wakeAll ();
- }
+ p_mi = new MainInterface( p_intf );
else
- {
- vlc_thread_ready( p_intf );
- p_intf->p_sys->b_isDialogProvider = true;
- }
+ p_mi = NULL;
+
+ /* */
+ iface.lock.lock();
+ p_intf->p_sys->p_mi = p_mi;
+ p_intf->p_sys->b_isDialogProvider = p_mi == NULL;
+ iface.ready.wakeAll();
+ iface.lock.unlock();
/* Explain to the core how to show a dialog :D */
p_intf->pf_show_dialog = ShowDialog;
bool b_loaded = qtTranslator.load( path + "qt_" + lang );
if (!b_loaded)
msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
- app->installTranslator( &qtTranslator );
+ app.installTranslator( &qtTranslator );
#endif //ENABLE_NLS
/* Last settings */
- app->setQuitOnLastWindowClosed( false );
+ app.setQuitOnLastWindowClosed( false );
/* Retrieve last known path used in file browsing */
- char *psz_path = config_GetPsz( p_intf, "qt-filedialog-path" );
- p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? config_GetHomeDir()
- : psz_path;
+ p_intf->p_sys->filepath =
+ getSettings()->value( "filedialog-path", QVLCUserDir( VLC_HOME_DIR ) ).toString();
+
+ /* Loads and tries to apply the preferred QStyle */
+ QString s_style = getSettings()->value( "MainWindow/QtStyle", "" ).toString();
+ if( s_style.compare("") != 0 )
+ QApplication::setStyle( s_style );
+
- vlc_restorecancel (canc);
/* Launch */
- app->exec();
+ app.exec();
/* And quit */
- canc = vlc_savecancel ();
msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
- if (miP)
- {
- QMutexLocker locker (&windowLock);
+ QApplication::closeAllWindows();
- /* We need to warn to detach from any vout before
- * deleting miP (WindowClose will not be called after it) */
- p_intf->p_sys->p_mi->releaseVideo( NULL );
+ if (p_mi != NULL)
+ {
+ QMutexLocker locker (&iface.lock);
- val.p_address = NULL;
- var_Set (p_intf, "window_widget", val);
- delete miP;
+ msg_Dbg (p_intf, "destroying the main Qt4 interface");
+ p_intf->p_sys->p_mi = NULL;
+ /* Destroy first the main interface because it is connected to some
+ slots in the MainInputManager */
+ delete p_mi;
}
- /* Destroy first the main interface because it is connected to some slots
- in the MainInputManager */
- delete p_intf->p_sys->p_mi;
-
/* Destroy all remaining windows,
because some are connected to some slots
in the MainInputManager
/* Delete the recentsMRL object before the configuration */
RecentsMRL::killInstance();
+ /* Save the path */
+ getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath );
+
/* Delete the configuration. Application has to be deleted after that. */
delete p_intf->p_sys->mainSettings;
/* Destroy the MainInputManager */
MainInputManager::killInstance();
- /* Delete the application */
- delete app;
- /* Save the path */
- config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
- free( psz_path );
- vlc_restorecancel (canc);
- vlc_cleanup_pop();
+
+ /* Delete the application automatically */
+#ifdef Q_WS_X11
+ free( display );
+#endif
return NULL;
}
static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg,
intf_dialog_args_t *p_arg )
{
+ VLC_UNUSED( p_intf );
DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg );
- QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
-}
-
-/*****************************************************************************
- * PopupMenuCB: callback to show the popupmenu.
- * We don't show the menu directly here because we don't want the
- * caller to block for a too long time.
- *****************************************************************************/
-static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t old_val, vlc_value_t new_val, void *param )
-{
- intf_thread_t *p_intf = (intf_thread_t *)param;
- ShowDialog( p_intf, INTF_DIALOG_POPUPMENU, new_val.b_bool, 0 );
- return VLC_SUCCESS;
+ QApplication::postEvent( THEDP, event );
}
/**
* Video output window provider
+ *
+ * TODO move it out of here ?
*/
-#include <vlc_window.h>
+#include <vlc_vout_window.h>
-static int WindowControl (vout_window_t *, int, va_list);
+static int WindowControl( vout_window_t *, int i_query, va_list );
-static int WindowOpen (vlc_object_t *obj)
+static int WindowOpen( vlc_object_t *p_obj )
{
- vout_window_t *wnd = (vout_window_t *)obj;
+ vout_window_t *p_wnd = (vout_window_t*)p_obj;
- if (config_GetInt (obj, "embedded-video") <= 0)
+ /* */
+ if( p_wnd->cfg->is_standalone )
return VLC_EGENERIC;
- intf_thread_t *intf = (intf_thread_t *)
- vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
- if (intf == NULL)
- return VLC_EGENERIC; /* Qt4 not in use */
- assert (intf->i_object_type == VLC_OBJECT_INTF);
+ QMutexLocker( &iface.lock );
+
+ vlc_value_t val;
- var_Create (intf, "window_widget", VLC_VAR_ADDRESS);
+ if( var_Get( p_obj->p_libvlc, "qt4-iface", &val ) )
+ val.p_address = NULL;
- vlc_value_t ptrval;
+ intf_thread_t *p_intf = (intf_thread_t *)val.p_address;
- windowLock.lock ();
- msg_Dbg (obj, "waiting for interface...");
- for (;;)
- {
- var_Get (intf, "window_widget", &ptrval);
- if (ptrval.p_address != NULL)
- break;
- windowWait.wait (&windowLock);
+ if( !p_intf )
+ { /* If another interface is used, this plugin cannot work */
+ msg_Dbg( p_obj, "Qt4 interface not found" );
+ return VLC_EGENERIC;
}
- msg_Dbg (obj, "requesting window...");
- QPointer<MainInterface> *miP = (QPointer<MainInterface> *)ptrval.p_address;
- miP = new QPointer<MainInterface> (*miP); /* create our own copy */
- vlc_object_release (intf);
+ MainInterface *p_mi = p_intf->p_sys->p_mi;
+ msg_Dbg( p_obj, "requesting video..." );
- if (miP->isNull ())
- return VLC_EGENERIC;
+ int i_x = p_wnd->cfg->x;
+ int i_y = p_wnd->cfg->y;
+ unsigned i_width = p_wnd->cfg->width;
+ unsigned i_height = p_wnd->cfg->height;
- wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
- &wnd->width, &wnd->height);
- windowLock.unlock ();
+#if defined (Q_WS_X11)
+ p_wnd->handle.xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_wnd->handle.xid )
+ return VLC_EGENERIC;
- if (!wnd->handle)
+#elif defined (WIN32)
+ p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_wnd->handle.hwnd )
return VLC_EGENERIC;
+#endif
- wnd->control = WindowControl;
- wnd->p_private = miP;
+ p_wnd->control = WindowControl;
+ p_wnd->sys = (vout_window_sys_t*)p_mi;
return VLC_SUCCESS;
}
-static int WindowControl (vout_window_t *wnd, int query, va_list args)
+static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
{
- QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;
- QMutexLocker locker (&windowLock);
+ MainInterface *p_mi = (MainInterface *)p_wnd->sys;
+ QMutexLocker locker(&iface.lock);
- if (miP->isNull ())
- return VLC_EGENERIC;
- return (*miP)->controlVideo (wnd->handle, query, args);
+ return p_mi->controlVideo( i_query, args );
}
-static void WindowClose (vlc_object_t *obj)
+static void WindowClose( vlc_object_t *p_obj )
{
- vout_window_t *wnd = (vout_window_t *)obj;
- QPointer<MainInterface> *miP = (QPointer<MainInterface> *)wnd->p_private;
- QMutexLocker locker (&windowLock);
+ vout_window_t *p_wnd = (vout_window_t*)p_obj;
+ MainInterface *p_mi = (MainInterface *)p_wnd->sys;
+
+ QMutexLocker locker( &iface.lock );
- if (!miP->isNull ())
- (*miP)->releaseVideo( wnd->handle );
- delete miP;
+ msg_Dbg( p_obj, "releasing video..." );
+ p_mi->releaseVideo();
}
projects / vlc / blobdiff