Qt: display a locker in the statusBar when encryption is set.

[vlc] / modules / gui / qt4 / input_manager.hpp

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 90fa02a78a82352dd93f6acbcdc7241e91f11980..f7fb204f17ace81c0b76ea4f1bb7f9dfaf5df910 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -57,8 +57,8 @@ enum {
     SynchroChanged_Type,
     CachingEvent_Type,
     BookmarksChanged_Type,
-/*    RecordingEvent_Type,
-    ProgramChanged_Type,
+    RecordingEvent_Type,
+/*    ProgramChanged_Type,
     SignalChanged_Type, */
 
     FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
@@ -129,10 +129,12 @@ private:
     void UpdateArt();
     void UpdateInfo();
     void UpdateMeta();
+    void UpdateMeta(int);
     void UpdateVout();
     void UpdateAout();
     void UpdateStats();
     void UpdateCaching();
+    void UpdateRecord();
 
     void AtoBLoop( int );
 
@@ -152,7 +154,6 @@ public slots:
     /* Teletext */
     void telexSetPage( int );          ///< Goto teletext page
     void telexSetTransparency( bool ); ///< Transparency on teletext background
-    void telexActivation( bool );      ///< Enable disable teletext buttons
     void activateTeletext( bool );     ///< Toggle buttons after click
     /* A to B Loop */
     void setAtoB();
@@ -172,9 +173,11 @@ signals:
     void statisticsUpdated( input_item_t* );
     void infoChanged( input_item_t* );
     void metaChanged( input_item_t* );
+    void metaChanged( int );
     void artChanged( QString );
     /// Play/pause status
     void statusChanged( int );
+    void recordingStateChanged( bool );
     /// Teletext
     void teletextPossible( bool );
     void teletextActivated( bool );
@@ -184,10 +187,12 @@ signals:
     void AtoBchanged( bool, bool );
     /// Vout
     void voutChanged( bool );
+    void voutListChanged( vout_thread_t **pp_vout, int i_vout );
+    /// Other
     void synchroChanged();
     void bookmarksChanged();
     void cachingChanged( float );
-    void voutListChanged( vout_thread_t **pp_vout, int i_vout );
+    void encryptionChanged( bool );
 };
 
 class MainInputManager : public QObject
@@ -208,27 +213,10 @@ public:
 
     input_thread_t *getInput() { return p_input; };
     InputManager *getIM() { return im; };
-    vout_thread_t * getVout()
-    {
-        vout_thread_t **pp_vout; int i_vout;
-        if( p_input && !input_Control( p_input, INPUT_GET_VOUTS, &pp_vout, &i_vout ) )
-        {
-            for( int i = 1; i < i_vout; i++ ) vlc_object_release( pp_vout[i]);
-            vout_thread_t *p_tmp = pp_vout[0];
-            free( pp_vout );
-            return p_tmp;
-        }
-        return NULL;
-    }
 
-    aout_instance_t *getAout()
-    {
-        aout_instance_t *p_aout;
-        if( p_input && !input_Control( p_input, INPUT_GET_AOUT, &p_aout ) )
-        {
-            return p_aout;
-        }
-    }
+    vout_thread_t* getVout();
+    aout_instance_t *getAout();
+
 private:
     MainInputManager( intf_thread_t * );
     static MainInputManager *instance;