VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 06:24:48 -04:00
Code Issues Projects Releases Wiki Activity

Multiple audio support: transfer start/stop audio to audio FIFO management in AudioDeviceManager

Browse Source
This commit is contained in:
f4exb
2018-03-24 04:18:58 +01:00
parent 937bc19375
commit 5b7cbdf0e5
27 changed files with 30 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/audio/audioinput.cpp
+2 -90
View File
@@ -37,7 +37,7 @@ AudioInput::~AudioInput()
QMutexLocker mutexLocker(&m_mutex);
for (AudioFifos::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it)
for (std::list<AudioFifo*>::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it)
{
delete *it;
}
@@ -116,79 +116,6 @@ bool AudioInput::start(int device, int rate)
return true;
}
bool AudioInput::startImmediate(int device, int rate)
{
if (QIODevice::isOpen())
{
qInfo("AudioInput::startImmediate: already started");
return true;
}
QAudioDeviceInfo devInfo;
QMutexLocker mutexLocker(&m_mutex);
if (device < 0)
{
devInfo = QAudioDeviceInfo::defaultInputDevice();
qWarning("AudioInput::startImmediate: using default device %s", qPrintable(devInfo.defaultInputDevice().deviceName()));
}
else
{
QList<QAudioDeviceInfo> devicesInfo = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
if (device < devicesInfo.size())
{
devInfo = devicesInfo[device];
qWarning("AudioInput::startImmediate: using audio device #%d: %s", device, qPrintable(devInfo.defaultInputDevice().deviceName()));
}
else
{
devInfo = QAudioDeviceInfo::defaultInputDevice();
qWarning("AudioInput::startImmediate: audio device #%d does not exist. Using default device %s", device, qPrintable(devInfo.defaultInputDevice().deviceName()));
}
}
//QAudioDeviceInfo devInfo(QAudioDeviceInfo::defaultOutputDevice());
m_audioFormat.setSampleRate(rate);
m_audioFormat.setChannelCount(2);
m_audioFormat.setSampleSize(16);
m_audioFormat.setCodec("audio/pcm");
m_audioFormat.setByteOrder(QAudioFormat::LittleEndian);
m_audioFormat.setSampleType(QAudioFormat::SignedInt);
if (!devInfo.isFormatSupported(m_audioFormat))
{
m_audioFormat = devInfo.nearestFormat(m_audioFormat);
qWarning("AudioInput::startImmediate: %d Hz S16_LE audio format not supported. New rate: %d", rate, m_audioFormat.sampleRate());
}
else
{
qInfo("AudioInput::startImmediate: audio format OK");
}
if (m_audioFormat.sampleSize() != 16)
{
qWarning("AudioInput::startImmediate: Audio device ( %s ) failed", qPrintable(devInfo.defaultInputDevice().deviceName()));
return false;
}
m_audioInput = new QAudioInput(devInfo, m_audioFormat);
m_audioInput->setVolume(m_volume);
QIODevice::open(QIODevice::ReadWrite);
m_audioInput->start(this);
if (m_audioInput->state() != QAudio::ActiveState)
{
qWarning("AudioInput::startImmediate: cannot start");
}
return true;
}
void AudioInput::stop()
{
qDebug("AudioInput::stop");
@@ -210,21 +137,6 @@ void AudioInput::stop()
}
}
void AudioInput::stopImmediate()
{
if (!QIODevice::isOpen())
{
qInfo("AudioInput::stopImmediate: already stopped");
}
else
{
qDebug("AudioInput::stopImmediate");
QMutexLocker mutexLocker(&m_mutex);
QIODevice::close();
delete m_audioInput;
}
}
void AudioInput::addFifo(AudioFifo* audioFifo)
{
QMutexLocker mutexLocker(&m_mutex);
@@ -267,7 +179,7 @@ qint64 AudioInput::writeData(const char *data, qint64 len)
return 0;
}
for (AudioFifos::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it)
for (std::list<AudioFifo*>::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it)
{
(*it)->write(reinterpret_cast<const quint8*>(data), len/4, 10);
}