#include <QMenu>
#include <QWidgetAction>
#include <QDesktopWidget>
+#include <QPainter>
+#include <QTimer>
#ifdef Q_WS_X11
# include <X11/Xlib.h>
* 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 )
+ , reparentable( NULL )
{
- /* Init */
- reparentable = NULL;
- videoSize.rwidth() = -1;
- videoSize.rheight() = -1;
-
- hide();
-
/* Set the policy to expand in both directions */
// setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
innerLayout->addWidget( stable );
- reparentable->setLayout( innerLayout );
layout->addWidget( reparentable );
#ifdef Q_WS_X11
- /* HACK: Only one X11 client can subscribe to mouse click events.
+ /* 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 them. */
+ * Force Qt4 to unsubscribe from mouse press and release events. */
Display *dpy = QX11Info::display();
Window w = stable->winId();
XWindowAttributes attr;
XGetWindowAttributes( dpy, w, &attr );
- XSelectInput( dpy, w, attr.your_event_mask & ~ButtonPressMask );
+ attr.your_event_mask &= ~(ButtonPressMask|ButtonReleaseMask);
+ XSelectInput( dpy, w, attr.your_event_mask );
#endif
videoSync();
#ifndef NDEBUG
Parent has to care about resizing itself */
void VideoWidget::SetSizing( unsigned int w, unsigned int h )
{
+ if (reparentable->windowState() & Qt::WindowFullScreen )
+ return;
msg_Dbg( p_intf, "Video is resizing to: %i %i", w, h );
- videoSize.rwidth() = w;
- videoSize.rheight() = h;
+ videoSize.setWidth( w );
+ videoSize.setHeight( h );
if( !isVisible() ) show();
updateGeometry(); // Needed for deinterlace
videoSync();
if( b_fs )
{ /* Go full-screen */
- int numscreen = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
+ int numscreen = var_InheritInteger( p_intf, "qt-fullscreen-screennumber" );
+ /* if user hasn't defined screennumber, or screennumber that is bigger
+ * than current number of screens, take screennumber where current interface
+ * is
+ */
+ if( numscreen == -1 || numscreen > QApplication::desktop()->numScreens() )
+ numscreen = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
+
QRect screenres = QApplication::desktop()->screenGeometry( numscreen );
+ reparentable->setParent( NULL, newflags );
reparentable->setWindowState( newstate );
- reparentable->setParent( NULL );
- reparentable->setWindowFlags( newflags );
/* To be sure window is on proper-screen in xinerama */
if( !screenres.contains( reparentable->pos() ) )
{
else
{ /* Go windowed */
reparentable->setWindowFlags( newflags );
- layout->addWidget( reparentable );
reparentable->setWindowState( newstate );
+ layout->addWidget( reparentable );
}
videoSync();
}
{
msg_Dbg( p_intf, "Video is not needed anymore" );
//layout->removeWidget( reparentable );
+
+#ifdef WIN32
+ /* Come back to default thumbnail for Windows 7 taskbar */
+ LPTASKBARLIST3 p_taskbl;
+
+ CoInitialize( 0 );
+
+ if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
+ NULL, CLSCTX_INPROC_SERVER,
+ &IID_ITaskbarList3,
+ (void **)&p_taskbl) )
+ {
+ p_taskbl->vt->HrInit(p_taskbl);
+
+ HWND hroot = GetAncestor(reparentable->winId(),GA_ROOT);
+
+ if (S_OK != p_taskbl->vt->SetThumbnailClip(p_taskbl, hroot, NULL))
+ msg_Err(p_intf, "SetThumbNailClip failed");
+ msg_Err(p_intf, "Releasing taskbar | root handle = %08x", hroot);
+ p_taskbl->vt->Release(p_taskbl);
+ }
+ CoUninitialize();
+
+#endif
+
delete reparentable;
reparentable = NULL;
- videoSize.rwidth() = 0;
- videoSize.rheight() = 0;
+ videoSize = QSize();
updateGeometry();
hide();
}
+
QSize VideoWidget::sizeHint() const
{
return videoSize;
/* 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->setMaximumHeight( MAX_BG_SIZE );
label->setMaximumWidth( MAX_BG_SIZE );
label->setMinimumHeight( MIN_BG_SIZE );
- label->setMinimumWidth( MIN_BG_SIZE );
+ label->setMinimumWidth( MIN_BG_SIZE );*/
label->setAlignment( Qt::AlignCenter );
if( QDate::currentDate().dayOfYear() >= 354 )
label->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) );
/* Change the SpeedRate in the Status Bar */
CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
- CONNECT( THEMIM, inputChanged( input_thread_t * ),
- speedControl, activateOnState() );
-
+ DCONNECT( THEMIM, inputChanged( input_thread_t * ),
+ speedControl, activateOnState() );
}
+
SpeedLabel::~SpeedLabel()
{
- delete speedControl;
- delete speedControlMenu;
+ delete speedControl;
+ delete speedControlMenu;
}
+
/****************************************************************************
* Small right-click menu for rate control
****************************************************************************/
+
void SpeedLabel::showSpeedMenu( QPoint pos )
{
speedControlMenu->exec( QCursor::pos() - pos
speedSlider->setPageStep( 1 );
speedSlider->setTickInterval( 17 );
- CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
+ CONNECT( speedSlider, sliderMoved( int ), this, updateRate( int ) );
QToolButton *normalSpeedButton = new QToolButton( this );
normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
CONNECT( normalSpeedButton, clicked(), this, resetRate() );
QVBoxLayout *speedControlLayout = new QVBoxLayout( this );
- speedControlLayout->setLayoutMargins( 4, 4, 4, 4, 4 );
+ speedControlLayout->setContentsMargins( 4, 4, 4, 4 );
speedControlLayout->setSpacing( 4 );
speedControlLayout->addWidget( speedSlider );
speedControlLayout->addWidget( normalSpeedButton );
sliderValue = speedSlider->maximum();
}
- //Block signals to avoid feedback loop
- speedSlider->blockSignals( true );
speedSlider->setValue( sliderValue );
- speedSlider->blockSignals( false );
}
void SpeedControlWidget::updateRate( int sliderValue )
void CoverArtLabel::showArtUpdate( const QString& url )
{
QPixmap pix;
- if( !url.isEmpty() && pix.load( url ) )
+ if( !url.isEmpty() && pix.load( url ) )
{
pix = pix.scaled( maximumWidth(), maximumHeight(),
Qt::KeepAspectRatioByExpanding );
THEMIM->getIM()->requestArtUpdate();
}
-TimeLabel::TimeLabel( intf_thread_t *_p_intf ) :QLabel(), p_intf( _p_intf )
+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( qtr( "Toggle between elapsed and remaining time" ) );
-
+ b_remainingTime = false;
+ setText( " --:--/--:-- " );
+ setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+ setToolTip( qtr( "Toggle between elapsed and remaining time" ) );
+ bufTimer->setSingleShot( true );
- CONNECT( THEMIM->getIM(), cachingChanged( float ),
- this, setCaching( float ) );
- CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
- this, setDisplayPosition( float, int, int ) );
+ 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() );
}
-void TimeLabel::setDisplayPosition( float pos, int time, int length )
+void TimeLabel::setDisplayPosition( float pos, int64_t t, int length )
{
+ showBuffering = false;
+ bufTimer->stop();
+
if( pos == -1.f )
{
setText( " --:--/--:-- " );
return;
}
- char psz_length[MSTRTIME_MAX_SIZE], psz_time[MSTRTIME_MAX_SIZE];
+ int time = t / 1000000;
+
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 );
+ timestr.sprintf( " %s%s/%s ", (b_remainingTime && length) ? "-" : "",
+ psz_time, ( !length && time ) ? "--:--" : psz_length );
+
+ setText( timestr );
+
+ cachedLength = length;
+}
+
+void TimeLabel::setDisplayPosition( float pos )
+{
+ if( pos == -1.f || cachedLength == 0 )
+ {
+ setText( " --:--/--:-- " );
+ return;
+ }
+
+ int time = pos * cachedLength;
+ secstotimestr( psz_time,
+ ( b_remainingTime && cachedLength ?
+ cachedLength - time : time ) );
+ QString timestr;
+ timestr.sprintf( " %s%s/%s ", (b_remainingTime && cachedLength) ? "-" : "",
+ psz_time, ( !cachedLength && time ) ? "--:--" : psz_length );
- /* Add a minus to remaining time*/
- if( b_remainingTime && length ) setText( " -"+timestr+" " );
- else setText( " "+timestr+" " );
+ setText( timestr );
}
+
void TimeLabel::toggleTimeDisplay()
{
b_remainingTime = !b_remainingTime;
}
-void TimeLabel::setCaching( float f_cache )
+
+void TimeLabel::updateBuffering( float _buffered )
{
- QString amount;
- amount.setNum( (int)(100 * f_cache) );
- msg_Dbg( p_intf, "New caching: %d", (int)(100*f_cache));
- setText( "Buff: " + amount + "%" );
+ bufVal = _buffered;
+ if( !buffering || bufVal == 0 )
+ {
+ showBuffering = false;
+ buffering = true;
+ bufTimer->start(200);
+ }
+ else if( bufVal == 1 )
+ {
+ showBuffering = buffering = false;
+ bufTimer->stop();
+ }
+ update();
}
+void TimeLabel::updateBuffering()
+{
+ showBuffering = true;
+ update();
+}
+void TimeLabel::paintEvent( QPaintEvent* event )
+{
+ if( showBuffering )
+ {
+ QRect r( rect() );
+ r.setLeft( r.width() * bufVal );
+ QPainter p( this );
+ p.setOpacity( 0.4 );
+ p.fillRect( r, palette().color( QPalette::Highlight ) );
+ }
+ QLabel::paintEvent( event );
+}
projects / vlc / blobdiff