* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
* Rafaël Carré <funman@videolanorg>
+ * Ilkka Ollakka <ileoo@videolan.org>
*
* 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
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "dialogs_provider.hpp"
-#include "qt4.hpp"
#include "components/interface_widgets.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
-
+#include "menus.hpp"
#include "util/input_slider.hpp"
+#include "util/customwidgets.hpp"
#include <vlc_vout.h>
#include <QLabel>
#include <QSpacerItem>
#include <QCursor>
#include <QPushButton>
+#include <QToolButton>
#include <QHBoxLayout>
#include <QMenu>
#include <QPalette>
#include <QResizeEvent>
-
-#define ICON_SIZE 300
+#include <QDate>
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
{
+ /* Init */
vlc_mutex_init( p_intf, &lock );
p_vout = NULL;
- CONNECT( this, askResize(), this, SetMinSize() );
- setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
+ hide(); setMinimumSize( 16, 16 );
+ videoSize.rwidth() = -1;
+ videoSize.rheight() = -1;
+
+ /* Black background is more coherent for a Video Widget IMVHO */
+ QPalette plt = palette();
+ plt.setColor( QPalette::Active, QPalette::Window , Qt::black );
+ plt.setColor( QPalette::Inactive, QPalette::Window , Qt::black );
+ setPalette( plt );
+
+ /* The core can ask through a callback to show the video */
+ CONNECT( this, askVideoWidgetToShow(), this, show() );
+ /* The core can ask through a callback to resize the video */
+ // CONNECT( this, askResize( int, int ), this, SetSizing( int, int ) );
}
VideoWidget::~VideoWidget()
vlc_mutex_destroy( &lock );
}
-QSize VideoWidget::sizeHint() const
-{
- return widgetSize;
-}
-
+/**
+ * Request the video to avoid the conflicts
+ **/
void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
unsigned int *pi_width, unsigned int *pi_height )
{
+ msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
+ emit askVideoWidgetToShow();
if( p_vout )
{
msg_Dbg( p_intf, "embedded video already in use" );
return NULL;
}
p_vout = p_nvout;
- emit askResize();
return ( void* )winId();
}
-void VideoWidget::SetMinSize()
+/* Set the Widget to the correct Size */
+/* Function has to be called by the parent
+ Parent has to care about resizing himself*/
+void VideoWidget::SetSizing( unsigned int w, unsigned int h )
{
- setMinimumSize( 16, 16 );
+ msg_Dbg( p_intf, "Video is resizing to: %i %i", w, h );
+ videoSize.rwidth() = w;
+ videoSize.rheight() = h;
+ updateGeometry(); // Needed for deinterlace
}
void VideoWidget::release( void *p_win )
{
+ msg_Dbg( p_intf, "Video is non needed anymore" );
p_vout = NULL;
+ videoSize.rwidth() = 0;
+ videoSize.rheight() = 0;
+ hide();
+ updateGeometry(); // Needed for deinterlace
+}
+
+QSize VideoWidget::sizeHint() const
+{
+ return videoSize;
}
+
/**********************************************************************
* Background Widget. Show a simple image background. Currently,
- * it's a static cone.
+ * it's album art if present or cone.
**********************************************************************/
-BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) :
- QFrame( NULL ), p_intf( _p_i )
+#define ICON_SIZE 128
+#define MAX_BG_SIZE 400
+#define MIN_BG_SIZE 64
+
+BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i )
+ :QWidget( NULL ), p_intf( _p_i )
{
+ /* We should use that one to take the more size it can */
+// setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
+ /* A dark background */
setAutoFillBackground( true );
plt = palette();
plt.setColor( QPalette::Active, QPalette::Window , Qt::black );
plt.setColor( QPalette::Inactive, QPalette::Window , Qt::black );
setPalette( plt );
- label = new QLabel( "" );
- label->setMaximumHeight( ICON_SIZE );
- label->setMaximumWidth( ICON_SIZE );
- label->setScaledContents( true );
- label->setPixmap( QPixmap( ":/vlc128.png" ) );
- backgroundLayout = new QHBoxLayout;
- backgroundLayout->addWidget( label );
- setLayout( backgroundLayout );
+ /* A cone in the middle */
+ label = new QLabel;
+ label->setMargin( 5 );
+ label->setMaximumHeight( MAX_BG_SIZE );
+ label->setMaximumWidth( MAX_BG_SIZE );
+ label->setMinimumHeight( MIN_BG_SIZE );
+ label->setMinimumWidth( MIN_BG_SIZE );
+ if( QDate::currentDate().dayOfYear() >= 354 )
+ label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
+ else
+ label->setPixmap( QPixmap( ":/vlc128.png" ) );
+
+ QGridLayout *backgroundLayout = new QGridLayout( this );
+ backgroundLayout->addWidget( label, 0, 1 );
+ backgroundLayout->setColumnStretch( 0, 1 );
+ backgroundLayout->setColumnStretch( 2, 1 );
+
+ CONNECT( THEMIM->getIM(), artChanged( QString ), this, updateArt( QString ) );
}
BackgroundWidget::~BackgroundWidget()
{
- backgroundLayout->takeAt( 0 );
- delete backgroundLayout;
}
-void BackgroundWidget::setArt( QString url )
+void BackgroundWidget::resizeEvent( QResizeEvent * event )
{
- if( url.isNull() )
- label->setPixmap( QPixmap( ":/vlc128.png" ) );
+ if( event->size().height() <= MIN_BG_SIZE )
+ label->hide();
else
- label->setPixmap( QPixmap( url ) );
+ label->show();
}
-QSize BackgroundWidget::sizeHint() const
+void BackgroundWidget::updateArt( QString url )
{
- return widgetSize;
+ if( url.isEmpty() )
+ {
+ if( QDate::currentDate().dayOfYear() >= 354 )
+ label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
+ else
+ label->setPixmap( QPixmap( ":/vlc128.png" ) );
+ return;
+ }
+ else
+ {
+ label->setPixmap( QPixmap( url ) );
+ }
}
-void BackgroundWidget::resizeEvent( QResizeEvent *e )
+void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event )
{
- if( e->size().height() < ICON_SIZE -1 )
- label->setMaximumWidth( e->size().height() );
- else
- label->setMaximumWidth( ICON_SIZE );
+ QVLCMenu::PopupMenu( p_intf, true );
}
/**********************************************************************
* Visualization selector panel
**********************************************************************/
VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
- QFrame( NULL ), p_intf( _p_i )
+ QFrame( NULL ), p_intf( _p_i )
{
QHBoxLayout *layout = new QHBoxLayout( this );
layout->setMargin( 0 );
advLayout->setMargin( 0 );
advLayout->setSpacing( 0 );
-/* FIXME A to B function */
+ /* A to B Button */
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() );
-
-//FIXME Frame by frame function
+ timeA = timeB = 0;
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
+ this, AtoBLoop( float, int, int ) );
+#if 0
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() );
+#endif
-/* 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() );
+ BUTTON_SET_ACT_I( recordButton, "", record_16px.png,
+ qtr( "Record" ), record() );
+ /* Snapshot Button */
+ 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() );
}
AdvControlsWidget::~AdvControlsWidget()
-{
-}
+{}
void AdvControlsWidget::enableInput( bool enable )
{
ABButton->setEnabled( enable );
recordButton->setEnabled( enable );
- normalButton->setEnabled( enable );
}
+
void AdvControlsWidget::enableVideo( bool enable )
{
snapshotButton->setEnabled( enable );
+#if 0
frameButton->setEnabled( enable );
+#endif
}
-void AdvControlsWidget::normal()
+void AdvControlsWidget::snapshot()
{
- THEMIM->getIM()->normalRate();
+ 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::snapshot()
+/* Function called when the button is clicked() */
+void AdvControlsWidget::fromAtoB()
{
- 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 );
+ 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::frame(){}
-void AdvControlsWidget::fromAtoB(){}
+/* Function called regularly when in an AtoB loop */
+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 );
+ }
+}
+
+/* FIXME Record function */
void AdvControlsWidget::record(){}
+#if 0
+//FIXME Frame by frame function
+void AdvControlsWidget::frame(){}
+#endif
+
/*****************************
* DA Control Widget !
*****************************/
-ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
- QFrame( NULL ), p_intf( _p_i )
+ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
+ MainInterface *_p_mi,
+ bool b_advControls,
+ bool b_shiny ) :
+ 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);
+ controlLayout->setSpacing( 0 );
+#if QT43
+ controlLayout->setContentsMargins( 9, 6, 9, 6 );
+#else
+ controlLayout->setMargin( 6 );
#endif
+ setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum );
+
/** The main Slider **/
slider = new InputSlider( Qt::Horizontal, NULL );
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 ) );
+ slider, setPosition( float, int, int ) );
/* And update the IM, when the position has changed */
CONNECT( slider, sliderDragged( float ),
THEMIM->getIM(), sliderUpdate( float ) );
/** Slower and faster Buttons **/
- slowerButton = new QPushButton( "S" );
- BUTTON_SET_ACT( slowerButton, "S", qtr( "Slower" ), slower() );
- controlLayout->addWidget( slowerButton, 0, 0 );
+ slowerButton = new QToolButton;
+ slowerButton->setAutoRaise( true );
slowerButton->setMaximumSize( QSize( 26, 20 ) );
- fasterButton = new QPushButton( "F" );
- BUTTON_SET_ACT( fasterButton, "F", qtr( "Faster" ), faster() );
- controlLayout->addWidget( fasterButton, 0, 17 );
+ BUTTON_SET_ACT( slowerButton, "-", qtr( "Slower" ), slower() );
+ controlLayout->addWidget( slowerButton, 0, 0 );
+
+ fasterButton = new QToolButton;
+ fasterButton->setAutoRaise( true );
fasterButton->setMaximumSize( QSize( 26, 20 ) );
- /** TODO: Insert here the AdvControls Widget
- * Then fix all the size issues in main_interface.cpp
- **/
+ BUTTON_SET_ACT( fasterButton, "+", qtr( "Faster" ), faster() );
+ controlLayout->addWidget( fasterButton, 0, 17 );
+
/* 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();
- //THIS should be removed. need_components_update = true;
/** Disc and Menus handling */
- discFrame = new QFrame( this );
+ discFrame = new QWidget( this );
QHBoxLayout *discLayout = new QHBoxLayout( discFrame );
discLayout->setSpacing( 0 );
sectionNext() );
CONNECT( menuButton, clicked(), THEMIM->getIM(),
sectionMenu() );
-
- /** TODO
+ /**
* Telextext QFrame
+ * TODO: Merge with upper menu in a StackLayout
**/
+#ifdef ZVBI_COMPILED
+ telexFrame = new QWidget( this );
+ QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
+ telexLayout->setSpacing( 0 );
+ telexLayout->setMargin( 0 );
+
+ QToolButton *telexOn = new QToolButton;
+ telexOn->setText( qtr( "On" ) );
+ setupSmallButton( telexOn );
+ telexLayout->addWidget( telexOn );
+
+ QToolButton *telexTransparent = new QToolButton;
+ telexTransparent->setText( qtr( "Transparent" ) );
+ setupSmallButton( telexTransparent );
+ telexLayout->addWidget( telexTransparent );
+
+ QSpinBox *telexPage = new QSpinBox;
+ telexPage->setRange( 0, 999 );
+ telexPage->setValue( 100 );
+ telexPage->setAccelerated( true );
+ telexPage->setWrapping( true );
+ telexPage->setAlignment( Qt::AlignRight );
+ telexPage->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
+ telexLayout->addWidget( telexPage );
+
+ controlLayout->addWidget( telexFrame, 1, 10, 2, 3, Qt::AlignBottom );
+ telexFrame->hide();
+
+ CONNECT( telexPage, valueChanged( int ), THEMIM->getIM(),
+ telexGotoPage( int ) );
+ CONNECT( telexOn, clicked( bool ), THEMIM->getIM(),
+ telexToggle( bool ) );
+ CONNECT( telexTransparent, clicked( bool ),
+ THEMIM->getIM(), telexSetTransparency( bool ) );
+ CONNECT( THEMIM->getIM(), teletextEnabled( bool ),
+ telexFrame, setVisible( bool ) );
+#endif
/** Play Buttons **/
- QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
+ QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
sizePolicy.setHorizontalStretch( 0 );
sizePolicy.setVerticalStretch( 0 );
/* Play */
playButton = new QPushButton;
playButton->setSizePolicy( sizePolicy );
- playButton->setMaximumSize( QSize( 45, 45 ) );
+ playButton->setMaximumSize( QSize( 36, 36 ) );
+ playButton->setMinimumSize( QSize( 36, 36 ) );
playButton->setIconSize( QSize( 30, 30 ) );
- controlLayout->addWidget( playButton, 2, 0, 2, 2, Qt::AlignBottom );
-
+ controlLayout->addWidget( playButton, 2, 0, 2, 2 );
+
controlLayout->setColumnMinimumWidth( 2, 20 );
controlLayout->setColumnStretch( 2, 0 );
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->setColumnMinimumWidth( 7, 20 );
+ controlLayout->setColumnStretch( 7, 0 );
+ controlLayout->setColumnStretch( 8, 0 );
controlLayout->setColumnStretch( 9, 0 );
-
+
/*
* Other first Line buttons
- * Might need to be inside a frame to avoid a few resizing pb
- * FIXME
*/
/** Fullscreen/Visualisation **/
fullscreenButton = new QPushButton( "F" );
BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
setupSmallButton( fullscreenButton );
- controlLayout->addWidget( fullscreenButton, 3, 10 );
+ controlLayout->addWidget( fullscreenButton, 3, 10, Qt::AlignBottom );
/** Playlist Button **/
playlistButton = new QPushButton;
setupSmallButton( playlistButton );
- controlLayout->addWidget( playlistButton, 3, 11 );
+ controlLayout->addWidget( playlistButton, 3, 11, Qt::AlignBottom );
+ BUTTON_SET_IMG( playlistButton, "" , playlist.png, qtr( "Show playlist" ) );
+ CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() );
/** extended Settings **/
QPushButton *extSettingsButton = new QPushButton( "F" );
BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ),
extSettings() );
setupSmallButton( extSettingsButton );
- controlLayout->addWidget( extSettingsButton, 3, 12 );
-
- /** Preferences **/
- QPushButton *prefsButton = new QPushButton( "P" );
- BUTTON_SET_ACT( prefsButton, "P", qtr( "Preferences / Settings" ),
- prefs() );
- setupSmallButton( prefsButton );
- controlLayout->addWidget( prefsButton, 3, 13 );
+ controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
+ controlLayout->setColumnStretch( 13, 0 );
+ controlLayout->setColumnMinimumWidth( 13, 24 );
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->setPixmap( QPixmap( ":/pixmaps/volume-medium.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, Qt::AlignBottom );
- volumeSlider->setMaximum( 100 );
+ if( b_shiny )
+ {
+ volumeSlider = new SoundSlider( this,
+ config_GetInt( p_intf, "volume-step" ),
+ config_GetInt( p_intf, "qt-volume-complete" ) );
+ }
+ else
+ {
+ volumeSlider = new QSlider( this );
+ volumeSlider->setOrientation( Qt::Horizontal );
+ }
+ volumeSlider->setMaximumSize( QSize( 200, 40 ) );
+ volumeSlider->setMinimumSize( QSize( 106, 30 ) );
volumeSlider->setFocusPolicy( Qt::NoFocus );
- controlLayout->addWidget( volMuteLabel, 3, 15 );
- controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 );
+ controlLayout->addWidget( volumeSlider, 2, 16, 2 , 2, Qt::AlignBottom );
+
+ /* Set the volume from the config */
+ volumeSlider->setValue( ( config_GetInt( p_intf, "volume" ) ) *
+ VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
+
+ /* Force the update at build time in order to have a muted icon if needed */
+ updateVolume( volumeSlider->value() );
/* Volume control connection */
CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
+ CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) );
+ updateInput();
}
+
ControlsWidget::~ControlsWidget()
-{
-}
+{}
+
void ControlsWidget::stop()
{
THEMIM->stop();
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();
{
if( !b_my_volume )
{
- int i_res = i_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 / 3 )
+ volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+ else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) )
+ volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
+ else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
}
-void ControlsWidget::updateOnTimer()
+void ControlsWidget::updateVolume()
{
/* 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;
}
- if( i_volume == 0 )
- volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) );
- else if( i_volume < volumeSlider->maximum()/2 )
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
- else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
+}
+void ControlsWidget::updateInput()
+{
/* Activate the interface buttons according to the presence of the input */
enableInput( THEMIM->getIM()->hasInput() );
- //enableVideo( THEMIM->getIM()->hasVideo() );
- enableVideo( true );
+ enableVideo( THEMIM->getIM()->hasVideo() && THEMIM->getIM()->hasInput() );
}
void ControlsWidget::setStatus( int status )
{
- if( status == PLAYING_S ) // Playing
+ if( status == PLAYING_S ) /* Playing */
+ {
playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
+ playButton->setToolTip( qtr( "Pause" ) );
+ }
else
+ {
playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
+ playButton->setToolTip( qtr( "Play" ) );
+ }
}
/**
* TODO
* This functions toggle the fullscreen mode
- * If there is no video, it should first activate Visualisations...
+ * If there is no video, it should first activate Visualisations...
* This has also to be fixed in enableVideo()
*/
void ControlsWidget::fullscreen()
{
- vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_CHILD );
+ 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 );
}
}
{
THEDP->extendedDialog();
}
-void ControlsWidget::prefs()
-{
- THEDP->prefsDialog();
-}
void ControlsWidget::slower()
{
advControls->hide();
b_advancedVisible = false;
}
- //FIXME connect this one :D
- emit advancedControlsToggled( b_advancedVisible ); // doComponentsUpdate();
+ emit advancedControlsToggled( b_advancedVisible );
}
+
/**********************************************************************
- * Playlist Widget. The embedded playlist
+ * Speed control widget
**********************************************************************/
-#include "components/playlist/panels.hpp"
-#include "components/playlist/selector.hpp"
-
-PlaylistWidget::PlaylistWidget( intf_thread_t *_p_intf ) :
- p_intf ( _p_intf )
+SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) :
+ QFrame( NULL ), p_intf( _p_i )
{
- /* Left Part and design */
- QWidget *leftW = new QWidget( this );
- QVBoxLayout *left = new QVBoxLayout( leftW );
-
- /* Source Selector */
- selector = new PLSelector( this, p_intf, THEPL );
- left->addWidget( selector );
-
- /* Art label */
- art = new QLabel( "" );
- art->setMinimumHeight( 128 );
- art->setMinimumWidth( 128 );
- art->setMaximumHeight( 128 );
- art->setMaximumWidth( 128 );
- art->setScaledContents( true );
- art->setPixmap( QPixmap( ":/noart.png" ) );
- left->addWidget( art );
+ QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
+ sizePolicy.setHorizontalStretch( 0 );
+ sizePolicy.setVerticalStretch( 0 );
- /* Initialisation of the playlist */
- playlist_item_t *p_root = playlist_GetPreferredNode( THEPL,
- THEPL->p_local_category );
+ speedSlider = new QSlider;
+ speedSlider->setSizePolicy( sizePolicy );
+ speedSlider->setMaximumSize( QSize( 80, 200 ) );
+ speedSlider->setOrientation( Qt::Vertical );
+ speedSlider->setTickPosition( QSlider::TicksRight );
- rightPanel = qobject_cast<PLPanel *>( new StandardPLPanel( this,
- p_intf, THEPL, p_root ) );
+ speedSlider->setRange( -100, 100 );
+ speedSlider->setSingleStep( 10 );
+ speedSlider->setPageStep( 20 );
+ speedSlider->setTickInterval( 20 );
- /* Connects */
- CONNECT( selector, activated( int ), rightPanel, setRoot( int ) );
+ CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
- CONNECT( qobject_cast<StandardPLPanel *>( rightPanel )->model,
- artSet( QString ) , this, setArt( QString ) );
- /* Forward removal requests from the selector to the main panel */
- CONNECT( qobject_cast<PLSelector *>( selector )->model,
- shouldRemove( int ),
- qobject_cast<StandardPLPanel *>( rightPanel ), removeItem( int ) );
+ QToolButton *normalSpeedButton = new QToolButton( this );
+ normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
+ normalSpeedButton->setAutoRaise( true );
+ normalSpeedButton->setText( "N" );
+ normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) );
- connect( selector, SIGNAL( activated( int ) ),
- this, SIGNAL( rootChanged( int ) ) );
- emit rootChanged( p_root->i_id );
+ CONNECT( normalSpeedButton, clicked(), this, resetRate() );
- /* Add the two sides of the QSplitter */
- addWidget( leftW );
- addWidget( rightPanel );
+ QVBoxLayout *speedControlLayout = new QVBoxLayout;
+ speedControlLayout->addWidget( speedSlider );
+ speedControlLayout->addWidget( normalSpeedButton );
+ setLayout( speedControlLayout );
+}
- leftW->setMaximumWidth( 250 );
- setCollapsible( 1, false );
+SpeedControlWidget::~SpeedControlWidget()
+{}
- QList<int> sizeList;
- sizeList << 180 << 520 ;
- setSizes( sizeList );
+void SpeedControlWidget::setEnable( bool b_enable )
+{
+ speedSlider->setEnabled( b_enable );
}
-void PlaylistWidget::setArt( QString url )
+#define RATE_SLIDER_MAXIMUM 3.0
+#define RATE_SLIDER_MINIMUM 0.3
+#define RATE_SLIDER_LENGTH 100.0
+
+void SpeedControlWidget::updateControls( int rate )
{
- if( url.isNull() )
- art->setPixmap( QPixmap( ":/noart.png" ) );
- else if( prevArt != url )
- art->setPixmap( QPixmap( url ) );
- prevArt = url;
- emit artSet( url );
+ 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 );
}
-PlaylistWidget::~PlaylistWidget()
+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 ));
+ }
+
+ THEMIM->getIM()->setRate(rate);
}
-QSize PlaylistWidget::sizeHint() const
+void SpeedControlWidget::resetRate()
{
- return widgetSize;
+ THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT);
}
-
projects / vlc / blobdiff