summaryrefslogtreecommitdiffstats
path: root/kmix/volume.h
diff options
context:
space:
mode:
Diffstat (limited to 'kmix/volume.h')
-rw-r--r--kmix/volume.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/kmix/volume.h b/kmix/volume.h
index 9051ed0c..a731ad59 100644
--- a/kmix/volume.h
+++ b/kmix/volume.h
@@ -27,7 +27,7 @@ class Volume
CUSTOM1 = 8, CUSTOM2 = 9, CHIDMAX = 9 };
- Volume( ChannelMask chmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false );
+ Volume( ChannelMask chtqmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false );
Volume( const Volume &v );
Volume( int channels, long maxVolume );
@@ -37,13 +37,13 @@ class Volume
void setAllVolumes(long vol);
// Set all volumes to the ones given in vol
void setVolume(const Volume &vol );
- // Set volumes as specified by the channel mask
- void setVolume( const Volume &vol, ChannelMask chmask);
+ // Set volumes as specified by the channel tqmask
+ void setVolume( const Volume &vol, ChannelMask chtqmask);
void setVolume( ChannelID chid, long volume);
long getVolume(ChannelID chid);
- long getAvgVolume(ChannelMask chmask);
- long getTopStereoVolume(ChannelMask chmask);
+ long getAvgVolume(ChannelMask chtqmask);
+ long getTopStereoVolume(ChannelMask chtqmask);
long operator[](int);
long maxVolume();
long minVolume();
@@ -61,13 +61,13 @@ class Volume
static int _channelMaskEnum[10];
bool _muted;
bool _isCapture; // true, when the Volume represents capture/record levels
- long _chmask;
+ long _chtqmask;
long _volumes[CHIDMAX+1];
long _maxVolume;
long _minVolume;
private:
- void init( ChannelMask chmask, long, long, bool );
+ void init( ChannelMask chtqmask, long, long, bool );
long volrange( int vol );
long volrangeRec( int vol );