flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

all voice changes from kbatclist branch

Browse Source 
refs #81
This commit is contained in:
Klaus Basan
2014-01-07 23:53:17 +00:00
committed by Mathew Sutcliffe
parent 51cbd2a394
commit 1c1fdabd2e
35 changed files with 2311 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/blackmisc/vvoiceroom.cpp
View File

@@ -17,11 +17,15 @@ namespace BlackMisc
{
namespace Voice
{
CVoiceRoom::CVoiceRoom(const QString &serverSpec) : m_hostname(""), m_channel("")
CVoiceRoom::CVoiceRoom(const QString &serverUrl, bool connected) :
m_hostname(""), m_channel(""), m_connected(connected), m_audioPlaying(false)
{
if (serverSpec.contains("/"))
if (serverUrl.contains("/"))
{
QStringList splittedSpec = serverSpec.split("/");
QString url = serverUrl.trimmed().toLower();
url.replace(CVoiceRoom::protocolComplete(), "");
url.replace(CVoiceRoom::protocol(), "");
QStringList splittedSpec = serverUrl.split("/");
m_hostname = splittedSpec.at(0);
m_channel = splittedSpec.at(1);
}
@@ -32,18 +36,11 @@ namespace BlackMisc
*/
bool CVoiceRoom::operator ==(const CVoiceRoom &other) const
{
if (&other == this)
{
return true;
}
if (m_hostname == other.m_hostname && m_channel == other.m_channel)
{
return true;
}
// otherwise
return false;
if (&other == this) return true;
return (m_hostname == other.m_hostname &&
m_channel == other.m_channel &&
m_connected == other.m_connected &&
m_audioPlaying == other.m_audioPlaying);
}
/*
@@ -54,25 +51,37 @@ namespace BlackMisc
return !((*this) == other);
}
/*
* Value hash
*/
uint CVoiceRoom::getValueHash() const
{
QList<uint> hashs;
hashs << qHash(m_hostname);
hashs << qHash(m_channel);
hashs << qHash(m_connected);
hashs << qHash(m_audioPlaying);
return BlackMisc::calculateHash(hashs, "CVoiceRoom");
}
/*
* Metadata
*/
void CVoiceRoom::registerMetadata()
{
qRegisterMetaType<CVoiceRoom>();
qDBusRegisterMetaType<CVoiceRoom>();
}
QString CVoiceRoom::convertToQString(bool /* i18n */ ) const
/*
* To string
*/
QString CVoiceRoom::convertToQString(bool /* i18n */) const
{
if (m_hostname.isEmpty() || m_channel.isEmpty()) return "Unknown";
QString s = m_hostname;
s.append("/").append(m_channel);
if (!this->isValid()) return "Invalid";
QString s = this->getVoiceRoomUrl(false);
s.append(this ->isConnected() ? " connected" : " unconnected");
if (this->m_audioPlaying) s.append(" playing");
return s;
}
@@ -83,6 +92,8 @@ namespace BlackMisc
{
argument << m_hostname;
argument << m_channel;
argument << m_connected;
argument << m_audioPlaying;
}
/*
@@ -92,8 +103,29 @@ namespace BlackMisc
{
argument >> m_hostname;
argument >> m_channel;
argument >> m_connected;
argument >> m_audioPlaying;
}
/*
* Server URL
*/
QString CVoiceRoom::getVoiceRoomUrl(bool noProtocol) const
{
if (!this->isValid()) return "";
QString url(noProtocol ? "" : CVoiceRoom::protocolComplete());
url.append(this->m_hostname);
url.append("/");
url.append(this->m_channel);
return url;
}
/*
* ATIS voice channel
*/
bool CVoiceRoom::isAtis() const
{
return (this->m_channel.contains("ATIS", Qt::CaseInsensitive));
}
} // Voice
} // BlackMisc