flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +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

2
samples/blackgui/mainwindow.cpp
View File

@@ -13,7 +13,7 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Settings;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
/*
* Constructor

2
samples/blackgui/mainwindow_aircraft.cpp
View File

@@ -12,7 +12,7 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Settings;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
/*
* Read aircrafts

4
samples/blackgui/mainwindow_cockpit.cpp
View File

@@ -3,7 +3,7 @@
#include "blackgui/atcstationlistmodel.h"
#include "blackcore/dbus_server.h"
#include "blackcore/context_network.h"
#include "blackmisc/vvoiceroom.h"
#include "blackmisc/voiceroom.h"
using namespace BlackCore;
using namespace BlackMisc;
@@ -14,7 +14,7 @@ using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Settings;
using namespace BlackMisc::Math;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
/*
* Cockpit values

2
samples/blackgui/mainwindow_textmessages.cpp
View File

@@ -10,7 +10,7 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Settings;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
/*
* Text messages received or send, append to GUI

2
samples/blackgui/mainwindow_voice.cpp
View File

@@ -11,7 +11,7 @@ using namespace BlackMisc;
using namespace BlackGui;
using namespace BlackSound;
using namespace BlackMisc::Network;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;

10
samples/voiceclient/client.cpp
View File

@@ -4,10 +4,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "client.h"
#include "blackmisc/vaudiodevicelist.h"
#include "blackmisc/audiodevicelist.h"
#include "blackmisc/avcallsignlist.h"
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Aviation;
@@ -120,7 +120,7 @@ void Client::initiateConnectionCmd(QTextStream &args)
QString channel;
args >> hostname >> channel;
std::cout << "Joining voice room: " << hostname.toStdString() << "/" << channel.toStdString() << std::endl;
m_voiceClient->joinVoiceRoom(BlackCore::IVoice::COM1, BlackMisc::Voice::CVoiceRoom(hostname, channel));
m_voiceClient->joinVoiceRoom(BlackCore::IVoice::COM1, BlackMisc::Audio::CVoiceRoom(hostname, channel));
printLinePrefix();
}
@@ -133,7 +133,7 @@ void Client::terminateConnectionCmd(QTextStream & /** args **/)
void Client::inputDevicesCmd(QTextStream & /** args **/)
{
foreach(BlackMisc::Voice::CAudioDevice device, this->m_voiceClient->audioDevices().getInputDevices())
foreach(BlackMisc::Audio::CAudioDevice device, this->m_voiceClient->audioDevices().getInputDevices())
{
std::cout << device.getName().toStdString() << std::endl;
}
@@ -145,7 +145,7 @@ void Client::inputDevicesCmd(QTextStream & /** args **/)
*/
void Client::outputDevicesCmd(QTextStream & /** args **/)
{
foreach(BlackMisc::Voice::CAudioDevice device, this->m_voiceClient->audioDevices().getOutputDevices())
foreach(BlackMisc::Audio::CAudioDevice device, this->m_voiceClient->audioDevices().getOutputDevices())
{
std::cout << device.getName().toStdString() << std::endl;
}

2
samples/voiceclient/main.cpp
View File

@@ -11,7 +11,7 @@
#include <QCoreApplication>
#include <QDebug>
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
int main(int argc, char *argv[])
{