X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=1a2b51c35550efc5e3252380884d32d41d17c613;hb=89f5d36846718c86518e11d6f542e61b8823b5ab;hp=b70275616a616707552562ed2b6c23262f70f69d;hpb=e056b5805aabed93d484dd92131463b760261b89;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index b70275616a..1a2b51c355 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -39,11 +39,11 @@ #include "util/qvlcapp.hpp" /* QVLCApplication definition */ #ifdef Q_WS_X11 - #include + #include #endif -#include "../../../share/vlc32x32.xpm" -#include "../../../share/vlc32x32-christmas.xpm" +#include "../../../share/icons/32x32/vlc.xpm" +#include "../../../share/icons/32x32/vlc-christmas.xpm" #include #ifdef WIN32 /* For static builds */ @@ -106,7 +106,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); " This option only works with Windows and " \ "X11 with composite extensions." ) -#define OPACITY_FS_TEXT N_( "Fullscreen controller opacity opacity between 0.1 and 1" ) +#define OPACITY_FS_TEXT N_( "Fullscreen controller opacity between 0.1 and 1" ) #define OPACITY_FS_LONGTEXT N_( "Sets the fullscreen controller opacity between 0.1 and 1 " \ "for main interface, playlist and extended panel."\ " This option only works with Windows and " \ @@ -128,6 +128,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); "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" ) @@ -150,10 +151,6 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); "as lyrics, album arts...\n" \ " - minimal mode with limited controls" ) -#define QT_NORMAL_MODE_TEXT N_( "Classic" ) -#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete (with information area)" ) -#define QT_MINIMAL_MODE_TEXT N_( "Minimal (without menu)" ) - #define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" ) #define QT_NATIVEOPEN_TEXT N_( "Embed the file browser in open dialog" ) @@ -165,12 +162,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define QT_AUTOLOAD_EXTENSIONS_LONGTEXT N_( "Automatically load the "\ "extensions module on startup" ) -/* Various modes definition */ -static const int i_mode_list[] = - { QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE }; -static const char *const psz_mode_list_text[] = - { QT_NORMAL_MODE_TEXT, QT_ALWAYS_VIDEO_MODE_TEXT, QT_MINIMAL_MODE_TEXT }; - +#define QT_MINIMAL_MODE_TEXT N_("Start in minimal view (without menus)" ) /**********************************************************************/ vlc_module_begin () @@ -182,9 +174,9 @@ vlc_module_begin () set_callbacks( OpenIntf, Close ) add_shortcut("qt") - 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, NULL ) + + add_bool( "qt-minimal-view", false, NULL, QT_MINIMAL_MODE_TEXT, + QT_MINIMAL_MODE_TEXT, false ); add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT, NOTIFICATION_LONGTEXT, false ) @@ -209,6 +201,8 @@ vlc_module_begin () COMPLETEVOL_LONGTEXT, true ) add_bool( "qt-autosave-volume", false, NULL, 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, NULL, QT_NATIVEOPEN_TEXT, QT_NATIVEOPEN_TEXT, false ) @@ -235,7 +229,7 @@ vlc_module_begin () add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT, false ) - change_internal () + change_private () add_integer( "qt-fullscreen-screennumber", -1, NULL, FULLSCREEN_NUMBER_TEXT, FULLSCREEN_NUMBER_LONGTEXT, false ); @@ -245,6 +239,11 @@ vlc_module_begin () false ) add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */ + add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */ + +#ifdef WIN32 + cannot_unload_broken_library() +#endif add_submodule () set_description( "Dialogs provider" ) @@ -252,12 +251,14 @@ vlc_module_begin () set_callbacks( OpenDialogs, Close ) -#if defined(Q_WS_X11) || defined(Q_WS_WIN) +#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", 50 ) + set_capability( "vout window xid", 0 ) #elif defined(Q_WS_WIN) - set_capability( "vout window hwnd", 50 ) + set_capability( "vout window hwnd", 0 ) +#elif defined(Q_WS_MAC) + set_capability( "vout window nsobject", 0 ) #endif set_callbacks( WindowOpen, WindowClose ) #endif @@ -281,23 +282,44 @@ static struct * Module callbacks *****************************************************************************/ +#ifdef Q_WS_MAC +/* Used to abort the app.exec() on OSX after libvlc_Quit is called */ +#include "../../../src/control/libvlc_internal.h" /* libvlc_SetExitHandler */ +static void Abort( void *obj ) +{ + QVLCApp::triggerQuit(); +} +#endif + +static void RegisterIntf( vlc_object_t *p_this ) +{ + playlist_t *pl = pl_Get(p_this); + var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS); + var_SetAddress (pl, "qt4-iface", p_this); + var_Create (pl, "window", VLC_VAR_STRING); + var_SetString (pl, "window", "qt4,any"); +} + /* Open Interface */ 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( !XInitThreads() ) + if( !vlc_xlib_init( p_this ) ) return VLC_EGENERIC; - x11_display = var_CreateGetNonEmptyString( p_intf, "x11-display" ); + + char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" ); Display *p_display = XOpenDisplay( x11_display ); if( !p_display ) { msg_Err( p_intf, "Could not connect to X server" ); + free (display); return VLC_EGENERIC; } XCloseDisplay( p_display ); - putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" ); +#else + char *display = NULL; #endif bool busy; @@ -308,38 +330,47 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) if (busy) { msg_Err (p_this, "cannot start Qt4 multiple times"); + free (display); return VLC_EGENERIC; } /* Allocations of p_sys */ intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t; p_intf->p_sys->b_isDialogProvider = isDialogProvider; - p_sys->p_popup_menu = NULL; p_sys->p_mi = NULL; - 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 + /* Run mainloop on the main thread as Cocoa requires */ + libvlc_SetExitHandler( p_intf->p_libvlc, Abort, p_intf ); + Thread( (void *)p_intf ); +#else 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 /* */ vlc_sem_wait (&ready); vlc_sem_destroy (&ready); +#ifndef Q_WS_MAC if( !p_sys->b_isDialogProvider ) { - vlc_value_t val; - var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS); - val.p_address = p_this; - var_Set (p_this->p_libvlc, "qt4-iface", val); + RegisterIntf( p_this ); } +#endif + return VLC_SUCCESS; } @@ -361,18 +392,24 @@ static void Close( vlc_object_t *p_this ) intf_sys_t *p_sys = p_intf->p_sys; if( !p_sys->b_isDialogProvider ) - var_Destroy (p_this->p_libvlc, "qt4-iface"); + { + var_Destroy (pl_Get(p_this), "window"); + var_Destroy (pl_Get(p_this), "qt4-iface"); + } QVLCApp::triggerQuit(); +#ifndef Q_WS_MAC vlc_join (p_sys->thread, NULL); - delete p_sys; - vlc_mutex_lock (&one.lock); - one.busy = false; - vlc_mutex_unlock (&one.lock); +#endif #ifdef Q_WS_X11 free (x11_display); + x11_display = NULL; #endif + delete p_sys; + + vlc_mutex_locker locker (&one.lock); + one.busy = false; } static void *Thread( void *obj ) @@ -410,10 +447,12 @@ static void *Thread( void *obj ) 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) ); else app.setWindowIcon( QIcon(vlc_xpm) ); +#endif /* Initialize timers and the Dialog Provider */ DialogsProvider::getInstance( p_intf ); @@ -443,14 +482,23 @@ static void *Thread( void *obj ) p_mi = new MainInterface( p_intf ); 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; /* */ - p_intf->p_sys->p_mi = p_mi; vlc_sem_post (&ready); +#ifdef Q_WS_MAC + /* We took over main thread, register and start here */ + if( !p_intf->p_sys->b_isDialogProvider ) + { + RegisterIntf( (vlc_object_t *)p_intf ); + playlist_Play( THEPL ); + } +#endif + /* Last settings */ app.setQuitOnLastWindowClosed( false ); @@ -467,15 +515,14 @@ static void *Thread( void *obj ) app.exec(); /* And quit */ - msg_Dbg( p_intf, "Quitting the Qt4 Interface" ); - QApplication::closeAllWindows(); if (p_mi != NULL) { - /* FIXME: are we sure that video window is already destroyed? */ +#warning BUG! + /* FIXME: the video window may still be registerd at this point */ + /* See LP#448082 as an example. */ - msg_Dbg (p_intf, "destroying the main Qt4 interface"); p_intf->p_sys->p_mi = NULL; /* Destroy first the main interface because it is connected to some slots in the MainInputManager */ @@ -501,11 +548,7 @@ static void *Thread( void *obj ) /* Destroy the MainInputManager */ MainInputManager::killInstance(); - /* Delete the application automatically */ -#ifdef Q_WS_X11 - free( x11_display ); -#endif return NULL; } @@ -536,10 +579,13 @@ static int WindowOpen( vlc_object_t *p_obj ) /* */ if( p_wnd->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_Get( p_obj->p_libvlc, "qt4-iface", &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; @@ -568,6 +614,11 @@ static int WindowOpen( vlc_object_t *p_obj ) p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); if( !p_wnd->handle.hwnd ) return VLC_EGENERIC; + +#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 ) + return VLC_EGENERIC; #else # error FIXME #endif