Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions source/LoudspeakerLayouts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ namespace spaudio {
}
else
{
// Fallback to a channel front centre
name = "Unknown";
this->channelType = ChannelTypes::FrontCentre;
polarPosition = bs2094::positions[static_cast<int>(ChannelTypes::FrontCentre)];
polarPositionNominal = polarPosition;
isLFE = false;
throw std::runtime_error("Channel type not complete. Please add label and position");
}
}
Expand Down Expand Up @@ -78,12 +72,6 @@ namespace spaudio {
}
else
{
// Fallback to a Custom channel at the front
channelType = ChannelTypes::Custom;
int fallbackIndex = static_cast<int>(ChannelTypes::FrontCentre);
polarPosition = bs2094::positions[fallbackIndex];
polarPositionNominal = bs2094::positions[fallbackIndex];
isLFE = false;
throw std::runtime_error("Unknown channel: " + channelName);
}
}
Expand Down Expand Up @@ -193,12 +181,10 @@ namespace spaudio {
layoutName = "2+3+0";
break;
case OutputLayout::Binaural:
throw std::runtime_error("Binaural is not a supported loudspeaker layout. Using stereo instead.");
layoutName = "0+2+0";
throw std::runtime_error("Binaural is not a supported loudspeaker layout.");
break;
default:
throw std::runtime_error("Layout is not in the list of presets! Please add it. Using stereo for now.");
layoutName = "0+2+0";
throw std::runtime_error("Layout is not in the list of presets! Please add it.");
break;
}
*this = getMatchingLayout(layoutName);
Expand Down
4 changes: 2 additions & 2 deletions source/Renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ namespace spaudio {

if (nObjectInd == -1) // this track was not declared at construction. Stopping here.
{
std::cerr << "AdmRender Warning: Expected a track index that was declared an Object in construction. Input will not be rendered." << std::endl;
std::cerr << "Renderer Error: Expected a track index that was declared an Object in construction. Input will not be rendered." << std::endl;
return;
}

Expand Down Expand Up @@ -400,7 +400,7 @@ namespace spaudio {

if (nObjectInd == -1) // this track was not declared at construction. Stopping here.
{
std::cerr << "AdmRender Warning: Expected a track index that was declared an Object in construction. Input will not be rendered." << std::endl;
std::cerr << "Renderer Error: Expected a track index that was declared an DirectSpeaker in construction. Input will not be rendered." << std::endl;
return;
}
int iDirSpk = m_channelToDirectSpeakerMap[nObjectInd];
Expand Down
1 change: 1 addition & 0 deletions tests/TestAmbisonicDecoderPresets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ int main() {
inputSignal.Configure(order, b3D, nSamples);
inputSignal.Reset();
std::array<float, nSamples> impulse;
impulse.fill(0.f);
impulse[0] = 1.f;

float** ldspkOut = new float* [nLdspk];
Expand Down
Loading