musicdsp/audio-river
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to the new airtaudio interface

Browse Source
This commit is contained in:
Edouard DUPIN 2015-02-05 23:27:58 +01:00
parent c6aa75e02b
commit bdb1102efa
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
river/io/Node.cpp
View File

@ -215,29 +215,7 @@ river::io::Node::Node(const std::string& _name, const std::shared_ptr<const ejso
rrate << m_info.sampleRates[jjj] << ";"; rrate << m_info.sampleRates[jjj] << ";";
} }
RIVER_INFO(" rates=" << rrate.str()); RIVER_INFO(" rates=" << rrate.str());
switch(m_info.nativeFormats) { RIVER_INFO(" native Format: " << m_info.nativeFormats);
case airtaudio::SINT8:
RIVER_INFO(" native Format: 8-bit signed integer");
break;
case airtaudio::SINT16:
RIVER_INFO(" native Format: 16-bit signed integer");
break;
case airtaudio::SINT24:
RIVER_INFO(" native Format: 24-bit signed integer");
break;
case airtaudio::SINT32:
RIVER_INFO(" native Format: 32-bit signed integer");
break;
case airtaudio::FLOAT32:
RIVER_INFO(" native Format: Normalized between plus/minus 1.0");
break;
case airtaudio::FLOAT64:
RIVER_INFO(" native Format: Normalized between plus/minus 1.0");
break;
default:
RIVER_INFO(" native Format: Unknow");
break;
}
} }
// open Audio device: // open Audio device:
@ -256,7 +234,7 @@ river::io::Node::Node(const std::string& _name, const std::shared_ptr<const ejso
enum airtaudio::errorType err = airtaudio::errorNone; enum airtaudio::errorType err = airtaudio::errorNone;
if (m_isInput == true) { if (m_isInput == true) {
err = m_adac.openStream(nullptr, &params, err = m_adac.openStream(nullptr, &params,
airtaudio::SINT16, m_hardwareFormat.getFrequency(), &m_rtaudioFrameSize, audio::format_int16, m_hardwareFormat.getFrequency(), &m_rtaudioFrameSize,
std::bind(&river::io::Node::rtAudioCallback, std::bind(&river::io::Node::rtAudioCallback,
this, this,
std::placeholders::_1, std::placeholders::_1,
@ -267,7 +245,7 @@ river::io::Node::Node(const std::string& _name, const std::shared_ptr<const ejso
); );
} else { } else {
err = m_adac.openStream(&params, nullptr, err = m_adac.openStream(&params, nullptr,
airtaudio::SINT16, m_hardwareFormat.getFrequency(), &m_rtaudioFrameSize, audio::format_int16, m_hardwareFormat.getFrequency(), &m_rtaudioFrameSize,
std::bind(&river::io::Node::rtAudioCallback, std::bind(&river::io::Node::rtAudioCallback,
this, this,
std::placeholders::_1, std::placeholders::_1,