Commit 72c15d7a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Fullscreen button should work now. hasVideo() does not work, so force...

Qt4 - Fullscreen button should work now. hasVideo() does not work, so force the activation of related buttons.

parent 9cbb99e3
...@@ -300,7 +300,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) : ...@@ -300,7 +300,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
//QSize size( 500, 200 ); //QSize size( 500, 200 );
//resize( size ); //resize( size );
controlLayout = new QGridLayout( this ); controlLayout = new QGridLayout( this );
#if DEBUG_COLOR #if DEBUG_COLOR
QPalette palette2; QPalette palette2;
palette2.setColor(this->backgroundRole(), Qt::magenta); palette2.setColor(this->backgroundRole(), Qt::magenta);
...@@ -583,7 +583,8 @@ void ControlsWidget::updateOnTimer() ...@@ -583,7 +583,8 @@ void ControlsWidget::updateOnTimer()
/* Activate the interface buttons according to the presence of the input */ /* Activate the interface buttons according to the presence of the input */
enableInput( THEMIM->getIM()->hasInput() ); enableInput( THEMIM->getIM()->hasInput() );
enableVideo( THEMIM->getIM()->hasVideo() ); enableVideo( true );
//enableVideo( THEMIM->getIM()->hasVideo() );
} }
void ControlsWidget::setStatus( int status ) void ControlsWidget::setStatus( int status )
...@@ -605,8 +606,11 @@ void ControlsWidget::fullscreen() ...@@ -605,8 +606,11 @@ void ControlsWidget::fullscreen()
vlc_object_t *p_vout = (vlc_object_t *)vlc_object_find( p_intf, vlc_object_t *p_vout = (vlc_object_t *)vlc_object_find( p_intf,
VLC_OBJECT_VOUT, FIND_CHILD ); VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout) if( p_vout)
var_SetBool( p_vout, "fullscreen", VLC_TRUE ); {
//msg_Dbg( p_intf, "Not implemented yet" ); var_Get( p_vout, "fullscreen", &val );
val.b_bool = !val.b_bool;
var_Set( p_vout, "fullscreen", val );
}
} }
void ControlsWidget::extSettings() void ControlsWidget::extSettings()
...@@ -639,7 +643,7 @@ void ControlsWidget::enableInput( bool enable ) ...@@ -639,7 +643,7 @@ void ControlsWidget::enableInput( bool enable )
} }
void ControlsWidget::enableVideo( bool enable ) void ControlsWidget::enableVideo( bool enable )
{ {
// TODO Later make the fullscreenButton toggle Visualisation and so on. // TODO Later make the fullscreenButton toggle Visualisation and so on.
fullscreenButton->setEnabled( enable ); fullscreenButton->setEnabled( enable );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment