X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmain_interface.cpp;h=68a297181e348c539e549448598228b4730c4842;hb=2795385d8edbee335d6abbb8fa05088c2dc7e846;hp=c4920c0cb901ad4b95838445ce58654c84cb4255;hpb=7149e064c3172d1e0c5b45bfb36807003f1f00f7;p=vlc diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index c4920c0cb9..8199129f43 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -1,10 +1,12 @@ /***************************************************************************** * main_interface.cpp : Main interface **************************************************************************** - * Copyright (C) 2006 the VideoLAN team + * Copyright (C) 2006-2007 the VideoLAN team * $Id$ * * Authors: Clément Stenac + * Jean-Baptiste Kempf + * Ilkka Ollakka * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,16 +20,22 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "qt4.hpp" #include "main_interface.hpp" #include "input_manager.hpp" -#include "util/input_slider.hpp" #include "util/qvlcframe.hpp" #include "util/customwidgets.hpp" #include "dialogs_provider.hpp" #include "components/interface_widgets.hpp" +#include "components/playlist/playlist.hpp" +#include "dialogs/extended.hpp" #include "dialogs/playlist.hpp" #include "menus.hpp" @@ -37,232 +45,538 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#if 0 +#include +#endif +#include +#include +#include +#include #include #include #include -#ifdef WIN32 - #define PREF_W 410 - #define PREF_H 121 -#else - #define PREF_W 450 - #define PREF_H 125 -#endif - -#define VISIBLE(i) (i && i->isVisible()) - #define SET_WIDTH(i,j) i->widgetSize.setWidth(j) #define SET_HEIGHT(i,j) i->widgetSize.setHeight(j) #define SET_WH( i,j,k) i->widgetSize.setWidth(j); i->widgetSize.setHeight(k); #define DS(i) i.width(),i.height() +/* Callback prototypes */ +static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ); +static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ); static int InteractCallback( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void *); -/* Video handling */ -static void *DoRequest( intf_thread_t *p_intf, vout_thread_t *p_vout, - int *pi1, int *pi2, unsigned int*pi3,unsigned int*pi4) -{ - return p_intf->p_sys->p_mi->requestVideo( p_vout, pi1, pi2, pi3, pi4 ); -} -static void DoRelease( intf_thread_t *p_intf, void *p_win ) -{ - return p_intf->p_sys->p_mi->releaseVideo( p_win ); -} -static int DoControl( intf_thread_t *p_intf, void *p_win, int i_q, va_list a ) -{ - return p_intf->p_sys->p_mi->controlVideo( p_win, i_q, a ); -} MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) { - /* Configuration */ - settings = new QSettings( "VideoLAN", "VLC" ); - settings->beginGroup( "MainWindow" ); + /* Variables initialisation */ + // need_components_update = false; + bgWidget = NULL; + videoWidget = NULL; + playlistWidget = NULL; + sysTray = NULL; + videoIsActive = false; + playlistVisible = false; + input_name = ""; + + /* Ask for privacy */ + askForPrivacy(); + + /** + * Configuration and settings + * Pre-building of interface + **/ + /* Main settings */ + setFocusPolicy( Qt::StrongFocus ); + setAcceptDrops( true ); + setWindowIcon( QApplication::windowIcon() ); + setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) ); - need_components_update = false; - bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL; - embeddedPlaylistWasActive = videoIsActive = false; + /* Set The Video In emebedded Mode or not */ + videoEmbeddedFlag = config_GetInt( p_intf, "embedded-video" ); - videoEmbeddedFlag = false; - if( config_GetInt( p_intf, "embedded-video" ) ) videoEmbeddedFlag = true; + /* Are we in the enhanced always-video mode or not ? */ + i_visualmode = config_GetInt( p_intf, "qt-display-mode" ); - alwaysVideoFlag = false; - if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" )) - alwaysVideoFlag = true; + /* Set the other interface settings */ + settings = new QSettings( "vlc", "vlc-qt-interface" ); + settings->beginGroup( "MainWindow" ); - playlistEmbeddedFlag = settings->value("playlist-embedded", true).toBool(); - advControlsEnabled= settings->value( "adv-controls", false ).toBool(); - visualSelectorEnabled= settings->value( "visual-selector", false ).toBool(); + //TODO: I don't like that code + visualSelectorEnabled = settings->value( "visual-selector", false ).toBool(); + notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" ); - /* UI */ - setWindowTitle( qtr( "VLC media player" ) ); + /************************** + * UI and Widgets design + **************************/ + setVLCWindowsTitle(); handleMainUi( settings ); - QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag, - advControlsEnabled, visualSelectorEnabled ); - timeLabel = new QLabel( 0 ); - nameLabel = new QLabel( 0 ); - statusBar()->addWidget( nameLabel, 4 ); - statusBar()->addPermanentWidget( timeLabel, 1 ); - setFocusPolicy( Qt::StrongFocus ); - setAcceptDrops(true); +#if 0 + /* Create a Dock to get the playlist */ + dockPL = new QDockWidget( qtr( "Playlist" ), this ); + dockPL->setSizePolicy( QSizePolicy::Preferred, + QSizePolicy::Expanding ); + dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures ); + dockPL->setAllowedAreas( Qt::LeftDockWidgetArea + | Qt::RightDockWidgetArea + | Qt::BottomDockWidgetArea ); + dockPL->hide(); +#endif + + /************ + * Menu Bar + ************/ + QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled ); + + /* StatusBar Creation */ + createStatusBar(); - /* Init input manager */ + + /******************** + * Input Manager * + ********************/ MainInputManager::getInstance( p_intf ); - ON_TIMEOUT( updateOnTimer() ); - /* Volume control */ - CONNECT( ui.volumeSlider, valueChanged(int), this, updateVolume(int) ); + /************************** + * Various CONNECTs on IM * + **************************/ /* Connect the input manager to the GUI elements it manages */ + + /* It is also connected to the control->slider, see the ControlsWidget */ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ), - slider, setPosition( float,int, int ) ); - CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ), - this, setDisplay( float, int, int ) ); - CONNECT( THEMIM->getIM(), nameChanged( QString ), this,setName( QString ) ); + this, setDisplayPosition( float, int, int ) ); + /* Change the SpeedRate in the Status */ + CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) ); + + /** + * Connects on nameChanged() + * Those connects are not merged because different options can trigger + * them down. + */ + /* Naming in the controller statusbar */ + CONNECT( THEMIM->getIM(), nameChanged( QString ), this, + setName( QString ) ); + /* and in the systray */ + if( sysTray ) + { + CONNECT( THEMIM->getIM(), nameChanged( QString ), this, + updateSystrayTooltipName( QString ) ); + } + /* and in the title of the controller */ + if( config_GetInt( p_intf, "qt-name-in-title" ) ) + { + CONNECT( THEMIM->getIM(), nameChanged( QString ), this, + setVLCWindowsTitle( QString ) ); + } + + /** + * CONNECTS on PLAY_STATUS + **/ + /* Status on the main controller */ CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) ); - CONNECT( THEMIM->getIM(), navigationChanged( int ), this, setNavigation(int) ); - CONNECT( slider, sliderDragged( float ), - THEMIM->getIM(), sliderUpdate( float ) ); + /* and in the systray */ + if( sysTray ) + { + CONNECT( THEMIM->getIM(), statusChanged( int ), this, + updateSystrayTooltipStatus( int ) ); + } - CONNECT( ui.prevSectionButton, clicked(), THEMIM->getIM(), - sectionPrev() ); - CONNECT( ui.nextSectionButton, clicked(), THEMIM->getIM(), - sectionNext() ); - CONNECT( ui.menuButton, clicked(), THEMIM->getIM(), - sectionMenu() ); + /* END CONNECTS ON IM */ + + /** OnTimeOut **/ + /* TODO Remove this function, but so far, there is no choice because there + is no intf-should-die variable */ + ON_TIMEOUT( updateOnTimer() ); + //ON_TIMEOUT( debug() ); + + /** + * Callbacks + **/ var_Create( p_intf, "interaction", VLC_VAR_ADDRESS ); var_AddCallback( p_intf, "interaction", InteractCallback, this ); - p_intf->b_interaction = VLC_TRUE; + p_intf->b_interaction = true; + + var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf ); + + /* Register callback for the intf-popupmenu variable */ + var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); + + /* VideoWidget connect mess to avoid different threads speaking to each other */ + CONNECT( this, askReleaseVideo( void * ), + this, releaseVideoSlot( void * ) ); + if( videoWidget ) + CONNECT( this, askVideoToResize( unsigned int, unsigned int ), + videoWidget, SetSizing( unsigned int, unsigned int ) ); + + CONNECT( this, askUpdate(), this, doComponentsUpdate() ); + + CONNECT( controls, advancedControlsToggled( bool ), + this, doComponentsUpdate() ); + + CONNECT( fullscreenControls, advancedControlsToggled( bool ), + this, doComponentsUpdate() ); + + /* Size and placement of interface */ + QVLCTools::restoreWidgetPosition(settings,this,QSize(350,60)); + + + /* Playlist */ + if( settings->value( "playlist-visible", 0 ).toInt() ) togglePlaylist(); + settings->endGroup(); + + show(); + + if( i_visualmode == QT_MINIMAL_MODE ) + toggleMinimalView(); + + /* Update the geometry TODO: is it useful ?*/ + updateGeometry(); + + /***************************************************** + * End everything by creating the Systray Management * + *****************************************************/ + initSystray(); } MainInterface::~MainInterface() { - settings->setValue( "playlist-embedded", playlistEmbeddedFlag ); - settings->setValue( "adv-controls", advControlsEnabled ); - settings->setValue( "pos", pos() ); + msg_Dbg( p_intf, "Destroying the main interface" ); + + if( playlistWidget ) + playlistWidget->savingSettings( settings ); + + settings->beginGroup( "MainWindow" ); + + // settings->setValue( "playlist-floats", (int)(dockPL->isFloating()) ); + settings->setValue( "playlist-visible", (int)playlistVisible ); + settings->setValue( "adv-controls", + getControlsVisibilityStatus() & CONTROLS_ADVANCED ); + + if( !videoIsActive ) + QVLCTools::saveWidgetPosition(settings, this); + + if( bgWidget ) + settings->setValue( "backgroundSize", bgWidget->size() ); + settings->endGroup(); delete settings; - p_intf->b_interaction = VLC_FALSE; + + var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf ); + + /* Unregister callback for the intf-popupmenu variable */ + var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); + + p_intf->b_interaction = false; var_DelCallback( p_intf, "interaction", InteractCallback, this ); - p_intf->pf_request_window = NULL; - p_intf->pf_release_window = NULL; - p_intf->pf_control_window = NULL; + p_intf->p_sys->p_mi = NULL; +} + +/***************************** + * Main UI handling * + *****************************/ + +inline void MainInterface::createStatusBar() +{ + /**************** + * Status Bar * + ****************/ + /* Widgets Creation*/ + b_remainingTime = false; + timeLabel = new TimeLabel; + timeLabel->setText( " --:--/--:-- " ); + timeLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + nameLabel = new QLabel; + nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse + | Qt::TextSelectableByKeyboard ); + speedLabel = new SpeedLabel( p_intf, "1.00x" ); + speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu ); + + /* Styling those labels */ + timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); + speedLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); + nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel); + + pgBar = new QProgressBar; + pgBar->hide(); + + /* and adding those */ + statusBar()->addWidget( nameLabel, 8 ); + statusBar()->addPermanentWidget( speedLabel, 0 ); + statusBar()->addPermanentWidget( pgBar, 0 ); + statusBar()->addPermanentWidget( timeLabel, 0 ); + + /* timeLabel behaviour: + - double clicking opens the goto time dialog + - right-clicking and clicking just toggle between remaining and + elapsed time.*/ + CONNECT( timeLabel, timeLabelClicked(), this, toggleTimeDisplay() ); + CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() ); + CONNECT( timeLabel, timeLabelDoubleClicked(), this, toggleTimeDisplay() ); + + /* Speed Label behaviour: + - right click gives the vertical speed slider */ + CONNECT( speedLabel, customContextMenuRequested( QPoint ), + this, showSpeedMenu( QPoint ) ); +} + +inline void MainInterface::initSystray() +{ + bool b_createSystray = false; + bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable(); + if( config_GetInt( p_intf, "qt-start-minimized") ) + { + if( b_systrayAvailable ) + { + b_createSystray = true; + hide(); + } + else msg_Err( p_intf, "You can't minimize if you haven't a system " + "tray bar" ); + } + if( config_GetInt( p_intf, "qt-system-tray") ) + b_createSystray = true; + + if( b_systrayAvailable && b_createSystray ) + createSystray(); +} + +/** + * Give the decorations of the Main Window a correct Name. + * If nothing is given, set it to VLC... + **/ +void MainInterface::setVLCWindowsTitle( QString aTitle ) +{ + if( aTitle.isEmpty() ) + { + setWindowTitle( qtr( "VLC media player" ) ); + } + else + { + setWindowTitle( aTitle + " - " + qtr( "VLC media player" ) ); + } } void MainInterface::handleMainUi( QSettings *settings ) { - QWidget *main = new QWidget( this ); + /* Create the main Widget and the mainLayout */ + QWidget *main = new QWidget; setCentralWidget( main ); - ui.setupUi( centralWidget() ); - - slider = new InputSlider( Qt::Horizontal, NULL ); - ui.vboxLayout->insertWidget( 0, slider ); - ui.discFrame->hide(); - BUTTON_SET_IMG( ui.prevSectionButton, "", previous.png, "" ); - BUTTON_SET_IMG( ui.nextSectionButton, "", next.png, "" ); - BUTTON_SET_IMG( ui.menuButton, "", previous.png, "" ); - - BUTTON_SET_ACT_I( ui.prevButton, "" , previous.png, - qtr("Previous"), prev() ); - BUTTON_SET_ACT_I( ui.nextButton, "", next.png, qtr("Next"), next() ); - BUTTON_SET_ACT_I( ui.playButton, "", play.png, qtr("Play"), play() ); - BUTTON_SET_ACT_I( ui.stopButton, "", stop.png, qtr("Stop"), stop() ); - - /* Volume */ - ui.volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) ); - ui.volumeSlider->setMaximum( 100 ); - ui.volMuteLabel->setToolTip( qtr( "Mute" ) ); - VolumeClickHandler *h = new VolumeClickHandler( p_intf, this ); - ui.volMuteLabel->installEventFilter(h); - ui.volumeSlider->setFocusPolicy( Qt::NoFocus ); - - BUTTON_SET_IMG( ui.playlistButton, "" , playlist_icon.png, - playlistEmbeddedFlag ? qtr( "Show playlist" ) : - qtr( "Open playlist" ) ); - BUTTONACT( ui.playlistButton, playlist() ); - - /* Set initial size */ - resize ( PREF_W, PREF_H ); - - addSize = QSize( ui.vboxLayout->margin() * 2, PREF_H ); - - advControls = new ControlsWidget( p_intf ); - ui.vboxLayout->insertWidget( 0, advControls ); - advControls->updateGeometry(); - if( !advControlsEnabled ) advControls->hide(); - need_components_update = true; - + mainLayout = new QVBoxLayout( main ); + + /* Margins, spacing */ + main->setContentsMargins( 0, 0, 0, 0 ); + main->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ); + mainLayout->setSpacing( 0 ); + mainLayout->setMargin( 0 ); + + /* Create the CONTROLS Widget */ + bool b_shiny = config_GetInt( p_intf, "qt-blingbling" ); + controls = new ControlsWidget( p_intf, this, + settings->value( "adv-controls", false ).toBool(), + b_shiny ); + + /* Create the FULLSCREEN CONTROLS Widget */ + /* bool b_shiny = config_GetInt( p_intf, "qt-blingbling" ); */ + fullscreenControls = new FullscreenControllerWidget( p_intf, this, + settings->value( "adv-controls", false ).toBool(), + b_shiny ); + + /* Add the controls Widget to the main Widget */ + mainLayout->insertWidget( 0, controls, 0, Qt::AlignBottom ); + + /* Create the Speed Control Widget */ + speedControl = new SpeedControlWidget( p_intf ); + speedControlMenu = new QMenu( this ); + + QWidgetAction *widgetAction = new QWidgetAction( speedControl ); + widgetAction->setDefaultWidget( speedControl ); + speedControlMenu->addAction( widgetAction ); + + /* Visualisation */ + /* Disabled for now, they SUCK */ + #if 0 visualSelector = new VisualSelector( p_intf ); - ui.vboxLayout->insertWidget( 0, visualSelector ); + mainLayout->insertWidget( 0, visualSelector ); visualSelector->hide(); + #endif - if( alwaysVideoFlag ) + /* And video Outputs */ + if( i_visualmode == QT_ALWAYS_VIDEO_MODE || + i_visualmode == QT_MINIMAL_MODE ) { bgWidget = new BackgroundWidget( p_intf ); - bgWidget->widgetSize = settings->value( "backgroundSize", - QSize( 200, 200 ) ).toSize(); - bgWidget->resize( bgWidget->widgetSize ); + bgWidget->resize( + settings->value( "backgroundSize", QSize( 300, 150 ) ).toSize() ); bgWidget->updateGeometry(); - ui.vboxLayout->insertWidget( 0, bgWidget ); + mainLayout->insertWidget( 0, bgWidget ); + CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() ); } if( videoEmbeddedFlag ) { videoWidget = new VideoWidget( p_intf ); - videoWidget->widgetSize = QSize( 1, 1 ); - videoWidget->resize( videoWidget->widgetSize ); - ui.vboxLayout->insertWidget( 0, videoWidget ); + mainLayout->insertWidget( 0, videoWidget, 10 ); + } - p_intf->pf_request_window = ::DoRequest; - p_intf->pf_release_window = ::DoRelease; - p_intf->pf_control_window = ::DoControl; + /* Finish the sizing */ + main->updateGeometry(); +} + +inline void MainInterface::askForPrivacy() +{ + /** + * Ask for the network policy on FIRST STARTUP + **/ + if( config_GetInt( p_intf, "qt-privacy-ask") ) + { + QList controls; + if( privacyDialog( controls ) == QDialog::Accepted ) + { + QList::Iterator i; + for( i = controls.begin() ; i != controls.end() ; i++ ) + { + ConfigControl *c = qobject_cast(*i); + c->doApply( p_intf ); + } + + config_PutInt( p_intf, "qt-privacy-ask" , 0 ); + /* We have to save here because the user may not launch Prefs */ + config_SaveConfigFile( p_intf, NULL ); + } } - setMinimumSize( PREF_W, addSize.height() ); } +int MainInterface::privacyDialog( QList controls ) +{ + QDialog *privacy = new QDialog(); + + privacy->setWindowTitle( qtr( "Privacy and Network Policies" ) ); + + QGridLayout *gLayout = new QGridLayout( privacy ); + + QGroupBox *blabla = new QGroupBox( qtr( "Privacy and Network Warning" ) ); + QGridLayout *blablaLayout = new QGridLayout( blabla ); + QLabel *text = new QLabel( qtr( + "

The VideoLAN Team doesn't like when an application goes " + "online without authorization.

\n " + "

VLC media player can request limited information on " + "the Internet, especially to get CD covers or to know " + "if updates are available.

\n" + "

VLC media player DOES NOT send or collect ANY " + "information, even anonymously, about your usage.

\n" + "

Therefore please check the following options, the default being " + "almost no access on the web.

\n") ); + text->setWordWrap( true ); + text->setTextFormat( Qt::RichText ); + + blablaLayout->addWidget( text, 0, 0 ) ; + + QGroupBox *options = new QGroupBox; + QGridLayout *optionsLayout = new QGridLayout( options ); + + gLayout->addWidget( blabla, 0, 0, 1, 3 ); + gLayout->addWidget( options, 1, 0, 1, 3 ); + module_config_t *p_config; + ConfigControl *control; + int line = 0; + +#define CONFIG_GENERIC( option, type ) \ + p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \ + if( p_config ) \ + { \ + control = new type ## ConfigControl( VLC_OBJECT(p_intf), \ + p_config, options, false, optionsLayout, line ); \ + controls.append( control ); \ + } + +#define CONFIG_GENERIC_NOBOOL( option, type ) \ + p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \ + if( p_config ) \ + { \ + control = new type ## ConfigControl( VLC_OBJECT(p_intf), \ + p_config, options, optionsLayout, line ); \ + controls.append( control ); \ + } + + CONFIG_GENERIC( "album-art", IntegerList ); line++; +#ifdef UPDATE_CHECK + CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++; + CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++; +#endif + + QPushButton *ok = new QPushButton( qtr( "OK" ) ); + + gLayout->addWidget( ok, 2, 2 ); + + CONNECT( ok, clicked(), privacy, accept() ); + return privacy->exec(); +} + + /********************************************************************** - * Handling of the components + * Handling of sizing of the components **********************************************************************/ -void MainInterface::calculateInterfaceSize() + +/* This function is probably wrong, but we don't have many many choices... + Since we can't know from the playlist Widget if we are inside a dock or not, + because the playlist Widget can be called by THEDP, as a separate windows for + the skins. + Maybe the other solution is to redefine the sizeHint() of the playlist and + ask _parent->isFloating()... + If you think this would be better, please FIXME it... +*/ +#if 0 +QSize MainInterface::sizeHint() const { - int width = 0, height = 0; + int nwidth = controls->sizeHint().width(); + int nheight = controls->isVisible() ? + controls->size().height() + + menuBar()->size().height() + + statusBar()->size().height() + : 0 ; + + msg_Dbg( p_intf, "1 %i %i", nheight, nwidth ); if( VISIBLE( bgWidget ) ) { - width = bgWidget->widgetSize.width(); - height = bgWidget->widgetSize.height(); - assert( !(playlistWidget && playlistWidget->isVisible() ) ); - } - else if( VISIBLE( playlistWidget ) ) - { - width = playlistWidget->widgetSize.width(); - height = playlistWidget->widgetSize.height(); + nheight += bgWidget->size().height(); + nwidth = bgWidget->size().width(); + msg_Dbg( p_intf, "1b %i %i", nheight, nwidth ); } else if( videoIsActive ) { - width = videoWidget->widgetSize.width() ; - height = videoWidget->widgetSize.height(); - } - else - { - width = PREF_W - addSize.width(); - height = PREF_H - addSize.height(); + nheight += videoWidget->size().height(); + nwidth = videoWidget->size().width(); + msg_Dbg( p_intf, "2 %i %i", nheight, nwidth ); } - if( VISIBLE( visualSelector ) ) - height += visualSelector->height(); - if( VISIBLE( advControls) ) +/* if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() ) { - height += advControls->sizeHint().height(); - } - mainSize = QSize( width + addSize.width(), height + addSize.height() ); + nheight += dockPL->size().height(); + nwidth = __MAX( nwidth, dockPL->size().width() ); + msg_Dbg( p_intf, "3 %i %i", nheight, nwidth ); + }*/ + msg_Dbg( p_intf, "4 %i %i", nheight, nwidth ); + return QSize( nwidth, nheight ); } - +#endif +#if 0 +/* FIXME This is dead code and need to be removed AT THE END */ void MainInterface::resizeEvent( QResizeEvent *e ) { - videoWidget->widgetSize.setWidth( e->size().width() - addSize.width() ); + if( videoWidget ) + videoWidget->widgetSize.setWidth( e->size().width() - addSize.width() ); if( videoWidget && videoIsActive && videoWidget->widgetSize.height() > 1 ) { SET_WH( videoWidget, e->size().width() - addSize.width(), @@ -271,31 +585,83 @@ void MainInterface::resizeEvent( QResizeEvent *e ) } if( VISIBLE( playlistWidget ) ) { - SET_WH( playlistWidget , e->size().width() - addSize.width(), - e->size().height() - addSize.height() ); +// SET_WH( playlistWidget , e->size().width() - addSize.width(), + // e->size().height() - addSize.height() ); playlistWidget->updateGeometry(); } } +#endif + +void MainInterface::requestLayoutUpdate() +{ + emit askUpdate(); +} + +//FIXME remove me at the end... +void MainInterface::debug() +{ + msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() ); + msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() ); + if( videoWidget && videoWidget->isVisible() ) + { +// sleep( 10 ); + msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() ); + msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() ); + } + adjustSize(); +} + +/**************************************************************************** + * Small right-click menu for rate control + ****************************************************************************/ +void MainInterface::showSpeedMenu( QPoint pos ) +{ + speedControlMenu->exec( QCursor::pos() - pos + + QPoint( 0, speedLabel->height() ) ); +} +/**************************************************************************** + * Video Handling + ****************************************************************************/ +class SetVideoOnTopQtEvent : public QEvent +{ +public: + SetVideoOnTopQtEvent( bool _onTop ) : + QEvent( (QEvent::Type)SetVideoOnTopEvent_Type ), onTop( _onTop) + {} + + bool OnTop() const + { + return onTop; + } + +private: + bool onTop; +}; + +/** + * README + * README + * Thou shall not call/resize/hide widgets from on another thread. + * This is wrong, and this is TEH reason to emit signals on those Video Functions + **/ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, int *pi_y, unsigned int *pi_width, unsigned int *pi_height ) { + bool bgWasVisible = false; + + /* Request the videoWidget */ void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height ); - if( ret ) + if( ret ) /* The videoWidget is available */ { - videoIsActive = true; - if( VISIBLE( playlistWidget ) ) - { - embeddedPlaylistWasActive = true; -// playlistWidget->hide(); - } - bool bgWasVisible = false; + /* Did we have a bg ? Hide it! */ if( VISIBLE( bgWidget) ) { bgWasVisible = true; -// bgWidget->hide(); + emit askBgWidgetToToggle(); } +#if 0 if( THEMIM->getIM()->hasVideo() || !bgWasVisible ) { videoWidget->widgetSize = QSize( *pi_width, *pi_height ); @@ -307,74 +673,160 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, // videoWidget->widgetSize = bgWidget->widgeTSize; videoWidget->widgetSize = QSize( *pi_width, *pi_height ); } -// videoWidget->updateGeometry(); /// FIXME: Needed ? - need_components_update = true; +#endif + videoIsActive = true; + +// emit askVideoToResize( *pi_width, *pi_height ); + emit askUpdate(); + + fullscreenControls->attachVout( p_nvout ); } return ret; } -void MainInterface::releaseVideo( void *p_win ) +void MainInterface::releaseVideo( vout_thread_t *p_vout, void *p_win ) +{ + fullscreenControls->detachVout( p_vout ); + emit askReleaseVideo( p_win ); +} + +void MainInterface::releaseVideoSlot( void *p_win ) { videoWidget->release( p_win ); - videoWidget->widgetSize = QSize( 0, 0 ); - videoWidget->resize( videoWidget->widgetSize ); + videoWidget->hide(); - if( embeddedPlaylistWasActive ) - ;//playlistWidget->show(); - else if( bgWidget ) - ;//bgWidget->show(); + if( bgWidget )// WRONG + bgWidget->show(); + adjustSize(); videoIsActive = false; - need_components_update = true; } int MainInterface::controlVideo( void *p_window, int i_query, va_list args ) { - int i_ret = VLC_EGENERIC; + int i_ret = VLC_SUCCESS; switch( i_query ) { case VOUT_GET_SIZE: { unsigned int *pi_width = va_arg( args, unsigned int * ); unsigned int *pi_height = va_arg( args, unsigned int * ); - *pi_width = videoWidget->widgetSize.width(); - *pi_height = videoWidget->widgetSize.height(); - i_ret = VLC_SUCCESS; + *pi_width = videoWidget->videoSize.width(); + *pi_height = videoWidget->videoSize.height(); break; } case VOUT_SET_SIZE: { unsigned int i_width = va_arg( args, unsigned int ); unsigned int i_height = va_arg( args, unsigned int ); - videoWidget->widgetSize = QSize( i_width, i_height ); - // videoWidget->updateGeometry(); - need_components_update = true; - i_ret = VLC_SUCCESS; + emit askVideoToResize( i_width, i_height ); + emit askUpdate(); break; } case VOUT_SET_STAY_ON_TOP: + { + int i_arg = va_arg( args, int ); + QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) ); + break; + } default: + i_ret = VLC_EGENERIC; msg_Warn( p_intf, "unsupported control query" ); break; } return i_ret; } -void MainInterface::advanced() +/***************************************************************************** + * Playlist, Visualisation and Menus handling + *****************************************************************************/ +/** + * Toggle the playlist widget or dialog + **/ +void MainInterface::togglePlaylist() { - if( !VISIBLE( advControls ) ) + THEDP->playlistDialog(); +#if 0 + /* CREATION + If no playlist exist, then create one and attach it to the DockPL*/ + if( !playlistWidget ) { - advControls->show(); - advControlsEnabled = true; + playlistWidget = new PlaylistWidget( p_intf, settings, dockPL ); + + /* Add it to the parent DockWidget */ + dockPL->setWidget( playlistWidget ); + + /* Add the dock to the main Interface */ + addDockWidget( Qt::BottomDockWidgetArea, dockPL ); + + /* Make the playlist floating is requested. Default is not. */ + settings->beginGroup( "MainWindow" ); + if( settings->value( "playlist-floats", 1 ).toInt() ) + { + msg_Dbg( p_intf, "we don't want the playlist inside"); + dockPL->setFloating( true ); + } + settings->endGroup(); + settings->beginGroup( "playlist" ); + dockPL->move( settings->value( "pos", QPoint( 0,0 ) ).toPoint() ); + QSize newSize = settings->value( "size", QSize( 400, 300 ) ).toSize(); + if( newSize.isValid() ) + dockPL->resize( newSize ); + settings->endGroup(); + + dockPL->show(); + playlistVisible = true; } else { - advControls->hide(); - advControlsEnabled = false; + /* toggle the visibility of the playlist */ + TOGGLEV( dockPL ); + resize( sizeHint() ); + playlistVisible = !playlistVisible; } + #endif +} + +/* Function called from the menu to undock the playlist */ +void MainInterface::undockPlaylist() +{ +// dockPL->setFloating( true ); + adjustSize(); +} + +void MainInterface::toggleMinimalView() +{ + /* HACK for minimalView, see menus.cpp */ + if( !menuBar()->isVisible() ) QVLCMenu::minimalViewAction->toggle(); + TOGGLEV( menuBar() ); + TOGGLEV( controls ); + TOGGLEV( statusBar() ); doComponentsUpdate(); } +/* Video widget cannot do this synchronously as it runs in another thread */ +/* Well, could it, actually ? Probably dangerous ... */ +void MainInterface::doComponentsUpdate() +{ + msg_Dbg( p_intf, "Updating the geometry" ); +// resize( sizeHint() ); + debug(); +} + +/* toggling advanced controls buttons */ +void MainInterface::toggleAdvanced() +{ + controls->toggleAdvanced(); +} + +/* Get the visibility status of the controls (hidden or not, advanced or not) */ +int MainInterface::getControlsVisibilityStatus() +{ + return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN ) + + CONTROLS_ADVANCED * controls->b_advancedVisible ); +} + +#if 0 void MainInterface::visual() { if( !VISIBLE( visualSelector) ) @@ -394,104 +846,217 @@ void MainInterface::visual() } doComponentsUpdate(); } +#endif -void MainInterface::playlist() +/************************************************************************ + * Other stuff + ************************************************************************/ +void MainInterface::setDisplayPosition( float pos, int time, int length ) { - // Toggle the playlist dialog - if( !playlistEmbeddedFlag ) + char psz_length[MSTRTIME_MAX_SIZE], psz_time[MSTRTIME_MAX_SIZE]; + secstotimestr( psz_length, length ); + secstotimestr( psz_time, ( b_remainingTime && length ) ? length - time + : time ); + + QString timestr; + timestr.sprintf( "%s/%s", psz_time, + ( !length && time ) ? "--:--" : psz_length ); + + /* Add a minus to remaining time*/ + if( b_remainingTime && length ) timeLabel->setText( " -"+timestr+" " ); + else timeLabel->setText( " "+timestr+" " ); +} + +void MainInterface::toggleTimeDisplay() +{ + b_remainingTime = !b_remainingTime; +} + +void MainInterface::setName( QString name ) +{ + input_name = name; /* store it for the QSystray use */ + /* Display it in the status bar, but also as a Tooltip in case it doesn't + fit in the label */ + nameLabel->setText( " " + name + " " ); + nameLabel->setToolTip( " " + name +" " ); +} + +void MainInterface::setStatus( int status ) +{ + msg_Dbg( p_intf, "I was here, updating your status" ); + /* Forward the status to the controls to toggle Play/Pause */ + controls->setStatus( status ); + fullscreenControls->setStatus( status ); + + controls->updateInput(); + fullscreenControls->updateInput(); + speedControl->setEnable( THEMIM->getIM()->hasInput() ); + + /* And in the systray for the menu */ + if( sysTray ) + QVLCMenu::updateSystrayMenu( this, p_intf ); +} + +void MainInterface::setRate( int rate ) +{ + QString str; + str.setNum( ( 1000 / (double)rate ), 'f', 2 ); + str.append( "x" ); + speedLabel->setText( str ); + speedLabel->setToolTip( str ); + speedControl->updateControls( rate ); +} + +void MainInterface::updateOnTimer() +{ + /* No event for dying */ + if( intf_ShouldDie( p_intf ) ) { - if( playlistWidget ) - { - /// \todo Destroy it - } - THEDP->playlistDialog(); - return; + QApplication::closeAllWindows(); + QApplication::quit(); } +} - if( !playlistWidget ) +/***************************************************************************** + * Systray Icon and Systray Menu + *****************************************************************************/ + +/** + * Create a SystemTray icon and a menu that would go with it. + * Connects to a click handler on the icon. + **/ +void MainInterface::createSystray() +{ + QIcon iconVLC; + if( QDate::currentDate().dayOfYear() >= 354 ) + iconVLC = QIcon( QPixmap( ":/vlc128-christmas.png" ) ); + else + iconVLC = QIcon( QPixmap( ":/vlc128.png" ) ); + sysTray = new QSystemTrayIcon( iconVLC, this ); + sysTray->setToolTip( qtr( "VLC media player" )); + + systrayMenu = new QMenu( qtr( "VLC media player" ), this ); + systrayMenu->setIcon( iconVLC ); + + QVLCMenu::updateSystrayMenu( this, p_intf, true ); + sysTray->show(); + + CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ), + this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) ); +} + +/** + * Updates the Systray Icon's menu and toggle the main interface + */ +void MainInterface::toggleUpdateSystrayMenu() +{ + /* If hidden, show it */ + if( isHidden() ) { - PlaylistDialog::killInstance(); - playlistWidget = new PlaylistWidget( p_intf ); - ui.vboxLayout->insertWidget( 0, playlistWidget ); - playlistWidget->widgetSize = settings->value( "playlistSize", - QSize( 650, 310 ) ).toSize(); - playlistWidget->hide(); + show(); + activateWindow(); } - if( VISIBLE( playlistWidget ) ) + else if( isMinimized() ) { - playlistWidget->hide(); - if( videoIsActive ) - { - videoWidget->widgetSize = savedVideoSize; - videoWidget->resize( videoWidget->widgetSize ); - videoWidget->updateGeometry(); - } + /* Minimized */ + showNormal(); + activateWindow(); } else { - playlistWidget->show(); - if( videoIsActive ) + /* Visible */ +#ifdef WIN32 + /* check if any visible window is above vlc in the z-order, + * but ignore the ones always on top */ + WINDOWINFO wi; + HWND hwnd; + wi.cbSize = sizeof( WINDOWINFO ); + for( hwnd = GetNextWindow( internalWinId(), GW_HWNDPREV ); + hwnd && !IsWindowVisible( hwnd ); + hwnd = GetNextWindow( hwnd, GW_HWNDPREV ) ); + if( !hwnd || !GetWindowInfo( hwnd, &wi ) || + (wi.dwExStyle&WS_EX_TOPMOST) ) +#else + if( isActiveWindow() ) +#endif { - savedVideoSize = videoWidget->widgetSize; - videoWidget->widgetSize.setHeight( 0 ); - videoWidget->resize( videoWidget->widgetSize ); - videoWidget->updateGeometry(); + hide(); + } + else + { + activateWindow(); } - if( VISIBLE( bgWidget ) ) bgWidget->hide(); } - doComponentsUpdate(); + QVLCMenu::updateSystrayMenu( this, p_intf ); } -/* Video widget cannot do this synchronously as it runs in another thread */ -/* Well, could it, actually ? Probably dangerous ... */ -void MainInterface::doComponentsUpdate() +void MainInterface::handleSystrayClick( + QSystemTrayIcon::ActivationReason reason ) { - calculateInterfaceSize(); - resize( mainSize ); + switch( reason ) + { + case QSystemTrayIcon::Trigger: + toggleUpdateSystrayMenu(); + break; + case QSystemTrayIcon::MiddleClick: + sysTray->showMessage( qtr( "VLC media player" ), + qtr( "Control menu for the player" ), + QSystemTrayIcon::Information, 3000 ); + break; + } } -void MainInterface::undockPlaylist() +/** + * Updates the name of the systray Icon tooltip. + * Doesn't check if the systray exists, check before you call it. + **/ +void MainInterface::updateSystrayTooltipName( QString name ) { - if( playlistWidget ) + if( name.isEmpty() ) { - playlistWidget->hide(); - playlistWidget->deleteLater(); - ui.vboxLayout->removeWidget( playlistWidget ); - playlistWidget = NULL; - playlistEmbeddedFlag = false; - - menuBar()->clear(); - QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled, - visualSelectorEnabled); - - if( videoIsActive ) + sysTray->setToolTip( qtr( "VLC media player" ) ); + } + else + { + sysTray->setToolTip( name ); + if( notificationEnabled && ( isHidden() || isMinimized() ) ) { - videoWidget->widgetSize = savedVideoSize; - videoWidget->resize( videoWidget->widgetSize ); - videoWidget->updateGeometry(); + sysTray->showMessage( qtr( "VLC media player" ), name, + QSystemTrayIcon::NoIcon, 3000 ); } - - doComponentsUpdate(); - THEDP->playlistDialog(); } } -void MainInterface::customEvent( QEvent *event ) +/** + * Updates the status of the systray Icon tooltip. + * Doesn't check if the systray exists, check before you call it. + **/ +void MainInterface::updateSystrayTooltipStatus( int i_status ) { - if( event->type() == PLDockEvent_Type ) + switch( i_status ) { - PlaylistDialog::killInstance(); - playlistEmbeddedFlag = true; - menuBar()->clear(); - QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled, - visualSelectorEnabled); - playlist(); + case 0: + case END_S: + { + sysTray->setToolTip( qtr( "VLC media player" ) ); + break; + } + case PLAYING_S: + { + sysTray->setToolTip( input_name ); + break; + } + case PAUSE_S: + { + sysTray->setToolTip( input_name + " - " + + qtr( "Paused") ); + break; + } } } - /************************************************************************ - * D&D + * D&D Events ************************************************************************/ void MainInterface::dropEvent(QDropEvent *event) { @@ -504,7 +1069,7 @@ void MainInterface::dropEvent(QDropEvent *event) { if( input_AddSubtitles( THEMIM->getInput(), qtu( mimeData->urls()[0].toString() ), - VLC_TRUE ) ) + true ) ) { event->acceptProposedAction(); return; @@ -512,12 +1077,13 @@ void MainInterface::dropEvent(QDropEvent *event) } } bool first = true; - foreach( QUrl url, mimeData->urls() ) { - QString s = url.toString(); + foreach( QUrl url, mimeData->urls() ) + { + QString s = url.toLocalFile(); if( s.length() > 0 ) { playlist_Add( THEPL, qtu(s), NULL, PLAYLIST_APPEND | (first ? PLAYLIST_GO:0), - PLAYLIST_END, VLC_TRUE, VLC_FALSE ); + PLAYLIST_END, true, false ); first = false; } } @@ -537,12 +1103,43 @@ void MainInterface::dragLeaveEvent(QDragLeaveEvent *event) } /************************************************************************ - * Other stuff + * Events stuff ************************************************************************/ +void MainInterface::customEvent( QEvent *event ) +{ +#if 0 + if( event->type() == PLDockEvent_Type ) + { + PlaylistDialog::killInstance(); + playlistEmbeddedFlag = true; + menuBar()->clear(); + QVLCMenu::createMenuBar(this, p_intf, true, visualSelectorEnabled); + togglePlaylist(); + } +#endif + /*else */ + if ( event->type() == SetVideoOnTopEvent_Type ) + { + SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event; + if( p_event->OnTop() ) + setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); + else + setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint); + show(); /* necessary to apply window flags?? */ + } +} + void MainInterface::keyPressEvent( QKeyEvent *e ) { + if( ( e->modifiers() & Qt::ControlModifier ) && ( e->key() & Qt::Key_H ) + && menuBar()->isHidden() ) + { + toggleMinimalView(); + e->accept(); + } + int i_vlck = qtEventToVLCKey( e ); - if( i_vlck >= 0 ) + if( i_vlck > 0 ) { var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck ); e->accept(); @@ -558,137 +1155,61 @@ void MainInterface::wheelEvent( QWheelEvent *e ) e->accept(); } -void MainInterface::stop() -{ - playlist_Stop( THEPL ); -} -void MainInterface::play() -{ - if( playlist_IsEmpty(THEPL) ) - { - /* The playlist is empty, open a file requester */ - THEDP->openFileDialog(); - setStatus( 0 ); - return; - } - THEMIM->togglePlayPause(); -} -void MainInterface::prev() -{ - playlist_Prev( THEPL ); -} -void MainInterface::next() -{ - playlist_Next( THEPL ); -} - -void MainInterface::setDisplay( float pos, int time, int length ) -{ - char psz_length[MSTRTIME_MAX_SIZE], psz_time[MSTRTIME_MAX_SIZE]; - secstotimestr( psz_length, length ); - secstotimestr( psz_time, time ); - QString title; - title.sprintf( "%s/%s", psz_time, psz_length ); - timeLabel->setText( " "+title+" " ); -} - -void MainInterface::setName( QString name ) +void MainInterface::closeEvent( QCloseEvent *e ) { - nameLabel->setText( " " + name+" " ); + hide(); + THEDP->quit(); } -void MainInterface::setStatus( int status ) +void MainInterface::toggleFullScreen( void ) { - if( status == 1 ) // Playing - ui.playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) ); + if( isFullScreen() ) + showNormal(); else - ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) ); + showFullScreen(); } -#define HELP_MENU N_("Menu") -#define HELP_PCH N_("Previous chapter") -#define HELP_NCH N_("Next chapter") -#define HELP_PTR N_("Previous track") -#define HELP_NTR N_("Next track") - -void MainInterface::setNavigation( int navigation ) +/***************************************************************************** + * Callbacks + *****************************************************************************/ +static int InteractCallback( vlc_object_t *p_this, + const char *psz_var, vlc_value_t old_val, + vlc_value_t new_val, void *param ) { - // 1 = chapter, 2 = title, 0 = no - if( navigation == 0 ) - { - ui.discFrame->hide(); - } else if( navigation == 1 ) { - ui.prevSectionButton->show(); - ui.prevSectionButton->setToolTip( qfu(HELP_PCH) ); - ui.nextSectionButton->show(); - ui.nextSectionButton->setToolTip( qfu(HELP_NCH) ); - ui.menuButton->show(); - ui.discFrame->show(); - } else { - ui.prevSectionButton->show(); - ui.prevSectionButton->setToolTip( qfu(HELP_PCH) ); - ui.nextSectionButton->show(); - ui.nextSectionButton->setToolTip( qfu(HELP_NCH) ); - ui.menuButton->hide(); - ui.discFrame->show(); - } + intf_dialog_args_t *p_arg = new intf_dialog_args_t; + p_arg->p_dialog = (interaction_dialog_t *)(new_val.p_address); + DialogEvent *event = new DialogEvent( INTF_DIALOG_INTERACTION, 0, p_arg ); + QApplication::postEvent( THEDP, static_cast(event) ); + return VLC_SUCCESS; } -static bool b_my_volume; - -void MainInterface::updateOnTimer() +/***************************************************************************** + * PopupMenuCB: callback triggered by the intf-popupmenu playlist variable. + * We don't show the menu directly here because we don't want the + * caller to block for a too long time. + *****************************************************************************/ +static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ) { - /* \todo Make this event-driven */ - advControls->enableInput( THEMIM->getIM()->hasInput() ); - advControls->enableVideo( THEMIM->getIM()->hasVideo() ); + intf_thread_t *p_intf = (intf_thread_t *)param; - if( intf_ShouldDie( p_intf ) ) - { - QApplication::closeAllWindows(); - QApplication::quit(); - } - if( need_components_update ) + if( p_intf->pf_show_dialog ) { - doComponentsUpdate(); - need_components_update = false; + p_intf->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU, + new_val.b_bool, 0 ); } - audio_volume_t i_volume; - aout_VolumeGet( p_intf, &i_volume ); - i_volume = (i_volume * 200 )/ AOUT_VOLUME_MAX ; - int i_gauge = ui.volumeSlider->value(); - b_my_volume = false; - if( i_volume - i_gauge > 1 || i_gauge - i_volume > 1 ) - { - b_my_volume = true; - ui.volumeSlider->setValue( i_volume ); - b_my_volume = false; - } -} - -void MainInterface::closeEvent( QCloseEvent *e ) -{ - hide(); - p_intf->b_die = VLC_TRUE; + return VLC_SUCCESS; } -void MainInterface::updateVolume( int sliderVolume ) +/***************************************************************************** + * IntfShowCB: callback triggered by the intf-show libvlc variable. + *****************************************************************************/ +static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ) { - if( !b_my_volume ) - { - int i_res = sliderVolume * AOUT_VOLUME_MAX / - (2*ui.volumeSlider->maximum() ); - aout_VolumeSet( p_intf, i_res ); - } -} + intf_thread_t *p_intf = (intf_thread_t *)param; + p_intf->p_sys->p_mi->requestLayoutUpdate(); -static int InteractCallback( vlc_object_t *p_this, - const char *psz_var, vlc_value_t old_val, - vlc_value_t new_val, void *param ) -{ - intf_dialog_args_t *p_arg = new intf_dialog_args_t; - p_arg->p_dialog = (interaction_dialog_t *)(new_val.p_address); - DialogEvent *event = new DialogEvent( INTF_DIALOG_INTERACTION, 0, p_arg ); - QApplication::postEvent( THEDP, static_cast(event) ); return VLC_SUCCESS; }