diff --git a/samples/voiceclient/client.cpp b/samples/voiceclient/client.cpp index c1969dcec..fec6cb9b3 100644 --- a/samples/voiceclient/client.cpp +++ b/samples/voiceclient/client.cpp @@ -85,14 +85,14 @@ void Client::exit(QTextStream &) emit quit(); } -void Client::squelchTestCmd(QTextStream &args) +void Client::squelchTestCmd(QTextStream & /** args **/) { std::cout << "Running squelch test. Please be quiet for 5 seconds..." << std::endl; printLinePrefix(); m_voiceClient->runSquelchTest(); } -void Client::micTestCmd(QTextStream &args) +void Client::micTestCmd(QTextStream & /** args **/) { std::cout << "Running mic test. Speak normally for 5 seconds..." << std::endl; printLinePrefix(); @@ -116,27 +116,27 @@ void Client::initiateConnectionCmd(QTextStream &args) printLinePrefix(); } -void Client::terminateConnectionCmd(QTextStream &args) +void Client::terminateConnectionCmd(QTextStream & /** args **/) { std::cout << "Leaving room." << std::endl; m_voiceClient->leaveVoiceRoom(BlackCore::IVoiceClient::COM1); printLinePrefix(); } -void Client::inputDevicesCmd(QTextStream &args) +void Client::inputDevicesCmd(QTextStream & /** args **/) { QList devices = m_voiceClient->audioInputDevices(); - foreach (BlackMisc::Voice::CInputAudioDevice device, devices) + foreach(BlackMisc::Voice::CInputAudioDevice device, devices) { std::cout << device.name().toStdString() << std::endl; } printLinePrefix(); } -void Client::outputDevicesCmd(QTextStream &args) +void Client::outputDevicesCmd(QTextStream & /** args **/) { QList devices = m_voiceClient->audioOutputDevices(); - foreach (BlackMisc::Voice::COutputAudioDevice device, devices) + foreach(BlackMisc::Voice::COutputAudioDevice device, devices) { std::cout << " " << device.name().toStdString() << std::endl; } @@ -147,7 +147,7 @@ void Client::listUsersCmd(QTextStream &args) { Q_UNUSED(args) QSet users = m_voiceClient->roomUserList(BlackCore::IVoiceClient::COM1); - foreach (QString user, users) + foreach(QString user, users) { std::cout << " " << user.toStdString() << std::endl; } @@ -166,7 +166,7 @@ void Client::onMicTestFinished() printLinePrefix(); } -void Client::connectionStatusConnected(const BlackCore::IVoiceClient::ComUnit comUnit) +void Client::connectionStatusConnected(const BlackCore::IVoiceClient::ComUnit /** comUnit **/) { std::cout << "CONN_STATUS_CONNECTED" << std::endl; printLinePrefix(); diff --git a/src/blackcore/voiceclient_vatlib.cpp b/src/blackcore/voiceclient_vatlib.cpp index 63c889e50..a2e301bd1 100644 --- a/src/blackcore/voiceclient_vatlib.cpp +++ b/src/blackcore/voiceclient_vatlib.cpp @@ -470,7 +470,7 @@ namespace BlackCore cbvar_cast(cbVar)->m_outputDevices.append(outputDevice); } - void CVoiceClientVatlib::addUserInRoom(const ComUnit comUnit, const QString &callsign) + void CVoiceClientVatlib::addUserInRoom(const ComUnit /** comUnit **/, const QString &callsign) { m_voiceRoomUsersUpdate.insert(callsign); } diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index bfa251f6f..9679c4a30 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -21,7 +21,8 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \ translations/blackmisc_i18n_en.ts HEADERS += *.h \ - vaudiodevice.h + vaudiodevice.h \ + voiceallclasses.h SOURCES += *.cpp DESTDIR = ../../lib OTHER_FILES += $$TRANSLATIONS readme.txt diff --git a/src/blackmisc/blackmiscallvalueclasses.h b/src/blackmisc/blackmiscallvalueclasses.h index 7a9198b28..73c88e8a8 100644 --- a/src/blackmisc/blackmiscallvalueclasses.h +++ b/src/blackmisc/blackmiscallvalueclasses.h @@ -14,5 +14,6 @@ #include "blackmisc/networkallclasses.h" #include "blackmisc/statusmessages.h" #include "blackmisc/statusmessage.h" +#include "blackmisc/voiceallclasses.h" #endif // guard diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index 3b8013f04..4a1b08e8f 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -11,6 +11,8 @@ #include "networkallclasses.h" #include "settingsallclasses.h" #include "valuemap.h" +#include "statusmessages.h" +#include "voiceallclasses.h" /* * Metadata for PQs @@ -94,6 +96,16 @@ void BlackMisc::Settings::registerMetadata() CSettingsNetwork::registerMetadata(); } +/* + * Metadata for Voice + */ +void BlackMisc::Voice::registerMetadata() +{ + COutputAudioDevice::registerMetadata(); + CInputAudioDevice::registerMetadata(); + CVoiceRoom::registerMetadata(); +} + /* * Metadata for Blackmisc */ @@ -110,6 +122,7 @@ void BlackMisc::registerMetadata() Geo::registerMetadata(); Network::registerMetadata(); Settings::registerMetadata(); + Voice::registerMetadata(); } /* diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index 9d34fd059..e2fe2a2d3 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -89,6 +89,14 @@ namespace BlackMisc void registerMetadata(); } + namespace Voice + { + /*! + * \brief Registe metadata for settings + */ + void registerMetadata(); + } + /*! * \brief Register all relevant metadata in BlackMisc */ diff --git a/src/blackmisc/vaudiodevice.cpp b/src/blackmisc/vaudiodevice.cpp index d6baf1074..f3d7588ff 100644 --- a/src/blackmisc/vaudiodevice.cpp +++ b/src/blackmisc/vaudiodevice.cpp @@ -52,7 +52,7 @@ namespace BlackMisc qDBusRegisterMetaType(); } - QString CAudioDevice::convertToQString(bool i18n) const + QString CAudioDevice::convertToQString(bool /* i18n */) const { return m_deviceName; } diff --git a/src/blackmisc/voiceallclasses.h b/src/blackmisc/voiceallclasses.h new file mode 100644 index 000000000..eed272608 --- /dev/null +++ b/src/blackmisc/voiceallclasses.h @@ -0,0 +1,12 @@ +/* Copyright (C) 2013 VATSIM Community / contributors + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BLACKMISC_VOICEALLCLASSES_H +#define BLACKMISC_VOICEALLCLASSES_H + +#include "blackmisc/vaudiodevice.h" +#include "blackmisc/vvoiceroom.h" + +#endif // guard diff --git a/src/blackmisc/vvoiceroom.cpp b/src/blackmisc/vvoiceroom.cpp index acc41f532..eb096e567 100644 --- a/src/blackmisc/vvoiceroom.cpp +++ b/src/blackmisc/vvoiceroom.cpp @@ -68,7 +68,7 @@ namespace BlackMisc qDBusRegisterMetaType(); } - QString CVoiceRoom::convertToQString(bool i18n) const + QString CVoiceRoom::convertToQString(bool /* i18n */ ) const { if (m_hostname.isEmpty() || m_channel.isEmpty()) return "Unknown"; QString s = m_hostname;