X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Finterface_widgets.cpp;h=42c8b3c9be08a646015555e552b0b3e876d70051;hb=ba714bedc852cc4a04c422b1dce3fa69e083a236;hp=b66beeaff5fc5ad1b9140e81917440276a5c76f4;hpb=393ae790649d0d5b6ab6b0ac4a440558ae829dbe;p=vlc diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index b66beeaff5..42c8b3c9be 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -23,10 +23,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include "dialogs_provider.hpp" #include "components/interface_widgets.hpp" #include "main_interface.hpp" @@ -34,7 +37,6 @@ #include "menus.hpp" #include "util/input_slider.hpp" #include "util/customwidgets.hpp" -#include #include #include @@ -47,39 +49,59 @@ #include #include +#ifdef Q_WS_X11 +# include +# include +#endif + +#include + /********************************************************************** * Video Widget. A simple frame on which video is drawn * This class handles resize issues **********************************************************************/ -static void *DoRequest( intf_thread_t *, vout_thread_t *, int*,int*, - unsigned int *, unsigned int * ); -static void DoRelease( intf_thread_t *, void * ); -static int DoControl( intf_thread_t *, void *, int, va_list ); VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i ) { /* Init */ - vlc_mutex_init( p_intf, &lock ); - p_vout = NULL; + i_vout = 0; hide(); setMinimumSize( 16, 16 ); videoSize.rwidth() = -1; videoSize.rheight() = -1; + setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); /* Black background is more coherent for a Video Widget IMVHO */ QPalette plt = palette(); plt.setColor( QPalette::Active, QPalette::Window , Qt::black ); plt.setColor( QPalette::Inactive, QPalette::Window , Qt::black ); setPalette( plt ); + setAttribute( Qt::WA_PaintOnScreen, true ); - /* The core can ask through a callback to show the video */ - CONNECT( this, askVideoWidgetToShow(), this, show() ); - /* The core can ask through a callback to resize the video */ - // CONNECT( this, askResize( int, int ), this, SetSizing( int, int ) ); + /* The core can ask through a callback to show the video. */ +#if HAS_QT43 + connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)), + this, SLOT(SetSizing(unsigned int, unsigned int )), + Qt::BlockingQueuedConnection ); +#else +#error This is broken. Fix it with a QEventLoop with a processEvents () + connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)), + this, SLOT(SetSizing(unsigned int, unsigned int )) ); +#endif +} + +void VideoWidget::paintEvent(QPaintEvent *ev) +{ + QFrame::paintEvent(ev); +#ifdef Q_WS_X11 + XFlush( QX11Info::display() ); +#endif } VideoWidget::~VideoWidget() { - vlc_mutex_lock( &lock ); + vout_thread_t *p_vout = i_vout + ? (vout_thread_t *)vlc_object_get( i_vout ) : NULL; + if( p_vout ) { if( !p_intf->psz_switch_intf ) @@ -92,25 +114,25 @@ VideoWidget::~VideoWidget() if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS ) vout_Control( p_vout, VOUT_CLOSE ); } + vlc_object_release( p_vout ); } - vlc_mutex_unlock( &lock ); - vlc_mutex_destroy( &lock ); } /** * Request the video to avoid the conflicts **/ void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y, - unsigned int *pi_width, unsigned int *pi_height ) + unsigned int *pi_width, unsigned int *pi_height ) { msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y ); - emit askVideoWidgetToShow(); - if( p_vout ) + emit askVideoWidgetToShow( *pi_width, *pi_height ); + if( i_vout ) { msg_Dbg( p_intf, "embedded video already in use" ); return NULL; } - p_vout = p_nvout; + i_vout = p_nvout->i_object_id; + msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() ); return ( void* )winId(); } @@ -122,13 +144,14 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h ) msg_Dbg( p_intf, "Video is resizing to: %i %i", w, h ); videoSize.rwidth() = w; videoSize.rheight() = h; + if( isHidden() ) show(); updateGeometry(); // Needed for deinterlace } void VideoWidget::release( void *p_win ) { - msg_Dbg( p_intf, "Video is non needed anymore" ); - p_vout = NULL; + msg_Dbg( p_intf, "Video is not needed anymore" ); + i_vout = 0; videoSize.rwidth() = 0; videoSize.rheight() = 0; hide(); @@ -152,7 +175,7 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) :QWidget( NULL ), p_intf( _p_i ) { /* We should use that one to take the more size it can */ -// setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); + setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding); /* A dark background */ setAutoFillBackground( true ); @@ -182,8 +205,7 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) } BackgroundWidget::~BackgroundWidget() -{ -} +{} void BackgroundWidget::resizeEvent( QResizeEvent * event ) { @@ -242,8 +264,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) : } VisualSelector::~VisualSelector() -{ -} +{} void VisualSelector::prev() { @@ -284,8 +305,7 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) : /* A to B Button */ ABButton = new QPushButton( "AB" ); - ABButton->setMaximumSize( QSize( 26, 26 ) ); - ABButton->setIconSize( QSize( 20, 20 ) ); + setupSmallButton( ABButton ); advLayout->addWidget( ABButton ); BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), fromAtoB() ); timeA = timeB = 0; @@ -300,16 +320,14 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) : #endif recordButton = new QPushButton( "R" ); - recordButton->setMaximumSize( QSize( 26, 26 ) ); - recordButton->setIconSize( QSize( 20, 20 ) ); + setupSmallButton( recordButton ); advLayout->addWidget( recordButton ); BUTTON_SET_ACT_I( recordButton, "", record_16px.png, qtr( "Record" ), record() ); /* Snapshot Button */ snapshotButton = new QPushButton( "S" ); - snapshotButton->setMaximumSize( QSize( 26, 26 ) ); - snapshotButton->setIconSize( QSize( 20, 20 ) ); + setupSmallButton( snapshotButton ); advLayout->addWidget( snapshotButton ); BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() ); } @@ -383,16 +401,17 @@ void AdvControlsWidget::frame(){} ControlsWidget::ControlsWidget( intf_thread_t *_p_i, MainInterface *_p_mi, bool b_advControls, - bool b_shiny ) : - QFrame( NULL ), p_intf( _p_i ) + bool b_shiny, + bool b_fsCreation) : + QFrame( _p_mi ), p_intf( _p_i ) { - controlLayout = new QGridLayout( this ); + controlLayout = new QGridLayout( ); + controlLayout->setSpacing( 0 ); -#if QT43 - controlLayout->setContentsMargins( 9, 6, 9, 6 ); -#else - controlLayout->setMargin( 6 ); -#endif + controlLayout->setLayoutMargins( 7, 5, 7, 3, 6 ); + + if( !b_fsCreation ) + setLayout( controlLayout ); setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum ); @@ -451,7 +470,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" ); BUTTON_SET_IMG( nextSectionButton, "", next.png, "" ); - BUTTON_SET_IMG( menuButton, "", previous.png, "" ); + BUTTON_SET_IMG( menuButton, "", previous.png, qtr( "Menu" ) ); discFrame->hide(); @@ -465,27 +484,26 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, sectionNext() ); CONNECT( menuButton, clicked(), THEMIM->getIM(), sectionMenu() ); + /** * Telextext QFrame * TODO: Merge with upper menu in a StackLayout **/ -#ifdef ZVBI_COMPILED telexFrame = new QWidget( this ); QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame ); telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 ); - QToolButton *telexOn = new QToolButton; - telexOn->setText( qtr( "On" ) ); + telexOn = new QPushButton; setupSmallButton( telexOn ); telexLayout->addWidget( telexOn ); - QToolButton *telexTransparent = new QToolButton; - telexTransparent->setText( qtr( "Transparent" ) ); + telexTransparent = new QPushButton; setupSmallButton( telexTransparent ); telexLayout->addWidget( telexTransparent ); + b_telexTransparent = false; - QSpinBox *telexPage = new QSpinBox; + telexPage = new QSpinBox; telexPage->setRange( 0, 999 ); telexPage->setValue( 100 ); telexPage->setAccelerated( true ); @@ -494,18 +512,34 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, telexPage->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ); telexLayout->addWidget( telexPage ); - controlLayout->addWidget( telexFrame, 1, 10, 2, 3, Qt::AlignBottom ); - telexFrame->hide(); + if( !b_fsCreation ) + controlLayout->addWidget( telexFrame, 1, 10, 2, 4, Qt::AlignBottom ); + telexFrame->hide(); /* default hidden */ CONNECT( telexPage, valueChanged( int ), THEMIM->getIM(), telexGotoPage( int ) ); + CONNECT( THEMIM->getIM(), setNewTelexPage( int ), + telexPage, setValue( int ) ); + + BUTTON_SET_IMG( telexOn, "", tv.png, qtr( "Teletext on" ) ); + + CONNECT( telexOn, clicked(), THEMIM->getIM(), + telexToggleButtons() ); CONNECT( telexOn, clicked( bool ), THEMIM->getIM(), telexToggle( bool ) ); + CONNECT( THEMIM->getIM(), toggleTelexButtons(), + this, toggleTeletext() ); + b_telexEnabled = false; + telexTransparent->setEnabled( false ); + telexPage->setEnabled( false ); + + BUTTON_SET_IMG( telexTransparent, "", tvtelx.png, qtr( "Teletext" ) ); CONNECT( telexTransparent, clicked( bool ), - THEMIM->getIM(), telexSetTransparency( bool ) ); + THEMIM->getIM(), telexSetTransparency() ); + CONNECT( THEMIM->getIM(), toggleTelexTransparency(), + this, toggleTeletextTransparency() ); CONNECT( THEMIM->getIM(), teletextEnabled( bool ), telexFrame, setVisible( bool ) ); -#endif /** Play Buttons **/ QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); @@ -525,7 +559,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, controlLayout->setColumnStretch( 2, 0 ); /** Prev + Stop + Next Block **/ - QHBoxLayout *controlButLayout = new QHBoxLayout; + controlButLayout = new QHBoxLayout; controlButLayout->setSpacing( 0 ); /* Don't remove that, will be useful */ /* Prev */ @@ -550,7 +584,8 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, controlButLayout->addWidget( nextButton ); /* Add this block to the main layout */ - controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 ); + if( !b_fsCreation ) + controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 ); BUTTON_SET_ACT_I( playButton, "", play.png, qtr( "Play" ), play() ); BUTTON_SET_ACT_I( prevButton, "" , previous.png, @@ -580,7 +615,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() ); /** extended Settings **/ - QPushButton *extSettingsButton = new QPushButton( "F" ); + extSettingsButton = new QPushButton; BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ), extSettings() ); setupSmallButton( extSettingsButton ); @@ -591,7 +626,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, controlLayout->setColumnStretch( 14, 5 ); /* Volume */ - VolumeClickHandler *hVolLabel = new VolumeClickHandler( p_intf, this ); + hVolLabel = new VolumeClickHandler( p_intf, this ); volMuteLabel = new QLabel; volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) ); @@ -603,7 +638,8 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, { volumeSlider = new SoundSlider( this, config_GetInt( p_intf, "volume-step" ), - config_GetInt( p_intf, "qt-volume-complete" ) ); + config_GetInt( p_intf, "qt-volume-complete" ), + config_GetPsz( p_intf, "qt-slider-colours" ) ); } else { @@ -632,6 +668,39 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, ControlsWidget::~ControlsWidget() {} +void ControlsWidget::toggleTeletext() +{ + bool b_enabled = THEMIM->teletextState(); + if( b_telexEnabled ) + { + telexTransparent->setEnabled( false ); + telexPage->setEnabled( false ); + b_telexEnabled = false; + } + else if( b_enabled ) + { + telexTransparent->setEnabled( true ); + telexPage->setEnabled( true ); + b_telexEnabled = true; + } +} + +void ControlsWidget::toggleTeletextTransparency() +{ + if( b_telexTransparent ) + { + telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx.png" ) ); + telexTransparent->setToolTip( qtr( "Teletext" ) ); + b_telexTransparent = false; + } + else + { + telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx-transparent.png" ) ); + telexTransparent->setToolTip( qtr( "Transparent" ) ); + b_telexTransparent = true; + } +} + void ControlsWidget::stop() { THEMIM->stop(); @@ -661,11 +730,8 @@ void ControlsWidget::next() void ControlsWidget::setNavigation( int navigation ) { -#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" ) // 1 = chapter, 2 = title, 0 = no if( navigation == 0 ) @@ -805,6 +871,330 @@ void ControlsWidget::toggleAdvanced() } +/********************************************************************** + * Fullscrenn control widget + **********************************************************************/ +FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, + MainInterface *_p_mi, bool b_advControls, bool b_shiny ) + : ControlsWidget( _p_i, _p_mi, b_advControls, b_shiny, true ), + i_lastPosX( -1 ), i_lastPosY( -1 ), i_hideTimeout( 1 ), + b_mouseIsOver( false ), b_isFullscreen( false ) +{ + setWindowFlags( Qt::ToolTip ); + + setFrameShape( QFrame::StyledPanel ); + setFrameStyle( QFrame::Sunken ); + setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); + + QGridLayout *fsLayout = new QGridLayout( this ); + controlLayout->setSpacing( 0 ); + controlLayout->setLayoutMargins( 5, 1, 5, 1, 5 ); + + fsLayout->addWidget( slowerButton, 0, 0 ); + slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum); + fsLayout->addWidget( slider, 0, 1, 1, 6 ); + fsLayout->addWidget( fasterButton, 0, 7 ); + + fsLayout->addWidget( volMuteLabel, 1, 0); + fsLayout->addWidget( volumeSlider, 1, 1 ); + + fsLayout->addLayout( controlButLayout, 1, 2 ); + + fsLayout->addWidget( playButton, 1, 3 ); + + fsLayout->addWidget( discFrame, 1, 4 ); + + fsLayout->addWidget( telexFrame, 1, 5 ); + + fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter ); + + fsLayout->addWidget( fullscreenButton, 1, 7 ); + + /* hiding timer */ + p_hideTimer = new QTimer( this ); + CONNECT( p_hideTimer, timeout(), this, hideFSControllerWidget() ); + p_hideTimer->setSingleShot( true ); + + /* slow hiding timer */ +#if HAVE_TRANSPARENCY + p_slowHideTimer = new QTimer( this ); + CONNECT( p_slowHideTimer, timeout(), this, slowHideFSC() ); +#endif + + adjustSize (); /* need to get real width and height for moving */ + + /* center down */ + QDesktopWidget * p_desktop = QApplication::desktop(); + + move( p_desktop->width() / 2 - width() / 2, + p_desktop->height() - height() ); + + #ifdef WIN32TRICK + setWindowOpacity( 0.0 ); + fscHidden = true; + show(); + #endif +} + +FullscreenControllerWidget::~FullscreenControllerWidget() +{ +} + +/** + * Hide fullscreen controller + * FIXME: under windows it have to be done by moving out of screen + * because hide() doesnt work + */ +void FullscreenControllerWidget::hideFSControllerWidget() +{ + #ifdef WIN32TRICK + fscHidden = true; + setWindowOpacity( 0.0 ); // simulate hidding + #else + hide(); + #endif +} + +/** + * Hidding fullscreen controller slowly + * Linux: need composite manager + * Windows: it is blinking, so it can be enabled by define TRASPARENCY + */ +void FullscreenControllerWidget::slowHideFSC() +{ +#if HAVE_TRANSPARENCY + static bool first_call = true; + + if ( first_call ) + { + first_call = false; + + p_slowHideTimer->stop(); + /* the last part of time divided to 100 pieces */ + p_slowHideTimer->start( + (int) ( i_hideTimeout / 2 / ( windowOpacity() * 100 ) ) ); + } + else + { +#ifdef WIN32TRICK + if ( windowOpacity() > 0.0 && !fscHidden ) +#else + if ( windowOpacity() > 0.0 ) +#endif + { + /* we should use 0.01 because of 100 pieces ^^^ + but than it cannt be done in time */ + setWindowOpacity( windowOpacity() - 0.02 ); + } + + if ( windowOpacity() == 0.0 ) + { + first_call = true; + p_slowHideTimer->stop(); + } + } +#endif +} + +/** + * Get state of visibility of FS controller on screen + * On windows control if it is on hidden position + */ +bool FullscreenControllerWidget::isFSCHidden() +{ + #ifdef WIN32TRICK + return fscHidden; + #endif + + return isHidden(); +} + +/** + * event handling + * events: show, hide, start timer for hidding + */ +void FullscreenControllerWidget::customEvent( QEvent *event ) +{ + int type = event->type(); + + if ( type == FullscreenControlShow_Type && b_isFullscreen ) + { + #ifdef WIN32TRICK + // after quiting and going to fs, we need to call show() + if ( isHidden() ) + show(); + + if ( fscHidden ) + { + fscHidden = false; + setWindowOpacity( 1.0 ); + } + #else + show(); + #endif + +#if HAVE_TRANSPARENCY + setWindowOpacity( DEFAULT_OPACITY ); +#endif + } + else if ( type == FullscreenControlHide_Type ) + { + hideFSControllerWidget(); + } + else if ( type == FullscreenControlPlanHide_Type && !b_mouseIsOver ) + { + p_hideTimer->start( i_hideTimeout ); +#if HAVE_TRANSPARENCY + p_slowHideTimer->start( i_hideTimeout / 2 ); +#endif + } +} + +/** + * On mouse move + * moving with FSC + */ +void FullscreenControllerWidget::mouseMoveEvent( QMouseEvent *event ) +{ + if ( event->buttons() == Qt::LeftButton ) + { + int i_moveX = event->globalX() - i_lastPosX; + int i_moveY = event->globalY() - i_lastPosY; + + move( x() + i_moveX, y() + i_moveY ); + + i_lastPosX = event->globalX(); + i_lastPosY = event->globalY(); + } +} + +/** + * On mouse press + * store position of cursor + */ +void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event ) +{ + i_lastPosX = event->globalX(); + i_lastPosY = event->globalY(); +} + +/** + * On mouse go above FSC + */ +void FullscreenControllerWidget::enterEvent( QEvent *event ) +{ + p_hideTimer->stop(); +#if HAVE_TRANSPARENCY + p_slowHideTimer->stop(); +#endif + b_mouseIsOver = true; +} + +/** + * On mouse go out from FSC + */ +void FullscreenControllerWidget::leaveEvent( QEvent *event ) +{ + p_hideTimer->start( i_hideTimeout ); +#if HAVE_TRANSPARENCY + p_slowHideTimer->start( i_hideTimeout / 2 ); +#endif + b_mouseIsOver = false; +} + +/** + * When you get pressed key, send it to video output + * FIXME: clearing focus by clearFocus() to not getting + * key press events didnt work + */ +void FullscreenControllerWidget::keyPressEvent( QKeyEvent *event ) +{ + int i_vlck = qtEventToVLCKey( event ); + if( i_vlck > 0 ) + { + var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck ); + event->accept(); + } + else + event->ignore(); +} + +/** + * It is called when video start + */ +void FullscreenControllerWidget::regFullscreenCallback( vout_thread_t *p_vout ) +{ + if ( p_vout ) + { + var_AddCallback( p_vout, "fullscreen", regMouseMoveCallback, this ); + } +} + +/** + * It is called after turn off video, because p_vout is NULL now + * we cannt delete callback, just hide if FScontroller is visible + */ +void FullscreenControllerWidget::unregFullscreenCallback() +{ + if ( isVisible() ) + hide(); +} + +/** + * Register and unregister callback for mouse moving + */ +static int regMouseMoveCallback( vlc_object_t *vlc_object, const char *variable, + vlc_value_t old_val, vlc_value_t new_val, + void *data ) +{ + vout_thread_t *p_vout = (vout_thread_t *) vlc_object; + + static bool b_registered = false; + FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *) data; + + if ( var_GetBool( p_vout, "fullscreen" ) && !b_registered ) + { + p_fs->setHideTimeout( var_GetInteger( p_vout, "mouse-hide-timeout" ) ); + p_fs->setIsFullscreen( true ); + var_AddCallback( p_vout, "mouse-moved", + showFullscreenControllCallback, (void *) p_fs ); + b_registered = true; + } + + if ( !var_GetBool( p_vout, "fullscreen" ) && b_registered ) + { + p_fs->setIsFullscreen( false ); + p_fs->hide(); + var_DelCallback( p_vout, "mouse-moved", + showFullscreenControllCallback, (void *) p_fs ); + b_registered = false; + } + + return VLC_SUCCESS; +} + +/** + * Show fullscreen controller after mouse move + * after show immediately plan hide event + */ +static int showFullscreenControllCallback( vlc_object_t *vlc_object, const char *variable, + vlc_value_t old_val, vlc_value_t new_val, + void *data ) +{ + FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *) data; + + if ( p_fs->isFSCHidden() || p_fs->windowOpacity() < DEFAULT_OPACITY ) + { + IMEvent *event = new IMEvent( FullscreenControlShow_Type, 0 ); + QApplication::postEvent( p_fs, static_cast(event) ); + } + + IMEvent *e = new IMEvent( FullscreenControlPlanHide_Type, 0 ); + QApplication::postEvent( p_fs, static_cast(e) ); + + return VLC_SUCCESS; +} + /********************************************************************** * Speed control widget **********************************************************************/ @@ -821,22 +1211,24 @@ SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) : speedSlider->setOrientation( Qt::Vertical ); speedSlider->setTickPosition( QSlider::TicksRight ); - speedSlider->setRange( -100, 100 ); - speedSlider->setSingleStep( 10 ); - speedSlider->setPageStep( 20 ); - speedSlider->setTickInterval( 20 ); + speedSlider->setRange( -24, 24 ); + speedSlider->setSingleStep( 1 ); + speedSlider->setPageStep( 1 ); + speedSlider->setTickInterval( 12 ); CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) ); QToolButton *normalSpeedButton = new QToolButton( this ); normalSpeedButton->setMaximumSize( QSize( 26, 20 ) ); normalSpeedButton->setAutoRaise( true ); - normalSpeedButton->setText( "N" ); + normalSpeedButton->setText( "1x" ); normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) ); CONNECT( normalSpeedButton, clicked(), this, resetRate() ); QVBoxLayout *speedControlLayout = new QVBoxLayout; + speedControlLayout->setLayoutMargins( 4, 4, 4, 4, 4 ); + speedControlLayout->setSpacing( 4 ); speedControlLayout->addWidget( speedSlider ); speedControlLayout->addWidget( normalSpeedButton ); setLayout( speedControlLayout ); @@ -850,10 +1242,6 @@ void SpeedControlWidget::setEnable( bool b_enable ) speedSlider->setEnabled( b_enable ); } -#define RATE_SLIDER_MAXIMUM 3.0 -#define RATE_SLIDER_MINIMUM 0.3 -#define RATE_SLIDER_LENGTH 100.0 - void SpeedControlWidget::updateControls( int rate ) { if( speedSlider->isSliderDown() ) @@ -862,32 +1250,16 @@ void SpeedControlWidget::updateControls( int rate ) return; } - int sliderValue; - double speed = INPUT_RATE_DEFAULT / (double)rate; + double value = 12 * log( (double)INPUT_RATE_DEFAULT / rate ) / log( 2 ); + int sliderValue = (int) ( ( value > 0 ) ? value + .5 : value - .5 ); - if( rate >= INPUT_RATE_DEFAULT ) + if( sliderValue < speedSlider->minimum() ) { - if( speed < RATE_SLIDER_MINIMUM ) - { - sliderValue = speedSlider->minimum(); - } - else - { - sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH - / ( 1.0 - RATE_SLIDER_MAXIMUM ) ); - } + sliderValue = speedSlider->minimum(); } - else + else if( sliderValue > speedSlider->maximum() ) { - if( speed > RATE_SLIDER_MAXIMUM ) - { - sliderValue = speedSlider->maximum(); - } - else - { - sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH - / ( RATE_SLIDER_MAXIMUM - 1.0 ) ); - } + sliderValue = speedSlider->maximum(); } //Block signals to avoid feedback loop @@ -898,18 +1270,8 @@ void SpeedControlWidget::updateControls( int rate ) void SpeedControlWidget::updateRate( int sliderValue ) { - int rate; - - if( sliderValue < 0.0 ) - { - rate = (int)(INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH / - ( sliderValue * ( 1.0 - RATE_SLIDER_MINIMUM ) + RATE_SLIDER_LENGTH )); - } - else - { - rate = (int)(INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH / - ( sliderValue * ( RATE_SLIDER_MAXIMUM - 1.0 ) + RATE_SLIDER_LENGTH )); - } + double speed = pow( 2, (double)sliderValue / 12 ); + int rate = INPUT_RATE_DEFAULT / speed; THEMIM->getIM()->setRate(rate); }