X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=2109367e32de9534a59394d84a772c06ba155d0d;hb=ba6501f3084682844e7ee87bad3986bced5f3652;hp=f22fc7bcb049542623c19dcdb95df77bca03dfe0;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index f22fc7bcb0..2109367e32 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,12 @@ #include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32-christmas.xpm" +#include + +#ifdef WIN32 + #include + Q_IMPORT_PLUGIN(qjpeg) +#endif /***************************************************************************** * Local prototypes. @@ -49,14 +59,16 @@ 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 *Init ( vlc_object_t * ); 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 +76,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 +95,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 +107,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,18 +123,16 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #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 " \ +#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 VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" ) - #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" ) @@ -130,14 +140,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 ); @@ -151,7 +163,7 @@ vlc_module_begin(); 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, 0 ); + change_integer_list( i_mode_list, psz_mode_list_text, NULL ); add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT, NOTIFICATION_LONGTEXT, false ); @@ -167,6 +179,8 @@ vlc_module_begin(); 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 ); @@ -186,20 +200,24 @@ vlc_module_begin(); #ifdef UPDATE_CHECK add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT, UPDATER_LONGTEXT, false ); - add_integer( "qt-updates-days", 14, NULL, UPDATER_DAYS_TEXT, + 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_bool( "qt-open-detail", false, NULL, VIEWDETAIL_TEXT, - VIEWDETAIL_TEXT, false ); - add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT, false ); + change_internal(); set_callbacks( OpenDialogs, Close ); + +#if 0 + add_submodule(); + set_capability( "vout window", 50 ); + set_callbacks( WindowOpen, WindowClose ); +#endif vlc_module_end(); /***************************************************************************** @@ -221,22 +239,22 @@ 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; + p_intf->p_sys->p_mi = NULL; - 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 = true; + /* Access to the playlist */ + p_intf->p_sys->p_playlist = pl_Hold( p_intf ); + /* 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; } @@ -255,15 +273,14 @@ 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 = true; - vlc_mutex_unlock( &p_intf->object_lock ); - if( p_intf->p_sys->b_isDialogProvider ) { - DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL ); - QApplication::postEvent( THEDP, static_cast(event) ); - + 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(event) ); + } vlc_thread_join( p_intf ); } @@ -284,14 +301,24 @@ static void Run( intf_thread_t *p_intf ) msg_Err( p_intf, "failed to create Qt dialogs thread" ); } else - Init( p_intf ); + { + int canc = vlc_savecancel (); + Init( VLC_OBJECT(p_intf) ); + vlc_restorecancel( canc ); + } } -static void Init( intf_thread_t *p_intf ) +static QMutex windowLock; +static QWaitCondition windowWait; + +static void *Init( vlc_object_t *obj ) { + intf_thread_t *p_intf = (intf_thread_t *)obj; + vlc_value_t val; char dummy[] = ""; char *argv[] = { dummy }; int argc = 1; + int canc = vlc_savecancel (); Q_INIT_RESOURCE( vlc ); @@ -308,23 +335,56 @@ 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 */ 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; + +#ifdef UPDATE_CHECK + /* Checking for VLC updates */ + if( config_GetInt( p_intf, "qt-updates-notif" ) && + !config_GetInt( p_intf, "qt-privacy-ask" ) ) + { + int interval = config_GetInt( p_intf, "qt-updates-days" ); + if( QDate::currentDate() > + getSettings()->value( "updatedate" ).toDate().addDays( interval ) ) + { + /* The constructor of the update Dialog will do the 1st request */ + UpdateDialog::getInstance( p_intf ); + getSettings()->setValue( "updatedate", QDate::currentDate() ); + } + } +#endif + + /* 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 { @@ -332,10 +392,20 @@ 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 - QLocale ql = QLocale::system(); +# if defined (WIN32) || defined (__APPLE__) + char* psz_tmp = config_GetPsz( p_intf, "language" ); + QString lang = qfu( psz_tmp ); + free( psz_tmp); + if (lang == "auto") + lang = QLocale::system().name(); +# else + QString lang = QLocale::system().name(); +# endif // Translations for qt's own dialogs QTranslator qtTranslator( 0 ); // Let's find the right path for the translation file @@ -343,68 +413,67 @@ 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()); + bool b_loaded = qtTranslator.load( path + "qt_" + lang ); if (!b_loaded) msg_Dbg( p_intf, "Error while initializing qt-specific localization" ); 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, 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; - -#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 ) ) - { - /* The constructor of the update Dialog will do the 1st request */ - UpdateDialog::getInstance( p_intf ); - settings.setValue( "updatedate", QDate::currentDate() ); - } - } -#endif + : config_GetHomeDir(); /* Launch */ app->exec(); /* And quit */ + msg_Dbg( p_intf, "Quitting the Qt4 Interface" ); + + if (miP) + { + QMutexLocker locker (&windowLock); + + /* 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 ); + + 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; - /* Destroy then other windows, because some are connected to some slots - in the MainInputManager */ + /* Destroy all remaining windows, + because some are connected to some slots + in the MainInputManager + Settings must be destroyed after that. + */ DialogsProvider::killInstance(); + /* 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); + return NULL; } /***************************************************************************** @@ -429,3 +498,78 @@ 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 (); + + if (!wnd->handle) + return VLC_EGENERIC; + + 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; +}