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

Qt: deactivate the encryption functionnality until core or ts demux is ready.

parent a9d5d43a
...@@ -129,7 +129,6 @@ void InputManager::delInput() ...@@ -129,7 +129,6 @@ void InputManager::delInput()
emit statusChanged( END_S ); emit statusChanged( END_S );
emit teletextPossible( false ); emit teletextPossible( false );
emit encryptionChanged( false );
emit AtoBchanged( false, false ); emit AtoBchanged( false, false );
emit voutChanged( false ); emit voutChanged( false );
emit voutListChanged( NULL, 0 ); emit voutListChanged( NULL, 0 );
...@@ -138,6 +137,9 @@ void InputManager::delInput() ...@@ -138,6 +137,9 @@ void InputManager::delInput()
emit artChanged( NULL ); emit artChanged( NULL );
emit infoChanged( NULL ); emit infoChanged( NULL );
emit metaChanged( (input_item_t *)NULL ); emit metaChanged( (input_item_t *)NULL );
#if 0
emit encryptionChanged( false );
#endif
} }
/* Convert the event from the callbacks in actions */ /* Convert the event from the callbacks in actions */
......
...@@ -192,7 +192,9 @@ signals: ...@@ -192,7 +192,9 @@ signals:
void synchroChanged(); void synchroChanged();
void bookmarksChanged(); void bookmarksChanged();
void cachingChanged( float ); void cachingChanged( float );
#if 0
void encryptionChanged( bool ); void encryptionChanged( bool );
#endif
}; };
class MainInputManager : public QObject class MainInputManager : public QObject
......
...@@ -82,7 +82,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -82,7 +82,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
playlistVisible = false; playlistVisible = false;
input_name = ""; input_name = "";
fullscreenControls = NULL; fullscreenControls = NULL;
#if 0
cryptedLabel = NULL; cryptedLabel = NULL;
#endif
/* Ask for privacy */ /* Ask for privacy */
askForPrivacy(); askForPrivacy();
...@@ -349,10 +351,12 @@ inline void MainInterface::createStatusBar() ...@@ -349,10 +351,12 @@ inline void MainInterface::createStatusBar()
- right-clicking and clicking just toggle between remaining and - right-clicking and clicking just toggle between remaining and
elapsed time.*/ elapsed time.*/
CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() ); CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
#if 0
CONNECT( THEMIM->getIM(), encryptionChanged( bool ) , this, showCryptedLabel( bool ) ); CONNECT( THEMIM->getIM(), encryptionChanged( bool ) , this, showCryptedLabel( bool ) );
#endif
} }
#if 0
void MainInterface::showCryptedLabel( bool ) void MainInterface::showCryptedLabel( bool )
{ {
if( cryptedLabel == NULL ) if( cryptedLabel == NULL )
...@@ -364,6 +368,7 @@ void MainInterface::showCryptedLabel( bool ) ...@@ -364,6 +368,7 @@ void MainInterface::showCryptedLabel( bool )
cryptedLabel->show(); cryptedLabel->show();
} }
#endif
inline void MainInterface::initSystray() inline void MainInterface::initSystray()
{ {
......
...@@ -141,7 +141,9 @@ private: ...@@ -141,7 +141,9 @@ private:
/* Status Bar */ /* Status Bar */
QLabel *nameLabel; QLabel *nameLabel;
#if 0
QLabel *cryptedLabel; QLabel *cryptedLabel;
#endif
virtual void customEvent( QEvent *); virtual void customEvent( QEvent *);
virtual void keyPressEvent( QKeyEvent *); virtual void keyPressEvent( QKeyEvent *);
...@@ -173,7 +175,9 @@ private slots: ...@@ -173,7 +175,9 @@ private slots:
void updateSystrayTooltipName( QString ); void updateSystrayTooltipName( QString );
void updateSystrayTooltipStatus( int ); void updateSystrayTooltipStatus( int );
#if 0
void showCryptedLabel( bool ); void showCryptedLabel( bool );
#endif
signals: signals:
void askReleaseVideo( ); void askReleaseVideo( );
void askVideoToResize( unsigned int, unsigned int ); void askVideoToResize( unsigned int, unsigned 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