flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-10 19:46:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored inheritance hierarchy of ContextAudio (former ContextVoice)

Browse Source 
refs #85
This commit is contained in:
Roland Winklmeier
2014-03-08 16:57:33 +01:00
parent 1e8a2a5b01
commit 33aee8cb12
15 changed files with 461 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/blackgui/mainwindow_cockpit.cpp
View File

@@ -130,11 +130,11 @@ void MainWindow::updateCockpitFromContext()
//
// Voice room override
//
if (this->m_contextVoiceAvailable)
if (this->m_contextAudioAvailable)
{
// get all rooms, it is important to get the rooms from voice context here
// these are the ones featuring the real audio status
CVoiceRoomList rooms = this->m_contextVoice->getComVoiceRoomsWithAudioStatus();
CVoiceRoomList rooms = this->m_contextAudio->getComVoiceRoomsWithAudioStatus();
Q_ASSERT(rooms.size() == 2);
Q_ASSERT(this->m_modelUsersVoiceCom1);
Q_ASSERT(this->m_modelUsersVoiceCom2);
@@ -145,12 +145,12 @@ void MainWindow::updateCockpitFromContext()
bool com2Connected = room2.isConnected();
// update views
this->m_modelUsersVoiceCom1->update(this->m_contextVoice->getCom1RoomUsers());
this->m_modelUsersVoiceCom1->update(this->m_contextAudio->getCom1RoomUsers());
this->ui->tv_CockpitVoiceRoom1->resizeColumnsToContents();
this->ui->tv_CockpitVoiceRoom1->resizeRowsToContents();
this->ui->tv_CockpitVoiceRoom1->horizontalHeader()->setStretchLastSection(true);
this->m_modelUsersVoiceCom2->update(this->m_contextVoice->getCom2RoomUsers());
this->m_modelUsersVoiceCom2->update(this->m_contextAudio->getCom2RoomUsers());
this->ui->tv_CockpitVoiceRoom2->resizeColumnsToContents();
this->ui->tv_CockpitVoiceRoom2->resizeRowsToContents();
this->ui->tv_CockpitVoiceRoom2->horizontalHeader()->setStretchLastSection(true);
@@ -316,7 +316,7 @@ void MainWindow::sendCockpitUpdates()
*/
void MainWindow::setAudioVoiceRooms()
{
if (!this->m_contextVoiceAvailable) return;
if (!this->m_contextAudioAvailable) return;
if (!this->m_contextNetworkAvailable) return;
// make fields readonly if not overriding
@@ -347,7 +347,7 @@ void MainWindow::setAudioVoiceRooms()
}
// set the real voice rooms for audio output
this->m_contextVoice->setComVoiceRooms(room1, room2);
this->m_contextAudio->setComVoiceRooms(room1, room2);
}
/*
@@ -362,10 +362,10 @@ void MainWindow::testSelcal()
CStatusMessage(CStatusMessage::TypeValidation, CStatusMessage::SeverityWarning, "invalid SELCAL codde"));
return;
}
if (this->m_contextVoiceAvailable)
if (this->m_contextAudioAvailable)
{
CSelcal selcal(selcalCode);
this->m_contextVoice->playSelcalTone(selcal);
this->m_contextAudio->playSelcalTone(selcal);
}
else
{