*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
+ * Rafaël Carré <funman@videolanorg>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
{
vlc_mutex_init( p_intf, &lock );
p_vout = NULL;
-
+ CONNECT( this, askResize(), this, SetMinSize() );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
}
return NULL;
}
p_vout = p_nvout;
- setMinimumSize( 16, 16 );
+ emit askResize();
return ( void* )winId();
}
+void VideoWidget::SetMinSize()
+{
+ setMinimumSize( 16, 16 );
+}
+
void VideoWidget::release( void *p_win )
{
p_vout = NULL;
}
/**********************************************************************
- * More controls
+ * 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 )
{
- QHBoxLayout *layout = new QHBoxLayout( this );
- layout->setMargin( 0 );
+ QHBoxLayout *advLayout = new QHBoxLayout( this );
+ advLayout->setMargin( 0 );
+ advLayout->setSpacing( 0 );
- normalButton = new QPushButton( "N" );
- BUTTON_SET_ACT( normalButton, "N", qtr( "Normal rate" ), normal() );
- layout->addWidget( normalButton );
- normalButton->setMaximumWidth( 35 );
-
-
- layout->addItem( new QSpacerItem( 100,20,
- QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+/* FIXME A to B function */
+ ABButton = new QPushButton( "AB" );
+ ABButton->setMaximumSize( QSize( 26, 26 ) );
+ 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() );
- layout->addWidget( snapshotButton );
- snapshotButton->setMaximumWidth( 35 );
- fullscreenButton = new QPushButton( "F" );
- BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
- layout->addWidget( fullscreenButton );
- fullscreenButton->setMaximumWidth( 35 );
+//FIXME Frame by frame function
+ 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() );
+
+/* FIXME Record function */
+ recordButton = new QPushButton( "R" );
+ recordButton->setMaximumSize( QSize( 26, 26 ) );
+ recordButton->setIconSize( QSize( 20, 20 ) );
+ advLayout->addWidget( recordButton );
+ BUTTON_SET_ACT( recordButton, "R", 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() );
+
}
AdvControlsWidget::~AdvControlsWidget()
void AdvControlsWidget::enableInput( bool enable )
{
-// slowerButton->setEnabled( enable );
+ ABButton->setEnabled( enable );
+ recordButton->setEnabled( enable );
normalButton->setEnabled( enable );
-// fasterButton->setEnabled( enable );
}
void AdvControlsWidget::enableVideo( bool enable )
{
snapshotButton->setEnabled( enable );
- fullscreenButton->setEnabled( enable );
+ frameButton->setEnabled( enable );
}
void AdvControlsWidget::normal()
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::fullscreen()
-{
-}
+void AdvControlsWidget::frame(){}
+void AdvControlsWidget::fromAtoB(){}
+void AdvControlsWidget::record(){}
-ControlsWidget::ControlsWidget( intf_thread_t *_p_i ) :
+/*****************************
+ * 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 );
+#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, 15 );
+ 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 ) );
slowerButton = new QPushButton( "S" );
BUTTON_SET_ACT( slowerButton, "S", qtr( "Slower" ), slower() );
controlLayout->addWidget( slowerButton, 0, 0 );
- slowerButton->setMaximumSize( QSize( 26, 26 ) );
+ slowerButton->setMaximumSize( QSize( 26, 20 ) );
fasterButton = new QPushButton( "F" );
BUTTON_SET_ACT( fasterButton, "F", qtr( "Faster" ), faster() );
- controlLayout->addWidget( fasterButton, 0, 16 );
- fasterButton->setMaximumSize( QSize( 26, 26 ) );
+ controlLayout->addWidget( fasterButton, 0, 17 );
+ fasterButton->setMaximumSize( QSize( 26, 20 ) );
+
+ /** TODO: Insert here the AdvControls Widget
+ * Then fix all the size issues in main_interface.cpp
+ **/
+ /* advanced Controls handling */
+ b_advancedVisible = b_advControls;
+
+ advControls = new AdvControlsWidget( p_intf );
+ controlLayout->addWidget( advControls, 1, 3, 2, 5, Qt::AlignBottom );
+ if( !b_advancedVisible ) advControls->hide();
+ //THIS should be removed. need_components_update = true;
/** Disc and Menus handling */
discFrame = new QFrame( this );
- QHBoxLayout *discLayout = new QHBoxLayout( discFrame );
- QPushButton *menuButton = new QPushButton( discFrame );
- discLayout->addWidget( menuButton );
+ QHBoxLayout *discLayout = new QHBoxLayout( discFrame );
+ discLayout->setSpacing( 0 );
+ discLayout->setMargin( 0 );
- QPushButton *prevSectionButton = new QPushButton( discFrame );
+ prevSectionButton = new QPushButton( discFrame );
+ setupSmallButton( prevSectionButton );
discLayout->addWidget( prevSectionButton );
- QPushButton *nextSectionButton = new QPushButton( discFrame );
+ menuButton = new QPushButton( discFrame );
+ setupSmallButton( menuButton );
+ discLayout->addWidget( menuButton );
+
+ nextSectionButton = new QPushButton( discFrame );
+ setupSmallButton( nextSectionButton );
discLayout->addWidget( nextSectionButton );
- controlLayout->addWidget( discFrame, 1, 13, 1, 4 );
+ controlLayout->addWidget( discFrame, 1, 10, 2, 3, Qt::AlignBottom );
BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" );
BUTTON_SET_IMG( nextSectionButton, "", next.png, "" );
CONNECT( menuButton, clicked(), THEMIM->getIM(),
sectionMenu() );
+ /** TODO
+ * Telextext QFrame
+ **/
+
/** Play Buttons **/
QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
sizePolicy.setHorizontalStretch( 0 );
sizePolicy.setVerticalStretch( 0 );
-// sizePolicy.setHeightForWidth( playButton->sizePolicy().hasHeightForWidth() );
/* Play */
- QPushButton *playButton = new QPushButton;
+ playButton = new QPushButton;
playButton->setSizePolicy( sizePolicy );
- playButton->setMaximumSize( QSize( 26, 26 ) );
- playButton->setIconSize( QSize( 20, 20 ) );
+ playButton->setMaximumSize( QSize( 45, 45 ) );
+ playButton->setIconSize( QSize( 30, 30 ) );
- controlLayout->addWidget( playButton, 2, 0, 2, 2 );
+ controlLayout->addWidget( playButton, 2, 0, 2, 2, Qt::AlignBottom );
+
+ controlLayout->setColumnMinimumWidth( 2, 20 );
+ controlLayout->setColumnStretch( 2, 0 );
/** Prev + Stop + Next Block **/
QHBoxLayout *controlButLayout = new QHBoxLayout;
/* Prev */
QPushButton *prevButton = new QPushButton;
prevButton->setSizePolicy( sizePolicy );
- prevButton->setMaximumSize( QSize( 26, 26 ) );
- prevButton->setIconSize( QSize( 20, 20 ) );
+ setupSmallButton( prevButton );
controlButLayout->addWidget( prevButton );
/* Stop */
QPushButton *stopButton = new QPushButton;
stopButton->setSizePolicy( sizePolicy );
- stopButton->setMaximumSize( QSize( 26, 26 ) );
- stopButton->setIconSize( QSize( 20, 20 ) );
+ setupSmallButton( stopButton );
controlButLayout->addWidget( stopButton );
/* next */
QPushButton *nextButton = new QPushButton;
nextButton->setSizePolicy( sizePolicy );
- nextButton->setMaximumSize( QSize( 26, 26 ) );
- nextButton->setIconSize( QSize( 20, 20 ) );
+ setupSmallButton( nextButton );
controlButLayout->addWidget( nextButton );
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 );
+
/*
* Other first Line buttons
* Might need to be inside a frame to avoid a few resizing pb
/** Fullscreen/Visualisation **/
fullscreenButton = new QPushButton( "F" );
BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
- fullscreenButton->setMaximumSize( QSize( 26, 26 ) );
- controlLayout->addWidget( fullscreenButton, 3, 11 );
+ setupSmallButton( fullscreenButton );
+ controlLayout->addWidget( fullscreenButton, 3, 10 );
/** Playlist Button **/
playlistButton = new QPushButton;
- playlistButton->setMaximumSize( QSize( 45, 45 ) );
- playlistButton->setIconSize( QSize( 30, 30 ) );
-
- controlLayout->addWidget( playlistButton, 3, 10 );
+ setupSmallButton( playlistButton );
+ controlLayout->addWidget( playlistButton, 3, 11 );
/** extended Settings **/
QPushButton *extSettingsButton = new QPushButton( "F" );
BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ),
extSettings() );
- extSettingsButton->setMaximumSize( QSize( 26, 26 ) );
+ setupSmallButton( extSettingsButton );
controlLayout->addWidget( extSettingsButton, 3, 12 );
- /** Preferences **/
- QPushButton *prefsButton = new QPushButton( "P" );
- BUTTON_SET_ACT( prefsButton, "P", qtr( "Preferences / Settings" ), prefs() );
- prefsButton->setMaximumSize( QSize( 26, 26 ) );
- controlLayout->addWidget( prefsButton, 3, 13 );
+ controlLayout->setColumnStretch( 14, 5 );
/* Volume */
VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
- QLabel *volMuteLabel = new QLabel;
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+ 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 );
- volumeSlider->setMaximum( 100 );
+ volumeSlider->setMaximum( VOLUME_MAX );
volumeSlider->setFocusPolicy( Qt::NoFocus );
- controlLayout->addWidget( volMuteLabel, 3, 14 );
- controlLayout->addWidget( volumeSlider, 3, 15, 1, 2 );
+ controlLayout->addWidget( volMuteLabel, 3, 15 );
+ controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 );
/* Volume control connection */
CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
-
}
ControlsWidget::~ControlsWidget()
{
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 ) )
{
/* The playlist is empty, open a file requester */
{
discFrame->hide();
} else if( navigation == 1 ) {
- prevSectionButton->show();
prevSectionButton->setToolTip( qfu( HELP_PCH ) );
- nextSectionButton->show();
nextSectionButton->setToolTip( qfu( HELP_NCH ) );
menuButton->show();
discFrame->show();
} else {
- prevSectionButton->show();
prevSectionButton->setToolTip( qfu( HELP_PCH ) );
- nextSectionButton->show();
nextSectionButton->setToolTip( qfu( HELP_NCH ) );
menuButton->hide();
discFrame->show();
}
static bool b_my_volume;
-void ControlsWidget::updateVolume( int sliderVolume )
+void ControlsWidget::updateVolume( int i_sliderVolume )
{
if( !b_my_volume )
{
- int i_res = sliderVolume * AOUT_VOLUME_MAX /
- ( 2*volumeSlider->maximum() );
+ int i_res = i_sliderVolume * (AOUT_VOLUME_MAX / 2) / VOLUME_MAX;
aout_VolumeSet( p_intf, i_res );
}
+ if( i_sliderVolume == 0 )
+ volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) );
+ else if( i_sliderVolume < VOLUME_MAX / 2 )
+ volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+ else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
}
void ControlsWidget::updateOnTimer()
{
+ /* Audio part */
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
- i_volume = ( i_volume * 200 )/ AOUT_VOLUME_MAX ;
+ 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 )
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() );
+ enableVideo( true );
}
-/* FIXME */
void ControlsWidget::setStatus( int status )
{
- if( status == 1 ) // Playing
- {
- msg_Dbg( p_intf, "I was here %i", status );
- // playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
- }
+ if( status == PLAYING_S ) // Playing
+ playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
else
- {
- msg_Dbg( p_intf, "I was here %i", status );
- // playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
- }
+ playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
}
-/*
+/**
+ * TODO
* This functions toggle the fullscreen mode
- * If there is no video, it should first activate Visualisations... TODO
+ * If there is no video, it should first activate Visualisations...
+ * This has also to be fixed in enableVideo()
*/
void ControlsWidget::fullscreen()
{
- msg_Dbg( p_intf, "Not implemented yet" );
+ 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 );
+ }
}
void ControlsWidget::extSettings()
{
THEDP->extendedDialog();
}
-void ControlsWidget::prefs()
-{
- THEDP->prefsDialog();
-}
void ControlsWidget::slower()
{
slowerButton->setEnabled( enable );
slider->setEnabled( enable );
fasterButton->setEnabled( enable );
+
+ /* Advanced Buttons too */
+ advControls->enableInput( enable );
}
void ControlsWidget::enableVideo( bool enable )
{
// TODO Later make the fullscreenButton toggle Visualisation and so on.
fullscreenButton->setEnabled( enable );
+
+ /* Advanced Buttons too */
+ advControls->enableVideo( enable );
}
+void ControlsWidget::toggleAdvanced()
+{
+ if( !VISIBLE( advControls ) )
+ {
+ advControls->show();
+ b_advancedVisible = true;
+ }
+ else
+ {
+ advControls->hide();
+ b_advancedVisible = false;
+ }
+ //FIXME connect this one :D
+ emit advancedControlsToggled( b_advancedVisible ); // doComponentsUpdate();
+}
/**********************************************************************
* Playlist Widget. The embedded playlist
#include "components/playlist/panels.hpp"
#include "components/playlist/selector.hpp"
-PlaylistWidget::PlaylistWidget( intf_thread_t *_p_intf ) :
- p_intf ( _p_intf )
+PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i ) :
+ p_intf ( _p_i )
{
/* Left Part and design */
QWidget *leftW = new QWidget( this );
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->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 ) );
+
+ 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);
+ setLayout(speedControlLayout);
+}
+
+SpeedControlWidget::~SpeedControlWidget()
+{
+}
+
+#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() )
+ {
+ //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();
+ }
+ else
+ {
+ sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH
+ / ( 1.0 - RATE_SLIDER_MAXIMUM ) );
+ }
+ }
+ 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 = INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH /
+ ( sliderValue * ( 1.0 - RATE_SLIDER_MINIMUM ) + RATE_SLIDER_LENGTH ) ;
+ }
+ else
+ {
+ rate = 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);
+}
projects / vlc / blobdiff