qt4: Catch INPUT_EVENT_PROGRAM updates and show icon when "program-scrambled" is...

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index adb58f13691823bff889d209bc8b6d0e6829d19b..14490b676a362d36c10239f3eec3aaf796bf70c3 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -138,9 +138,8 @@ 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 */
@@ -229,6 +228,9 @@ void InputManager::customEvent( QEvent *event )
     case RecordingEvent_Type:
         UpdateRecord();
         break;
+    case ProgramChanged_Type:
+        UpdateProgramEvent();
+        break;
     default:
         msg_Warn( p_intf, "This shouldn't happen: %i", i_type );
         assert(0);
@@ -328,8 +330,9 @@ static int InputEvent( vlc_object_t *p_this, const char *,
 
     case INPUT_EVENT_PROGRAM:
         /* This is for PID changes */
-        /* event = new IMEvent( ProgramChanged_Type, 0 );
-        break; */
+        event = new IMEvent( ProgramChanged_Type, 0 );
+        break;
+
     case INPUT_EVENT_SIGNAL:
         /* This is for capture-card signals */
         /* event = new IMEvent( SignalChanged_Type, 0 );
@@ -628,6 +631,15 @@ void InputManager::UpdateRecord()
     }
 }
 
+void InputManager::UpdateProgramEvent()
+{
+    if( hasInput() )
+    {
+        bool b_scrambled = var_GetBool( p_input, "program-scrambled" );
+        emit encryptionChanged( b_scrambled );
+    }
+}
+
 /* User update of the slider */
 void InputManager::sliderUpdate( float new_pos )
 {

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index bc478e1404439c909d71c7b35b3df9d667b9798d..961d2d758aadef7b9a93acee07bc6332d6d7ea35 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -58,8 +58,8 @@ enum {
     CachingEvent_Type,
     BookmarksChanged_Type,
     RecordingEvent_Type,
-/*    ProgramChanged_Type,
-    SignalChanged_Type, */
+    ProgramChanged_Type,
+/*    SignalChanged_Type, */
 
     FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
     FullscreenControlShow_Type,
@@ -135,7 +135,7 @@ private:
     void UpdateStats();
     void UpdateCaching();
     void UpdateRecord();
-
+    void UpdateProgramEvent();
 
 public slots:
     void setInput( input_thread_t * ); ///< Our controlled input changed
@@ -197,9 +197,8 @@ signals:
     void synchroChanged();
     void bookmarksChanged();
     void cachingChanged( float );
-#if 0
+    /// Program Event changes
     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 d31d5e596af06d3c7c63932dca446bbb9e29430a..54e0bbadc3cf7b065817e3b233ecb3558c77ad47 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -81,9 +81,7 @@ 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();
@@ -353,12 +351,10 @@ 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 )
@@ -370,7 +366,6 @@ 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 fd66a5d7f7442985d1bfabe26b92c9d708d7a414..ff96d353e336336ee82feacc75342413120c4aa2 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -142,9 +142,7 @@ private:
 
     /* Status Bar */
     QLabel              *nameLabel;
-#if 0
     QLabel              *cryptedLabel;
-#endif
 
     virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
@@ -177,9 +175,7 @@ private slots:
     void updateSystrayTooltipName( QString );
     void updateSystrayTooltipStatus( int );
 
-#if 0
     void showCryptedLabel( bool );
-#endif
 signals:
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );