# include <qx11info_x11.h>
#endif
+#include <math.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 )
{
/* Init */
- vlc_mutex_init( &lock );
- p_vout = NULL;
+ i_vout = 0;
hide(); setMinimumSize( 16, 16 );
videoSize.rwidth() = -1;
videoSize.rheight() = -1;
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
+
+
}
void VideoWidget::paintEvent(QPaintEvent *ev)
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 )
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 );
}
/**
{
msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
emit askVideoWidgetToShow( *pi_width, *pi_height );
- if( p_vout )
+ 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();
}
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();
: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 );
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_mouseIsOver( false ), b_isFullscreen( false )
{
setWindowFlags( Qt::ToolTip );
}
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 */
{
int type = event->type();
- if ( type == FullscreenControlShow_Type )
+ if ( type == FullscreenControlShow_Type && b_isFullscreen )
{
#ifdef WIN32TRICK
// after quiting and going to fs, we need to call show()
if ( var_GetBool( p_vout, "fullscreen" ) && !b_registered )
{
- p_fs->SetHideTimeout( var_GetInteger( p_vout, "mouse-hide-timeout" ) );
+ 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;
}
- if ( !var_GetBool( p_vout, "fullscreen" ) )
- p_fs->hide();
-
return VLC_SUCCESS;
}
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 );
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() )
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
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);
}