1 files changed, 31 insertions, 16 deletions

diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h
index a982f53..9fc12d8 100644
--- a/core/applets/volumeapplet/volume.h
+++ b/core/applets/volumeapplet/volume.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
@@ -19,2 +19,3 @@
 **********************************************************************/
+
 #ifndef __VOLUME_APPLET_H__
@@ -27,2 +28,3 @@
 #include <qguardedptr.h>
+#include <qtimer.h>
 
@@ -30,4 +32,2 @@ class QSlider;
 class QCheckBox;
-class QPushButton;
-class QTimer;
 
@@ -37,3 +37,3 @@ class VolumeControl : public QFrame
 public:
-    VolumeControl( QWidget *parent=0, const char *name=0 );
+    VolumeControl( bool showMic=FALSE, QWidget *parent=0, const char *name=0 );
 
@@ -41,2 +41,3 @@ public:
     QSlider *slider;
+    QSlider *mic;
     QCheckBox *muteBox;
@@ -44,4 +45,8 @@ public:
 private:
+    QPushButton *upButton;
+    QPushButton *downButton;
+    QTimer *rateTimer;
+    
     void keyPressEvent( QKeyEvent * );
-
+    void createView(bool showMic = FALSE);
 private slots:
@@ -49,7 +54,3 @@ private slots:
     void rateTimerDone();
-
-private:
-    QPushButton *upButton;
-    QPushButton *downButton;
-    QTimer *rateTimer;
+    
 };
@@ -67,3 +68,3 @@ public slots:
     void volumeChanged( bool muted );
-    void setVolume( int percent );
+    void micChanged( bool muted );
     void sliderMoved( int percent );
@@ -71,3 +72,15 @@ public slots:
 
+    void micMoved( int percent );
+    void setVolume( int percent );
+    void setMic( int percent );
+
+    void showVolControl(bool showMic = FALSE);
+    void advVolControl();
+
 private:
+    int volumePercent, micPercent;
+    bool muted, micMuted;
+    QPixmap volumePixmap;
+    QTimer *advancedTimer;
+
     void readSystemVolume();
@@ -77,6 +90,7 @@ private:
 
-private:
-    int volumePercent;
-    bool muted;
-    QPixmap volumePixmap;
+    void readSystemMic();
+    void keyPressEvent ( QKeyEvent * e );
+    void mouseReleaseEvent( QMouseEvent *);
+    void writeSystemMic();
+
 };
@@ -85 +99,2 @@ private:
 #endif // __VOLUME_APPLET_H__
+