/// Base class for button controls
-class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap, void*>
+class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap>
{
public:
/// Create a button with 3 images
/// Base class for checkbox controls
-class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap, void*>
+class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap>
{
public:
/// Create a checkbox with 6 images
/// Base class for controls
-class CtrlGeneric: public SkinObject, public Observer<VarBool, void*>
+class CtrlGeneric: public SkinObject, public Observer<VarBool>
{
public:
virtual ~CtrlGeneric();
/// Class for control list
-class CtrlList: public CtrlGeneric, public Observer<VarList, void*>,
- public Observer<VarPercent, void *>
+class CtrlList: public CtrlGeneric, public Observer<VarList>,
+ public Observer<VarPercent>
{
public:
CtrlList( intf_thread_t *pIntf, VarList &rList,
/// Radial slider
-class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent, void*>
+class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent>
{
public:
/// Create a radial slider with the given image, which must be
/// Cursor of a slider
-class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent, void*>
+class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
{
public:
/// Create a cursor with 3 images (which are NOT copied, be careful)
/// Slider background
-class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent, void*>
+class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent>
{
public:
CtrlSliderBg( intf_thread_t *pIntf,
/// Class for control text
-class CtrlText: public CtrlGeneric, public Observer<VarText, void*>
+class CtrlText: public CtrlGeneric, public Observer<VarText>
{
public:
enum Align_t
/// Class for control tree
class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update*>,
- public Observer<VarPercent, void*>
+ public Observer<VarPercent>
{
public:
CtrlTree( intf_thread_t *pIntf,
class VoutWindow;
/// Control video
-class CtrlVideo: public CtrlGeneric, public Observer<VarBox, void*>
+class CtrlVideo: public CtrlGeneric, public Observer<VarBox>
{
public:
CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
/// Generic window class
-class GenericWindow: public SkinObject, public Observer<VarBool, void*>
+class GenericWindow: public SkinObject, public Observer<VarBool>
{
private:
friend class WindowManager;
class UString;
-class Tooltip: public SkinObject, public Observer<VarText, void*>
+class Tooltip: public SkinObject, public Observer<VarText>
{
public:
/// Create a tooltip with the given font and delay (in milliseconds)
/// Conjunction of two boolean variables (AND)
-class VarBoolAndBool: public VarBool, public Observer<VarBool, void*>
+class VarBoolAndBool: public VarBool, public Observer<VarBool>
{
public:
VarBoolAndBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
/// Disjunction of two boolean variables (OR)
-class VarBoolOrBool: public VarBool, public Observer<VarBool, void*>
+class VarBoolOrBool: public VarBool, public Observer<VarBool>
{
public:
VarBoolOrBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
/// Negation of a boolean variable (NOT)
-class VarNotBool: public VarBool, public Observer<VarBool, void*>
+class VarNotBool: public VarBool, public Observer<VarBool>
{
public:
VarNotBool( intf_thread_t *pIntf, VarBool &rVar );
/// String variable
class VarText: public Variable, public Subject<VarText>,
- public Observer<VarPercent, void*>,
- public Observer< VarText,void*>
+ public Observer<VarPercent>,
+ public Observer<VarText>
{
public:
// Set substVars to true to replace "$X" variables in the text
/// Variable for graphical equalizer
-class EqualizerBands: public SkinObject, public Observer<VarPercent, void*>
+class EqualizerBands: public SkinObject, public Observer<VarPercent>
{
public:
/// Number of bands