#include <math.h>
-#define I_PLAY_TOOLTIP "Play\nIf the playlist is empty, open a media"
+#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
aButton->setMinimumSize( QSize( 26, 26 ) ); \
aButton->setIconSize( QSize( 20, 20 ) ); }
-AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
+/* init static variables in advanced controls */
+mtime_t AdvControlsWidget::timeA = 0;
+mtime_t AdvControlsWidget::timeB = 0;
+
+AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i, bool b_fsCreation = false ) :
QFrame( NULL ), p_intf( _p_i )
{
QHBoxLayout *advLayout = new QHBoxLayout( this );
qtr( "Loop from point A to point B continuously.\nClick to set point A" ),
fromAtoB() );
timeA = timeB = 0;
- CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
- this, AtoBLoop( float, int, int ) );
+ i_last_input_id = 0;
+ /* in FS controller we skip this, because we dont want to have it double
+ controlled */
+ if( !b_fsCreation )
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
+ this, AtoBLoop( float, int, int ) );
+ /* set up synchronization between main controller and fs controller */
+ CONNECT( THEMIM->getIM(), advControlsSetIcon(), this, setIcon() );
+ connect( this, SIGNAL( timeChanged() ),
+ THEMIM->getIM(), SIGNAL( advControlsSetIcon()));
#if 0
frameButton = new QPushButton( "Fr" );
frameButton->setMaximumSize( QSize( 26, 26 ) );
void AdvControlsWidget::enableInput( bool enable )
{
+ int i_input_id = 0;
+ if( THEMIM->getInput() != NULL )
+ {
+ input_item_t *p_item = input_GetItem( THEMIM->getInput() );
+ i_input_id = p_item->i_id;
+ }
ABButton->setEnabled( enable );
recordButton->setEnabled( enable );
+
+ if( enable && ( i_last_input_id != i_input_id ) )
+ {
+ timeA = timeB = 0;
+ i_last_input_id = i_input_id;
+ emit timeChanged();
+ }
}
void AdvControlsWidget::enableVideo( bool enable )
if( !timeA )
{
timeA = var_GetTime( THEMIM->getInput(), "time" );
- ABButton->setToolTip( "Click to set point B" );
- ABButton->setIcon( QIcon( ":/atob_noa" ) );
+ emit timeChanged();
return;
}
if( !timeB )
{
timeB = var_GetTime( THEMIM->getInput(), "time" );
var_SetTime( THEMIM->getInput(), "time" , timeA );
- ABButton->setIcon( QIcon( ":/atob" ) );
- ABButton->setToolTip( "Stop the A to B loop" );
+ emit timeChanged();
return;
}
timeA = 0;
timeB = 0;
- ABButton->setToolTip( qtr( "Loop from point A to point B continuously\nClick to set point A" ) );
- ABButton->setIcon( QIcon( ":/atob_nob" ) );
+ emit timeChanged();
+}
+
+/* setting/synchro icons after click on main or fs controller */
+void AdvControlsWidget::setIcon()
+{
+ if( !timeA && !timeB)
+ {
+ ABButton->setIcon( QIcon( ":/atob_nob" ) );
+ ABButton->setToolTip( qtr( "Loop from point A to point B continuously\nClick to set point A" ) );
+ }
+ else if( timeA && !timeB )
+ {
+ ABButton->setIcon( QIcon( ":/atob_noa" ) );
+ ABButton->setToolTip( qtr( "Click to set point B" ) );
+ }
+ else if( timeA && timeB )
+ {
+ ABButton->setIcon( QIcon( ":/atob" ) );
+ ABButton->setToolTip( qtr( "Stop the A to B loop" ) );
+ }
}
/* Function called regularly when in an AtoB loop */
{
if( timeB )
{
- if( i_time >= (int)(timeB/1000000) )
+ if( ( i_time >= (int)( timeB/1000000 ) )
+ || ( i_time < (int)( timeA/1000000 ) ) )
var_SetTime( THEMIM->getInput(), "time" , timeA );
}
}
/* advanced Controls handling */
b_advancedVisible = b_advControls;
- advControls = new AdvControlsWidget( p_intf );
+ advControls = new AdvControlsWidget( p_intf, b_fsCreation );
if( !b_advancedVisible ) advControls->hide();
/** Disc and Menus handling */
volumeSlider->setOrientation( Qt::Horizontal );
}
volumeSlider->setMaximumSize( QSize( 200, 40 ) );
- volumeSlider->setMinimumSize( QSize( 106, 30 ) );
+ volumeSlider->setMinimumSize( QSize( 85, 30 ) );
volumeSlider->setFocusPolicy( Qt::NoFocus );
/* Set the volume from the config */
controlLayout->setSpacing( 0 );
controlLayout->setLayoutMargins( 7, 5, 7, 3, 6 );
- controlLayout->addWidget( slider, 0, 1, 1, 16 );
+ controlLayout->addWidget( slider, 0, 1, 1, 18 );
controlLayout->addWidget( slowerButton, 0, 0 );
- controlLayout->addWidget( fasterButton, 0, 17 );
+ controlLayout->addWidget( fasterButton, 0, 19 );
- controlLayout->addWidget( advControls, 1, 3, 2, 4, Qt::AlignBottom );
- controlLayout->addWidget( discFrame, 1, 10, 2, 3, Qt::AlignBottom );
- controlLayout->addWidget( telexFrame, 1, 10, 2, 4, Qt::AlignBottom );
+ controlLayout->addWidget( discFrame, 1, 8, 2, 3, Qt::AlignBottom );
+ controlLayout->addWidget( telexFrame, 1, 8, 2, 5, Qt::AlignBottom );
- controlLayout->addWidget( playButton, 2, 0, 2, 2 );
- controlLayout->setColumnMinimumWidth( 2, 20 );
+ controlLayout->addWidget( playButton, 2, 0, 2, 2, Qt::AlignBottom );
+ controlLayout->setColumnMinimumWidth( 2, 10 );
controlLayout->setColumnStretch( 2, 0 );
- controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 );
- controlLayout->setColumnMinimumWidth( 7, 20 );
+ controlLayout->addLayout( controlButLayout, 3, 3, 1, 3, Qt::AlignBottom );
+ /* Column 6 is unused */
+ controlLayout->setColumnStretch( 6, 0 );
controlLayout->setColumnStretch( 7, 0 );
- controlLayout->setColumnStretch( 8, 0 );
- controlLayout->setColumnStretch( 9, 0 );
+ controlLayout->setColumnMinimumWidth( 7, 10 );
+
+ controlLayout->addWidget( fullscreenButton, 3, 8, Qt::AlignBottom );
+ controlLayout->addWidget( playlistButton, 3, 9, Qt::AlignBottom );
+ controlLayout->addWidget( extSettingsButton, 3, 10, Qt::AlignBottom );
+ controlLayout->setColumnStretch( 11, 0 ); /* telex alignment */
- controlLayout->addWidget( fullscreenButton, 3, 10, Qt::AlignBottom );
- controlLayout->addWidget( playlistButton, 3, 11, Qt::AlignBottom );
- controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
+ controlLayout->setColumnStretch( 12, 0 );
+ controlLayout->setColumnMinimumWidth( 12, 10 );
- controlLayout->setColumnStretch( 13, 0 );
- controlLayout->setColumnMinimumWidth( 13, 24 );
- controlLayout->setColumnStretch( 14, 5 );
+ controlLayout->addWidget( advControls, 3, 13, 1, 3, Qt::AlignBottom );
- controlLayout->addWidget( volMuteLabel, 3, 15, Qt::AlignBottom );
- controlLayout->addWidget( volumeSlider, 2, 16, 2 , 2, Qt::AlignBottom );
+ controlLayout->setColumnStretch( 16, 10 );
+ controlLayout->setColumnMinimumWidth( 16, 10 );
+
+ controlLayout->addWidget( volMuteLabel, 3, 17, Qt::AlignBottom );
+ controlLayout->addWidget( volumeSlider, 3, 18, 1 , 2, Qt::AlignBottom );
}
updateInput();
{
slowerButton->setEnabled( enable );
slider->setEnabled( enable );
+ slider->setSliderPosition ( 0 );
fasterButton->setEnabled( enable );
/* Advanced Buttons too */
void ControlsWidget::toggleAdvanced()
{
- if( !VISIBLE( advControls ) )
+ if( advControls && !b_advancedVisible )
{
advControls->show();
b_advancedVisible = true;
: ControlsWidget( _p_i, _p_mi, b_advControls, b_shiny, true ),
i_mouse_last_x( -1 ), i_mouse_last_y( -1 ), b_mouse_over(false),
b_slow_hide_begin(false), i_slow_hide_timeout(1),
- b_fullscreen( false ), i_hide_timeout( 1 )
+ b_fullscreen( false ), i_hide_timeout( 1 ), p_vout(NULL)
{
setWindowFlags( Qt::ToolTip );
/* First line */
slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
fsLayout->addWidget( slowerButton, 0, 0 );
- fsLayout->addWidget( slider, 0, 1, 1, 6 );
- fsLayout->addWidget( fasterButton, 0, 7 );
+ fsLayout->addWidget( slider, 0, 1, 1, 8 );
+ fsLayout->addWidget( fasterButton, 0, 9 );
- fsLayout->addWidget( playButton, 1, 0 );
- fsLayout->addLayout( controlButLayout, 1, 1 );
+ fsLayout->addWidget( playButton, 1, 0, 1, 2 );
+ fsLayout->addLayout( controlButLayout, 1, 2 );
- fsLayout->addWidget( discFrame, 1, 2 );
- fsLayout->addWidget( telexFrame, 1, 3 );
- fsLayout->addWidget( advControls, 1, 4, Qt::AlignVCenter );
- fsLayout->addWidget( fullscreenButton, 1, 5 );
+ fsLayout->addWidget( discFrame, 1, 3 );
+ fsLayout->addWidget( telexFrame, 1, 4 );
+ fsLayout->addWidget( advControls, 1, 5, Qt::AlignVCenter );
+ fsLayout->addWidget( fullscreenButton, 1, 6 );
- fsLayout->addWidget( volMuteLabel, 1, 6);
- fsLayout->addWidget( volumeSlider, 1, 7 );
+ fsLayout->addWidget( volMuteLabel, 1, 7 );
+ fsLayout->addWidget( volumeSlider, 1, 8, 1, 2 );
/* hiding timer */
p_hideTimer = new QTimer( this );
#ifdef WIN32TRICK
setWindowOpacity( 0.0 );
fscHidden = true;
+ adjustSize();
show();
#endif
FullscreenControllerWidget::~FullscreenControllerWidget()
{
+ detachVout();
vlc_mutex_destroy( &lock );
}
*/
void FullscreenControllerWidget::showFSC()
{
+ adjustSize();
#ifdef WIN32TRICK
// after quiting and going to fs, we need to call show()
if( isHidden() )
switch( event->type() )
{
+ case FullscreenControlToggle_Type:
+ // FIXME
+ TOGGLEV( this );
+ break;
case FullscreenControlShow_Type:
vlc_mutex_lock( &lock );
b_fs = b_fullscreen;
/**
* It is called when video start
*/
-void FullscreenControllerWidget::attachVout( vout_thread_t *p_vout )
+void FullscreenControllerWidget::attachVout( vout_thread_t *p_nvout )
{
- assert( p_vout );
+ assert( p_nvout && !p_vout );
+
+ p_vout = p_nvout;
vlc_mutex_lock( &lock );
var_AddCallback( p_vout, "fullscreen", FullscreenControllerWidgetFullscreenChanged, this ); /* I miss a add and fire */
/**
* It is called after turn off video.
*/
-void FullscreenControllerWidget::detachVout( vout_thread_t *p_vout )
+void FullscreenControllerWidget::detachVout()
{
- assert( p_vout );
-
- var_DelCallback( p_vout, "fullscreen", FullscreenControllerWidgetFullscreenChanged, this );
- vlc_mutex_lock( &lock );
- fullscreenChanged( p_vout, false, 0 );
- vlc_mutex_unlock( &lock );
+ if( p_vout )
+ {
+ var_DelCallback( p_vout, "fullscreen", FullscreenControllerWidgetFullscreenChanged, this );
+ vlc_mutex_lock( &lock );
+ fullscreenChanged( p_vout, false, 0 );
+ vlc_mutex_unlock( &lock );
+ p_vout = NULL;
+ }
}
/**
projects / vlc / blobdiff