flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refs #140 , refs #85 Rename namespace voice to audio.

Browse Source 
In #85 the voice context will be renamed to audio context, so the CValueObject classes will be renamed to namespace Audio too.
As #140 changes many CValueClasses, this crossover change is done in the same unit of work.
This commit is contained in:
Klaus Basan
2014-03-10 14:43:06 +01:00
parent e93ef236af
commit dde9710144
33 changed files with 115 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blacksound/soundgenerator.cpp
View File

@@ -15,7 +15,7 @@
using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
namespace BlackSound
{
@@ -122,10 +122,10 @@ namespace BlackSound
{
// periodSize-> Returns the period size in bytes.
const qint64 len = this->read(m_buffer.data(), this->m_audioOutput->periodSize());
if (len)
if (len >= 0)
this->m_pushModeIODevice->write(m_buffer.data(), len);
if (len != this->m_audioOutput->periodSize())
break;
break; // not a complete period, so buffer is completely read
--chunks;
}
}
@@ -361,7 +361,7 @@ namespace BlackSound
/*
* BlackMisc to Qt audio device
*/
QAudioDeviceInfo CSoundGenerator::findClosestOutputDevice(const BlackMisc::Voice::CAudioDevice &audioDevice)
QAudioDeviceInfo CSoundGenerator::findClosestOutputDevice(const BlackMisc::Audio::CAudioDevice &audioDevice)
{
Q_ASSERT(audioDevice.getType() == CAudioDevice::OutputDevice);
const QString lookFor = audioDevice.getName().toLower();

8
src/blacksound/soundgenerator.h
View File

@@ -7,7 +7,7 @@
#define BLACKSOUND_SOUNDGENERATOR_H
#include "blackmisc/avselcal.h"
#include "blackmisc/vaudiodevice.h"
#include "blackmisc/audiodevice.h"
#include "blackmisc/pqtime.h"
#include <QIODevice>
#include <QThread>
@@ -167,7 +167,7 @@ namespace BlackSound
* \param audioDevice output audio device
* \return
*/
static QAudioDeviceInfo findClosestOutputDevice(const BlackMisc::Voice::CAudioDevice &audioDevice);
static QAudioDeviceInfo findClosestOutputDevice(const BlackMisc::Audio::CAudioDevice &audioDevice);
/*!
* \brief Play signal of tones once
@@ -211,7 +211,7 @@ namespace BlackSound
* \param audioDevice device to be used
* \see BlackMisc::Aviation::CSelcal
*/
static void playSelcal(qint32 volume, const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::Voice::CAudioDevice &audioDevice);
static void playSelcal(qint32 volume, const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::Audio::CAudioDevice &audioDevice);
/*!
* \brief Play notification
@@ -247,7 +247,7 @@ namespace BlackSound
/*!
* \brief Play sound, open device
* \param volume 0..100
* \param pull if false push mode
* \param pull pull/push, if false push mode
*/
void start(int volume, bool pull = true);