X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=37b5316c2b047db64323fd1c838efbb03e427777;hb=6a66117a34f627ad9560b07cead07663b48f23b6;hp=cb00389eb588c531fb10d9cabcae1035eefff15a;hpb=8501e4a23824813d95c036b398f89524245b55c5;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index cb00389eb5..37b5316c2b 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -29,6 +29,10 @@ #include #include #include +#include +#include +#include +#include #include "qt4.hpp" #include "dialogs_provider.hpp" @@ -42,6 +46,7 @@ #include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32-christmas.xpm" +#include /***************************************************************************** * Local prototypes. @@ -49,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 * ); @@ -56,7 +63,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -#define ADVANCED_PREFS_TEXT N_( "Show advanced prefs over simple ones" ) +#define ADVANCED_PREFS_TEXT N_( "Show advanced preferences over simple ones" ) #define ADVANCED_PREFS_LONGTEXT N_( "Show advanced preferences and not simple "\ "preferences when opening the preferences "\ "dialog." ) @@ -64,16 +71,15 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define SYSTRAY_TEXT N_( "Systray icon" ) #define SYSTRAY_LONGTEXT N_( "Show an icon in the systray " \ "allowing you to control VLC media player " \ - "for basic actions" ) + "for basic actions." ) #define MINIMIZED_TEXT N_( "Start VLC with only a systray icon" ) -#define MINIMIZED_LONGTEXT N_( "When you launch VLC with that option, " \ - "VLC will start with just an icon in" \ +#define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \ "your taskbar" ) #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" ) + "controler window title." ) #define FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" ) @@ -84,11 +90,11 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define ADVANCED_OPTIONS_TEXT N_( "Advanced options" ) #define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \ - "in the dialogs" ) + "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." \ + "for main interface, playlist and extended panel."\ " This option only works with Windows and " \ "X11 with composite extensions." ) @@ -96,7 +102,8 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define UPDATER_TEXT N_( "Activate the updates availability notification" ) #define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \ - "versions of the software. It runs once a week." ) + "versions of the software. It runs once every " \ + "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%" ) @@ -111,13 +118,16 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define PRIVACY_TEXT N_( "Ask for network policy at start" ) - -#define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" ) +#define SLIDERCOL_TEXT N_( "Define the colors of the volume slider " ) +#define SLIDERCOL_LONGTEXT N_( "Define the colors 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 QT_MODE_TEXT N_( "Selection of the starting mode and look " ) #define QT_MODE_LONGTEXT N_( "Start VLC with:\n" \ " - normal mode\n" \ - " - a zone always present to show information" \ + " - a zone always present to show information " \ "as lyrics, album arts...\n" \ " - minimal mode with limited controls" ) @@ -125,14 +135,16 @@ 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[] = +#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" ) + +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 ); @@ -145,53 +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 ); - add_bool( "qt-autosave-volume", VLC_FALSE, NULL, SAVEVOL_TEXT, - SAVEVOL_TEXT, 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-fs-controller", false, 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, 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_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 ); + change_internal(); set_callbacks( OpenDialogs, Close ); + + add_submodule(); + set_capability( "vout window", 50 ); + set_callbacks( WindowOpen, WindowClose ); vlc_module_end(); /***************************************************************************** @@ -213,22 +232,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->pf_run = Run; + /* Access to the playlist */ p_intf->p_sys->p_playlist = pl_Yield( p_intf ); - p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); - - /* We support play on start */ - p_intf->b_play = VLC_TRUE; + /* Listen to the messages */ + p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); + /* one settings to rule them all */ + var_Create( p_this, "window_widget", VLC_VAR_ADDRESS ); return VLC_SUCCESS; } @@ -247,9 +265,9 @@ 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 ) { @@ -272,15 +290,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; @@ -300,23 +322,41 @@ static void Init( intf_thread_t *p_intf ) /* Start the QApplication here */ QApplication *app = new QApplication( argc, argv , true ); + p_intf->p_sys->p_app = app; + + p_intf->p_sys->mainSettings = new QSettings( +#ifdef WIN32 + QSettings::IniFormat, +#else + QSettings::NativeFormat, +#endif + QSettings::UserScope, "vlc", "vlc-qt-interface" ); + + /* 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_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 { @@ -324,6 +364,8 @@ static void Init( intf_thread_t *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 @@ -335,7 +377,7 @@ static void Init( intf_thread_t *p_intf ) QString path = QString( QT4LOCALEDIR ); #else QString path = QString( QString(config_GetDataDir()) + DIR_SEP + - "locale" + DIR_SEP ); + "locale" + DIR_SEP + "qt4" + DIR_SEP ); #endif // files depending on locale bool b_loaded = qtTranslator.load( path + "qt_" + ql.name()); @@ -344,35 +386,25 @@ 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_PLAY, 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 ) ) + getSettings()->value( "updatedate" ).toDate().addDays( interval ) ) { /* The constructor of the update Dialog will do the 1st request */ UpdateDialog::getInstance( p_intf ); - settings.setValue( "updatedate", QDate::currentDate() ); + getSettings()->setValue( "updatedate", QDate::currentDate() ); } } #endif @@ -382,6 +414,14 @@ 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 */ delete p_intf->p_sys->p_mi; @@ -393,8 +433,13 @@ static void Init( intf_thread_t *p_intf ) /* Destroy the MainInputManager */ MainInputManager::killInstance(); + /* Delete the configuration */ + delete p_intf->p_sys->mainSettings; + + /* Delete the application */ delete app; + /* Save the path */ config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath ); free( psz_path ); } @@ -421,3 +466,74 @@ 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; + + if (config_GetInt (obj, "embedded-video") <= 0) + 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); + + 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; + + 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->vout, wnd->handle ); + delete miP; +}