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

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index d2c9310365b189961a80b555f6c21026c59c1ddc..9067b761d79ca87c0a487f41ad158fa85c657111 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -129,7 +129,6 @@ void InputManager::delInput()
     emit statusChanged( END_S );
 
     emit teletextPossible( false );
-    emit encryptionChanged( false );
     emit AtoBchanged( false, false );
     emit voutChanged( false );
     emit voutListChanged( NULL, 0 );
@@ -138,6 +137,9 @@ void InputManager::delInput()
     emit artChanged( NULL );
     emit infoChanged( NULL );
     emit metaChanged( (input_item_t *)NULL );
+#if 0
+    emit encryptionChanged( false );
+#endif
 }
 
 /* Convert the event from the callbacks in actions */

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index f7fb204f17ace81c0b76ea4f1bb7f9dfaf5df910..2560045f6bb09e52b33dffe38870a49f4cd4ea2b 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -192,7 +192,9 @@ signals:
     void synchroChanged();
     void bookmarksChanged();
     void cachingChanged( float );
+#if 0
     void encryptionChanged( bool );
+#endif
 };
 
 class MainInputManager : public QObject

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index a577ae9c9e931153e5e035836e9707b56094098b..42d9f690b727119d9e9e4a49476cb0dba7ad4e28 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -82,7 +82,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     playlistVisible      = false;
     input_name           = "";
     fullscreenControls   = NULL;
+#if 0
     cryptedLabel         = NULL;
+#endif
 
     /* Ask for privacy */
     askForPrivacy();
@@ -349,10 +351,12 @@ inline void MainInterface::createStatusBar()
        - right-clicking and clicking just toggle between remaining and
          elapsed time.*/
     CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
-
+#if 0
     CONNECT( THEMIM->getIM(), encryptionChanged( bool ) , this, showCryptedLabel( bool ) );
+#endif
 }
 
+#if 0
 void MainInterface::showCryptedLabel( bool )
 {
     if( cryptedLabel == NULL )
@@ -364,6 +368,7 @@ void MainInterface::showCryptedLabel( bool )
 
     cryptedLabel->show();
 }
+#endif
 
 inline void MainInterface::initSystray()
 {

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 3f84db8bce4db23384cc10907d77873f8bbeb6df..df86b807e5ac2f56d289d5c5d86b59c6468aa409 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -141,7 +141,9 @@ private:
 
     /* Status Bar */
     QLabel              *nameLabel;
+#if 0
     QLabel              *cryptedLabel;
+#endif
 
     virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
@@ -173,7 +175,9 @@ private slots:
     void updateSystrayTooltipName( QString );
     void updateSystrayTooltipStatus( int );
 
+#if 0
     void showCryptedLabel( bool );
+#endif
 signals:
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );