X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=41bdd26d395d6065b0b619c5af880a3a9466daf3;hb=7cd22823b1e7e4b6a3f23e8f6624ded298459b73;hp=8880e4546980d81f6238a54c69e64111285798a0;hpb=03fefb1cb273bf54a9f68828ee03bd490edff233;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 8880e45469..41bdd26d39 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * qt4.cpp : QT4 interface **************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright © 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -29,9 +29,12 @@ #include #include #include +#include +#include +#include +#include #include "qt4.hpp" -#include #include "dialogs_provider.hpp" #include "input_manager.hpp" #include "main_interface.hpp" @@ -43,6 +46,7 @@ #include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32-christmas.xpm" +#include /***************************************************************************** * Local prototypes. @@ -50,6 +54,8 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); 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 ( intf_thread_t * ); static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); @@ -89,15 +95,10 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #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." \ + "for main interface, playlist and extended panel."\ " This option only works with Windows and " \ "X11 with composite extensions." ) -#define SHOWFLAGS_TEXT N_( "Define what columns to show in playlist window" ) -#define SHOWFLAGS_LONGTEXT N_( "Enter the sum of the options that you want: \n" \ - "Title: 1; Duration: 2; Artist: 4; Genre: 8; " \ - "Copyright: 16; Collection/album: 32; Rating: 256." ) - #define ERROR_TEXT N_( "Show unimportant error and warnings dialogs" ) #define UPDATER_TEXT N_( "Activate the updates availability notification" ) @@ -111,10 +112,17 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); "can distort the audio, since it uses " \ "software amplification." ) +#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 SLIDERCOL_TEXT N_( "Define the colours of the volume slider " ) +#define SLIDERCOL_LONGTEXT N_( "Define the colours of the volume slider\n " \ + "By specifying the 12 numbers separated by a ';'\n " \ + "Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n " \ + "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' ") #define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" ) @@ -129,14 +137,14 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" ) #define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" ) -static int i_mode_list[] = +static const int i_mode_list[] = { QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE }; -static const char *psz_mode_list_text[] = +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( (char *)"Qt" ); - set_description( (char*)_("Qt interface") ); + set_shortname( "Qt" ); + set_description( N_("Qt interface") ); set_category( CAT_INTERFACE ) ; set_subcategory( SUBCAT_INTERFACE_MAIN ); set_capability( "interface", 151 ); @@ -149,58 +157,60 @@ vlc_module_begin(); set_capability( "dialogs provider", 51 ); add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL, - QT_MODE_TEXT, QT_MODE_LONGTEXT, VLC_FALSE ); + QT_MODE_TEXT, QT_MODE_LONGTEXT, false ); change_integer_list( i_mode_list, psz_mode_list_text, 0 ); - add_bool( "qt-notification", VLC_TRUE, NULL, NOTIFICATION_TEXT, - NOTIFICATION_LONGTEXT, VLC_FALSE ); + 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, VLC_FALSE ); - add_bool( "qt-blingbling", VLC_TRUE, NULL, BLING_TEXT, - BLING_TEXT, VLC_FALSE ); - - add_bool( "qt-system-tray", VLC_TRUE, NULL, SYSTRAY_TEXT, - SYSTRAY_LONGTEXT, VLC_FALSE); - add_bool( "qt-start-minimized", VLC_FALSE, NULL, MINIMIZED_TEXT, - MINIMIZED_LONGTEXT, VLC_TRUE); - add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT, - TITLE_LONGTEXT, VLC_FALSE ); - - add_bool( "qt-volume-complete", VLC_FALSE, NULL, COMPLETEVOL_TEXT, - COMPLETEVOL_LONGTEXT, VLC_TRUE ); + 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-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, VLC_TRUE ); + FILEDIALOG_PATH_TEXT, true ); change_autosave(); change_internal(); - add_bool( "qt-adv-options", VLC_FALSE, NULL, ADVANCED_OPTIONS_TEXT, - ADVANCED_OPTIONS_LONGTEXT, VLC_TRUE ); - add_bool( "qt-advanced-pref", VLC_FALSE, NULL, ADVANCED_PREFS_TEXT, - ADVANCED_PREFS_LONGTEXT, VLC_FALSE ); - add_bool( "qt-error-dialogs", VLC_TRUE, NULL, ERROR_TEXT, - ERROR_TEXT, VLC_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", VLC_TRUE, NULL, UPDATER_TEXT, - UPDATER_LONGTEXT, VLC_FALSE ); + add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT, + UPDATER_LONGTEXT, false ); add_integer( "qt-updates-days", 14, NULL, UPDATER_DAYS_TEXT, - UPDATER_DAYS_TEXT, VLC_FALSE ); + 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_integer( "qt-pl-showflags", - VLC_META_ENGINE_ARTIST|VLC_META_ENGINE_TITLE| - VLC_META_ENGINE_DURATION|VLC_META_ENGINE_COLLECTION, - NULL, SHOWFLAGS_TEXT, - SHOWFLAGS_LONGTEXT, VLC_TRUE ); - change_autosave(); + add_bool( "qt-open-detail", false, NULL, VIEWDETAIL_TEXT, + VIEWDETAIL_TEXT, false ); - add_bool( "qt-open-detail", VLC_FALSE, NULL, VIEWDETAIL_TEXT, - VIEWDETAIL_TEXT, VLC_FALSE ); - - add_bool( "qt-privacy-ask", VLC_TRUE, NULL, PRIVACY_TEXT, PRIVACY_TEXT, - VLC_FALSE ); + add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT, + false ); set_callbacks( OpenDialogs, Close ); + + add_submodule(); + set_capability( "vout window", 50 ); + set_callbacks( WindowOpen, WindowClose ); vlc_module_end(); /***************************************************************************** @@ -209,7 +219,7 @@ vlc_module_end(); static int Open( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - p_intf->pf_run = Run; + #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 */ @@ -221,19 +231,21 @@ static int Open( vlc_object_t *p_this ) } XCloseDisplay( p_display ); #endif + + /* Allocations */ p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) ); if( !p_intf->p_sys ) - { - msg_Err( p_intf, "Out of memory" ); return VLC_ENOMEM; - } memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) ); - p_intf->p_sys->p_playlist = pl_Yield( p_intf ); - p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); + p_intf->pf_run = Run; - p_intf->b_play = VLC_TRUE; + /* Access to the playlist */ + p_intf->p_sys->p_playlist = pl_Yield( p_intf ); + /* Listen to the messages */ + p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); + var_Create( p_this, "window_widget", VLC_VAR_ADDRESS ); return VLC_SUCCESS; } @@ -251,9 +263,18 @@ static int OpenDialogs( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - vlc_mutex_lock( &p_intf->object_lock ); - p_intf->b_dead = VLC_TRUE; - vlc_mutex_unlock( &p_intf->object_lock ); + + vlc_object_lock( p_intf ); + p_intf->b_dead = true; + vlc_object_unlock( p_intf ); + + if( p_intf->p_sys->b_isDialogProvider ) + { + DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL ); + QApplication::postEvent( THEDP, static_cast(event) ); + + vlc_thread_join( p_intf ); + } vlc_object_release( p_intf->p_sys->p_playlist ); msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); @@ -268,15 +289,19 @@ static void Run( intf_thread_t *p_intf ) { if( p_intf->pf_show_dialog ) { - if( vlc_thread_create( p_intf, "Qt dialogs", Init, 0, VLC_TRUE ) ) + if( vlc_thread_create( p_intf, "Qt dialogs", Init, 0, true ) ) msg_Err( p_intf, "failed to create Qt dialogs thread" ); } else Init( p_intf ); } +static QMutex windowLock; +static QWaitCondition windowWait; + static void Init( intf_thread_t *p_intf ) { + vlc_value_t val; char dummy[] = ""; char *argv[] = { dummy }; int argc = 1; @@ -290,30 +315,48 @@ static void Init( intf_thread_t *p_intf ) * see commits 21610 21622 21654 for reference */ /* If you don't have a gconftool-2 binary, you should comment this line */ - QApplication::setDesktopSettingsAware( false ); + if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */ + QApplication::setDesktopSettingsAware( false ); #endif /* Start the QApplication here */ QApplication *app = new QApplication( argc, argv , true ); + p_intf->p_sys->p_app = app; + + /* Icon setting + FIXME: use a bigger icon ? */ if( QDate::currentDate().dayOfYear() >= 354 ) app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) ); else app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); - p_intf->p_sys->p_app = app; - // Initialize timers and the Dialog Provider + /* Initialize timers and the Dialog Provider */ DialogsProvider::getInstance( p_intf ); - // Create the normal interface + QPointer *miP = NULL; + + /* Create the normal interface in non-DP mode */ if( !p_intf->pf_show_dialog ) { - MainInterface *p_mi = new MainInterface( p_intf ); - p_intf->p_sys->p_mi = p_mi; - p_mi->show(); + 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 (p_intf->p_sys->p_mi); + val.p_address = miP; + QMutexLocker locker (&windowLock); + var_Set (p_intf, "window_widget", val); + windowWait.wakeAll (); } else + { vlc_thread_ready( p_intf ); + p_intf->p_sys->b_isDialogProvider = true; + } + /* Explain to the core how to show a dialog :D */ + p_intf->pf_show_dialog = ShowDialog; #ifdef ENABLE_NLS // Translation - get locale @@ -324,7 +367,7 @@ static void Init( intf_thread_t *p_intf ) #if !defined( WIN32 ) QString path = QString( QT4LOCALEDIR ); #else - QString path = QString( QString(system_VLCPath()) + DIR_SEP + + QString path = QString( QString(config_GetDataDir()) + DIR_SEP + "locale" + DIR_SEP ); #endif // files depending on locale @@ -334,31 +377,23 @@ static void Init( intf_thread_t *p_intf ) app->installTranslator( &qtTranslator ); #endif //ENABLE_NLS - /* Start playing if needed */ - if( !p_intf->pf_show_dialog && p_intf->b_play ) - { - playlist_Control( THEPL, PLAYLIST_AUTOPLAY, VLC_FALSE ); - } - - /* Explain to the core how to show a dialog :D */ - p_intf->pf_show_dialog = ShowDialog; - /* Last settings */ app->setQuitOnLastWindowClosed( false ); - /* retrieve last known path used in file browsing */ + /* 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 ) ? psz_path - : p_intf->p_libvlc->psz_homedir; + : config_GetHomeDir(); #ifdef UPDATE_CHECK + /* Checking for VLC updates */ if( config_GetInt( p_intf, "qt-updates-notif" ) ) { int interval = config_GetInt( p_intf, "qt-updates-days" ); QSettings settings( "vlc", "vlc-qt-interface" ); - if( QDate::currentDate() > settings.value( "updatedate" ).toDate().addDays( interval ) ) + if( QDate::currentDate() > + settings.value( "updatedate" ).toDate().addDays( interval ) ) { - msg_Dbg( p_intf, "Someone said I need to check updates" ); /* The constructor of the update Dialog will do the 1st request */ UpdateDialog::getInstance( p_intf ); settings.setValue( "updatedate", QDate::currentDate() ); @@ -371,9 +406,17 @@ static void Init( intf_thread_t *p_intf ) /* And quit */ + if (miP) + { + QMutexLocker locker (&windowLock); + val.p_address = NULL; + var_Set (p_intf, "window_widget", val); + delete miP; + } + /* Destroy first the main interface because it is connected to some slots in the MainInputManager */ - if( p_intf->p_sys->p_mi ) delete p_intf->p_sys->p_mi; + delete p_intf->p_sys->p_mi; /* Destroy then other windows, because some are connected to some slots in the MainInputManager */ @@ -382,10 +425,12 @@ static void Init( intf_thread_t *p_intf ) /* 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 ); - - delete app; } /***************************************************************************** @@ -410,3 +455,77 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable, ShowDialog( p_intf, INTF_DIALOG_POPUPMENU, new_val.b_bool, 0 ); return VLC_SUCCESS; } + +/** + * Video output window provider + */ +#include + +static int WindowControl (vout_window_t *, int, va_list); + +static int WindowOpen (vlc_object_t *obj) +{ + vout_window_t *wnd = (vout_window_t *)obj; + + 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); + + var_Create (intf, "window_widget", VLC_VAR_ADDRESS); + + vlc_value_t ptrval; + + windowLock.lock (); + msg_Dbg (obj, "waiting for interface..."); + for (;;) + { + var_Get (intf, "window_widget", &ptrval); + if (ptrval.p_address != NULL) + break; + windowWait.wait (&windowLock); + } + + msg_Dbg (obj, "requesting window..."); + QPointer *miP = (QPointer *)ptrval.p_address; + miP = new QPointer (*miP); /* create our own copy */ + vlc_object_release (intf); + + if (miP->isNull ()) + return VLC_EGENERIC; + + if (config_GetInt (obj, "embedded-video") <= 0) + { + (*miP)->requestNotEmbeddedVideo (wnd->vout); + return VLC_EGENERIC; + } + + wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y, + &wnd->width, &wnd->height); + windowLock.unlock (); + wnd->control = WindowControl; + wnd->p_private = miP; + return VLC_SUCCESS; +} + +static int WindowControl (vout_window_t *wnd, int query, va_list args) +{ + QPointer *miP = (QPointer *)wnd->p_private; + QMutexLocker locker (&windowLock); + + if (miP->isNull ()) + return VLC_EGENERIC; + return (*miP)->controlVideo (wnd->handle, query, args); +} + +static void WindowClose (vlc_object_t *obj) +{ + vout_window_t *wnd = (vout_window_t *)obj; + QPointer *miP = (QPointer *)wnd->p_private; + QMutexLocker locker (&windowLock); + + if (!miP->isNull ()) + (*miP)->releaseVideo (wnd->handle); + delete miP; +}