[vlc-devel] commit: Logarithmic slider for speed. (Jean-Baptiste Kempf )
git version control
git at videolan.org
Mon Jul 7 18:05:10 CEST 2008
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 7 06:58:38 2008 -0700| [79bc7d59facaeafe140ecc924b04c9cb6310df61]
Logarithmic slider for speed.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=79bc7d59facaeafe140ecc924b04c9cb6310df61
---
modules/gui/qt4/components/interface_widgets.cpp | 60 ++++++---------------
1 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 207699e..c53d8fb 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -52,6 +52,8 @@
# include <qx11info_x11.h>
#endif
+#include <math.h>
+
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
* This class handles resize issues
@@ -1211,22 +1213,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 );
@@ -1240,10 +1244,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() )
@@ -1252,32 +1252,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
@@ -1288,18 +1272,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);
}
More information about the vlc-devel
mailing list