* 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
#include <QPalette>
#include <QResizeEvent>
-#define ICON_SIZE 128
-#define MAX_BG_SIZE 300
-
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
* This class handles resize issues
{
vlc_mutex_init( p_intf, &lock );
p_vout = NULL;
- CONNECT( this, askResize(), this, SetMinSize() );
- CONNECT( this, askVideoToShow(), this, show() );
+ hide(); setMinimumSize( 16, 16 );
+
+ // CONNECT( this, askResize( int, int ), this, SetSizing( int, int ) );
+ CONNECT( this, askVideoWidgetToShow(), this, show() );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
}
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 )
{
- emit askVideoToShow();
+ 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 */
+void VideoWidget::SetSizing( unsigned int w, unsigned int h )
{
- setMinimumSize( 16, 16 );
+ resize( w, h );
+ //updateGeometry(); // Needed for deinterlace
+ msg_Dbg( p_intf, "%i %i", sizeHint().height(), sizeHint().width() );
+ emit askResize();
}
void VideoWidget::release( void *p_win )
{
p_vout = NULL;
}
+
+
/**********************************************************************
* Background Widget. Show a simple image background. Currently,
* it's a static cone.
**********************************************************************/
+#define ICON_SIZE 128
+#define MAX_BG_SIZE 400
+#define MIN_BG_SIZE 64
+
BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) :
QFrame( NULL ), p_intf( _p_i )
{
+ /* We should use that one to take the more size it can */
+ setSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding );
+ /* 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 );
+ /* A cone in the middle */
label = new QLabel;
- label->setMaximumHeight( ICON_SIZE );
- label->setMaximumWidth( ICON_SIZE );
label->setScaledContents( true );
+ label->setMargin( 5 );
+ label->setMaximumHeight( MAX_BG_SIZE );
+ label->setMaximumWidth( MAX_BG_SIZE );
+ label->setMinimumHeight( MIN_BG_SIZE );
+ label->setMinimumWidth( MIN_BG_SIZE );
label->setPixmap( QPixmap( ":/vlc128.png" ) );
- backgroundLayout = new QHBoxLayout;
+
+ QHBoxLayout *backgroundLayout = new QHBoxLayout( this );
backgroundLayout->addWidget( label );
- setLayout( backgroundLayout );
+
+ resize( 300, 150 );
+ updateGeometry();
+ CONNECT( THEMIM, inputChanged( input_thread_t *), this, update( input_thread_t * ) );
}
BackgroundWidget::~BackgroundWidget()
{
- backgroundLayout->takeAt( 0 );
- delete backgroundLayout;
}
-void BackgroundWidget::setArt( QString url )
+
+void BackgroundWidget::update( input_thread_t *p_input )
{
- if( url.isNull() )
+ if( !p_input || p_input->b_dead )
+ {
+ label->setPixmap( QPixmap( ":/vlc128.png" ) );
+ return;
+ }
+
+
+ vlc_object_yield( p_input );
+ char *psz_arturl = input_item_GetArtURL( input_GetItem(p_input) );
+ vlc_object_release( p_input );
+ QString url = qfu( psz_arturl );
+ QString arturl = url.replace( "file://",QString("" ) );
+ if( arturl.isNull() )
label->setPixmap( QPixmap( ":/vlc128.png" ) );
else
- label->setPixmap( QPixmap( url ) );
+ {
+ label->setPixmap( QPixmap( arturl ) );
+ msg_Dbg( p_intf, "changing input b_need_update done %s", psz_arturl );
+ }
+ free( psz_arturl );
}
QSize BackgroundWidget::sizeHint() const
{
- return widgetSize;
+ return label->size();
}
void BackgroundWidget::resizeEvent( QResizeEvent *e )
{
- if( e->size().height() < ICON_SIZE -1 )
+ if( e->size().height() < MAX_BG_SIZE -1 )
+ {
label->setMaximumWidth( e->size().height() );
+ label->setMaximumHeight( e->size().width() );
+ }
else
- label->setMaximumWidth( ICON_SIZE );
+ {
+ label->setMaximumHeight( MAX_BG_SIZE );
+ label->setMaximumWidth( MAX_BG_SIZE );
+ }
}
void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event )
{
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() );
- timeA = 0;
- timeB = 0;
+ timeA = timeB = 0;
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
this, AtoBLoop( float, int, int ) );
-//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 ) );
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 );
}
+
void AdvControlsWidget::enableVideo( bool enable )
{
snapshotButton->setEnabled( enable );
void AdvControlsWidget::snapshot()
{
- vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ 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()
-{
-}
-
+/* Function called when the button is clicked() */
void AdvControlsWidget::fromAtoB()
{
if( !timeA )
ABButton->setText( "AB" );
}
-void AdvControlsWidget::record(){}
-
+/* Function called regularly when in an AtoB loop */
void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
{
if( timeB )
}
}
+/* FIXME Record function */
+void AdvControlsWidget::record(){}
+
+//FIXME Frame by frame function
+void AdvControlsWidget::frame(){}
+
/*****************************
* 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 )
{
controlLayout = new QGridLayout( this );
controlLayout->setSpacing( 0 );
- setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
+#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 ) );
/* Play */
playButton = new QPushButton;
playButton->setSizePolicy( sizePolicy );
- playButton->setMaximumSize( QSize( 38, 38 ) );
- playButton->setMinimumSize( 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 );
controlButLayout->addWidget( nextButton );
/* Add this block to the main layout */
- controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 );
+ controlLayout->addLayout( controlButLayout, 3, 3, 1, 3, Qt::AlignBottom );
BUTTON_SET_ACT_I( playButton, "", play.png, qtr( "Play" ), play() );
BUTTON_SET_ACT_I( prevButton, "" , previous.png,
BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() );
BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
- controlLayout->setColumnStretch( 7 , 2 );
+ 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 );
+ controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
+ controlLayout->setColumnStretch( 13, 0 );
+ controlLayout->setColumnMinimumWidth( 13, 24 );
controlLayout->setColumnStretch( 14, 5 );
/* Volume */
volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
volMuteLabel->setToolTip( qtr( "Mute" ) );
volMuteLabel->installEventFilter( hVolLabel );
- controlLayout->addWidget( volMuteLabel, 3, 15 );
+ controlLayout->addWidget( volMuteLabel, 3, 15, Qt::AlignBottom );
- volumeSlider = new SoundSlider( this, config_GetInt( p_intf, "qt-volume-complete" ) );
+ 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( 80, 20 ) );
+ volumeSlider->setMinimumSize( QSize( 106, 30 ) );
volumeSlider->setFocusPolicy( Qt::NoFocus );
- 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) );
+ volumeSlider->setValue( ( config_GetInt( p_intf, "volume" ) ) *
+ VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
/* Volume control connection */
+ //resize( QSize( 300, 60 ) );
CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
- msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() );
+ msg_Dbg( p_intf, "controls size: %i - %i", size().width(), size().height() );
}
+
ControlsWidget::~ControlsWidget()
+{}
+
+/*
+QSize ControlsWidget::sizeHint() const
{
+ return QSize( 300, 50 );
}
+*/
+
void ControlsWidget::stop()
{
THEMIM->stop();
/* Audio part */
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
- i_volume = ( i_volume * VOLUME_MAX )/ (AOUT_VOLUME_MAX/2) ;
+ 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 )
*/
void ControlsWidget::fullscreen()
{
- vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ 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" ) );
advControls->hide();
b_advancedVisible = false;
}
- //FIXME connect this one :D
- emit advancedControlsToggled( b_advancedVisible ); // doComponentsUpdate();
+ emit advancedControlsToggled( b_advancedVisible );
}
-/**********************************************************************
- * Playlist Widget. The embedded playlist
- **********************************************************************/
-#include "components/playlist/panels.hpp"
-#include "components/playlist/selector.hpp"
-
-PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i ) :
- 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 );
-
- /* Initialisation of the playlist */
- playlist_item_t *p_root = playlist_GetPreferredNode( THEPL,
- THEPL->p_local_category );
-
- rightPanel = qobject_cast<PLPanel *>( new StandardPLPanel( this,
- p_intf, THEPL, p_root ) );
-
- /* Connects */
- CONNECT( selector, activated( int ), rightPanel, setRoot( 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 ) );
-
- connect( selector, SIGNAL( activated( int ) ),
- this, SIGNAL( rootChanged( int ) ) );
- emit rootChanged( p_root->i_id );
-
- /* Add the two sides of the QSplitter */
- addWidget( leftW );
- addWidget( rightPanel );
-
- leftW->setMaximumWidth( 250 );
- setCollapsible( 1, false );
-
- QList<int> sizeList;
- sizeList << 180 << 520 ;
- setSizes( sizeList );
-}
-
-void PlaylistWidget::setArt( QString url )
-{
- if( url.isNull() )
- art->setPixmap( QPixmap( ":/noart.png" ) );
- else if( prevArt != url )
- {
- art->setPixmap( QPixmap( url ) );
- prevArt = url;
- emit artSet( url );
- }
-}
-
-PlaylistWidget::~PlaylistWidget()
-{
-}
/**********************************************************************
* Speed control widget
}
SpeedControlWidget::~SpeedControlWidget()
-{
-}
+{}
#define RATE_SLIDER_MAXIMUM 3.0
#define RATE_SLIDER_MINIMUM 0.3
if( sliderValue < 0.0 )
{
rate = INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH /
- ( sliderValue * ( 1.0 - RATE_SLIDER_MINIMUM ) + 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 );
+ ( sliderValue * ( RATE_SLIDER_MAXIMUM - 1.0 ) + RATE_SLIDER_LENGTH );
}
THEMIM->getIM()->setRate(rate);
{
THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT);
}
-
-
projects / vlc / blobdiff