Commit f651c3b2 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent e4c890c4
...@@ -457,10 +457,11 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, ...@@ -457,10 +457,11 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
sectionNext() ); sectionNext() );
CONNECT( menuButton, clicked(), THEMIM->getIM(), CONNECT( menuButton, clicked(), THEMIM->getIM(),
sectionMenu() ); sectionMenu() );
/** TODO /**
* Telextext QFrame * Telextext QFrame
* Merge with upper menu in a StackLayout * TODO: Merge with upper menu in a StackLayout
**/ **/
#ifdef ZVBI_COMPILED
telexFrame = new QWidget( this ); telexFrame = new QWidget( this );
QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame ); QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
telexLayout->setSpacing( 0 ); telexLayout->setSpacing( 0 );
...@@ -493,6 +494,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, ...@@ -493,6 +494,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
THEMIM->getIM(), telexSetTransparency( bool ) ); THEMIM->getIM(), telexSetTransparency( bool ) );
CONNECT( THEMIM->getIM(), teletextEnabled( bool ), CONNECT( THEMIM->getIM(), teletextEnabled( bool ),
telexFrame, setVisible( bool ) ); telexFrame, setVisible( bool ) );
#endif
/** Play Buttons **/ /** Play Buttons **/
QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
......
...@@ -138,10 +138,10 @@ void InputManager::update() ...@@ -138,10 +138,10 @@ void InputManager::update()
emit navigationChanged( 0 ); emit navigationChanged( 0 );
} }
#ifdef ZVBI_COMPILED
/* Update teletext status*/ /* Update teletext status*/
emit teletextEnabled( true );/* FIXME */
/* emit teletextEnabled( true|false ) */ #endif
/* Update text */ /* Update text */
QString text; QString text;
...@@ -236,6 +236,7 @@ void InputManager::sectionMenu() ...@@ -236,6 +236,7 @@ void InputManager::sectionMenu()
var_SetInteger( p_input, "title 0", 2 ); var_SetInteger( p_input, "title 0", 2 );
} }
#ifdef ZVBI_COMPILED
void InputManager::telexGotoPage( int page ) void InputManager::telexGotoPage( int page )
{ {
// TODO: this has only sense when telx codec is available // TODO: this has only sense when telx codec is available
...@@ -272,6 +273,7 @@ void InputManager::telexSetTransparency( bool b_transp ) ...@@ -272,6 +273,7 @@ void InputManager::telexSetTransparency( bool b_transp )
} }
} }
} }
#endif
void InputManager::slower() void InputManager::slower()
{ {
......
...@@ -59,9 +59,11 @@ public slots: ...@@ -59,9 +59,11 @@ public slots:
void sectionNext(); void sectionNext();
void sectionPrev(); void sectionPrev();
void sectionMenu(); void sectionMenu();
#ifdef ZVBI_COMPILED
void telexGotoPage( int ); void telexGotoPage( int );
void telexToggle( bool ); void telexToggle( bool );
void telexSetTransparency( bool ); void telexSetTransparency( bool );
#endif
signals: signals:
/// Send new position, new time and new length /// Send new position, new time and new length
void positionUpdated( float , int, int ); void positionUpdated( float , int, int );
...@@ -69,7 +71,9 @@ signals: ...@@ -69,7 +71,9 @@ signals:
void nameChanged( QString ); void nameChanged( QString );
/// Used to signal whether we should show navigation buttons /// Used to signal whether we should show navigation buttons
void navigationChanged( int ); void navigationChanged( int );
#ifdef ZVBI_COMPILED
void teletextEnabled( bool ); void teletextEnabled( bool );
#endif
/// Play/pause status /// Play/pause status
void statusChanged( int ); void statusChanged( int );
}; };
......
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