#include "input_manager.hpp"
#include "menus.hpp"
#include "util/input_slider.hpp"
+#include "util/customwidgets.hpp"
#include <vlc_vout.h>
#include <QLabel>
ABButton->setIconSize( QSize( 20, 20 ) );
advLayout->addWidget( ABButton );
BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), fromAtoB() );
-
- snapshotButton = new QPushButton( "S" );
- snapshotButton->setMaximumSize( QSize( 26, 26 ) );
- snapshotButton->setIconSize( QSize( 20, 20 ) );
- advLayout->addWidget( snapshotButton );
- BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() );
+ timeA = 0;
+ timeB = 0;
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
+ this, AtoBLoop( float, int, int ) );
//FIXME Frame by frame function
frameButton = new QPushButton( "Fr" );
BUTTON_SET_ACT_I( recordButton, "", record_16px.png,
qtr( "Record" ), record() );
- normalButton = new QPushButton( "N" );
- normalButton->setMaximumSize( QSize( 26, 26 ) );
- normalButton->setIconSize( QSize( 20, 20 ) );
- advLayout->addWidget( normalButton );
- BUTTON_SET_ACT( normalButton, "N", qtr( "Normal rate" ), normal() );
+ snapshotButton = new QPushButton( "S" );
+ snapshotButton->setMaximumSize( QSize( 26, 26 ) );
+ snapshotButton->setIconSize( QSize( 20, 20 ) );
+ advLayout->addWidget( snapshotButton );
+ BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() );
}
{
ABButton->setEnabled( enable );
recordButton->setEnabled( enable );
- normalButton->setEnabled( enable );
}
void AdvControlsWidget::enableVideo( bool enable )
{
frameButton->setEnabled( enable );
}
-void AdvControlsWidget::normal()
-{
- THEMIM->getIM()->normalRate();
-}
-
void AdvControlsWidget::snapshot()
{
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 );
}
-void AdvControlsWidget::frame(){}
-void AdvControlsWidget::fromAtoB(){}
+void AdvControlsWidget::frame()
+{
+}
+
+void AdvControlsWidget::fromAtoB()
+{
+ 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" );
+}
+
void AdvControlsWidget::record(){}
+void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
+{
+ if( timeB )
+ {
+ if( i_time >= (int)(timeB/1000000) )
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
+ }
+}
+
/*****************************
* DA Control Widget !
*****************************/
ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
QFrame( NULL ), p_intf( _p_i )
{
- //QSize size( 500, 200 );
- //resize( size );
controlLayout = new QGridLayout( this );
controlLayout->setSpacing( 0 );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
-#if DEBUG_COLOR
- QPalette palette2;
- palette2.setColor(this->backgroundRole(), Qt::magenta);
- setPalette(palette2);
-#endif
-
/** The main Slider **/
slider = new InputSlider( Qt::Horizontal, NULL );
controlLayout->addWidget( slider, 0, 1, 1, 16 );
THEMIM->getIM(), sliderUpdate( float ) );
/** Slower and faster Buttons **/
- slowerButton = new QPushButton( "S" );
+ slowerButton = new QPushButton;
slowerButton->setFlat( true );
+ slowerButton->setMaximumSize( QSize( 26, 20 ) );
- BUTTON_SET_ACT( slowerButton, "S", qtr( "Slower" ), slower() );
+ BUTTON_SET_ACT( slowerButton, "-", qtr( "Slower" ), slower() );
controlLayout->addWidget( slowerButton, 0, 0 );
- slowerButton->setMaximumSize( QSize( 26, 20 ) );
- fasterButton = new QPushButton( "F" );
+ fasterButton = new QPushButton;
fasterButton->setFlat( true );
+ fasterButton->setMaximumSize( QSize( 26, 20 ) );
- BUTTON_SET_ACT( fasterButton, "F", qtr( "Faster" ), faster() );
+ BUTTON_SET_ACT( fasterButton, "+", qtr( "Faster" ), faster() );
controlLayout->addWidget( fasterButton, 0, 17 );
- fasterButton->setMaximumSize( QSize( 26, 20 ) );
/* advanced Controls handling */
b_advancedVisible = b_advControls;
advControls = new AdvControlsWidget( p_intf );
- controlLayout->addWidget( advControls, 1, 3, 2, 5, Qt::AlignBottom );
+ controlLayout->addWidget( advControls, 1, 3, 2, 4, Qt::AlignBottom );
if( !b_advancedVisible ) advControls->hide();
- // FIXME THIS should be removed. need_components_update = true;
/** Disc and Menus handling */
discFrame = new QFrame( this );
/** TODO
* Telextext QFrame
+ * Merge with upper menu in a StackLayout
**/
/** Play Buttons **/
BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() );
BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
- controlLayout->setColumnStretch( 8 , 10 );
- controlLayout->setColumnStretch( 9, 0 );
+ controlLayout->setColumnStretch( 7 , 2 );
/*
* Other first Line buttons
controlLayout->setColumnStretch( 14, 5 );
/* Volume */
- VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
+ VolumeClickHandler *hVolLabel = new VolumeClickHandler( p_intf, this );
volMuteLabel = new QLabel;
volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
volMuteLabel->setToolTip( qtr( "Mute" ) );
- volMuteLabel->installEventFilter( h );
-
- /** TODO:
- * Change this slider to use a nice Amarok-like one
- * Add a Context menu to change to the most useful %
- * **/
- /** FIXME
- * THis percerntage thing has to be handled correctly
- * This has to match to the OSD
- **/
- volumeSlider = new QSlider;
- volumeSlider->setSizePolicy( sizePolicy );
- volumeSlider->setMaximumSize( QSize( 80, 200 ) );
- volumeSlider->setOrientation( Qt::Horizontal );
+ volMuteLabel->installEventFilter( hVolLabel );
+ controlLayout->addWidget( volMuteLabel, 3, 15 );
- volumeSlider->setMaximum( VOLUME_MAX );
+ volumeSlider = new SoundSlider( this, config_GetInt( p_intf, "qt-volume-complete" ) );
+ volumeSlider->setMaximumSize( QSize( 200, 40 ) );
+ volumeSlider->setMinimumSize( QSize( 80, 20 ) );
volumeSlider->setFocusPolicy( Qt::NoFocus );
- controlLayout->addWidget( volMuteLabel, 3, 15 );
controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 );
+
+ /* Set the volume from the config */
+ volumeSlider->setValue( (config_GetInt( p_intf, "volume" ) )* VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
/* Volume control connection */
CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
void ControlsWidget::play()
{
- if( THEPL )
- msg_Dbg( p_intf, "There is %i playlist items", THEPL->items.i_size ); /* FIXME: remove me */
- if( playlist_IsEmpty( THEPL ) )
+ if( THEPL->current.i_size == 0 )
{
/* The playlist is empty, open a file requester */
THEDP->openFileDialog();
volumeSlider->setValue( i_volume );
b_my_volume = false;
}
-
+
/* Activate the interface buttons according to the presence of the input */
enableInput( THEMIM->getIM()->hasInput() );
//enableVideo( THEMIM->getIM()->hasVideo() );
{
}
-QSize PlaylistWidget::sizeHint() const
-{
- return widgetSize;
-}
-
/**********************************************************************
* 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->setSingleStep( 10 );
speedSlider->setPageStep( 20 );
speedSlider->setTickInterval( 20 );
-
+
CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
-
+
normalSpeedButton = new QPushButton( "N" );
normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
normalSpeedButton->setFlat( true );
normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) );
-
+
CONNECT( normalSpeedButton, clicked(), this, resetRate() );
-
+
QVBoxLayout *speedControlLayout = new QVBoxLayout;
speedControlLayout->addWidget(speedSlider);
speedControlLayout->addWidget(normalSpeedButton);
//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( speed < RATE_SLIDER_MINIMUM )
{
sliderValue = speedSlider->minimum();
/ ( RATE_SLIDER_MAXIMUM - 1.0 ) );
}
}
-
+
//Block signals to avoid feedback loop
speedSlider->blockSignals( true );
speedSlider->setValue( sliderValue );
void SpeedControlWidget::updateRate( int sliderValue )
{
int rate;
-
+
if( sliderValue < 0.0 )
{
rate = INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH /
( sliderValue * ( RATE_SLIDER_MAXIMUM - 1.0 ) + RATE_SLIDER_LENGTH );
}
- THEMIM->getIM()->setRate(rate);
+ THEMIM->getIM()->setRate(rate);
}
void SpeedControlWidget::resetRate()
{
- THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT);
+ THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT);
}
+
+
projects / vlc / blobdiff