* skins2/src/vlcproc.cpp: New "dvd.isActive" boolean variable

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

diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp
index f7d6ff9244f1dbdcc18f685be0e5cb4d1dff7335..09cac396a886c4cafa44dcf3d9f1b504d04358d7 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.hpp
+++ b/modules/gui/skins2/src/vlcproc.hpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * vlcproc.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $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,13 +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
@@ -50,6 +55,9 @@ class VlcProc: public SkinObject
         /// Getter for the playlist variable
         Playlist &getPlaylistVar() { return *((Playlist*)m_cPlaylist.get()); }
 
+        /// Getter for the playtree variable
+        Playtree &getPlaytreeVar() { return *((Playtree*)m_cPlaytree.get()); }
+
         /// Getter for the time variable
         StreamTime &getTimeVar() { return *((StreamTime*)(m_cVarTime.get())); }
 
@@ -64,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 );
 
@@ -71,7 +82,7 @@ class VlcProc: public SkinObject
         void unregisterVoutWindow( void *pVoutWindow );
 
         /// Indicate whether the embedded video output is currently used
-        bool isVoutUsed() const { return m_pVout; }
+        bool isVoutUsed() const { return m_pVout != NULL; }
 
         /// If an embedded video output is used, drop it (i.e. tell it to stop
         /// using our window handle)
@@ -87,6 +98,8 @@ class VlcProc: public SkinObject
         OSTimer *m_pTimer;
         /// Playlist variable
         VariablePtr m_cPlaylist;
+        /// Playtree variable FIXME
+        VariablePtr m_cPlaytree;
         VariablePtr m_cVarRandom;
         VariablePtr m_cVarLoop;
         VariablePtr m_cVarRepeat;
@@ -104,6 +117,14 @@ class VlcProc: public SkinObject
         VariablePtr m_cVarStopped;
         VariablePtr m_cVarPaused;
         VariablePtr m_cVarSeekable;
+        /// Variable for the vout
+        VarBox m_varVoutSize;
+        /// Equalizer variables
+        EqualizerBands m_varEqBands;
+        VariablePtr m_cVarEqPreamp;
+        VariablePtr m_cVarEqualizer;
+        /// Variable for DVD detection
+        VariablePtr m_cVarDvdActive;
 
         /// Set of handles of vout windows
         /**
@@ -113,6 +134,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
@@ -123,13 +146,15 @@ class VlcProc: public SkinObject
          */
         void manage();
 
+        /// 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 );
 
-        /// This function directly calls manage(), because it's boring to
-        /// always write "pThis->"
-        static void doManage( SkinObject *pObj );
-
         /// Callback for intf-change variable
         static int onIntfChange( vlc_object_t *pObj, const char *pVariable,
                                  vlc_value_t oldVal, vlc_value_t newVal,
@@ -145,6 +170,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,
@@ -155,6 +191,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,
@@ -167,6 +208,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 );
 };