1 files changed, 12 insertions, 3 deletions

diff --git a/noncore/applets/volumeapplet2/volumeapplet.h b/noncore/applets/volumeapplet2/volumeapplet.h
index c1f1a3a..953c305 100644
--- a/noncore/applets/volumeapplet2/volumeapplet.h
+++ b/noncore/applets/volumeapplet2/volumeapplet.h
@@ -29,21 +29,23 @@
 */
 
 #ifndef VOLUMEAPPLET_H
 #define VOLUMEAPPLET_H
 
 #include <opie2/otaskbarapplet.h>
+#include <opie2/osoundsystem.h>
 #include <qframe.h>
 #include <qstring.h>
 #include <qvbox.h>
 #include <qpixmap.h>
+//using namespace Opie::MM;
 
 namespace Opie
 {
     namespace Ui { class OLedBox; }
-    namespace MM { class OMixerInterface; }
+//    namespace MM { class OMixerInterface; }
 }
 class QLabel;
 class QSlider;
 class QShowEvent;
 class QHideEvent;
 class QGridLayout;
@@ -66,23 +68,30 @@ class Channel : public QVBox
 
 class VolumeAppletControl : public QFrame
 {
   public:
     VolumeAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 );
     ~VolumeAppletControl();
+   bool volMuted() const;
+   int volPercent() const;
+
+   int  m_vol_percent;
+   bool m_vol_muted;
+
+    Opie::MM::OMixerInterface* mixer;
 
     virtual QSize sizeHint() const;
 
   protected:
     virtual void showEvent( QShowEvent* );
     virtual void hideEvent( QHideEvent* );
     void build();
 
   private:
-    QGridLayout* l;
 
+    QGridLayout* l;
 };
 
 
 class VolumeApplet : public Opie::Ui::OTaskbarApplet
 {
   public:
@@ -93,11 +102,11 @@ class VolumeApplet : public Opie::Ui::OTaskbarApplet
   protected:
     virtual void paintEvent( QPaintEvent* );
     virtual void mousePressEvent( QMouseEvent* );
 
   private:
     VolumeAppletControl* _control;
-    QPixmap _pixmap;
+    QPixmap* _pixmap;
 };
 
 #endif