diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-20 01:19:55 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-25 13:24:33 +0900 |
commit | b06d352d14d9d917ff23288dd6a9433e4e75f7df (patch) | |
tree | 5518cf17eab0c4d4f3d76e02c610deccbea63339 /kmix/mixer.h | |
parent | c0249fdb66a93f3fd3b413f8c05d455f05ae8cdb (diff) | |
download | tdemultimedia-b06d352d14d9d917ff23288dd6a9433e4e75f7df.tar.gz tdemultimedia-b06d352d14d9d917ff23288dd6a9433e4e75f7df.zip |
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>
Diffstat (limited to 'kmix/mixer.h')
-rw-r--r-- | kmix/mixer.h | 46 |
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 ); |