KMix: 1) added direct DCOP access to the user selected mixer/device channel used as master.

2) fixed bug with volume update
3) unlinked global keyboard shortcuts for volume control to avoid
clashing with kmilo. A user can still link them manually if needed.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 23 insertions, 23 deletions

diff --git a/kmix/mixer.h b/kmix/mixer.h
index 80610c59..47b49ebb 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -113,29 +113,29 @@ class Mixer : public TQObject, virtual public MixerIface
       void setMasterDevice(TQString&);
 
       /// DCOP oriented methods (look at mixerIface.h for the descriptions)
-      virtual void setVolume( int deviceidx, int percentage );
-      virtual void setAbsoluteVolume( int deviceidx, long absoluteVolume );
-      virtual void setMasterVolume( int percentage );
-
-      virtual void increaseVolume( int deviceidx );
-      virtual void decreaseVolume( int deviceidx );
-
-      virtual long absoluteVolume( int deviceidx );
-      virtual long absoluteVolumeMin( int deviceidx );
-      virtual long absoluteVolumeMax( int deviceidx );
-      virtual int volume( int deviceidx );
-      virtual int masterVolume();
-      virtual int masterDeviceIndex();
-
-      virtual void setMute( int deviceidx, bool on );
-      virtual void setMasterMute( bool on );
-      virtual bool mute( int deviceidx );
-      virtual bool masterMute();
-      virtual void toggleMute( int deviceidx );
-      virtual void toggleMasterMute();
-      virtual bool isRecordSource( int deviceidx );
-
-      virtual bool isAvailableDevice( int deviceidx );
+      void setVolume( int deviceidx, int percentage );
+      void setAbsoluteVolume( int deviceidx, long absoluteVolume );
+      void setMasterVolume( int percentage );
+
+      void increaseVolume( int deviceidx, int percentage );
+      void decreaseVolume( int deviceidx, int percentage );
+
+      long absoluteVolume( int deviceidx );
+      long absoluteVolumeMin( int deviceidx );
+      long absoluteVolumeMax( int deviceidx );
+      int volume( int deviceidx );
+      int masterVolume();
+      int masterDeviceIndex();
+
+      void setMute( int deviceidx, bool on );
+      void setMasterMute( bool on );
+      bool mute( int deviceidx );
+      bool masterMute();
+      void toggleMute( int deviceidx );
+      void toggleMasterMute();
+      bool isRecordSource( int deviceidx );
+
+      bool isAvailableDevice( int deviceidx );
 
       void commitVolumeChange( MixDevice* md );