X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=2794999145f44a8743af3a58a630072d2b91c77b;hb=223419069363b3eab712cff2d0ac671a94d8fc65;hp=6dfe0f90786d3f428f8065f41781689bf58399b5;hpb=81126aae092b083285f624ced656ba541deea1a8;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 6dfe0f9078..2794999145 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" @@ -50,8 +54,8 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static int OpenDialogs ( vlc_object_t * ); -static int OpenWindow ( vlc_object_t * ); -static void CloseWindow ( 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 * ); @@ -59,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." ) @@ -67,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" ) @@ -87,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." ) @@ -99,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%" ) @@ -114,10 +118,10 @@ 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" ) @@ -125,7 +129,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #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" ) @@ -206,7 +210,7 @@ vlc_module_begin(); add_submodule(); set_capability( "vout window", 50 ); - set_callbacks( OpenWindow, CloseWindow ); + set_callbacks( WindowOpen, WindowClose ); vlc_module_end(); /***************************************************************************** @@ -228,19 +232,20 @@ 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 ); + /* 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; } @@ -291,8 +296,12 @@ static void Run( intf_thread_t *p_intf ) 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; @@ -312,23 +321,33 @@ 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; + + /* 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 { @@ -336,6 +355,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 @@ -356,16 +377,13 @@ static void Init( intf_thread_t *p_intf ) app->installTranslator( &qtTranslator ); #endif //ENABLE_NLS - /* 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 - : config_GetHomeDir(); + : config_GetHomeDir(); #ifdef UPDATE_CHECK /* Checking for VLC updates */ @@ -388,6 +406,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; @@ -399,8 +425,10 @@ 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 ); } @@ -433,14 +461,13 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable, */ #include -static int ControlWindow (vout_window_t *, int, va_list); +static int WindowControl (vout_window_t *, int, va_list); -static int OpenWindow (vlc_object_t *obj) +static int WindowOpen (vlc_object_t *obj) { vout_window_t *wnd = (vout_window_t *)obj; - /* TODO: should probably be in the libvlc core instead: */ - if (!config_GetInt (obj, "embedded-video")) + if (config_GetInt (obj, "embedded-video") <= 0) return VLC_EGENERIC; intf_thread_t *intf = (intf_thread_t *) @@ -449,43 +476,53 @@ static int OpenWindow (vlc_object_t *obj) return VLC_EGENERIC; /* Qt4 not in use */ assert (intf->i_object_type == VLC_OBJECT_INTF); - var_Create (intf, "window_mutex", VLC_VAR_MUTEX); var_Create (intf, "window_widget", VLC_VAR_ADDRESS); - vlc_value_t lockval, ptrval; - var_Get (intf, "window_mutex", &lockval); + vlc_value_t ptrval; - vlc_mutex_lock ((vlc_mutex_t *)lockval.p_address); + windowLock.lock (); msg_Dbg (obj, "waiting for interface..."); - do + for (;;) { var_Get (intf, "window_widget", &ptrval); - /* FIXME A condition variable would be way more appropriate. */ - msleep (INTF_IDLE_SLEEP); - } while (ptrval.p_address == NULL); - - msg_Dbg (obj, "requestiong window..."); - MainInterface *mi = (MainInterface *)ptrval.p_address; - - wnd->handle = mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y, - &wnd->width, &wnd->height); - vlc_mutex_unlock ((vlc_mutex_t *)lockval.p_address); - wnd->control = ControlWindow; - wnd->p_private = intf; + 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 ControlWindow (vout_window_t *wnd, int query, va_list args) +static int WindowControl (vout_window_t *wnd, int query, va_list args) { - intf_thread_t *intf = (intf_thread_t *)wnd->p_private; - intf->p_sys->p_mi->controlVideo (wnd->handle, query, 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 CloseWindow (vlc_object_t *obj) +static void WindowClose (vlc_object_t *obj) { vout_window_t *wnd = (vout_window_t *)obj; - intf_thread_t *intf = (intf_thread_t *)obj->p_private; + QPointer *miP = (QPointer *)wnd->p_private; + QMutexLocker locker (&windowLock); - intf->p_sys->p_mi->releaseVideo (wnd->handle); - vlc_object_release (intf); + if (!miP->isNull ()) + (*miP)->releaseVideo (wnd->handle); + delete miP; }