Rename aout_instance_t to audio_output_t

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

diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp
index c558bb95bbb86ec991843a52720cf1776da97ad3..5c5687e87133f0cde51b56a28709385d7c6ef82d 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.hpp
+++ b/modules/gui/skins2/src/vlcproc.hpp
@@ -36,12 +36,13 @@
 #include "../vars/volume.hpp"
 #include "../utils/position.hpp"
 #include "../utils/var_text.hpp"
+#include "../utils/var_string.hpp"
 #include "../commands/cmd_generic.hpp"
 #include "../controls/ctrl_video.hpp"
 
 class OSTimer;
 class VarBool;
-struct aout_instance_t;
+struct audio_output_t;
 struct vout_window_t;
 
 
@@ -81,8 +82,9 @@ public:
     VarText &getStreamSampleRateVar()
         { return *((VarText*)(m_cVarStreamSampleRate.get())); }
 
-    /// Getter for the vout size variable
-    VarBox &getVoutSizeVar() { return m_varVoutSize; }
+    /// Getter for the stream Art url variable
+    VarString &getStreamArtVar()
+       { return *((VarString*)(m_cVarStreamArt.get())); }
 
     /// Getter/Setter for the fullscreen variable
     VarBool &getFullscreenVar() { return *((VarBool*)(m_cVarFullscreen.get())); }
@@ -109,6 +111,8 @@ public:
 
     void on_intf_show_changed( vlc_object_t* p_obj, vlc_value_t newVal );
 
+    void on_mouse_moved_changed( vlc_object_t* p_obj, vlc_value_t newVal );
+
 protected:
     // Protected because it is a singleton
     VlcProc( intf_thread_t *pIntf );
@@ -131,6 +135,7 @@ private:
     VariablePtr m_cVarStreamURI;
     VariablePtr m_cVarStreamBitRate;
     VariablePtr m_cVarStreamSampleRate;
+    VariablePtr m_cVarStreamArt;
     /// Variable for the "mute" state
     VariablePtr m_cVarMute;
     /// Variables related to the input
@@ -142,7 +147,6 @@ private:
     VariablePtr m_cVarRecording;
     /// Variables related to the vout
     VariablePtr m_cVarFullscreen;
-    VarBox m_varVoutSize;
     VariablePtr m_cVarHasVout;
     /// Variables related to audio
     VariablePtr m_cVarHasAudio;
@@ -156,7 +160,7 @@ private:
     /// Vout thread
     vout_thread_t *m_pVout;
     /// Audio output
-    aout_instance_t *m_pAout;
+    audio_output_t *m_pAout;
     bool m_bEqualizer_started;
 
     /**
@@ -177,14 +181,6 @@ private:
     /// Define the command that calls manage()
     DEFINE_CALLBACK( VlcProc, Manage );
 
-    /// Update the stream name variable
-    void updateStreamName();
-
-    /// Callback for intf-change variable
-    static int onIntfChange( vlc_object_t *pObj, const char *pVariable,
-                             vlc_value_t oldVal, vlc_value_t newVal,
-                             void *pParam );
-
     /// Callback for intf-show variable
     static int onIntfShow( vlc_object_t *pObj, const char *pVariable,
                            vlc_value_t oldVal, vlc_value_t newVal,
@@ -210,11 +206,6 @@ private:
                              vlc_value_t oldVal, vlc_value_t newVal,
                              void *pParam );
 
-    /// Callback for skins2-to-load variable
-    static int onSkinToLoad( vlc_object_t *pObj, const char *pVariable,
-                             vlc_value_t oldVal, vlc_value_t newVal,
-                             void *pParam );
-
     static int onInteraction( vlc_object_t *pObj, const char *pVariable,
                               vlc_value_t oldVal, vlc_value_t newVal,
                               void *pParam );
@@ -232,6 +223,10 @@ private:
                                   vlc_value_t oldVal, vlc_value_t newVal,
                                   void *pParam );
 
+    /// Generic Callback for intf-event
+    static int onGenericCallback2( vlc_object_t *pObj, const char *pVariable,
+                                   vlc_value_t oldVal, vlc_value_t newVal,
+                                   void *pParam );
 };