From 087e6a8afd89d53dad28288d9e4030c785b517d2 Mon Sep 17 00:00:00 2001 From: beveloper Date: Tue, 1 Jul 2003 00:29:38 +0000 Subject: [PATCH] fixed MediaPlayer volume control bug by using R5 like ID assignments (taken from media kit SoundPlayer.cpp) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3778 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/media-add-ons/mixer/AudioMixer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp index fac474e93b..0b9a5120df 100644 --- a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp +++ b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp @@ -844,14 +844,14 @@ AudioMixer::CreateBufferGroup() // BControllable methods // -#define PARAM_INPUT(a) (10*(a) + 0) -#define PARAM_FORMAT(a) (10*(a) + 1) -#define PARAM_MUTE(a) (10*(a) + 2) -#define PARAM_GAIN(a) (10*(a) + 3) -#define PARAM_OUTPUT(a) (10*(a) + 4) -#define PARAM(a) ((a) / 10) -#define PARAM_IS_MUTE(a) ((a) % 10 == 2) -#define PARAM_IS_GAIN(a) ((a) % 10 == 3) +#define PARAM_INPUT(a) (((a) << 16) + 0) +#define PARAM_FORMAT(a) (((a) << 16) + 1) +#define PARAM_MUTE(a) (((a) << 16) + 2) +#define PARAM_GAIN(a) (((a) << 16) + 3) +#define PARAM_OUTPUT(a) (((a) << 16) + 4) +#define PARAM(a) ((a) >> 16) +#define PARAM_IS_MUTE(a) (((a) & 0xffff) == 2) +#define PARAM_IS_GAIN(a) (((a) & 0xffff) == 3) #define DB_TO_GAIN(_db) (20.0 * log10(_db)) #define GAIN_TO_DB(_gain) (pow(10.0, (_gain) / 20.0))