Kill stupid VOUT_SNAPSHOT control.

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 904fe9352fa9badf7420b08f2efb1f11ee8a1928..322887350b7c6cac5d88ec57d3011e961ed32378 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,14 +29,16 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
 #include <vlc_input.h>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
 
 #include "qt4.hpp"
 
 #include <QObject>
 #include <QEvent>
 
+
 enum {
     PositionUpdate_Type = QEvent::User + IMEventType + 1,
     ItemChanged_Type,
@@ -43,10 +46,20 @@ enum {
     ItemTitleChanged_Type,
     ItemRateChanged_Type,
     VolumeChanged_Type,
-    ItemSpuChanged_Type,
+    ItemEsChanged_Type,
     ItemTeletextChanged_Type,
     InterfaceVoutUpdate_Type,
-    StatisticsUpdate_Type,
+    StatisticsUpdate_Type, /*10*/
+    InterfaceAoutUpdate_Type,
+    MetaChanged_Type,
+    NameChanged_Type,
+    InfoChanged_Type,
+    SynchroChanged_Type,
+    CachingEvent_Type,
+    BookmarksChanged_Type,
+    RecordingEvent_Type,
+/*    ProgramChanged_Type,
+    SignalChanged_Type, */
 
     FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
     FullscreenControlShow_Type,
@@ -76,10 +89,17 @@ public:
     virtual ~InputManager();
 
     void delInput();
-    bool hasInput() { return p_input && !p_input->b_dead
-                            && vlc_object_alive (p_input); }
+    bool hasInput()
+    {
+        return p_input /* We have an input */
+            && !p_input->b_dead /* not dead yet, */
+            && !p_input->b_eof  /* not EOF either, */
+            && vlc_object_alive (p_input); /* and the VLC object is alive */
+    }
+
     bool hasAudio();
     bool hasVideo() { return hasInput() && b_video; }
+    void requestArtUpdate();
 
     QString getName() { return oldName; }
 
@@ -91,6 +111,7 @@ private:
     QString         oldName;
     QString         artUrl;
     int             i_rate;
+    float           f_cache;
     bool            b_video;
     mtime_t         timeA, timeB;
 
@@ -100,15 +121,19 @@ private:
     void delCallbacks();
 
     void UpdateRate();
-    void UpdateMeta();
+    void UpdateName();
     void UpdateStatus();
     void UpdateNavigation();
     void UpdatePosition();
-    void UpdateSPU();
     void UpdateTeletext();
     void UpdateArt();
+    void UpdateInfo();
+    void UpdateMeta();
     void UpdateVout();
+    void UpdateAout();
     void UpdateStats();
+    void UpdateCaching();
+    void UpdateRecord();
 
     void AtoBLoop( int );
 
@@ -128,7 +153,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();
@@ -146,9 +170,12 @@ signals:
     void chapterChanged( bool );
     /// Statistics are updated
     void statisticsUpdated( input_item_t* );
+    void infoChanged( input_item_t* );
+    void metaChanged( input_item_t* );
+    void artChanged( QString );
     /// Play/pause status
     void statusChanged( int );
-    void artChanged( input_item_t* );
+    void recordingStateChanged( bool );
     /// Teletext
     void teletextPossible( bool );
     void teletextActivated( bool );
@@ -158,6 +185,10 @@ signals:
     void AtoBchanged( bool, bool );
     /// Vout
     void voutChanged( bool );
+    void synchroChanged();
+    void bookmarksChanged();
+    void cachingChanged( float );
+    void voutListChanged( vout_thread_t **pp_vout, int i_vout );
 };
 
 class MainInputManager : public QObject
@@ -179,6 +210,9 @@ public:
     input_thread_t *getInput() { return p_input; };
     InputManager *getIM() { return im; };
 
+    vout_thread_t* getVout();
+    aout_instance_t *getAout();
+
 private:
     MainInputManager( intf_thread_t * );
     static MainInputManager *instance;