Split VolumeBox class out of DisplayVolume

So we can reuse this VolumeBox code later.

1 files changed, 8 insertions, 12 deletions

diff --git a/displayvolume.h b/displayvolume.h
index 6c184b2..0b3f9d7 100644
--- a/displayvolume.h
+++ b/displayvolume.h
@@ -3,24 +3,20 @@
 
 #include <vdr/skins.h>
 #include <vdr/thread.h>
+#include "volumebox.h"
 #include "imagecache.h"
 
 class cNopacityDisplayVolume : public cSkinDisplayVolume, cThread {
 private:
-    bool initial;
-    bool fadeout;
-    bool muted;
-    cOsd *osd;
-    cPixmap *pixmapBackground;
-    cPixmap *pixmapProgressBar;
-    cPixmap *pixmapLabel;
-    virtual void Action(void);
-    void DrawProgressBar(int Current, int Total);
-    tColor DrawProgressbarBackground(int left, int top, int width, int height);
-    void SetAlpha(int Alpha = 0);
+  bool initial;
+  bool fadeout;
+  cOsd *osd;
+  cNopacityVolumeBox *volumeBox;
+  void Action(void);
+  void SetAlpha(int Alpha = 0);
 public:
   cNopacityDisplayVolume(void);
-  virtual ~cNopacityDisplayVolume(void);
+  ~cNopacityDisplayVolume(void);
   virtual void SetVolume(int Current, int Total, bool Mute);
   virtual void Flush(void);
   };