X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=f0d58917c9821167462fbfd9c06c2e7822e99853;hb=d1305a887f96653503500d9d485281437b720d5c;hp=5a29d30f8d9883239dfd6938cdddb6503885ced0;hpb=40b4d780a427e29a936e267090d6809e2ce98fd3;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 5a29d30f8d..f0d58917c9 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -1,5 +1,5 @@ /***************************************************************************** - * qt4.cpp : QT4 interface + * qt4.cpp : Qt interface **************************************************************************** * Copyright © 2006-2009 the VideoLAN team * $Id$ @@ -26,30 +26,42 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS + #include #include +#include #include "qt4.hpp" -#include "input_manager.hpp" /* THEMIM creation */ +#include "input_manager.hpp" /* THEMIM destruction */ #include "dialogs_provider.hpp" /* THEDP creation */ #include "main_interface.hpp" /* MainInterface creation */ +#include "extensions_manager.hpp" /* Extensions manager */ +#include "managers/addons_manager.hpp" /* Addons manager */ #include "dialogs/help.hpp" /* Launch Update */ #include "recents.hpp" /* Recents Item destruction */ #include "util/qvlcapp.hpp" /* QVLCApplication definition */ +#include "components/playlist/playlist_model.hpp" /* for ~PLModel() */ -#ifdef Q_WS_X11 +#if defined (QT5_HAS_X11) || defined (Q_WS_X11) #include #endif -#include "../../../share/icons/32x32/vlc.xpm" -#include "../../../share/icons/32x32/vlc-christmas.xpm" #include +#include -#ifdef WIN32 /* For static builds */ +#ifdef _WIN32 /* For static builds */ #include - Q_IMPORT_PLUGIN(qjpeg) - Q_IMPORT_PLUGIN(qtaccessiblewidgets) + #if HAS_QT5 + #ifdef QT_STATICPLUGIN + Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) + Q_IMPORT_PLUGIN(AccessibleFactory) + #endif + #else + Q_IMPORT_PLUGIN(qjpeg) + Q_IMPORT_PLUGIN(qtaccessiblewidgets) + #endif #endif /***************************************************************************** @@ -59,8 +71,8 @@ static int OpenIntf ( vlc_object_t * ); static int OpenDialogs ( vlc_object_t * ); static int Open ( vlc_object_t *, bool ); static void Close ( vlc_object_t * ); -static int WindowOpen ( vlc_object_t * ); -static void WindowClose ( vlc_object_t * ); +static int WindowOpen ( vout_window_t *, const vout_window_cfg_t * ); +static void WindowClose ( vout_window_t * ); static void *Thread ( void * ); static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); @@ -89,17 +101,13 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #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." ) + "controller window title." ) #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 " \ "the current playlist item changes, when VLC is minimized or hidden." ) -#define ADVANCED_OPTIONS_TEXT N_( "Advanced options" ) -#define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \ - "in the dialogs." ) - #define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1" ) #define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \ "for main interface, playlist and extended panel."\ @@ -121,15 +129,6 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); "two weeks." ) #define UPDATER_DAYS_TEXT N_("Number of days between two update checks") -#define COMPLETEVOL_TEXT N_( "Allow the volume to be set to 400%" ) -#define COMPLETEVOL_LONGTEXT N_( "Allow the volume to have range from 0% to " \ - "400%, instead of 0% to 200%. This option " \ - "can distort the audio, since it uses " \ - "software amplification." ) - -#define SAVEVOL_TEXT N_( "Automatically save the volume on exit" ) -#define STARTVOL_TEXT N_( "Default start volume" ) - #define PRIVACY_TEXT N_( "Ask for network policy at start" ) #define RECENTPLAY_TEXT N_( "Save the recently played items in the menu" ) @@ -155,7 +154,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define QT_NATIVEOPEN_TEXT N_( "Embed the file browser in open dialog" ) #define FULLSCREEN_NUMBER_TEXT N_( "Define which screen fullscreen goes" ) -#define FULLSCREEN_NUMBER_LONGTEXT N_( "Screennumber of fullscreen, instead of" \ +#define FULLSCREEN_NUMBER_LONGTEXT N_( "Screennumber of fullscreen, instead of " \ "same screen where interface is" ) #define QT_AUTOLOAD_EXTENSIONS_TEXT N_( "Load extensions on startup" ) @@ -164,6 +163,47 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define QT_MINIMAL_MODE_TEXT N_("Start in minimal view (without menus)" ) +#define QT_BGCONE_TEXT N_( "Display background cone or art" ) +#define QT_BGCONE_LONGTEXT N_( "Display background cone or current album art " \ + "when not playing. " \ + "Can be disabled to prevent burning screen." ) +#define QT_BGCONE_EXPANDS_TEXT N_( "Expanding background cone or art." ) +#define QT_BGCONE_EXPANDS_LONGTEXT N_( "Background art fits window's size" ) + +#define QT_DISABLE_VOLUME_KEYS_TEXT N_( "Ignore keyboard volume buttons." ) +#define QT_DISABLE_VOLUME_KEYS_LONGTEXT N_( \ + "With this option checked, the volume up, volume down and mute buttons on your " \ + "keyboard will always change your system volume. With this option unchecked, the " \ + "volume buttons will change VLC's volume when VLC is selected and change the " \ + "system volume when VLC is not selected." ) + +#define QT_PAUSE_MINIMIZED_TEXT N_( "Pause the video playback when minimized" ) +#define QT_PAUSE_MINIMIZED_LONGTEXT N_( \ + "With this option enabled, the playback will be automatically paused when minimizing the window." ) + +#define ICONCHANGE_TEXT N_( "Allow automatic icon changes") +#define ICONCHANGE_LONGTEXT N_( \ + "This option allows the interface to change its icon on various occasions.") + +#define VOLUME_MAX_TEXT N_( "Maximum Volume displayed" ) + +#define FULLSCREEN_CONTROL_PIXELS N_( "Fullscreen controller mouse sensitivity" ) + +#define CONTINUE_PLAYBACK_TEXT N_("Continue playback?") + +static const int i_notification_list[] = + { NOTIFICATION_NEVER, NOTIFICATION_MINIMIZED, NOTIFICATION_ALWAYS }; + +static const char *const psz_notification_list_text[] = + { N_("Never"), N_("When minimized"), N_("Always") }; + +static const int i_continue_list[] = + { 0, 1, 2 }; + +static const char *const psz_continue_list_text[] = + { N_("Never"), N_("Ask"), N_("Always") }; + + /**********************************************************************/ vlc_module_begin () set_shortname( "Qt" ) @@ -178,18 +218,23 @@ vlc_module_begin () add_bool( "qt-minimal-view", false, QT_MINIMAL_MODE_TEXT, QT_MINIMAL_MODE_TEXT, false ); - add_bool( "qt-notification", true, NOTIFICATION_TEXT, - NOTIFICATION_LONGTEXT, false ) + add_bool( "qt-system-tray", true, SYSTRAY_TEXT, SYSTRAY_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_integer( "qt-notification", NOTIFICATION_MINIMIZED, + NOTIFICATION_TEXT, + NOTIFICATION_LONGTEXT, false ) + change_integer_list( i_notification_list, psz_notification_list_text ) - add_bool( "qt-system-tray", true, SYSTRAY_TEXT, - SYSTRAY_LONGTEXT, false) add_bool( "qt-start-minimized", false, MINIMIZED_TEXT, MINIMIZED_LONGTEXT, true) + add_bool( "qt-pause-minimized", false, QT_PAUSE_MINIMIZED_TEXT, + QT_PAUSE_MINIMIZED_LONGTEXT, false ) + + add_float_with_range( "qt-opacity", 1., 0.1, 1., OPACITY_TEXT, + OPACITY_LONGTEXT, false ) + add_float_with_range( "qt-fs-opacity", 0.8, 0.1, 1., OPACITY_FS_TEXT, + OPACITY_FS_LONGTEXT, false ) + add_bool( "qt-video-autoresize", true, KEEPSIZE_TEXT, KEEPSIZE_LONGTEXT, false ) add_bool( "qt-name-in-title", true, TITLE_TEXT, @@ -197,33 +242,38 @@ vlc_module_begin () add_bool( "qt-fs-controller", true, QT_FULLSCREEN_TEXT, QT_FULLSCREEN_TEXT, false ) - add_bool( "qt-volume-complete", false, COMPLETEVOL_TEXT, - COMPLETEVOL_LONGTEXT, true ) - add_bool( "qt-autosave-volume", false, SAVEVOL_TEXT, - SAVEVOL_TEXT, true ) - add_integer_with_range( "qt-startvolume", QT_VOLUME_DEFAULT, 0, - QT_VOLUME_MAX, NULL, STARTVOL_TEXT, STARTVOL_TEXT, true ) - - add_bool( "qt-embedded-open", false, QT_NATIVEOPEN_TEXT, - QT_NATIVEOPEN_TEXT, false ) add_bool( "qt-recentplay", true, RECENTPLAY_TEXT, RECENTPLAY_TEXT, false ) add_string( "qt-recentplay-filter", "", RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false ) + add_integer( "qt-continue", 1, CONTINUE_PLAYBACK_TEXT, CONTINUE_PLAYBACK_TEXT, false ) + change_integer_list(i_continue_list, psz_continue_list_text ) - add_bool( "qt-adv-options", false, ADVANCED_OPTIONS_TEXT, - ADVANCED_OPTIONS_LONGTEXT, true ) - add_bool( "qt-advanced-pref", false, ADVANCED_PREFS_TEXT, - ADVANCED_PREFS_LONGTEXT, false ) - add_bool( "qt-error-dialogs", true, ERROR_TEXT, - ERROR_TEXT, false ) #ifdef UPDATE_CHECK add_bool( "qt-updates-notif", true, UPDATER_TEXT, UPDATER_LONGTEXT, false ) - add_integer( "qt-updates-days", 7, UPDATER_DAYS_TEXT, - UPDATER_DAYS_TEXT, false ) + add_integer_with_range( "qt-updates-days", 3, 0, 180, + UPDATER_DAYS_TEXT, UPDATER_DAYS_TEXT, false ) +#endif + +#ifdef _WIN32 + add_bool( "qt-disable-volume-keys" /* name */, + true /* default value */, + QT_DISABLE_VOLUME_KEYS_TEXT /* text */, + QT_DISABLE_VOLUME_KEYS_LONGTEXT /* longtext */, + false /* advanced mode only */) #endif - add_string( "qt-slider-colours", "255;255;255;20;210;20;255;199;15;245;39;29", + + add_bool( "qt-embedded-open", false, QT_NATIVEOPEN_TEXT, + QT_NATIVEOPEN_TEXT, false ) + + + add_bool( "qt-advanced-pref", false, ADVANCED_PREFS_TEXT, + ADVANCED_PREFS_LONGTEXT, false ) + add_bool( "qt-error-dialogs", true, ERROR_TEXT, + ERROR_TEXT, false ) + + add_string( "qt-slider-colours", "153;210;153;20;210;20;255;199;15;245;39;29", SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false ) add_bool( "qt-privacy-ask", true, PRIVACY_TEXT, PRIVACY_TEXT, @@ -237,12 +287,25 @@ vlc_module_begin () QT_AUTOLOAD_EXTENSIONS_TEXT, QT_AUTOLOAD_EXTENSIONS_LONGTEXT, false ) - add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */ + add_bool( "qt-bgcone", true, QT_BGCONE_TEXT, QT_BGCONE_LONGTEXT, true ) + add_bool( "qt-bgcone-expands", false, QT_BGCONE_EXPANDS_TEXT, + QT_BGCONE_EXPANDS_LONGTEXT, true ) + + add_bool( "qt-icon-change", true, ICONCHANGE_TEXT, ICONCHANGE_LONGTEXT, true ) + + add_integer_with_range( "qt-max-volume", 125, 60, 300, VOLUME_MAX_TEXT, VOLUME_MAX_TEXT, true) + + add_integer_with_range( "qt-fs-sensitivity", 3, 0, 4000, FULLSCREEN_CONTROL_PIXELS, + FULLSCREEN_CONTROL_PIXELS, true) + + add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */ add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */ -#ifdef WIN32 + add_obsolete_bool( "qt-adv-options" ) /* Since 2.0.0 */ + add_obsolete_bool( "qt-volume-complete" ) /* Since 2.0.0 */ + add_obsolete_integer( "qt-startvolume" ) /* Since 2.0.0 */ + cannot_unload_broken_library() -#endif add_submodule () set_description( "Dialogs provider" ) @@ -250,49 +313,36 @@ vlc_module_begin () set_callbacks( OpenDialogs, Close ) -#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MAC) add_submodule () -#if defined(Q_WS_X11) - set_capability( "vout window xid", 0 ) -#elif defined(Q_WS_WIN) - set_capability( "vout window hwnd", 0 ) -#elif defined(Q_WS_MAC) - set_capability( "vout window nsobject", 0 ) -#endif + set_capability( "vout window", 0 ) set_callbacks( WindowOpen, WindowClose ) -#endif vlc_module_end () /*****************************************/ -/* Ugly, but the Qt4 interface assumes single instance anyway */ +/* Ugly, but the Qt interface assumes single instance anyway */ static vlc_sem_t ready; -#ifdef Q_WS_X11 -static char *x11_display = NULL; -#endif -static struct -{ - vlc_mutex_t lock; - bool busy; -} one = { VLC_STATIC_MUTEX, false }; +static QMutex lock; +static bool busy = false; +static bool active = false; /***************************************************************************** * Module callbacks *****************************************************************************/ -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC /* Used to abort the app.exec() on OSX after libvlc_Quit is called */ -#include "../../../src/control/libvlc_internal.h" /* libvlc_SetExitHandler */ +#include "../../../lib/libvlc_internal.h" /* libvlc_SetExitHandler */ static void Abort( void *obj ) { QVLCApp::triggerQuit(); } #endif -static void RegisterIntf( vlc_object_t *p_this ) +static void RegisterIntf( intf_thread_t *p_this ) { - playlist_t *pl = pl_Get(p_this); + playlist_t *pl = p_this->p_sys->p_playlist; var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS); var_SetAddress (pl, "qt4-iface", p_this); var_Create (pl, "window", VLC_VAR_STRING); @@ -304,32 +354,23 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; -#ifdef Q_WS_X11 +#if defined (QT5_HAS_X11) || defined (Q_WS_X11) if( !vlc_xlib_init( p_this ) ) return VLC_EGENERIC; - char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" ); - Display *p_display = XOpenDisplay( x11_display ); + Display *p_display = XOpenDisplay( NULL ); if( !p_display ) { msg_Err( p_intf, "Could not connect to X server" ); - free (display); return VLC_EGENERIC; } XCloseDisplay( p_display ); -#else - char *display = NULL; #endif - bool busy; - vlc_mutex_lock (&one.lock); - busy = one.busy; - one.busy = true; - vlc_mutex_unlock (&one.lock); + QMutexLocker locker (&lock); if (busy) { - msg_Err (p_this, "cannot start Qt4 multiple times"); - free (display); + msg_Err (p_this, "cannot start Qt multiple times"); return VLC_EGENERIC; } @@ -337,13 +378,17 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t; p_intf->p_sys->b_isDialogProvider = isDialogProvider; p_sys->p_mi = NULL; + p_sys->pl_model = NULL; + + /* set up the playlist to work on */ + if( isDialogProvider ) + p_intf->p_sys->p_playlist = pl_Get( (intf_thread_t *)p_intf->p_parent ); + else + p_intf->p_sys->p_playlist = pl_Get( p_intf ); /* */ -#ifdef Q_WS_X11 - x11_display = display; -#endif vlc_sem_init (&ready, 0); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC /* Run mainloop on the main thread as Cocoa requires */ libvlc_SetExitHandler( p_intf->p_libvlc, Abort, p_intf ); Thread( (void *)p_intf ); @@ -351,29 +396,26 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) ) { delete p_sys; - free (display); - vlc_mutex_lock (&one.lock); - one.busy = false; - vlc_mutex_unlock (&one.lock); return VLC_ENOMEM; } #endif - /* */ + /* Wait for the interface to be ready. This prevents the main + * LibVLC thread from starting video playback before we can create + * an embedded video window. */ vlc_sem_wait (&ready); vlc_sem_destroy (&ready); + busy = active = true; -#ifndef Q_WS_MAC - if( !p_sys->b_isDialogProvider ) - { - RegisterIntf( p_this ); - } +#ifndef Q_OS_MAC + if( !isDialogProvider ) + RegisterIntf( p_intf ); #endif return VLC_SUCCESS; } -/* Open qt4 interface */ +/* Open Qt interface */ static int OpenIntf( vlc_object_t *p_this ) { return Open( p_this, false ); @@ -392,45 +434,49 @@ static void Close( vlc_object_t *p_this ) if( !p_sys->b_isDialogProvider ) { - var_Destroy (pl_Get(p_this), "window"); - var_Destroy (pl_Get(p_this), "qt4-iface"); + playlist_t *pl = THEPL; + + var_Destroy (pl, "window"); + var_Destroy (pl, "qt4-iface"); + playlist_Deactivate (pl); /* release window provider if needed */ } + /* And quit */ + msg_Dbg( p_this, "requesting exit..." ); QVLCApp::triggerQuit(); -#ifndef Q_WS_MAC + msg_Dbg( p_this, "waiting for UI thread..." ); +#ifndef Q_OS_MAC vlc_join (p_sys->thread, NULL); -#endif -#ifdef Q_WS_X11 - free (x11_display); - x11_display = NULL; #endif delete p_sys; - vlc_mutex_locker locker (&one.lock); - one.busy = false; + QMutexLocker locker (&lock); + assert (busy); + busy = false; } static void *Thread( void *obj ) { intf_thread_t *p_intf = (intf_thread_t *)obj; MainInterface *p_mi; - char dummy[] = "vlc"; /* for WM_CLASS */ - char *argv[4] = { dummy, NULL, }; - int argc = 1; + char vlc_name[] = "vlc"; /* for WM_CLASS */ +#ifdef QT5_HAS_X11 + char platform_parm[] = "-platform"; + char platform_value[] = "xcb"; +#endif + char *argv[] = { + vlc_name, +#ifdef QT5_HAS_X11 + platform_parm, platform_value, +#endif + NULL, + }; + int argc = sizeof(argv) / sizeof(argv[0]) - 1; Q_INIT_RESOURCE( vlc ); /* Start the QApplication here */ -#ifdef Q_WS_X11 - if( x11_display != NULL ) - { - argv[argc++] = const_cast("-display"); - argv[argc++] = x11_display; - argv[argc] = NULL; - } -#endif - QVLCApp app( argc, argv ); p_intf->p_sys->p_app = &app; @@ -438,27 +484,28 @@ static void *Thread( void *obj ) /* All the settings are in the .conf/.ini style */ p_intf->p_sys->mainSettings = new QSettings( -#ifdef WIN32 +#ifdef _WIN32 QSettings::IniFormat, #else QSettings::NativeFormat, #endif QSettings::UserScope, "vlc", "vlc-qt-interface" ); - /* Icon setting */ -#ifndef Q_WS_MAC - if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */ - app.setWindowIcon( QIcon(vlc_christmas_xpm) ); + /* Icon setting, Mac uses icon from .icns */ +#ifndef Q_OS_MAC + if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) ) + app.setWindowIcon( QIcon::fromTheme( "vlc-xmas", QIcon( ":/logo/vlc128-xmas.png" ) ) ); else - app.setWindowIcon( QIcon(vlc_xpm) ); + app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon( ":/logo/vlc256.png" ) ) ); #endif - /* Initialize timers and the Dialog Provider */ + /* Initialize the Dialog Provider and the Main Input Manager */ DialogsProvider::getInstance( p_intf ); - - /* Detect screensize for small screens like TV or EEEpc*/ - p_intf->p_sys->i_screenHeight = - app.QApplication::desktop()->availableGeometry().height(); + MainInputManager *mim = MainInputManager::getInstance( p_intf ); + /* initialize p_input (an input can already be running) */ + input_thread_t *p_input = playlist_CurrentInput( THEPL ); + if( p_input ) + mim->getIM()->inputChangedHandler(); #ifdef UPDATE_CHECK /* Checking for VLC updates */ @@ -478,22 +525,44 @@ static void *Thread( void *obj ) /* Create the normal interface in non-DP mode */ if( !p_intf->p_sys->b_isDialogProvider ) + { p_mi = new MainInterface( p_intf ); + p_intf->p_sys->p_mi = p_mi; + } else p_mi = NULL; - p_intf->p_sys->p_mi = p_mi; /* Explain how to show a dialog :D */ p_intf->pf_show_dialog = ShowDialog; - /* */ + /* Check window type from the Qt platform back-end */ + p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_INVALID; +#if HAS_QT5 || defined (Q_WS_QPA) + QString platform = app.platformName(); + if( platform == qfu("xcb") ) + p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_XID; + else if( platform == qfu("windows") ) + p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_HWND; + else if( platform == qfu("cocoa" ) ) + p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_NSOBJECT; + else + msg_Err( p_intf, "unknown Qt platform: %s", qtu(platform) ); +#elif defined (Q_WS_X11) + p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_XID; +#elif defined (Q_WS_WIN) || defined (Q_WS_PM) + p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_HWND; +#elif defined (Q_WS_MAC) + p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_NSOBJECT; +#endif + + /* Tell the main LibVLC thread we are ready */ vlc_sem_post (&ready); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC /* We took over main thread, register and start here */ if( !p_intf->p_sys->b_isDialogProvider ) { - RegisterIntf( (vlc_object_t *)p_intf ); + RegisterIntf( p_intf ); playlist_Play( THEPL ); } #endif @@ -513,14 +582,11 @@ static void *Thread( void *obj ) /* Launch */ app.exec(); - /* And quit */ - QApplication::closeAllWindows(); - + msg_Dbg( p_intf, "QApp exec() finished" ); if (p_mi != NULL) { -#warning BUG! - /* FIXME: the video window may still be registerd at this point */ - /* See LP#448082 as an example. */ + QMutexLocker locker (&lock); + active = false; p_intf->p_sys->p_mi = NULL; /* Destroy first the main interface because it is connected to some @@ -528,6 +594,10 @@ static void *Thread( void *obj ) delete p_mi; } + /* */ + ExtensionsManager::killInstance(); + AddonsManager::killInstance(); + /* Destroy all remaining windows, because some are connected to some slots in the MainInputManager @@ -538,8 +608,14 @@ static void *Thread( void *obj ) /* Delete the recentsMRL object before the configuration */ RecentsMRL::killInstance(); - /* Save the path */ - getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath ); + /* Save the path or delete if recent play are disabled */ + if( var_InheritBool( p_intf, "qt-recentplay" ) ) + getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath ); + else + getSettings()->remove( "filedialog-path" ); + + /* */ + delete p_intf->p_sys->pl_model; /* Delete the configuration. Application has to be deleted after that. */ delete p_intf->p_sys->mainSettings; @@ -567,60 +643,64 @@ static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg, * * TODO move it out of here ? */ -#include - static int WindowControl( vout_window_t *, int i_query, va_list ); -static int WindowOpen( vlc_object_t *p_obj ) +static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg ) { - vout_window_t *p_wnd = (vout_window_t*)p_obj; - - /* */ - if( p_wnd->cfg->is_standalone ) + if( cfg->is_standalone ) return VLC_EGENERIC; -#if defined (Q_WS_X11) - if( var_InheritBool( p_obj, "video-wallpaper" ) ) - return VLC_EGENERIC; -#endif - - vlc_value_t val; - if( var_Inherit( p_obj, "qt4-iface", VLC_VAR_ADDRESS, &val ) ) - val.p_address = NULL; - - intf_thread_t *p_intf = (intf_thread_t *)val.p_address; + intf_thread_t *p_intf = + (intf_thread_t *)var_InheritAddress( p_wnd, "qt4-iface" ); if( !p_intf ) { /* If another interface is used, this plugin cannot work */ - msg_Dbg( p_obj, "Qt4 interface not found" ); + msg_Dbg( p_wnd, "Qt interface not found" ); return VLC_EGENERIC; } - MainInterface *p_mi = p_intf->p_sys->p_mi; - msg_Dbg( p_obj, "requesting video..." ); + if( cfg->type != VOUT_WINDOW_TYPE_INVALID + && cfg->type != p_intf->p_sys->voutWindowType ) + 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; + switch( p_intf->p_sys->voutWindowType ) + { + case VOUT_WINDOW_TYPE_XID: + if( var_InheritBool( p_wnd, "video-wallpaper" ) ) + return VLC_EGENERIC; + break; + } -#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 ) + QMutexLocker locker (&lock); + if (unlikely(!active)) return VLC_EGENERIC; - p_wnd->display.x11 = x11_display; -#elif defined (Q_WS_WIN) - p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); - if( !p_wnd->handle.hwnd ) - return VLC_EGENERIC; + MainInterface *p_mi = p_intf->p_sys->p_mi; + msg_Dbg( p_wnd, "requesting video window..." ); -#elif defined (Q_WS_MAC) - p_wnd->handle.nsobject = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); - if( !p_wnd->handle.nsobject ) + unsigned i_width = cfg->width; + unsigned i_height = cfg->height; + + WId wid = p_mi->getVideo( p_wnd, &i_width, &i_height ); + if( !wid ) return VLC_EGENERIC; -#else -# error FIXME -#endif + + p_wnd->type = p_intf->p_sys->voutWindowType; + + switch( p_wnd->type ) + { + case VOUT_WINDOW_TYPE_XID: + p_wnd->handle.xid = (uintptr_t)wid; + p_wnd->display.x11 = NULL; + break; + case VOUT_WINDOW_TYPE_HWND: + p_wnd->handle.hwnd = (void *)wid; + break; + case VOUT_WINDOW_TYPE_NSOBJECT: + p_wnd->handle.nsobject = (void *)wid; + break; + default: + vlc_assert_unreachable(); + } p_wnd->control = WindowControl; p_wnd->sys = (vout_window_sys_t*)p_mi; @@ -630,15 +710,35 @@ static int WindowOpen( vlc_object_t *p_obj ) static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args ) { MainInterface *p_mi = (MainInterface *)p_wnd->sys; + QMutexLocker locker (&lock); + + if (unlikely(!active)) + { + msg_Warn (p_wnd, "video already released before control"); + return VLC_EGENERIC; + } return p_mi->controlVideo( i_query, args ); } -static void WindowClose( vlc_object_t *p_obj ) +static void WindowClose( vout_window_t *p_wnd ) { - vout_window_t *p_wnd = (vout_window_t*)p_obj; MainInterface *p_mi = (MainInterface *)p_wnd->sys; - - msg_Dbg( p_obj, "releasing video..." ); + QMutexLocker locker (&lock); + + /* Normally, the interface terminates after the video. In the contrary, the + * Qt main loop is gone, so we cannot send any event to the user interface + * widgets. Ideally, we would keep the Qt main loop running until after + * the video window is released. But it is far simpler to just have the Qt + * thread destroy the window early, and to turn this function into a stub. + * + * That assumes the video output will behave sanely if it window is + * destroyed asynchronously. + * XCB and Xlib-XCB are fine with that. Plain Xlib wouldn't, */ + if (unlikely(!active)) + { + msg_Warn (p_wnd, "video already released"); + return; + } + msg_Dbg (p_wnd, "releasing video..."); p_mi->releaseVideo(); } -