* $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
- * Olivier Teulière <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
*
* 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
#include <set>
#include "../vars/equalizer.hpp"
-#include "../vars/playlist.hpp"
#include "../vars/playtree.hpp"
#include "../vars/time.hpp"
#include "../vars/volume.hpp"
class OSTimer;
class VarBool;
struct aout_instance_t;
+struct vout_window_t;
/// Singleton object handling VLC internal state and playlist
/// 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()); }
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; }
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;
/// 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
VariablePtr m_cVarStopped;
VariablePtr m_cVarPaused;
VariablePtr m_cVarSeekable;
- /// Variable for the vout
+ /// Variables related to the vout
+ VariablePtr m_cVarFullscreen;
VarBox m_varVoutSize;
- /// Equalizer variable
+ VariablePtr m_cVarHasVout;
+ /// Variables related to audio
+ VariablePtr m_cVarHasAudio;
+ /// Equalizer variables
EqualizerBands m_varEqBands;
+ VariablePtr m_cVarEqPreamp;
VariablePtr m_cVarEqualizer;
+ /// Variable for DVD detection
+ VariablePtr m_cVarDvdActive;
/// Set of handles of vout windows
/**
/// 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 );
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,
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,
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
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 );
};