[haiku-commits] haiku: hrev45986 - in src/add-ons/kernel/drivers/audio: usb ac97/sis7018
- From: zharik@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 22 Aug 2013 11:00:19 +0200 (CEST)
hrev45986 adds 1 changeset to branch 'master'
old head: d5de9547c79ff18ccc3c20b3afd05243a7c230fb
new head: d516d16129c2d4abec06967f43de5ded7aa05688
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d516d16+%5Ed5de954
----------------------------------------------------------------------------
d516d16: USB audio/SiS7018: Set controls_count on list mix ioctl
Looks like it works with default controls count 128 on default Haiku
builds but force media-addons-server to crash in case KDEBUG_LEVEL is set
to 0. Thanks to Vitaly Diger for pointing out and testing this issue.
[ Siarzhuk Zharski <zharik@xxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45986
Commit: d516d16129c2d4abec06967f43de5ded7aa05688
URL: http://cgit.haiku-os.org/haiku/commit/?id=d516d16
Author: Siarzhuk Zharski <zharik@xxxxxx>
Date: Thu Aug 22 08:52:26 2013 UTC
----------------------------------------------------------------------------
2 files changed, 4 insertions(+)
src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp | 2 ++
src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp | 2 ++
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
index 5ad29ee..d5056a4 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
+++ b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Mixer.cpp
@@ -612,6 +612,8 @@ Mixer::ListMixControls(multi_mix_control_info* Info)
_CreateMIXControlGroup(Info, index, recordGroup,
RecordControls[i]);
}
+ Info->control_count = index;
+
return B_OK;
}
diff --git a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
index 042817e..1a20f7c 100644
--- a/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
+++ b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
@@ -1855,6 +1855,8 @@
AudioControlInterface::ListMixControls(multi_mix_control_info* Info)
I != MixerControlsMap.End(); I++)
_ListMixControlsForMixerUnit(index, Info, I->Value());
+ Info->control_count = index;
+
return B_OK;
}
Other related posts:
- » [haiku-commits] haiku: hrev45986 - in src/add-ons/kernel/drivers/audio: usb ac97/sis7018 - zharik
