X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Finterface_widgets.cpp;h=a26111ef558005aaa654c282118ed401967ea21f;hb=672c3f35c4e4;hp=6a8f8ace5e5a53b9e4729e5a920238700978b66b;hpb=e17bf628eebcba0307d3c5ad5f80c97d43c48fa5;p=vlc diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index 6a8f8ace5e..a26111ef55 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -56,6 +56,8 @@ #include +#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media") + /********************************************************************** * Video Widget. A simple frame on which video is drawn * This class handles resize issues @@ -236,6 +238,7 @@ void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event ) QVLCMenu::PopupMenu( p_intf, true ); } +#if 0 /********************************************************************** * Visualization selector panel **********************************************************************/ @@ -249,8 +252,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) : layout->addWidget( prevButton ); layout->addWidget( nextButton ); - layout->addItem( new QSpacerItem( 40,20, - QSizePolicy::Expanding, QSizePolicy::Minimum ) ); + layout->addStretch( 10 ); layout->addWidget( new QLabel( qtr( "Current visualization" ) ) ); current = new QLabel( qtr( "None" ) ); @@ -285,6 +287,7 @@ void VisualSelector::next() free( psz_new ); } } +#endif /********************************************************************** * TEH controls @@ -295,7 +298,11 @@ void VisualSelector::next() 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 ); @@ -304,13 +311,23 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) : advLayout->setAlignment( Qt::AlignBottom ); /* A to B Button */ - ABButton = new QPushButton( "AB" ); + ABButton = new QPushButton; setupSmallButton( ABButton ); advLayout->addWidget( ABButton ); - BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), fromAtoB() ); + BUTTON_SET_ACT_I( ABButton, "", atob_nob, + 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 ) ); @@ -319,17 +336,18 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) : BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by frame" ), frame() ); #endif - recordButton = new QPushButton( "R" ); + recordButton = new QPushButton; setupSmallButton( recordButton ); advLayout->addWidget( recordButton ); - BUTTON_SET_ACT_I( recordButton, "", record_16px.png, + BUTTON_SET_ACT_I( recordButton, "", record, qtr( "Record" ), record() ); /* Snapshot Button */ - snapshotButton = new QPushButton( "S" ); + snapshotButton = new QPushButton; setupSmallButton( snapshotButton ); advLayout->addWidget( snapshotButton ); - BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() ); + BUTTON_SET_ACT_I( snapshotButton, "", snapshot, + qtr( "Take a snapshot" ), snapshot() ); } AdvControlsWidget::~AdvControlsWidget() @@ -337,8 +355,21 @@ AdvControlsWidget::~AdvControlsWidget() 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 ) @@ -362,19 +393,39 @@ void AdvControlsWidget::fromAtoB() if( !timeA ) { timeA = var_GetTime( THEMIM->getInput(), "time" ); - ABButton->setText( "A->..." ); + emit timeChanged(); return; } if( !timeB ) { timeB = var_GetTime( THEMIM->getInput(), "time" ); var_SetTime( THEMIM->getInput(), "time" , timeA ); - ABButton->setText( "A<=>B" ); + emit timeChanged(); return; } timeA = 0; timeB = 0; - ABButton->setText( "AB" ); + 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 */ @@ -382,13 +433,34 @@ void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length ) { 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 ); } } /* FIXME Record function */ -void AdvControlsWidget::record(){} +void AdvControlsWidget::record() +{ + input_thread_t *p_input = THEMIM->getInput(); + if( p_input ) + { + /* This method won't work fine if the stream can't be cut anywhere */ + if( var_Type( p_input, "record-toggle" ) == VLC_VAR_VOID ) + var_TriggerCallback( p_input, "record-toggle" ); + else + { + /* 'record' access-filter is not loaded, we open Save dialog */ + input_item_t *p_item = input_GetItem( p_input ); + if( !p_item ) + return; + + char *psz = input_item_GetURI( p_item ); + if( psz ) + THEDP->streamingDialog( NULL, psz, true ); + } + } +} #if 0 //FIXME Frame by frame function @@ -405,19 +477,10 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_fsCreation) : QFrame( _p_mi ), p_intf( _p_i ) { - controlLayout = new QGridLayout( ); - - controlLayout->setSpacing( 0 ); - controlLayout->setLayoutMargins( 7, 5, 7, 3, 6 ); - - if( !b_fsCreation ) - setLayout( controlLayout ); - 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 ) ); @@ -431,20 +494,17 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, slowerButton->setMaximumSize( QSize( 26, 20 ) ); BUTTON_SET_ACT( slowerButton, "-", qtr( "Slower" ), slower() ); - controlLayout->addWidget( slowerButton, 0, 0 ); fasterButton = new QToolButton; fasterButton->setAutoRaise( true ); fasterButton->setMaximumSize( QSize( 26, 20 ) ); 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, 4, Qt::AlignBottom ); + advControls = new AdvControlsWidget( p_intf, b_fsCreation ); if( !b_advancedVisible ) advControls->hide(); /** Disc and Menus handling */ @@ -466,11 +526,9 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, setupSmallButton( nextSectionButton ); discLayout->addWidget( nextSectionButton ); - controlLayout->addWidget( discFrame, 1, 10, 2, 3, Qt::AlignBottom ); - - BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" ); - BUTTON_SET_IMG( nextSectionButton, "", next.png, "" ); - BUTTON_SET_IMG( menuButton, "", previous.png, qtr( "Menu" ) ); + BUTTON_SET_IMG( prevSectionButton, "", dvd_prev, "" ); + BUTTON_SET_IMG( nextSectionButton, "", dvd_next, "" ); + BUTTON_SET_IMG( menuButton, "", dvd_menu, qtr( "Menu" ) ); discFrame->hide(); @@ -512,8 +570,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, telexPage->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ); telexLayout->addWidget( telexPage ); - if( !b_fsCreation ) - controlLayout->addWidget( telexFrame, 1, 10, 2, 4, Qt::AlignBottom ); telexFrame->hide(); /* default hidden */ CONNECT( telexPage, valueChanged( int ), THEMIM->getIM(), @@ -521,7 +577,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, CONNECT( THEMIM->getIM(), setNewTelexPage( int ), telexPage, setValue( int ) ); - BUTTON_SET_IMG( telexOn, "", tv.png, qtr( "Teletext on" ) ); + BUTTON_SET_IMG( telexOn, "", tv, qtr( "Teletext on" ) ); CONNECT( telexOn, clicked(), THEMIM->getIM(), telexToggleButtons() ); @@ -533,7 +589,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, telexTransparent->setEnabled( false ); telexPage->setEnabled( false ); - BUTTON_SET_IMG( telexTransparent, "", tvtelx.png, qtr( "Teletext" ) ); + BUTTON_SET_IMG( telexTransparent, "", tvtelx, qtr( "Teletext" ) ); CONNECT( telexTransparent, clicked( bool ), THEMIM->getIM(), telexSetTransparency() ); CONNECT( THEMIM->getIM(), toggleTelexTransparency(), @@ -553,10 +609,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, playButton->setMinimumSize( QSize( 36, 36 ) ); playButton->setIconSize( QSize( 30, 30 ) ); - controlLayout->addWidget( playButton, 2, 0, 2, 2 ); - - controlLayout->setColumnMinimumWidth( 2, 20 ); - controlLayout->setColumnStretch( 2, 0 ); /** Prev + Stop + Next Block **/ controlButLayout = new QHBoxLayout; @@ -584,55 +636,44 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, controlButLayout->addWidget( nextButton ); /* Add this block to the main layout */ - if( !b_fsCreation ) - controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 ); - - BUTTON_SET_ACT_I( playButton, "", play.png, qtr( "Play" ), play() ); - BUTTON_SET_ACT_I( prevButton, "" , previous.png, - qtr( "Previous" ), prev() ); - BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() ); - BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() ); - controlLayout->setColumnMinimumWidth( 7, 20 ); - controlLayout->setColumnStretch( 7, 0 ); - controlLayout->setColumnStretch( 8, 0 ); - controlLayout->setColumnStretch( 9, 0 ); + BUTTON_SET_ACT_I( playButton, "", play_b, qtr( I_PLAY_TOOLTIP ), play() ); + BUTTON_SET_ACT_I( prevButton, "" , previous_b, + qtr( "Previous media in the playlist" ), prev() ); + BUTTON_SET_ACT_I( nextButton, "", next_b, + qtr( "Next media in the playlist" ), next() ); + BUTTON_SET_ACT_I( stopButton, "", stop_b, qtr( "Stop playback" ), stop() ); /* * Other first Line buttons */ /** Fullscreen/Visualisation **/ - fullscreenButton = new QPushButton( "F" ); - BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() ); + fullscreenButton = new QPushButton; + BUTTON_SET_ACT_I( fullscreenButton, "", fullscreen, + qtr( "Toggle the video in fullscreen" ), fullscreen() ); setupSmallButton( fullscreenButton ); - controlLayout->addWidget( fullscreenButton, 3, 10, Qt::AlignBottom ); - - /** Playlist Button **/ - playlistButton = new QPushButton; - setupSmallButton( playlistButton ); - controlLayout->addWidget( playlistButton, 3, 11, Qt::AlignBottom ); - BUTTON_SET_IMG( playlistButton, "" , playlist.png, qtr( "Show playlist" ) ); - CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() ); - - /** extended Settings **/ - extSettingsButton = new QPushButton; - BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended settings" ), - extSettings() ); - setupSmallButton( extSettingsButton ); - controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom ); - - controlLayout->setColumnStretch( 13, 0 ); - controlLayout->setColumnMinimumWidth( 13, 24 ); - controlLayout->setColumnStretch( 14, 5 ); + + if( !b_fsCreation ) + { + /** Playlist Button **/ + playlistButton = new QPushButton; + setupSmallButton( playlistButton ); + BUTTON_SET_IMG( playlistButton, "" , playlist, qtr( "Show playlist" ) ); + CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() ); + + /** extended Settings **/ + extSettingsButton = new QPushButton; + BUTTON_SET_ACT_I( extSettingsButton, "", extended, + qtr( "Show extended settings" ), extSettings() ); + setupSmallButton( extSettingsButton ); + } /* Volume */ hVolLabel = new VolumeClickHandler( p_intf, this ); volMuteLabel = new QLabel; - volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) ); - volMuteLabel->setToolTip( qtr( "Mute" ) ); + volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) ); volMuteLabel->installEventFilter( hVolLabel ); - controlLayout->addWidget( volMuteLabel, 3, 15, Qt::AlignBottom ); if( b_shiny ) { @@ -647,9 +688,8 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, volumeSlider->setOrientation( Qt::Horizontal ); } volumeSlider->setMaximumSize( QSize( 200, 40 ) ); - volumeSlider->setMinimumSize( QSize( 106, 30 ) ); + volumeSlider->setMinimumSize( QSize( 85, 30 ) ); volumeSlider->setFocusPolicy( Qt::NoFocus ); - controlLayout->addWidget( volumeSlider, 2, 16, 2 , 2, Qt::AlignBottom ); /* Set the volume from the config */ volumeSlider->setValue( ( config_GetInt( p_intf, "volume" ) ) * @@ -662,6 +702,47 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) ); CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) ); + if( !b_fsCreation ) + { + controlLayout = new QGridLayout( this ); + + controlLayout->setSpacing( 0 ); + controlLayout->setLayoutMargins( 7, 5, 7, 3, 6 ); + + controlLayout->addWidget( slider, 0, 1, 1, 18 ); + controlLayout->addWidget( slowerButton, 0, 0 ); + controlLayout->addWidget( fasterButton, 0, 19 ); + + 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, Qt::AlignBottom ); + controlLayout->setColumnMinimumWidth( 2, 10 ); + controlLayout->setColumnStretch( 2, 0 ); + + controlLayout->addLayout( controlButLayout, 3, 3, 1, 3, Qt::AlignBottom ); + /* Column 6 is unused */ + controlLayout->setColumnStretch( 6, 0 ); + controlLayout->setColumnStretch( 7, 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->setColumnStretch( 12, 0 ); + controlLayout->setColumnMinimumWidth( 12, 10 ); + + controlLayout->addWidget( advControls, 3, 13, 1, 3, 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(); } @@ -684,6 +765,7 @@ void ControlsWidget::toggleTeletext() b_telexEnabled = true; } } + void ControlsWidget::enableTeletext( bool b_enable ) { telexFrame->setVisible( b_enable ); @@ -699,13 +781,13 @@ void ControlsWidget::toggleTeletextTransparency() { if( b_telexTransparent ) { - telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx.png" ) ); + telexTransparent->setIcon( QIcon( ":/tvtelx" ) ); telexTransparent->setToolTip( qtr( "Teletext" ) ); b_telexTransparent = false; } else { - telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx-transparent.png" ) ); + telexTransparent->setIcon( QIcon( ":/tvtelx-transparent" ) ); telexTransparent->setToolTip( qtr( "Transparent" ) ); b_telexTransparent = true; } @@ -769,12 +851,18 @@ void ControlsWidget::updateVolume( int i_sliderVolume ) 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" ) ); + { + volMuteLabel->setPixmap( QPixmap(":/volume-muted" ) ); + volMuteLabel->setToolTip( qtr( "Unmute" ) ); + return; + } + + if( i_sliderVolume < VOLUME_MAX / 3 ) + volMuteLabel->setPixmap( QPixmap( ":/volume-low" ) ); else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) ) - volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) ); - else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) ); + volMuteLabel->setPixmap( QPixmap( ":/volume-high" ) ); + else volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) ); + volMuteLabel->setToolTip( qtr( "Mute" ) ); } void ControlsWidget::updateVolume() @@ -804,13 +892,13 @@ void ControlsWidget::setStatus( int status ) { if( status == PLAYING_S ) /* Playing */ { - playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) ); - playButton->setToolTip( qtr( "Pause" ) ); + playButton->setIcon( QIcon( ":/pause_b" ) ); + playButton->setToolTip( qtr( "Pause the playback" ) ); } else { - playButton->setIcon( QIcon( ":/pixmaps/play.png" ) ); - playButton->setToolTip( qtr( "Play" ) ); + playButton->setIcon( QIcon( ":/play_b" ) ); + playButton->setToolTip( qtr( I_PLAY_TOOLTIP ) ); } } @@ -850,6 +938,7 @@ void ControlsWidget::enableInput( bool enable ) { slowerButton->setEnabled( enable ); slider->setEnabled( enable ); + slider->setSliderPosition ( 0 ); fasterButton->setEnabled( enable ); /* Advanced Buttons too */ @@ -867,7 +956,7 @@ void ControlsWidget::enableVideo( bool enable ) void ControlsWidget::toggleAdvanced() { - if( !VISIBLE( advControls ) ) + if( advControls && !b_advancedVisible ) { advControls->show(); b_advancedVisible = true; @@ -889,7 +978,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, : 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 ); @@ -898,28 +987,24 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); QGridLayout *fsLayout = new QGridLayout( this ); - controlLayout->setSpacing( 0 ); - controlLayout->setLayoutMargins( 5, 1, 5, 1, 5 ); + fsLayout->setLayoutMargins( 5, 1, 5, 1, 5 ); - fsLayout->addWidget( slowerButton, 0, 0 ); + /* First line */ slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum); - fsLayout->addWidget( slider, 0, 1, 1, 6 ); - fsLayout->addWidget( fasterButton, 0, 7 ); - - fsLayout->addWidget( volMuteLabel, 1, 0); - fsLayout->addWidget( volumeSlider, 1, 1 ); + fsLayout->addWidget( slowerButton, 0, 0 ); + fsLayout->addWidget( slider, 0, 1, 1, 8 ); + fsLayout->addWidget( fasterButton, 0, 9 ); + fsLayout->addWidget( playButton, 1, 0, 1, 2 ); fsLayout->addLayout( controlButLayout, 1, 2 ); - fsLayout->addWidget( playButton, 1, 3 ); - - fsLayout->addWidget( discFrame, 1, 4 ); - - fsLayout->addWidget( telexFrame, 1, 5 ); - - fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter ); + fsLayout->addWidget( discFrame, 1, 3 ); + fsLayout->addWidget( telexFrame, 1, 4 ); + fsLayout->addWidget( advControls, 1, 5, Qt::AlignVCenter ); + fsLayout->addWidget( fullscreenButton, 1, 6 ); - fsLayout->addWidget( fullscreenButton, 1, 7 ); + fsLayout->addWidget( volMuteLabel, 1, 7 ); + fsLayout->addWidget( volumeSlider, 1, 8, 1, 2 ); /* hiding timer */ p_hideTimer = new QTimer( this ); @@ -942,7 +1027,8 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, #ifdef WIN32TRICK setWindowOpacity( 0.0 ); - fscHidden = true; + b_fscHidden = true; + adjustSize(); show(); #endif @@ -951,6 +1037,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, FullscreenControllerWidget::~FullscreenControllerWidget() { + detachVout(); vlc_mutex_destroy( &lock ); } @@ -959,14 +1046,15 @@ FullscreenControllerWidget::~FullscreenControllerWidget() */ void FullscreenControllerWidget::showFSC() { + adjustSize(); #ifdef WIN32TRICK // after quiting and going to fs, we need to call show() if( isHidden() ) show(); - if( fscHidden ) + if( b_fscHidden ) { - fscHidden = false; + b_fscHidden = false; setWindowOpacity( 1.0 ); } #else @@ -986,7 +1074,7 @@ void FullscreenControllerWidget::showFSC() void FullscreenControllerWidget::hideFSC() { #ifdef WIN32TRICK - fscHidden = true; + b_fscHidden = true; setWindowOpacity( 0.0 ); // simulate hidding #else hide(); @@ -1031,7 +1119,7 @@ void FullscreenControllerWidget::slowHideFSC() else { #ifdef WIN32TRICK - if ( windowOpacity() > 0.0 && !fscHidden ) + if ( windowOpacity() > 0.0 && !b_fscHidden ) #else if ( windowOpacity() > 0.0 ) #endif @@ -1057,21 +1145,38 @@ void FullscreenControllerWidget::customEvent( QEvent *event ) switch( event->type() ) { - case FullscreenControlShow_Type: - vlc_mutex_lock( &lock ); - b_fs = b_fullscreen; - vlc_mutex_unlock( &lock ); - - if( b_fs ) // FIXME I am not sure about that one - showFSC(); - break; - case FullscreenControlHide_Type: - hideFSC(); - break; - case FullscreenControlPlanHide_Type: - if( !b_mouse_over ) // Only if the mouse is not over FSC - planHideFSC(); - break; + case FullscreenControlToggle_Type: + vlc_mutex_lock( &lock ); + b_fs = b_fullscreen; + vlc_mutex_unlock( &lock ); + if( b_fs ) +#ifdef WIN32TRICK + if( b_fscHidden ) +#else + if( isHidden() ) +#endif + { + p_hideTimer->stop(); + showFSC(); + } + else + hideFSC(); + break; + case FullscreenControlShow_Type: + vlc_mutex_lock( &lock ); + b_fs = b_fullscreen; + vlc_mutex_unlock( &lock ); + + if( b_fs ) // FIXME I am not sure about that one + showFSC(); + break; + case FullscreenControlHide_Type: + hideFSC(); + break; + case FullscreenControlPlanHide_Type: + if( !b_mouse_over ) // Only if the mouse is not over FSC + planHideFSC(); + break; } } @@ -1177,9 +1282,11 @@ static int FullscreenControllerWidgetMouseMoved( vlc_object_t *vlc_object, const /** * 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 */ @@ -1189,14 +1296,16 @@ void FullscreenControllerWidget::attachVout( vout_thread_t *p_vout ) /** * 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; + } } /**