mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Force specific rtaudio API depending on platform.

merge-requests/5/head
Phil Taylor 2021-06-02 18:35:04 +01:00
rodzic b850eb078b
commit a04044e75b
2 zmienionych plików z 23 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

34
audiohandler.cpp
Wyświetl plik

@ -24,11 +24,12 @@ audioHandler::~audioHandler()
if (resampler != Q_NULLPTR) {
speex_resampler_destroy(resampler);
}
if (audio.isStreamRunning())
if (audio->isStreamRunning())
{
audio.stopStream();
audio.closeStream();
audio->stopStream();
audio->closeStream();
}
delete audio;
if (ringBuf != Q_NULLPTR)
delete ringBuf;
}
@ -49,21 +50,30 @@ bool audioHandler::init(const quint8 bits, const quint8 radioChan, const quint16
// chunk size is always relative to Internal Sample Rate.
ringBuf = new wilt::Ring<audioPacket>(100); // Should be customizable.
#if defined(Q_OS_LINUX)
audio = new RtAudio(RtAudio::Api::LINUX_ALSA);
#elif defined(Q_OS_WIN)
audio = new RtAudio(RtAudio::Api::WINDOWS_WASAPI);
#elif defined(Q_OS_MACX)
audio = new RtAudio(RtAudio::Api::MACOSX_CORE);
#endif
tempBuf.sent = 0;
if (port > 0) {
aParams.deviceId = port;
}
else if (isInput) {
aParams.deviceId = audio.getDefaultInputDevice();
aParams.deviceId = audio->getDefaultInputDevice();
}
else {
aParams.deviceId = audio.getDefaultOutputDevice();
aParams.deviceId = audio->getDefaultOutputDevice();
}
aParams.firstChannel = 0;
try {
info = audio.getDeviceInfo(aParams.deviceId);
info = audio->getDeviceInfo(aParams.deviceId);
}
catch (RtAudioError& e) {
qInfo(logAudio()) << "Device error:" << aParams.deviceId << ":" << QString::fromStdString(e.getMessage());
@ -128,8 +138,8 @@ bool audioHandler::init(const quint8 bits, const quint8 radioChan, const quint16
if (isInput) {
resampler = wf_resampler_init(devChannels, this->nativeSampleRate, samplerate, resampleQuality, &resample_error);
try {
audio.openStream(NULL, &aParams, RTAUDIO_SINT16, this->nativeSampleRate, &this->chunkSize, &staticWrite, this, &options);
audio.startStream();
audio->openStream(NULL, &aParams, RTAUDIO_SINT16, this->nativeSampleRate, &this->chunkSize, &staticWrite, this, &options);
audio->startStream();
}
catch (RtAudioError& e) {
qInfo(logAudio()) << "Error opening:" << QString::fromStdString(e.getMessage());
@ -140,8 +150,8 @@ bool audioHandler::init(const quint8 bits, const quint8 radioChan, const quint16
{
resampler = wf_resampler_init(devChannels, samplerate, this->nativeSampleRate, resampleQuality, &resample_error);
try {
audio.openStream(&aParams, NULL, RTAUDIO_SINT16, this->nativeSampleRate, &this->chunkSize, &staticRead, this, &options);
audio.startStream();
audio->openStream(&aParams, NULL, RTAUDIO_SINT16, this->nativeSampleRate, &this->chunkSize, &staticRead, this, &options);
audio->startStream();
}
catch (RtAudioError& e) {
qInfo(logAudio()) << "Error opening:" << QString::fromStdString(e.getMessage());
@ -150,7 +160,7 @@ bool audioHandler::init(const quint8 bits, const quint8 radioChan, const quint16
}
qInfo(logAudio()) << (isInput ? "Input" : "Output") << "device successfully opened";
qInfo(logAudio()) << (isInput ? "Input" : "Output") << "detected latency:" <<audio.getStreamLatency();
qInfo(logAudio()) << (isInput ? "Input" : "Output") << "detected latency:" <<audio->getStreamLatency();
wf_resampler_get_ratio(resampler, &ratioNum, &ratioDen);
qInfo(logAudio()) << (isInput ? "Input" : "Output") << "wf_resampler_init() returned: " << resample_error << " ratioNum" << ratioNum << " ratioDen" << ratioDen;
@ -300,7 +310,7 @@ void audioHandler::incomingAudio(audioPacket inPacket)
// Regardless of the radio stream format, the buffered audio will ALWAYS be
// 16bit sample interleaved stereo 48K (or whatever the native sample rate is)
if (!audio.isStreamRunning())
if (!audio->isStreamRunning())
{
qDebug(logAudio()) << "Packet received before stream was started";
return;

2
audiohandler.h
Wyświetl plik

@ -79,7 +79,7 @@ private:
void reinit();
bool isInitialized;
RtAudio audio;
RtAudio* audio = Q_NULLPTR;
int audioDevice = 0;
RtAudio::StreamParameters aParams;
RtAudio::StreamOptions options;