i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_audio: Code cleanup.

Browse Source 
No functional changes intended.
This commit is contained in:
Augustin Cavalier
2021-09-03 11:08:18 -04:00
parent 95682340fb
commit 3f7da9312e
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
+2 -2
View File
@@ -1076,7 +1076,7 @@ AudioControlInterface::GetChannelsDescription(
= Terminals[i]->SubType() == USB_AUDIO_AC_INPUT_TERMINAL;
AudioChannelCluster* cluster = Terminals[i]->OutCluster();
if (cluster == 0 || cluster->ChannelsCount() <= 0) {
if (cluster == NULL || cluster->ChannelsCount() <= 0) {
TRACE(ERR, "Terminal #%d ignored due null "
"channels cluster (%08x)\n", Terminals[i]->ID(), cluster);
continue;
@@ -1167,7 +1167,7 @@ AudioControlInterface::GetBusChannelsDescription(
continue;
AudioChannelCluster* cluster = control->OutCluster();
if (cluster == 0 || cluster->ChannelsCount() <= 0) {
if (cluster == NULL || cluster->ChannelsCount() <= 0) {
TRACE(ERR, "Terminal #%d ignored due null "
"channels cluster (%08x)\n", control->ID(), cluster);
continue;
src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.cpp
+1 -1
View File
@@ -476,7 +476,7 @@ AudioStreamingInterface::~AudioStreamingInterface()
uint8
AudioStreamingInterface::TerminalLink()
{
if (fAlternates[fActiveAlternate]->Interface() != 0)
if (fAlternates[fActiveAlternate]->Interface() != NULL)
return fAlternates[fActiveAlternate]->Interface()->fTerminalLink;
return 0;
}
src/add-ons/kernel/drivers/audio/usb/Device.cpp
+6 -15
View File
@@ -493,27 +493,18 @@ Device::_MultiGetDescription(multi_description* multiDescription)
Description.control_panel[0] = '\0';
Vector<_AudioControl*> USBTerminals;
Vector<_AudioControl*> USBTerminals;
// channels (USB I/O terminals) are already in fStreams
// channels (USB I/O terminals) are already in fStreams
// in outputs->inputs order, use them.
for (int i = 0; i < fStreams.Count(); i++) {
uint8 id = fStreams[i]->TerminalLink();
_AudioControl* control = fAudioControl.Find(id);
// if (control->SubType() == USB_AUDIO_AC_OUTPUT_TERMINAL) {
// if (control->SubType() == USB_AUDIO_AC_INPUT_TERMINAL) {
// USBTerminals.PushFront(control);
// fStreams[i]->GetFormatsAndRates(Description);
// } else
// if (control->SubType() == IDSInputTerminal) {
USBTerminals.PushBack(control);
fStreams[i]->GetFormatsAndRates(&Description);
// }
USBTerminals.PushBack(fAudioControl.Find(fStreams[i]->TerminalLink()));
fStreams[i]->GetFormatsAndRates(&Description);
}
Vector<multi_channel_info> Channels;
fAudioControl.GetChannelsDescription(Channels, &Description, USBTerminals);
fAudioControl.GetBusChannelsDescription(Channels, &Description );
fAudioControl.GetBusChannelsDescription(Channels, &Description);
// Description.request_channel_count = channels + bus_channels;
@@ -812,7 +803,7 @@ Device::_SetupEndpoints()
{
Stream* stream = new(std::nothrow) Stream(this, i,
&config->interface[i]);
if (B_OK == stream->Init()) {
if (stream->Init() == B_OK) {
// put the stream in the correct order:
// first output that input ones.
if (stream->IsInput())