skins2: use the vout window interface (untested)

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

diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp
index 09cac396a886c4cafa44dcf3d9f1b504d04358d7..1e4fac2ffaca3a57a7234a3436a1472c568ae553 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�e <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <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
@@ -28,7 +28,6 @@
 #include <set>
 
 #include "../vars/equalizer.hpp"
-#include "../vars/playlist.hpp"
 #include "../vars/playtree.hpp"
 #include "../vars/time.hpp"
 #include "../vars/volume.hpp"
@@ -39,6 +38,7 @@
 class OSTimer;
 class VarBool;
 struct aout_instance_t;
+struct vout_window_t;
 
 
 /// Singleton object handling VLC internal state and playlist
@@ -52,9 +52,6 @@ class VlcProc: public SkinObject
         /// Delete the instance of VlcProc
         static void destroy( intf_thread_t *pIntf );
 
-        /// Getter for the playlist variable
-        Playlist &getPlaylistVar() { return *((Playlist*)m_cPlaylist.get()); }
-
         /// Getter for the playtree variable
         Playtree &getPlaytreeVar() { return *((Playtree*)m_cPlaytree.get()); }
 
@@ -72,6 +69,14 @@ class VlcProc: public SkinObject
         VarText &getStreamURIVar()
             { return *((VarText*)(m_cVarStreamURI.get())); }
 
+        /// Getter for the stream bitrate variable
+        VarText &getStreamBitRateVar()
+            { return *((VarText*)(m_cVarStreamBitRate.get())); }
+
+        /// Getter for the stream sample rate variable
+        VarText &getStreamSampleRateVar()
+            { return *((VarText*)(m_cVarStreamSampleRate.get())); }
+
         /// Getter for the vout size variable
         VarBox &getVoutSizeVar() { return m_varVoutSize; }
 
@@ -96,9 +101,7 @@ class VlcProc: public SkinObject
     private:
         /// Timer to call manage() regularly (via doManage())
         OSTimer *m_pTimer;
-        /// Playlist variable
-        VariablePtr m_cPlaylist;
-        /// Playtree variable FIXME
+        /// Playtree variable
         VariablePtr m_cPlaytree;
         VariablePtr m_cVarRandom;
         VariablePtr m_cVarLoop;
@@ -110,6 +113,8 @@ class VlcProc: public SkinObject
         /// Variable for current stream properties
         VariablePtr m_cVarStreamName;
         VariablePtr m_cVarStreamURI;
+        VariablePtr m_cVarStreamBitRate;
+        VariablePtr m_cVarStreamSampleRate;
         /// Variable for the "mute" state
         VariablePtr m_cVarMute;
         /// Variables related to the input
@@ -117,8 +122,12 @@ class VlcProc: public SkinObject
         VariablePtr m_cVarStopped;
         VariablePtr m_cVarPaused;
         VariablePtr m_cVarSeekable;
-        /// Variable for the vout
+        /// Variables related to the vout
+        VariablePtr m_cVarFullscreen;
         VarBox m_varVoutSize;
+        VariablePtr m_cVarHasVout;
+        /// Variables related to audio
+        VariablePtr m_cVarHasAudio;
         /// Equalizer variables
         EqualizerBands m_varEqBands;
         VariablePtr m_cVarEqPreamp;
@@ -151,6 +160,10 @@ class VlcProc: public SkinObject
 
         /// Refresh audio variables
         void refreshAudio();
+        /// Refresh playlist variables
+        void refreshPlaylist();
+        /// Refresh input variables
+        void refreshInput();
 
         /// Update the stream name variable
         void updateStreamName( playlist_t *p_playlist );
@@ -206,7 +219,7 @@ class VlcProc: public SkinObject
         static void releaseWindow( intf_thread_t *pIntf, void *pWindow );
 
         /// Callback to change a vout window
-        static int controlWindow( intf_thread_t *pIntf, void *pWindow,
+        static int controlWindow( struct vout_window_t *pWnd,
                                   int query, va_list args );
 
         /// Callback for equalizer-bands variable