Qt: Access-filter 'record' does not exist anymore.

[vlc] / modules / gui / qt4 / components / interface_widgets.cpp

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index c6424e46dfa56e56a03d893c85ce152355d00866..f99a660991705961ef22f537569a3d233c983f23 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -73,7 +73,7 @@ VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
     hide();
 
     /* Set the policy to expand in both directions */
-    setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+//    setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
     /* Black background is more coherent for a Video Widget */
     QPalette plt =  palette();
@@ -350,11 +350,13 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i, bool b_fsCreation = f
 #endif
 
     /* Record Button */
+#if 0
     recordButton = new QPushButton;
     setupSmallButton( recordButton );
     advLayout->addWidget( recordButton );
     BUTTON_SET_ACT_I( recordButton, "", record,
             qtr( "Record" ), record() );
+#endif
 
     /* Snapshot Button */
     snapshotButton = new QPushButton;
@@ -374,16 +376,19 @@ void AdvControlsWidget::enableInput( bool enable )
     {
         input_item_t *p_item = input_GetItem( THEMIM->getInput() );
         i_input_id = p_item->i_id;
-
+#if 0
         recordButton->setVisible( var_GetBool( THEMIM->getInput(), "can-record" ) );
     }
     else
     {
         recordButton->setVisible( false );
+#endif
     }
 
     ABButton->setEnabled( enable );
+#if 0
     recordButton->setEnabled( enable );
+#endif
 
     if( enable && ( i_last_input_id != i_input_id ) )
     {
@@ -464,6 +469,7 @@ void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
     }
 }
 
+// TODO: On-the-fly record needs to be reimplemented
 void AdvControlsWidget::record()
 {
     input_thread_t *p_input = THEMIM->getInput();
@@ -673,6 +679,9 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     /*
      * Other first Line buttons
      */
+    /* */
+    CONNECT( THEMIM->getIM(), voutChanged(bool), this, enableVideo(bool) );
+
     /** Fullscreen/Visualisation **/
     fullscreenButton = new QPushButton;
     BUTTON_SET_ACT_I( fullscreenButton, "", fullscreen,
@@ -813,7 +822,7 @@ void ControlsWidget::toggleTeletextTransparency()
     }
     else
     {
-        telexTransparent->setIcon( QIcon( ":/tvtelx-transparent" ) );
+        telexTransparent->setIcon( QIcon( ":/tvtelx-trans" ) );
         telexTransparent->setToolTip( qtr( "Transparent" ) );
         b_telexTransparent = true;
     }
@@ -911,7 +920,7 @@ void ControlsWidget::updateInput()
 {
     /* Activate the interface buttons according to the presence of the input */
     enableInput( THEMIM->getIM()->hasInput() );
-    enableVideo( THEMIM->getIM()->hasVideo() && THEMIM->getIM()->hasInput() );
+    enableVideo( THEMIM->getIM()->hasVideo() );
 }
 
 void ControlsWidget::setStatus( int status )
@@ -995,7 +1004,6 @@ void ControlsWidget::toggleAdvanced()
     emit advancedControlsToggled( b_advancedVisible );
 }
 
-
 /**********************************************************************
  * Fullscrenn control widget
  **********************************************************************/
@@ -1465,8 +1473,10 @@ static int downloadCoverCallback( vlc_object_t *p_this,
     return VLC_SUCCESS;
 }
 
-CoverArtLabel::CoverArtLabel( vlc_object_t *_p_this, input_item_t *_p_input )
-        : p_this( _p_this), p_input( _p_input ), prevArt()
+CoverArtLabel::CoverArtLabel( QWidget *parent,
+                              vlc_object_t *_p_this,
+                              input_item_t *_p_input )
+        : QLabel( parent ), p_this( _p_this), p_input( _p_input ), prevArt()
 {
     setContextMenuPolicy( Qt::ActionsContextMenu );
     CONNECT( this, updateRequested(), this, doUpdate() );