* added a new skin variable "vlc.hasVout", true when... there is a vout !

[vlc] / modules / gui / skins2 / src / vlcproc.hpp

diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp
index 2ec1a1f801cf0bd570951dd4b6ce2df88514e81f..94bf422b0a8219adad80ea8c0efdc2dfdcc95e6a 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.hpp
+++ b/modules/gui/skins2/src/vlcproc.hpp
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teuli�e <ipkiss@via.ecp.fr>
  *
  * 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
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VLCPROC_HPP
@@ -27,15 +27,18 @@
 
 #include <set>
 
+#include "../vars/equalizer.hpp"
 #include "../vars/playlist.hpp"
 #include "../vars/playtree.hpp"
 #include "../vars/time.hpp"
 #include "../vars/volume.hpp"
+#include "../utils/position.hpp"
 #include "../utils/var_text.hpp"
 #include "../commands/cmd_generic.hpp"
 
 class OSTimer;
 class VarBool;
+struct aout_instance_t;
 
 
 /// Singleton object handling VLC internal state and playlist
@@ -69,6 +72,9 @@ class VlcProc: public SkinObject
         VarText &getStreamURIVar()
             { return *((VarText*)(m_cVarStreamURI.get())); }
 
+        /// Getter for the vout size variable
+        VarBox &getVoutSizeVar() { return m_varVoutSize; }
+
         /// Set the vout window handle
         void registerVoutWindow( void *pVoutWindow );
 
@@ -111,6 +117,16 @@ class VlcProc: public SkinObject
         VariablePtr m_cVarStopped;
         VariablePtr m_cVarPaused;
         VariablePtr m_cVarSeekable;
+        /// Variables related to the vout
+        VariablePtr m_cVarFullscreen;
+        VarBox m_varVoutSize;
+        VariablePtr m_cVarHasVout;
+        /// Equalizer variables
+        EqualizerBands m_varEqBands;
+        VariablePtr m_cVarEqPreamp;
+        VariablePtr m_cVarEqualizer;
+        /// Variable for DVD detection
+        VariablePtr m_cVarDvdActive;
 
         /// Set of handles of vout windows
         /**
@@ -120,6 +136,8 @@ class VlcProc: public SkinObject
         set<void *> m_handleSet;
         /// Vout thread
         vout_thread_t *m_pVout;
+        /// Audio output
+        aout_instance_t *m_pAout;
 
         /**
          * Poll VLC internals to update the status (volume, current time in
@@ -133,6 +151,9 @@ class VlcProc: public SkinObject
         /// Define the command that calls manage()
         DEFINE_CALLBACK( VlcProc, Manage );
 
+        /// Refresh audio variables
+        void refreshAudio();
+
         /// Update the stream name variable
         void updateStreamName( playlist_t *p_playlist );
 
@@ -151,6 +172,17 @@ class VlcProc: public SkinObject
                                  vlc_value_t oldVal, vlc_value_t newVal,
                                  void *pParam );
 
+        /// Callback for item-change variable
+        static int onItemAppend( vlc_object_t *pObj, const char *pVariable,
+                                 vlc_value_t oldVal, vlc_value_t newVal,
+                                 void *pParam );
+
+        /// Callback for item-change variable
+        static int onItemDelete( vlc_object_t *pObj, const char *pVariable,
+                                 vlc_value_t oldVal, vlc_value_t newVal,
+                                 void *pParam );
+
+
         /// Callback for playlist-current variable
         static int onPlaylistChange( vlc_object_t *pObj, const char *pVariable,
                                      vlc_value_t oldVal, vlc_value_t newVal,
@@ -161,6 +193,11 @@ class VlcProc: public SkinObject
                                  vlc_value_t oldVal, vlc_value_t newVal,
                                  void *pParam );
 
+        /// Callback for interaction variable
+        static int onInteraction( vlc_object_t *pObj, const char *pVariable,
+                                  vlc_value_t oldVal, vlc_value_t newVal,
+                                  void *pParam );
+
         /// Callback to request a vout window
         static void *getWindow( intf_thread_t *pIntf, vout_thread_t *pVout,
                                 int *pXHint, int *pYHint,
@@ -173,6 +210,16 @@ class VlcProc: public SkinObject
         /// Callback to change a vout window
         static int controlWindow( intf_thread_t *pIntf, void *pWindow,
                                   int query, va_list args );
+
+        /// Callback for equalizer-bands variable
+        static int onEqBandsChange( vlc_object_t *pObj, const char *pVariable,
+                                    vlc_value_t oldVal, vlc_value_t newVal,
+                                    void *pParam );
+
+        /// Callback for equalizer-preamp variable
+        static int onEqPreampChange( vlc_object_t *pObj, const char *pVariable,
+                                     vlc_value_t oldVal, vlc_value_t newVal,
+                                     void *pParam );
 };