/*****************************************************************************
* interface_widgets.cpp : Custom widgets for the main interface
****************************************************************************
- * Copyright ( C ) 2006 the VideoLAN team
+ * Copyright (C) 2006-2010 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
# include "config.h"
#endif
-#include "dialogs_provider.hpp"
#include "components/interface_widgets.hpp"
-#include "main_interface.hpp"
-#include "input_manager.hpp"
-#include "menus.hpp"
-#include "util/input_slider.hpp"
-#include "util/customwidgets.hpp"
+#include "dialogs_provider.hpp"
+#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
+
+#include "menus.hpp" /* Popup menu on bgWidget */
+
#include <vlc_vout.h>
#include <QLabel>
-#include <QSpacerItem>
-#include <QCursor>
-#include <QPushButton>
#include <QToolButton>
-#include <QHBoxLayout>
-#include <QMenu>
#include <QPalette>
+#include <QEvent>
#include <QResizeEvent>
#include <QDate>
+#include <QMenu>
+#include <QWidgetAction>
+#include <QDesktopWidget>
+#include <QPainter>
+#include <QTimer>
+#include <QSlider>
+#include <QBitmap>
+
#ifdef Q_WS_X11
-# include <X11/Xlib.h>
-# include <qx11info_x11.h>
+# include <X11/Xlib.h>
+# include <qx11info_x11.h>
#endif
+#include <math.h>
+#include <assert.h>
+
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
* This class handles resize issues
**********************************************************************/
-VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
+VideoWidget::VideoWidget( intf_thread_t *_p_i )
+ : QFrame( NULL )
+ , p_intf( _p_i )
{
- /* Init */
- p_vout = NULL;
- 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. */
-#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
-
+ /* Set the policy to expand in both directions */
+ // setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+ layout = new QHBoxLayout( this );
+ layout->setContentsMargins( 0, 0, 0, 0 );
+ setLayout( layout );
+ stable = NULL;
}
-void VideoWidget::paintEvent(QPaintEvent *ev)
+VideoWidget::~VideoWidget()
{
- QFrame::paintEvent(ev);
-#ifdef Q_WS_X11
- XFlush( QX11Info::display() );
-#endif
+ /* Ensure we are not leaking the video output. This would crash. */
+ assert( !stable );
}
-VideoWidget::~VideoWidget()
+void VideoWidget::sync( void )
{
- if( p_vout )
- {
- if( !p_intf->psz_switch_intf )
- {
- if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
- vout_Control( p_vout, VOUT_REPARENT );
- }
- else
- {
- if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS )
- vout_Control( p_vout, VOUT_CLOSE );
- }
- }
+#ifdef Q_WS_X11
+ /* Make sure the X server has processed all requests.
+ * This protects other threads using distinct connections from getting
+ * the video widget window in an inconsistent states. */
+ XSync( QX11Info::display(), False );
+#endif
}
/**
* 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 )
+WId VideoWidget::request( int *pi_x, int *pi_y,
+ unsigned int *pi_width, unsigned int *pi_height,
+ bool b_keep_size )
{
msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
- emit askVideoWidgetToShow( *pi_width, *pi_height );
- if( p_vout )
+
+ if( stable )
{
msg_Dbg( p_intf, "embedded video already in use" );
return NULL;
}
- p_vout = p_nvout;
- msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() );
- return ( void* )winId();
+ if( b_keep_size )
+ {
+ *pi_width = size().width();
+ *pi_height = size().height();
+ }
+
+ /* The owner of the video window needs a stable handle (WinId). Reparenting
+ * in Qt4-X11 changes the WinId of the widget, so we need to create another
+ * dummy widget that stays within the reparentable widget. */
+ stable = new QWidget();
+ QPalette plt = palette();
+ plt.setColor( QPalette::Window, Qt::black );
+ stable->setPalette( plt );
+ stable->setAutoFillBackground(true);
+ /* Indicates that the widget wants to draw directly onto the screen.
+ Widgets with this attribute set do not participate in composition
+ management */
+ /* This is currently disabled on X11 as it does not seem to improve
+ * performance, but causes the video widget to be transparent... */
+#ifndef Q_WS_X11
+ stable->setAttribute( Qt::WA_PaintOnScreen, true );
+#endif
+
+ layout->addWidget( stable );
+
+#ifdef Q_WS_X11
+ /* HACK: Only one X11 client can subscribe to mouse button press events.
+ * VLC currently handles those in the video display.
+ * Force Qt4 to unsubscribe from mouse press and release events. */
+ Display *dpy = QX11Info::display();
+ Window w = stable->winId();
+ XWindowAttributes attr;
+
+ XGetWindowAttributes( dpy, w, &attr );
+ attr.your_event_mask &= ~(ButtonPressMask|ButtonReleaseMask);
+ XSelectInput( dpy, w, attr.your_event_mask );
+#endif
+ sync();
+#ifndef NDEBUG
+ msg_Dbg( p_intf, "embedded video ready (handle %p)",
+ (void *)stable->winId() );
+#endif
+ return stable->winId();
}
/* Set the Widget to the correct Size */
/* Function has to be called by the parent
- Parent has to care about resizing himself*/
+ Parent has to care about resizing itself */
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
+ if( !isVisible() ) show();
+ resize( w, h );
+ emit sizeChanged( w, h );
+ /* Work-around a bug?misconception? that would happen when vout core resize
+ twice to the same size and would make the vout not centered.
+ This cause a small flicker.
+ See #3621
+ */
+ if( size().width() == w && size().height() == h )
+ updateGeometry();
+ sync();
}
-void VideoWidget::release( void *p_win )
+void VideoWidget::release( void )
{
- msg_Dbg( p_intf, "Video is non needed anymore" );
- p_vout = NULL;
- videoSize.rwidth() = 0;
- videoSize.rheight() = 0;
- hide();
- updateGeometry(); // Needed for deinterlace
-}
+ msg_Dbg( p_intf, "Video is not needed anymore" );
-QSize VideoWidget::sizeHint() const
-{
- return videoSize;
+ assert( stable );
+ layout->removeWidget( stable );
+ stable->deleteLater();
+ stable = NULL;
+
+ updateGeometry();
+ hide();
}
/**********************************************************************
* Background Widget. Show a simple image background. Currently,
* it's album art if present or cone.
**********************************************************************/
-#define ICON_SIZE 128
-#define MAX_BG_SIZE 400
-#define MIN_BG_SIZE 64
BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i )
- :QWidget( NULL ), p_intf( _p_i )
+ :QWidget( NULL ), p_intf( _p_i ), b_expandPixmap( false )
{
- /* We should use that one to take the more size it can */
-// setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
-
/* A dark background */
setAutoFillBackground( true );
- plt = palette();
+ QPalette plt = palette();
plt.setColor( QPalette::Active, QPalette::Window , Qt::black );
plt.setColor( QPalette::Inactive, QPalette::Window , Qt::black );
setPalette( plt );
- /* A cone in the middle */
- label = new QLabel;
- label->setMargin( 5 );
- label->setMaximumHeight( MAX_BG_SIZE );
- label->setMaximumWidth( MAX_BG_SIZE );
- label->setMinimumHeight( MIN_BG_SIZE );
- label->setMinimumWidth( MIN_BG_SIZE );
- if( QDate::currentDate().dayOfYear() >= 354 )
- label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
- else
- label->setPixmap( QPixmap( ":/vlc128.png" ) );
+ /* Init the cone art */
+ updateArt( "" );
- QGridLayout *backgroundLayout = new QGridLayout( this );
- backgroundLayout->addWidget( label, 0, 1 );
- backgroundLayout->setColumnStretch( 0, 1 );
- backgroundLayout->setColumnStretch( 2, 1 );
-
- CONNECT( THEMIM->getIM(), artChanged( QString ), this, updateArt( QString ) );
-}
-
-BackgroundWidget::~BackgroundWidget()
-{
+ CONNECT( THEMIM->getIM(), artChanged( QString ),
+ this, updateArt( const QString& ) );
}
-void BackgroundWidget::resizeEvent( QResizeEvent * event )
+void BackgroundWidget::updateArt( const QString& url )
{
- if( event->size().height() <= MIN_BG_SIZE )
- label->hide();
+ if ( !url.isEmpty() )
+ {
+ pixmapUrl = url;
+ }
else
- label->show();
+ { /* Xmas joke */
+ if( QDate::currentDate().dayOfYear() >= 354 )
+ pixmapUrl = QString( ":/logo/vlc128-christmas.png" );
+ else
+ pixmapUrl = QString( ":/logo/vlc128.png" );
+ }
+ update();
}
-void BackgroundWidget::updateArt( QString url )
+void BackgroundWidget::paintEvent( QPaintEvent *e )
{
- if( url.isEmpty() )
+ int i_maxwidth, i_maxheight;
+ QPixmap pixmap = QPixmap( pixmapUrl );
+ QPainter painter(this);
+ QBitmap pMask;
+ float f_alpha = 1.0;
+
+ i_maxwidth = std::min( maximumWidth(), width() ) - MARGIN * 2;
+ i_maxheight = std::min( maximumHeight(), height() ) - MARGIN * 2;
+
+ if ( height() > MARGIN * 2 )
{
- if( QDate::currentDate().dayOfYear() >= 354 )
- label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
+ /* Scale down the pixmap if the widget is too small */
+ if( pixmap.width() > i_maxwidth || pixmap.height() > i_maxheight )
+ {
+ pixmap = pixmap.scaled( i_maxwidth, i_maxheight,
+ Qt::KeepAspectRatio, Qt::SmoothTransformation );
+ }
else
- label->setPixmap( QPixmap( ":/vlc128.png" ) );
- return;
- }
- else
- {
- label->setPixmap( QPixmap( url ) );
+ if ( b_expandPixmap &&
+ pixmap.width() < width() && pixmap.height() < height() )
+ {
+ /* Scale up the pixmap to fill widget's size */
+ f_alpha = ( (float) pixmap.height() / (float) height() );
+ pixmap = pixmap.scaled(
+ width() - MARGIN * 2,
+ height() - MARGIN * 2,
+ Qt::KeepAspectRatio,
+ ( f_alpha < .2 )? /* Don't waste cpu when not visible */
+ Qt::SmoothTransformation:
+ Qt::FastTransformation
+ );
+ /* Non agressive alpha compositing when sizing up */
+ pMask = QBitmap( pixmap.width(), pixmap.height() );
+ pMask.fill( QColor::fromRgbF( 1.0, 1.0, 1.0, f_alpha ) );
+ pixmap.setMask( pMask );
+ }
+
+ painter.drawPixmap(
+ MARGIN + ( i_maxwidth - pixmap.width() ) /2,
+ MARGIN + ( i_maxheight - pixmap.height() ) /2,
+ pixmap);
}
+ QWidget::paintEvent( e );
}
void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event )
{
QVLCMenu::PopupMenu( p_intf, true );
+ event->accept();
}
+#if 0
+#include <QPushButton>
+#include <QHBoxLayout>
+
/**********************************************************************
* Visualization selector panel
**********************************************************************/
layout->addWidget( prevButton );
layout->addWidget( nextButton );
- layout->addItem( new QSpacerItem( 40,20,
- QSizePolicy::Expanding, QSizePolicy::Minimum ) );
- layout->addWidget( new QLabel( qtr( "Current visualization:" ) ) );
+ layout->addStretch( 10 );
+ layout->addWidget( new QLabel( qtr( "Current visualization" ) ) );
current = new QLabel( qtr( "None" ) );
layout->addWidget( current );
}
VisualSelector::~VisualSelector()
-{
-}
+{}
void VisualSelector::prev()
{
free( psz_new );
}
}
+#endif
-/**********************************************************************
- * TEH controls
- **********************************************************************/
-
-#define setupSmallButton( aButton ){ \
- aButton->setMaximumSize( QSize( 26, 26 ) ); \
- aButton->setMinimumSize( QSize( 26, 26 ) ); \
- aButton->setIconSize( QSize( 20, 20 ) ); }
-
-AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
- QFrame( NULL ), p_intf( _p_i )
+SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
+ : QLabel( parent ), p_intf( _p_intf )
{
- QHBoxLayout *advLayout = new QHBoxLayout( this );
- advLayout->setMargin( 0 );
- advLayout->setSpacing( 0 );
- advLayout->setAlignment( Qt::AlignBottom );
-
- /* A to B Button */
- ABButton = new QPushButton( "AB" );
- setupSmallButton( ABButton );
- advLayout->addWidget( ABButton );
- BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), fromAtoB() );
- timeA = timeB = 0;
- CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
- this, AtoBLoop( float, int, int ) );
-#if 0
- frameButton = new QPushButton( "Fr" );
- frameButton->setMaximumSize( QSize( 26, 26 ) );
- frameButton->setIconSize( QSize( 20, 20 ) );
- advLayout->addWidget( frameButton );
- BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by Frame" ), frame() );
-#endif
+ tooltipStringPattern = qtr( "Current playback speed: %1\nClick to adjust" );
- recordButton = new QPushButton( "R" );
- setupSmallButton( recordButton );
- advLayout->addWidget( recordButton );
- BUTTON_SET_ACT_I( recordButton, "", record_16px.png,
- qtr( "Record" ), record() );
-
- /* Snapshot Button */
- snapshotButton = new QPushButton( "S" );
- setupSmallButton( snapshotButton );
- advLayout->addWidget( snapshotButton );
- BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() );
-}
+ /* Create the Speed Control Widget */
+ speedControl = new SpeedControlWidget( p_intf, this );
+ speedControlMenu = new QMenu( this );
-AdvControlsWidget::~AdvControlsWidget()
-{}
+ QWidgetAction *widgetAction = new QWidgetAction( speedControl );
+ widgetAction->setDefaultWidget( speedControl );
+ speedControlMenu->addAction( widgetAction );
-void AdvControlsWidget::enableInput( bool enable )
-{
- ABButton->setEnabled( enable );
- recordButton->setEnabled( enable );
-}
+ /* Change the SpeedRate in the Status Bar */
+ CONNECT( THEMIM->getIM(), rateChanged( float ), this, setRate( float ) );
-void AdvControlsWidget::enableVideo( bool enable )
-{
- snapshotButton->setEnabled( enable );
-#if 0
- frameButton->setEnabled( enable );
-#endif
+ DCONNECT( THEMIM, inputChanged( input_thread_t * ),
+ speedControl, activateOnState() );
+ setRate( var_InheritFloat( p_intf, "rate" ) );
}
-void AdvControlsWidget::snapshot()
+SpeedLabel::~SpeedLabel()
{
- vout_thread_t *p_vout =
- (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
+ delete speedControl;
+ delete speedControlMenu;
}
-/* Function called when the button is clicked() */
-void AdvControlsWidget::fromAtoB()
+/****************************************************************************
+ * Small right-click menu for rate control
+ ****************************************************************************/
+
+void SpeedLabel::showSpeedMenu( QPoint pos )
{
- if( !timeA )
- {
- timeA = var_GetTime( THEMIM->getInput(), "time" );
- ABButton->setText( "A->..." );
- return;
- }
- if( !timeB )
- {
- timeB = var_GetTime( THEMIM->getInput(), "time" );
- var_SetTime( THEMIM->getInput(), "time" , timeA );
- ABButton->setText( "A<=>B" );
- return;
- }
- timeA = 0;
- timeB = 0;
- ABButton->setText( "AB" );
+ speedControlMenu->exec( QCursor::pos() - pos
+ + QPoint( 0, height() ) );
}
-/* Function called regularly when in an AtoB loop */
-void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
+void SpeedLabel::setRate( float rate )
{
- if( timeB )
- {
- if( i_time >= (int)(timeB/1000000) )
- var_SetTime( THEMIM->getInput(), "time" , timeA );
- }
+ QString str;
+ str.setNum( rate, 'f', 2 );
+ str.append( "x" );
+ setText( str );
+ setToolTip( tooltipStringPattern.arg( str ) );
+ speedControl->updateControls( rate );
}
-/* FIXME Record function */
-void AdvControlsWidget::record(){}
-
-#if 0
-//FIXME Frame by frame function
-void AdvControlsWidget::frame(){}
-#endif
-
-/*****************************
- * DA Control Widget !
- *****************************/
-ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
- MainInterface *_p_mi,
- bool b_advControls,
- bool b_shiny,
- bool b_fsCreation) :
- QFrame( _p_mi ), p_intf( _p_i )
+/**********************************************************************
+ * Speed control widget
+ **********************************************************************/
+SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i, QWidget *_parent )
+ : QFrame( _parent ), p_intf( _p_i )
{
- controlLayout = new QGridLayout( );
-
- controlLayout->setSpacing( 0 );
- controlLayout->setLayoutMargins( 7, 5, 7, 3, 6 );
-
- if( !b_fsCreation )
- setLayout( controlLayout );
-
- setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum );
-
- /** The main Slider **/
- slider = new InputSlider( Qt::Horizontal, NULL );
- controlLayout->addWidget( slider, 0, 1, 1, 16 );
- /* Update the position when the IM has changed */
- CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
- slider, setPosition( float, int, int ) );
- /* And update the IM, when the position has changed */
- CONNECT( slider, sliderDragged( float ),
- THEMIM->getIM(), sliderUpdate( float ) );
-
- /** Slower and faster Buttons **/
- slowerButton = new QToolButton;
- slowerButton->setAutoRaise( true );
- slowerButton->setMaximumSize( QSize( 26, 20 ) );
-
- BUTTON_SET_ACT( slowerButton, "-", qtr( "Slower" ), slower() );
- controlLayout->addWidget( slowerButton, 0, 0 );
-
- fasterButton = new QToolButton;
- fasterButton->setAutoRaise( true );
- fasterButton->setMaximumSize( QSize( 26, 20 ) );
-
- BUTTON_SET_ACT( fasterButton, "+", qtr( "Faster" ), faster() );
- controlLayout->addWidget( fasterButton, 0, 17 );
-
- /* advanced Controls handling */
- b_advancedVisible = b_advControls;
-
- advControls = new AdvControlsWidget( p_intf );
- controlLayout->addWidget( advControls, 1, 3, 2, 4, Qt::AlignBottom );
- if( !b_advancedVisible ) advControls->hide();
-
- /** Disc and Menus handling */
- discFrame = new QWidget( this );
-
- QHBoxLayout *discLayout = new QHBoxLayout( discFrame );
- discLayout->setSpacing( 0 );
- discLayout->setMargin( 0 );
-
- prevSectionButton = new QPushButton( discFrame );
- setupSmallButton( prevSectionButton );
- discLayout->addWidget( prevSectionButton );
-
- menuButton = new QPushButton( discFrame );
- setupSmallButton( menuButton );
- discLayout->addWidget( menuButton );
-
- nextSectionButton = new QPushButton( discFrame );
- setupSmallButton( nextSectionButton );
- discLayout->addWidget( nextSectionButton );
-
- controlLayout->addWidget( discFrame, 1, 10, 2, 3, Qt::AlignBottom );
-
- BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" );
- BUTTON_SET_IMG( nextSectionButton, "", next.png, "" );
- BUTTON_SET_IMG( menuButton, "", previous.png, qtr( "Menu" ) );
-
- discFrame->hide();
-
- /* Change the navigation button display when the IM navigation changes */
- CONNECT( THEMIM->getIM(), navigationChanged( int ),
- this, setNavigation( int ) );
- /* Changes the IM navigation when triggered on the nav buttons */
- CONNECT( prevSectionButton, clicked(), THEMIM->getIM(),
- sectionPrev() );
- CONNECT( nextSectionButton, clicked(), THEMIM->getIM(),
- sectionNext() );
- CONNECT( menuButton, clicked(), THEMIM->getIM(),
- sectionMenu() );
-
- /**
- * Telextext QFrame
- * TODO: Merge with upper menu in a StackLayout
- **/
- telexFrame = new QWidget( this );
- QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
- telexLayout->setSpacing( 0 );
- telexLayout->setMargin( 0 );
-
- telexOn = new QPushButton;
- setupSmallButton( telexOn );
- telexLayout->addWidget( telexOn );
-
- telexTransparent = new QPushButton;
- setupSmallButton( telexTransparent );
- telexLayout->addWidget( telexTransparent );
- b_telexTransparent = false;
-
- telexPage = new QSpinBox;
- telexPage->setRange( 0, 999 );
- telexPage->setValue( 100 );
- telexPage->setAccelerated( true );
- telexPage->setWrapping( true );
- telexPage->setAlignment( Qt::AlignRight );
- telexPage->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
- telexLayout->addWidget( telexPage );
-
- 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() );
- CONNECT( THEMIM->getIM(), toggleTelexTransparency(),
- this, toggleTeletextTransparency() );
- CONNECT( THEMIM->getIM(), teletextEnabled( bool ),
- telexFrame, setVisible( bool ) );
-
- /** Play Buttons **/
- QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+ QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
sizePolicy.setHorizontalStretch( 0 );
sizePolicy.setVerticalStretch( 0 );
- /* Play */
- playButton = new QPushButton;
- playButton->setSizePolicy( sizePolicy );
- playButton->setMaximumSize( QSize( 36, 36 ) );
- playButton->setMinimumSize( QSize( 36, 36 ) );
- playButton->setIconSize( QSize( 30, 30 ) );
-
- controlLayout->addWidget( playButton, 2, 0, 2, 2 );
-
- controlLayout->setColumnMinimumWidth( 2, 20 );
- controlLayout->setColumnStretch( 2, 0 );
-
- /** Prev + Stop + Next Block **/
- controlButLayout = new QHBoxLayout;
- controlButLayout->setSpacing( 0 ); /* Don't remove that, will be useful */
-
- /* Prev */
- QPushButton *prevButton = new QPushButton;
- prevButton->setSizePolicy( sizePolicy );
- setupSmallButton( prevButton );
-
- controlButLayout->addWidget( prevButton );
-
- /* Stop */
- QPushButton *stopButton = new QPushButton;
- stopButton->setSizePolicy( sizePolicy );
- setupSmallButton( stopButton );
-
- controlButLayout->addWidget( stopButton );
-
- /* next */
- QPushButton *nextButton = new QPushButton;
- nextButton->setSizePolicy( sizePolicy );
- setupSmallButton( nextButton );
-
- controlButLayout->addWidget( nextButton );
-
- /* Add this block to the main layout */
- 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,
- qtr( "Previous" ), prev() );
- BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() );
- BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
-
- controlLayout->setColumnMinimumWidth( 7, 20 );
- controlLayout->setColumnStretch( 7, 0 );
- controlLayout->setColumnStretch( 8, 0 );
- controlLayout->setColumnStretch( 9, 0 );
-
- /*
- * Other first Line buttons
- */
- /** Fullscreen/Visualisation **/
- fullscreenButton = new QPushButton( "F" );
- BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
- setupSmallButton( fullscreenButton );
- controlLayout->addWidget( fullscreenButton, 3, 10, Qt::AlignBottom );
-
- /** Playlist Button **/
- playlistButton = new QPushButton;
- setupSmallButton( playlistButton );
- controlLayout->addWidget( playlistButton, 3, 11, Qt::AlignBottom );
- BUTTON_SET_IMG( playlistButton, "" , playlist.png, qtr( "Show playlist" ) );
- CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() );
-
- /** extended Settings **/
- extSettingsButton = new QPushButton;
- BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ),
- extSettings() );
- setupSmallButton( extSettingsButton );
- controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
-
- controlLayout->setColumnStretch( 13, 0 );
- controlLayout->setColumnMinimumWidth( 13, 24 );
- controlLayout->setColumnStretch( 14, 5 );
-
- /* Volume */
- hVolLabel = new VolumeClickHandler( p_intf, this );
-
- volMuteLabel = new QLabel;
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
- volMuteLabel->setToolTip( qtr( "Mute" ) );
- volMuteLabel->installEventFilter( hVolLabel );
- controlLayout->addWidget( volMuteLabel, 3, 15, Qt::AlignBottom );
-
- if( b_shiny )
- {
- volumeSlider = new SoundSlider( this,
- config_GetInt( p_intf, "volume-step" ),
- config_GetInt( p_intf, "qt-volume-complete" ),
- config_GetPsz( p_intf, "qt-slider-colours" ) );
- }
- else
- {
- volumeSlider = new QSlider( this );
- volumeSlider->setOrientation( Qt::Horizontal );
- }
- volumeSlider->setMaximumSize( QSize( 200, 40 ) );
- volumeSlider->setMinimumSize( QSize( 106, 30 ) );
- volumeSlider->setFocusPolicy( Qt::NoFocus );
- controlLayout->addWidget( volumeSlider, 2, 16, 2 , 2, Qt::AlignBottom );
+ speedSlider = new QSlider( this );
+ speedSlider->setSizePolicy( sizePolicy );
+ speedSlider->setMaximumSize( QSize( 80, 200 ) );
+ speedSlider->setOrientation( Qt::Vertical );
+ speedSlider->setTickPosition( QSlider::TicksRight );
- /* Set the volume from the config */
- volumeSlider->setValue( ( config_GetInt( p_intf, "volume" ) ) *
- VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
+ speedSlider->setRange( -34, 34 );
+ speedSlider->setSingleStep( 1 );
+ speedSlider->setPageStep( 1 );
+ speedSlider->setTickInterval( 17 );
- /* Force the update at build time in order to have a muted icon if needed */
- updateVolume( volumeSlider->value() );
+ CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
- /* Volume control connection */
- CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
- CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) );
+ QToolButton *normalSpeedButton = new QToolButton( this );
+ normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
+ normalSpeedButton->setAutoRaise( true );
+ normalSpeedButton->setText( "1x" );
+ normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) );
- updateInput();
-}
+ CONNECT( normalSpeedButton, clicked(), this, resetRate() );
-ControlsWidget::~ControlsWidget()
-{}
+ QVBoxLayout *speedControlLayout = new QVBoxLayout( this );
+ speedControlLayout->setContentsMargins( 4, 4, 4, 4 );
+ speedControlLayout->setSpacing( 4 );
+ speedControlLayout->addWidget( speedSlider );
+ speedControlLayout->addWidget( normalSpeedButton );
-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;
- }
-}
+ lastValue = 0;
-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;
- }
+ activateOnState();
}
-void ControlsWidget::stop()
+void SpeedControlWidget::activateOnState()
{
- THEMIM->stop();
+ speedSlider->setEnabled( THEMIM->getIM()->hasInput() );
}
-void ControlsWidget::play()
+void SpeedControlWidget::updateControls( float rate )
{
- if( THEPL->current.i_size == 0 )
+ if( speedSlider->isSliderDown() )
{
- /* The playlist is empty, open a file requester */
- THEDP->openFileDialog();
- setStatus( 0 );
+ //We don't want to change anything if the user is using the slider
return;
}
- THEMIM->togglePlayPause();
-}
-void ControlsWidget::prev()
-{
- THEMIM->prev();
-}
-
-void ControlsWidget::next()
-{
- THEMIM->next();
-}
-
-void ControlsWidget::setNavigation( int navigation )
-{
-#define HELP_PCH N_( "Previous chapter" )
-#define HELP_NCH N_( "Next chapter" )
+ double value = 17 * log( rate ) / log( 2 );
+ int sliderValue = (int) ( ( value > 0 ) ? value + .5 : value - .5 );
- // 1 = chapter, 2 = title, 0 = no
- if( navigation == 0 )
+ if( sliderValue < speedSlider->minimum() )
{
- discFrame->hide();
- } else if( navigation == 1 ) {
- prevSectionButton->setToolTip( qfu( HELP_PCH ) );
- nextSectionButton->setToolTip( qfu( HELP_NCH ) );
- menuButton->show();
- discFrame->show();
- } else {
- prevSectionButton->setToolTip( qfu( HELP_PCH ) );
- nextSectionButton->setToolTip( qfu( HELP_NCH ) );
- menuButton->hide();
- discFrame->show();
+ sliderValue = speedSlider->minimum();
}
-}
-
-static bool b_my_volume;
-void ControlsWidget::updateVolume( int i_sliderVolume )
-{
- if( !b_my_volume )
+ else if( sliderValue > speedSlider->maximum() )
{
- int i_res = i_sliderVolume * (AOUT_VOLUME_MAX / 2) / VOLUME_MAX;
- aout_VolumeSet( p_intf, i_res );
+ sliderValue = speedSlider->maximum();
}
- if( i_sliderVolume == 0 )
- volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) );
- else if( i_sliderVolume < VOLUME_MAX / 3 )
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
- else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) )
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
- else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
-}
+ lastValue = sliderValue;
-void ControlsWidget::updateVolume()
-{
- /* Audio part */
- audio_volume_t i_volume;
- aout_VolumeGet( p_intf, &i_volume );
- i_volume = ( i_volume * VOLUME_MAX )/ (AOUT_VOLUME_MAX/2);
- int i_gauge = volumeSlider->value();
- b_my_volume = false;
- if( i_volume - i_gauge > 1 || i_gauge - i_volume > 1 )
- {
- b_my_volume = true;
- volumeSlider->setValue( i_volume );
- b_my_volume = false;
- }
+ speedSlider->setValue( sliderValue );
}
-void ControlsWidget::updateInput()
+void SpeedControlWidget::updateRate( int sliderValue )
{
- /* Activate the interface buttons according to the presence of the input */
- enableInput( THEMIM->getIM()->hasInput() );
- enableVideo( THEMIM->getIM()->hasVideo() && THEMIM->getIM()->hasInput() );
-}
+ if( sliderValue == lastValue )
+ return;
-void ControlsWidget::setStatus( int status )
-{
- if( status == PLAYING_S ) /* Playing */
- {
- playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
- playButton->setToolTip( qtr( "Pause" ) );
- }
- else
- {
- playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
- playButton->setToolTip( qtr( "Play" ) );
- }
-}
+ double speed = pow( 2, (double)sliderValue / 17 );
+ int rate = INPUT_RATE_DEFAULT / speed;
-/**
- * TODO
- * This functions toggle the fullscreen mode
- * If there is no video, it should first activate Visualisations...
- * This has also to be fixed in enableVideo()
- */
-void ControlsWidget::fullscreen()
-{
- vout_thread_t *p_vout =
- (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_vout)
- {
- var_SetBool( p_vout, "fullscreen", !var_GetBool( p_vout, "fullscreen" ) );
- vlc_object_release( p_vout );
- }
+ THEMIM->getIM()->setRate(rate);
}
-void ControlsWidget::extSettings()
+void SpeedControlWidget::resetRate()
{
- THEDP->extendedDialog();
+ THEMIM->getIM()->setRate( INPUT_RATE_DEFAULT );
}
-void ControlsWidget::slower()
+CoverArtLabel::CoverArtLabel( QWidget *parent, intf_thread_t *_p_i )
+ : QLabel( parent ), p_intf( _p_i )
{
- THEMIM->getIM()->slower();
-}
+ setContextMenuPolicy( Qt::ActionsContextMenu );
+ CONNECT( this, updateRequested(), this, askForUpdate() );
-void ControlsWidget::faster()
-{
- THEMIM->getIM()->faster();
-}
+ setMinimumHeight( 128 );
+ setMinimumWidth( 128 );
+ setMaximumHeight( 128 );
+ setMaximumWidth( 128 );
+ setScaledContents( false );
+ setAlignment( Qt::AlignCenter );
-void ControlsWidget::enableInput( bool enable )
-{
- slowerButton->setEnabled( enable );
- slider->setEnabled( enable );
- fasterButton->setEnabled( enable );
+ QList< QAction* > artActions = actions();
+ QAction *action = new QAction( qtr( "Download cover art" ), this );
+ CONNECT( action, triggered(), this, askForUpdate() );
+ addAction( action );
- /* Advanced Buttons too */
- advControls->enableInput( enable );
+ showArtUpdate( "" );
}
-void ControlsWidget::enableVideo( bool enable )
+CoverArtLabel::~CoverArtLabel()
{
- // TODO Later make the fullscreenButton toggle Visualisation and so on.
- fullscreenButton->setEnabled( enable );
-
- /* Advanced Buttons too */
- advControls->enableVideo( enable );
+ QList< QAction* > artActions = actions();
+ foreach( QAction *act, artActions )
+ removeAction( act );
}
-void ControlsWidget::toggleAdvanced()
+void CoverArtLabel::showArtUpdate( const QString& url )
{
- if( !VISIBLE( advControls ) )
+ QPixmap pix;
+ if( !url.isEmpty() && pix.load( url ) )
{
- advControls->show();
- b_advancedVisible = true;
+ pix = pix.scaled( maximumWidth(), maximumHeight(),
+ Qt::KeepAspectRatioByExpanding,
+ Qt::SmoothTransformation );
}
else
{
- advControls->hide();
- b_advancedVisible = false;
+ pix = QPixmap( ":/noart.png" );
}
- emit advancedControlsToggled( b_advancedVisible );
+ setPixmap( pix );
}
-
-/**********************************************************************
- * 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 )
+void CoverArtLabel::askForUpdate()
{
- 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
+ THEMIM->getIM()->requestArtUpdate();
}
-FullscreenControllerWidget::~FullscreenControllerWidget()
+TimeLabel::TimeLabel( intf_thread_t *_p_intf )
+ : QLabel(), p_intf( _p_intf ), bufTimer( new QTimer(this) ),
+ buffering( false ), showBuffering(false), bufVal( -1 )
{
-}
+ b_remainingTime = false;
+ setText( " --:--/--:-- " );
+ setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+ setToolTip( QString( "- " )
+ + qtr( "Click to toggle between elapsed and remaining time" )
+ + QString( "\n- " )
+ + qtr( "Double click to jump to a chosen time position" ) );
+ bufTimer->setSingleShot( true );
-/**
- * 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
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ),
+ this, setDisplayPosition( float, int64_t, int ) );
+ CONNECT( THEMIM->getIM(), cachingChanged( float ),
+ this, updateBuffering( float ) );
+ CONNECT( bufTimer, timeout(), this, updateBuffering() );
}
-/**
- * Hidding fullscreen controller slowly
- * Linux: need composite manager
- * Windows: it is blinking, so it can be enabled by define TRASPARENCY
- */
-void FullscreenControllerWidget::slowHideFSC()
+void TimeLabel::setDisplayPosition( float pos, int64_t t, int length )
{
-#if HAVE_TRANSPARENCY
- static bool first_call = true;
+ showBuffering = false;
+ bufTimer->stop();
- if ( first_call )
+ if( pos == -1.f )
{
- 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();
- }
+ setText( " --:--/--:-- " );
+ return;
}
-#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
+ int time = t / 1000000;
- return isHidden();
-}
+ secstotimestr( psz_length, length );
+ secstotimestr( psz_time, ( b_remainingTime && length ) ? length - time
+ : time );
-/**
- * event handling
- * events: show, hide, start timer for hidding
- */
-void FullscreenControllerWidget::customEvent( QEvent *event )
-{
- int type = event->type();
+ QString timestr = QString( " %1%2/%3 " )
+ .arg( QString( (b_remainingTime && length) ? "-" : "" ) )
+ .arg( QString( psz_time ) )
+ .arg( QString( ( !length && time ) ? "--:--" : psz_length ) );
- 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
+ setText( timestr );
-#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
- }
+ cachedLength = length;
}
-/**
- * On mouse move
- * moving with FSC
- */
-void FullscreenControllerWidget::mouseMoveEvent( QMouseEvent *event )
+void TimeLabel::setDisplayPosition( float pos )
{
- if ( event->buttons() == Qt::LeftButton )
+ if( pos == -1.f || cachedLength == 0 )
{
- 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();
+ setText( " --:--/--:-- " );
+ return;
}
-}
-/**
- * On mouse press
- * store position of cursor
- */
-void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event )
-{
- i_lastPosX = event->globalX();
- i_lastPosY = event->globalY();
-}
+ int time = pos * cachedLength;
+ secstotimestr( psz_time,
+ ( b_remainingTime && cachedLength ?
+ cachedLength - time : time ) );
+ QString timestr = QString( " %1%2/%3 " )
+ .arg( QString( (b_remainingTime && cachedLength) ? "-" : "" ) )
+ .arg( QString( psz_time ) )
+ .arg( QString( ( !cachedLength && time ) ? "--:--" : psz_length ) );
-/**
- * On mouse go above FSC
- */
-void FullscreenControllerWidget::enterEvent( QEvent *event )
-{
- p_hideTimer->stop();
-#if HAVE_TRANSPARENCY
- p_slowHideTimer->stop();
-#endif
- b_mouseIsOver = true;
+ setText( timestr );
}
-/**
- * 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 )
+void TimeLabel::toggleTimeDisplay()
{
- int i_vlck = qtEventToVLCKey( event );
- if( i_vlck > 0 )
- {
- var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
- event->accept();
- }
- else
- event->ignore();
+ b_remainingTime = !b_remainingTime;
}
-/**
- * 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 )
+void TimeLabel::updateBuffering( float _buffered )
{
- 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 )
+ bufVal = _buffered;
+ if( !buffering || bufVal == 0 )
{
- 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;
+ showBuffering = false;
+ buffering = true;
+ bufTimer->start(200);
}
-
- 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 )
+ else if( bufVal == 1 )
{
- IMEvent *event = new IMEvent( FullscreenControlShow_Type, 0 );
- QApplication::postEvent( p_fs, static_cast<QEvent *>(event) );
+ showBuffering = buffering = false;
+ bufTimer->stop();
}
-
- IMEvent *e = new IMEvent( FullscreenControlPlanHide_Type, 0 );
- QApplication::postEvent( p_fs, static_cast<QEvent *>(e) );
-
- return VLC_SUCCESS;
-}
-
-/**********************************************************************
- * Speed control widget
- **********************************************************************/
-SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) :
- QFrame( NULL ), p_intf( _p_i )
-{
- QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
- sizePolicy.setHorizontalStretch( 0 );
- sizePolicy.setVerticalStretch( 0 );
-
- speedSlider = new QSlider;
- speedSlider->setSizePolicy( sizePolicy );
- speedSlider->setMaximumSize( QSize( 80, 200 ) );
- speedSlider->setOrientation( Qt::Vertical );
- speedSlider->setTickPosition( QSlider::TicksRight );
-
- speedSlider->setRange( -100, 100 );
- speedSlider->setSingleStep( 10 );
- speedSlider->setPageStep( 20 );
- speedSlider->setTickInterval( 20 );
-
- CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
-
- QToolButton *normalSpeedButton = new QToolButton( this );
- normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
- normalSpeedButton->setAutoRaise( true );
- normalSpeedButton->setText( "N" );
- normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) );
-
- CONNECT( normalSpeedButton, clicked(), this, resetRate() );
-
- QVBoxLayout *speedControlLayout = new QVBoxLayout;
- speedControlLayout->addWidget( speedSlider );
- speedControlLayout->addWidget( normalSpeedButton );
- setLayout( speedControlLayout );
+ update();
}
-SpeedControlWidget::~SpeedControlWidget()
-{}
-
-void SpeedControlWidget::setEnable( bool b_enable )
+void TimeLabel::updateBuffering()
{
- speedSlider->setEnabled( b_enable );
+ showBuffering = true;
+ update();
}
-#define RATE_SLIDER_MAXIMUM 3.0
-#define RATE_SLIDER_MINIMUM 0.3
-#define RATE_SLIDER_LENGTH 100.0
-
-void SpeedControlWidget::updateControls( int rate )
+void TimeLabel::paintEvent( QPaintEvent* event )
{
- if( speedSlider->isSliderDown() )
- {
- //We don't want to change anything if the user is using the slider
- return;
- }
-
- int sliderValue;
- double speed = INPUT_RATE_DEFAULT / (double)rate;
-
- if( rate >= INPUT_RATE_DEFAULT )
+ if( showBuffering )
{
- if( speed < RATE_SLIDER_MINIMUM )
- {
- sliderValue = speedSlider->minimum();
- }
- else
- {
- sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH
- / ( 1.0 - RATE_SLIDER_MAXIMUM ) );
- }
+ QRect r( rect() );
+ r.setLeft( r.width() * bufVal );
+ QPainter p( this );
+ p.setOpacity( 0.4 );
+ p.fillRect( r, palette().color( QPalette::Highlight ) );
}
- else
- {
- if( speed > RATE_SLIDER_MAXIMUM )
- {
- sliderValue = speedSlider->maximum();
- }
- else
- {
- sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH
- / ( RATE_SLIDER_MAXIMUM - 1.0 ) );
- }
- }
-
- //Block signals to avoid feedback loop
- speedSlider->blockSignals( true );
- speedSlider->setValue( sliderValue );
- speedSlider->blockSignals( false );
-}
-
-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 ));
- }
-
- THEMIM->getIM()->setRate(rate);
-}
-
-void SpeedControlWidget::resetRate()
-{
- THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT);
+ QLabel::paintEvent( event );
}
projects / vlc / blobdiff