66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From 5f04be57d78f368fef2fe3744261061f103c3b6a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
Date: Tue, 17 Apr 2012 14:32:35 +0200
|
|
Subject: [PATCH] audio: add VOICE_VOLUME ctl
|
|
|
|
Add a new PCM control operation to update the stream volume on the
|
|
audio backend. The argument given is a SWVoiceOut/SWVoiceIn.
|
|
|
|
v4:
|
|
- verified other backends didn't fail/assert on this new control
|
|
they randomly return 0 or -1, but we ignore return value.
|
|
|
|
Signed-off-by: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
|
|
Signed-off-by: malc <av1474@comtv.ru>
|
|
---
|
|
audio/audio.c | 12 ++++++++++++
|
|
audio/audio_int.h | 1 +
|
|
2 files changed, 13 insertions(+)
|
|
|
|
diff --git a/audio/audio.c b/audio/audio.c
|
|
index 50d0d71..2ae9b2f 100644
|
|
--- a/audio/audio.c
|
|
+++ b/audio/audio.c
|
|
@@ -2050,17 +2050,29 @@ void AUD_del_capture (CaptureVoiceOut *cap, void *cb_opaque)
|
|
void AUD_set_volume_out (SWVoiceOut *sw, int mute, uint8_t lvol, uint8_t rvol)
|
|
{
|
|
if (sw) {
|
|
+ HWVoiceOut *hw = sw->hw;
|
|
+
|
|
sw->vol.mute = mute;
|
|
sw->vol.l = nominal_volume.l * lvol / 255;
|
|
sw->vol.r = nominal_volume.r * rvol / 255;
|
|
+
|
|
+ if (hw->pcm_ops->ctl_out) {
|
|
+ hw->pcm_ops->ctl_out (hw, VOICE_VOLUME, sw);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
void AUD_set_volume_in (SWVoiceIn *sw, int mute, uint8_t lvol, uint8_t rvol)
|
|
{
|
|
if (sw) {
|
|
+ HWVoiceIn *hw = sw->hw;
|
|
+
|
|
sw->vol.mute = mute;
|
|
sw->vol.l = nominal_volume.l * lvol / 255;
|
|
sw->vol.r = nominal_volume.r * rvol / 255;
|
|
+
|
|
+ if (hw->pcm_ops->ctl_in) {
|
|
+ hw->pcm_ops->ctl_in (hw, VOICE_VOLUME, sw);
|
|
+ }
|
|
}
|
|
}
|
|
diff --git a/audio/audio_int.h b/audio/audio_int.h
|
|
index 2003f8b..117f95e 100644
|
|
--- a/audio/audio_int.h
|
|
+++ b/audio/audio_int.h
|
|
@@ -231,6 +231,7 @@ void audio_run (const char *msg);
|
|
|
|
#define VOICE_ENABLE 1
|
|
#define VOICE_DISABLE 2
|
|
+#define VOICE_VOLUME 3
|
|
|
|
static inline int audio_ring_dist (int dst, int src, int len)
|
|
{
|