Qt4 - Don't compile and create the Teletext bar without ZBVI

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 440731de873fee93eaceec0fa9b5471ec44ee793..3dd702989ad92a9219775902be27990152defd67 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -457,10 +457,11 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
              sectionNext() );
     CONNECT( menuButton, clicked(), THEMIM->getIM(),
              sectionMenu() );
-    /** TODO
+    /**
      * Telextext QFrame
-     * Merge with upper menu in a StackLayout
+     * TODO: Merge with upper menu in a StackLayout
      **/
+#ifdef ZVBI_COMPILED
     telexFrame = new QWidget( this );
     QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
     telexLayout->setSpacing( 0 );
@@ -493,6 +494,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
              THEMIM->getIM(), telexSetTransparency( bool ) );
     CONNECT( THEMIM->getIM(), teletextEnabled( bool ),
              telexFrame, setVisible( bool ) );
+#endif
 
     /** Play Buttons **/
     QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index ec3423eb9ad80c02df2f626f22d415a078ee6f52..9bb4992194e3b0024a3289345c9791df03042a84 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -138,10 +138,10 @@ void InputManager::update()
         emit navigationChanged( 0 );
     }
 
+#ifdef ZVBI_COMPILED
     /* Update teletext status*/
-
-    /* emit teletextEnabled( true|false ) */
-
+    emit teletextEnabled( true );/* FIXME */
+#endif
 
     /* Update text */
     QString text;
@@ -236,6 +236,7 @@ void InputManager::sectionMenu()
         var_SetInteger( p_input, "title 0", 2 );
 }
 
+#ifdef ZVBI_COMPILED
 void InputManager::telexGotoPage( int page )
 {
     // TODO: this has only sense when telx codec is available
@@ -272,6 +273,7 @@ void InputManager::telexSetTransparency( bool b_transp )
         }
     }
 }
+#endif
 
 void InputManager::slower()
 {

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index f5c84415dd4c58d89dbfcbf287054bb0dccaf040..e645f08994b5684615ecd6788a7f4292bf510aaa 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -59,9 +59,11 @@ public slots:
     void sectionNext();
     void sectionPrev();
     void sectionMenu();
+#ifdef ZVBI_COMPILED
     void telexGotoPage( int );
     void telexToggle( bool );
     void telexSetTransparency( bool );
+#endif
 signals:
     /// Send new position, new time and new length
     void positionUpdated( float , int, int );
@@ -69,7 +71,9 @@ signals:
     void nameChanged( QString );
     /// Used to signal whether we should show navigation buttons
     void navigationChanged( int );
+#ifdef ZVBI_COMPILED
     void teletextEnabled( bool );
+#endif
     /// Play/pause status
     void statusChanged( int );
 };