X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=24a3219fdf48d04adc55559a7f26ae1749069c47;hb=5f68da68a5534c31a09c43d284a9939e6c39f6ec;hp=a942350015abcbc85c9de000a9cdb921c32a46dc;hpb=384ef8909eece3b8621737a052fa522a3ba33f35;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index a942350015..24a3219fdf 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * qt4.cpp : QT4 interface **************************************************************************** - * Copyright © 2006-2008 the VideoLAN team + * Copyright © 2006-2009 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -27,30 +27,26 @@ #endif #include -#include -#include #include -#include -#include -#include #include "qt4.hpp" + #include "input_manager.hpp" /* THEMIM creation */ #include "dialogs_provider.hpp" /* THEDP creation */ #include "main_interface.hpp" /* MainInterface creation */ #include "dialogs/help.hpp" /* Launch Update */ #include "recents.hpp" /* Recents Item destruction */ -#include "util/qvlcapp.hpp" +#include "util/qvlcapp.hpp" /* QVLCApplication definition */ -#ifdef HAVE_X11_XLIB_H -#include +#ifdef Q_WS_X11 + #include #endif #include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32-christmas.xpm" #include -#ifdef WIN32 +#ifdef WIN32 /* For static builds */ #include Q_IMPORT_PLUGIN(qjpeg) Q_IMPORT_PLUGIN(qtaccessiblewidgets) @@ -59,9 +55,10 @@ /***************************************************************************** * Local prototypes. *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +static int OpenIntf ( vlc_object_t * ); static int OpenDialogs ( vlc_object_t * ); +static int Open ( vlc_object_t *, bool ); +static void Close ( vlc_object_t * ); static int WindowOpen ( vlc_object_t * ); static void WindowClose ( vlc_object_t * ); static void *Thread ( void * ); @@ -84,12 +81,16 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \ "your taskbar" ) +#define KEEPSIZE_TEXT N_( "Resize interface to the native video size" ) +#define KEEPSIZE_LONGTEXT N_( "You have two choices:\n" \ + " - The interface will resize to the native video size\n" \ + " - The video will fit to the interface size\n " \ + "By default, interface resize to the native video size." ) + #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." ) -#define FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" ) - #define NOTIFICATION_TEXT N_( "Show notification popup on track change" ) #define NOTIFICATION_LONGTEXT N_( \ "Show a notification popup with the artist and track name when " \ @@ -99,12 +100,19 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \ "in the dialogs." ) -#define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." ) +#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."\ " 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_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 " \ + "X11 with composite extensions." ) + + #define ERROR_TEXT N_( "Show unimportant error and warnings dialogs" ) #define UPDATER_TEXT N_( "Activate the updates availability notification" ) @@ -121,8 +129,6 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); #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 RECENTPLAY_TEXT N_( "Save the recently played items in the menu" ) @@ -144,155 +150,188 @@ 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 look" ) -#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" ) -#define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" ) +#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" ) + +#define FULLSCREEN_NUMBER_TEXT N_( "Define which screen fullscreen goes" ) +#define FULLSCREEN_NUMBER_LONGTEXT N_( "Screennumber of fullscreen, instead of" \ + "same screen where interface is" ) +#define QT_AUTOLOAD_EXTENSIONS_TEXT N_( "Load extensions on startup" ) +#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 }; + +/**********************************************************************/ vlc_module_begin () set_shortname( "Qt" ) set_description( N_("Qt interface") ) set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_MAIN ) set_capability( "interface", 151 ) - set_callbacks( Open, Close ) + 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 ); + QT_MODE_TEXT, QT_MODE_LONGTEXT, false ) + change_integer_list( i_mode_list, psz_mode_list_text, NULL ) add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT, - NOTIFICATION_LONGTEXT, false ); + NOTIFICATION_LONGTEXT, false ) add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT, - OPACITY_LONGTEXT, false ); - add_bool( "qt-blingbling", true, NULL, BLING_TEXT, BLING_TEXT, false ) + OPACITY_LONGTEXT, false ) + add_float_with_range( "qt-fs-opacity", 0.8, 0.1, 1., NULL, OPACITY_FS_TEXT, + OPACITY_FS_LONGTEXT, false ) add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT, - SYSTRAY_LONGTEXT, false); + SYSTRAY_LONGTEXT, false) add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT, - MINIMIZED_LONGTEXT, true); + MINIMIZED_LONGTEXT, true) + add_bool( "qt-video-autoresize", true, NULL, KEEPSIZE_TEXT, + KEEPSIZE_LONGTEXT, false ) add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT, - TITLE_LONGTEXT, false ); + TITLE_LONGTEXT, false ) add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT, - QT_FULLSCREEN_TEXT, false ); + QT_FULLSCREEN_TEXT, false ) add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT, - COMPLETEVOL_LONGTEXT, true ); + 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, true ); - change_autosave () - change_internal () + SAVEVOL_TEXT, true ) + add_bool( "qt-embedded-open", false, NULL, QT_NATIVEOPEN_TEXT, + QT_NATIVEOPEN_TEXT, false ) add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT, - RECENTPLAY_TEXT, false ); + RECENTPLAY_TEXT, false ) add_string( "qt-recentplay-filter", "", NULL, - RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false ); + RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false ) add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT, - ADVANCED_OPTIONS_LONGTEXT, true ); + ADVANCED_OPTIONS_LONGTEXT, true ) add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT, - ADVANCED_PREFS_LONGTEXT, false ); + ADVANCED_PREFS_LONGTEXT, false ) add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT, - ERROR_TEXT, false ); + ERROR_TEXT, false ) #ifdef UPDATE_CHECK add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT, - UPDATER_LONGTEXT, false ); + UPDATER_LONGTEXT, false ) add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT, - UPDATER_DAYS_TEXT, 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 ); + "255;255;255;20;210;20;255;199;15;245;39;29", + NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false ) add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT, - false ); + false ) change_internal () + add_integer( "qt-fullscreen-screennumber", -1, NULL, FULLSCREEN_NUMBER_TEXT, + FULLSCREEN_NUMBER_LONGTEXT, false ); + + add_bool( "qt-autoload-extensions", true, NULL, + QT_AUTOLOAD_EXTENSIONS_TEXT, QT_AUTOLOAD_EXTENSIONS_LONGTEXT, + false ) + + add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */ + add_submodule () set_description( "Dialogs provider" ) set_capability( "dialogs provider", 51 ) set_callbacks( OpenDialogs, Close ) +#if defined(Q_WS_X11) || defined(Q_WS_WIN) add_submodule () - set_capability( "vout_window", 50 ) +#if defined(Q_WS_X11) + set_capability( "vout window xid", 50 ) +#elif defined(Q_WS_WIN) + set_capability( "vout window hwnd", 50 ) +#endif set_callbacks( WindowOpen, WindowClose ) +#endif vlc_module_end () +/*****************************************/ + /* Ugly, but the Qt4 interface assumes single instance anyway */ -static struct -{ - QMutex lock; - QWaitCondition ready; -} iface; +static vlc_sem_t ready; +#ifdef Q_WS_X11 +static char *x11_display = NULL; +#endif /***************************************************************************** * Module callbacks *****************************************************************************/ -static int Open( vlc_object_t *p_this ) + +/* Open Interface */ +static int Open( vlc_object_t *p_this, bool isDialogProvider ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - intf_sys_t *p_sys; -#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 */ - Display *p_display = XOpenDisplay( NULL ); +#ifdef Q_WS_X11 + x11_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" ); return VLC_EGENERIC; } XCloseDisplay( p_display ); + putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" ); #endif - /* Allocations */ - p_sys = p_intf->p_sys = new intf_sys_t; - p_sys->b_isDialogProvider = false; - p_sys->p_popup_menu = NULL; /* ??? */ - p_sys->p_playlist = pl_Hold( p_intf ); + /* 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 ); + /* */ + vlc_sem_init (&ready, 0); if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) ) { - pl_Release (p_sys->p_playlist); delete p_sys; return VLC_ENOMEM; } /* */ - QMutexLocker locker (&iface.lock); - vlc_value_t val; + vlc_sem_wait (&ready); + vlc_sem_destroy (&ready); - while( p_sys->p_mi == NULL && !p_sys->b_isDialogProvider ) - iface.ready.wait( &iface.lock ); - 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); + 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); + } return VLC_SUCCESS; } -static int OpenDialogs( vlc_object_t *p_this ) +/* Open qt4 interface */ +static int OpenIntf( vlc_object_t *p_this ) { - intf_thread_t *p_intf = (intf_thread_t *)p_this; - p_intf->pf_show_dialog = ShowDialog; - - int val = Open( p_this ); - if( val ) - return val; + return Open( p_this, false ); +} - return VLC_SUCCESS; +/* Open Dialog Provider */ +static int OpenDialogs( vlc_object_t *p_this ) +{ + return Open( p_this, true ); } static void Close( vlc_object_t *p_this ) @@ -300,44 +339,44 @@ static void Close( vlc_object_t *p_this ) intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_sys_t *p_sys = p_intf->p_sys; - var_Destroy (p_this->p_libvlc, "qt4-iface"); - QApplication::quit(); + if( !p_sys->b_isDialogProvider ) + var_Destroy (p_this->p_libvlc, "qt4-iface"); + + QVLCApp::triggerQuit(); vlc_join (p_sys->thread, NULL); - pl_Release (p_this); delete p_sys; +#ifdef Q_WS_X11 + free (x11_display); +#endif } - - -static QMutex windowLock; -static QWaitCondition windowWait; - static void *Thread( void *obj ) { intf_thread_t *p_intf = (intf_thread_t *)obj; MainInterface *p_mi; - char dummy[] = ""; - char *argv[] = { dummy }; + char dummy[] = "vlc"; /* for WM_CLASS */ + char *argv[4] = { dummy, NULL, }; int argc = 1; Q_INIT_RESOURCE( vlc ); -#if !defined(WIN32) && !defined(__APPLE__) - /* KLUDGE: - * disables icon theme use because that makes Cleanlooks style bug - * because it asks gconf for some settings that timeout because of threads - * see commits 21610 21622 21654 for reference */ - - /* If you don't have a gconftool-2 binary, you should comment this line */ - if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */ - QApplication::setDesktopSettingsAware( false ); + /* Start the QApplication here */ +#ifdef Q_WS_X11 + if( x11_display != NULL ) + { + argv[argc++] = const_cast("-display"); + argv[argc++] = x11_display; + argv[argc] = NULL; + } #endif - /* Start the QApplication here */ - QVLCApp *app = new QVLCApp( argc, argv , true ); - p_intf->p_sys->p_app = app; + QVLCApp app( argc, argv ); + + p_intf->p_sys->p_app = &app; + + /* All the settings are in the .conf/.ini style */ p_intf->p_sys->mainSettings = new QSettings( #ifdef WIN32 QSettings::IniFormat, @@ -347,20 +386,24 @@ static void *Thread( void *obj ) QSettings::UserScope, "vlc", "vlc-qt-interface" ); /* Icon setting */ - if( QDate::currentDate().dayOfYear() >= 354 ) - app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) ); + if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */ + app.setWindowIcon( QIcon(vlc_christmas_xpm) ); else - app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); + app.setWindowIcon( QIcon(vlc_xpm) ); /* Initialize timers and the Dialog Provider */ DialogsProvider::getInstance( p_intf ); + /* Detect screensize for small screens like TV or EEEpc*/ + p_intf->p_sys->i_screenHeight = + app.QApplication::desktop()->availableGeometry().height(); + #ifdef UPDATE_CHECK /* Checking for VLC updates */ - if( config_GetInt( p_intf, "qt-updates-notif" ) && - !config_GetInt( p_intf, "qt-privacy-ask" ) ) + if( var_InheritBool( p_intf, "qt-updates-notif" ) && + !var_InheritBool( p_intf, "qt-privacy-ask" ) ) { - int interval = config_GetInt( p_intf, "qt-updates-days" ); + int interval = var_InheritInteger( p_intf, "qt-updates-days" ); if( QDate::currentDate() > getSettings()->value( "updatedate" ).toDate().addDays( interval ) ) { @@ -372,58 +415,32 @@ static void *Thread( void *obj ) #endif /* Create the normal interface in non-DP mode */ - if( !p_intf->pf_show_dialog ) + if( !p_intf->p_sys->b_isDialogProvider ) p_mi = new MainInterface( p_intf ); else p_mi = NULL; - /* */ - iface.lock.lock(); - p_intf->p_sys->p_mi = p_mi; - p_intf->p_sys->b_isDialogProvider = p_mi == NULL; - iface.ready.wakeAll(); - iface.lock.unlock(); - - /* Explain to the core how to show a dialog :D */ + /* Explain how to show a dialog :D */ p_intf->pf_show_dialog = ShowDialog; -#ifdef ENABLE_NLS - // Translation - get locale -# 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 -#if !defined( WIN32 ) - QString path = QString( QT4LOCALEDIR ); -#else - QString path = QString( QString(config_GetDataDir()) + DIR_SEP + - "locale" + DIR_SEP + "qt4" + DIR_SEP ); -#endif - // files depending on locale - 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 + /* */ + p_intf->p_sys->p_mi = p_mi; + vlc_sem_post (&ready); /* Last settings */ - app->setQuitOnLastWindowClosed( false ); + app.setQuitOnLastWindowClosed( false ); /* 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 ) ? config_GetHomeDir() - : psz_path; + p_intf->p_sys->filepath = + getSettings()->value( "filedialog-path", QVLCUserDir( VLC_HOME_DIR ) ).toString(); + + /* Loads and tries to apply the preferred QStyle */ + QString s_style = getSettings()->value( "MainWindow/QtStyle", "" ).toString(); + if( s_style.compare("") != 0 ) + QApplication::setStyle( s_style ); /* Launch */ - app->exec(); + app.exec(); /* And quit */ msg_Dbg( p_intf, "Quitting the Qt4 Interface" ); @@ -432,7 +449,7 @@ static void *Thread( void *obj ) if (p_mi != NULL) { - QMutexLocker locker (&iface.lock); + /* FIXME: are we sure that video window is already destroyed? */ msg_Dbg (p_intf, "destroying the main Qt4 interface"); p_intf->p_sys->p_mi = NULL; @@ -451,18 +468,20 @@ static void *Thread( void *obj ) /* Delete the recentsMRL object before the configuration */ RecentsMRL::killInstance(); + /* Save the path */ + getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath ); + /* 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 ); + /* Delete the application automatically */ +#ifdef Q_WS_X11 + free( x11_display ); +#endif return NULL; } @@ -474,61 +493,78 @@ static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg, { VLC_UNUSED( p_intf ); DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg ); - QApplication::postEvent( THEDP, static_cast(event) ); + QApplication::postEvent( THEDP, event ); } /** * Video output window provider + * + * TODO move it out of here ? */ -#include +#include -static int WindowControl (vout_window_t *, int, va_list); +static int WindowControl( vout_window_t *, int i_query, va_list ); -static int WindowOpen (vlc_object_t *obj) +static int WindowOpen( vlc_object_t *p_obj ) { - vout_window_t *wnd = (vout_window_t *)obj; - intf_thread_t *intf = NULL; - vlc_value_t val; + vout_window_t *p_wnd = (vout_window_t*)p_obj; - if (config_GetInt (obj, "embedded-video") <= 0) + /* */ + if( p_wnd->cfg->is_standalone ) return VLC_EGENERIC; - QMutexLocker (&iface.lock); - if (var_Get (obj->p_libvlc, "qt4-iface", &val) == 0) - intf = (intf_thread_t *)val.p_address; - if (intf == NULL) + vlc_value_t val; + + if( var_Get( p_obj->p_libvlc, "qt4-iface", &val ) ) + val.p_address = NULL; + + intf_thread_t *p_intf = (intf_thread_t *)val.p_address; + + if( !p_intf ) { /* If another interface is used, this plugin cannot work */ - msg_Dbg (obj, "Qt4 interface not found"); + msg_Dbg( p_obj, "Qt4 interface not found" ); return VLC_EGENERIC; } - MainInterface *p_mi = intf->p_sys->p_mi; - msg_Dbg (obj, "requesting video..."); + MainInterface *p_mi = p_intf->p_sys->p_mi; + msg_Dbg( p_obj, "requesting video..." ); + + int i_x = p_wnd->cfg->x; + int i_y = p_wnd->cfg->y; + unsigned i_width = p_wnd->cfg->width; + unsigned i_height = p_wnd->cfg->height; - wnd->handle = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y, - &wnd->width, &wnd->height); - if (!wnd->handle) +#if defined (Q_WS_X11) + p_wnd->handle.xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); + if( !p_wnd->handle.xid ) return VLC_EGENERIC; + p_wnd->display.x11 = x11_display; - wnd->control = WindowControl; - wnd->p_private = p_mi; +#elif defined (Q_WS_WIN) + p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); + if( !p_wnd->handle.hwnd ) + return VLC_EGENERIC; +#else +# error FIXME +#endif + + p_wnd->control = WindowControl; + p_wnd->sys = (vout_window_sys_t*)p_mi; return VLC_SUCCESS; } -static int WindowControl (vout_window_t *wnd, int query, va_list args) +static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args ) { - MainInterface *p_mi = (MainInterface *)wnd->p_private; - QMutexLocker locker (&iface.lock); - - return p_mi->controlVideo (wnd->handle, query, args); + MainInterface *p_mi = (MainInterface *)p_wnd->sys; + return p_mi->controlVideo( i_query, args ); } -static void WindowClose (vlc_object_t *obj) +static void WindowClose( vlc_object_t *p_obj ) { - vout_window_t *wnd = (vout_window_t *)obj; - MainInterface *p_mi = (MainInterface *)wnd->p_private; - QMutexLocker locker (&iface.lock); + vout_window_t *p_wnd = (vout_window_t*)p_obj; + MainInterface *p_mi = (MainInterface *)p_wnd->sys; - msg_Dbg (obj, "releasing video..."); - p_mi->releaseVideo (); + msg_Dbg( p_obj, "releasing video..." ); + p_mi->releaseVideo(); } +