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

Ref T494, added new sounds

Browse Source
This commit is contained in:
Klaus Basan
2018-12-31 06:38:06 +01:00
committed by Mat Sutcliffe
parent 80ed972e53
commit dc8ea83839
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/blacksound/share/sounds/callsignmentioned.wav Normal file
View File

Binary file not shown.

BIN
src/blacksound/share/sounds/pttclick.wav Normal file
View File

Binary file not shown.

10
src/blacksound/soundgenerator.cpp
View File

@@ -486,7 +486,7 @@ namespace BlackSound
CSoundGenerator::playSelcal(volume, selcal, CSoundGenerator::findClosestOutputDevice(audioDevice)); CSoundGenerator::playSelcal(volume, selcal, CSoundGenerator::findClosestOutputDevice(audioDevice));
} }
void CSoundGenerator::playNotificationSound(int volume, CNotificationSounds::Notification notification) void CSoundGenerator::playNotificationSound(int volume, CNotificationSounds::NotificationFlag notification)
{ {
QMediaPlayer *mediaPlayer = CSoundGenerator::mediaPlayer(); QMediaPlayer *mediaPlayer = CSoundGenerator::mediaPlayer();
if (mediaPlayer->state() == QMediaPlayer::PlayingState) return; if (mediaPlayer->state() == QMediaPlayer::PlayingState) return;
@@ -500,15 +500,19 @@ namespace BlackSound
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/login.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/login.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/logoff.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/logoff.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/privatemessage.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/privatemessage.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/callsignmentioned.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomjoined.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomjoined.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomleft.wav")) && success; success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/voiceroomleft.wav")) && success;
success = playlist->addMedia(QUrl::fromLocalFile(CDirectoryUtils::soundFilesDirectory() + "/pttclick.wav")) && success;
Q_ASSERT(success); Q_ASSERT(success);
playlist->setPlaybackMode(QMediaPlaylist::CurrentItemOnce); playlist->setPlaybackMode(QMediaPlaylist::CurrentItemOnce);
mediaPlayer->setPlaylist(playlist); mediaPlayer->setPlaylist(playlist);
} }
if (notification == CNotificationSounds::NotificationsLoadSounds) return; if (notification == CNotificationSounds::LoadSounds) { return; }
int index = static_cast<int>(notification); if (notification == CNotificationSounds::NoNotifications) { return; }
const int index = qRound(std::log2(static_cast<double>(notification)));
playlist->setCurrentIndex(index); playlist->setCurrentIndex(index);
mediaPlayer->setVolume(volume); // 0-100 mediaPlayer->setVolume(volume); // 0-100
mediaPlayer->play(); mediaPlayer->play();

2
src/blacksound/soundgenerator.h
View File

@@ -169,7 +169,7 @@ namespace BlackSound
//! Play notification //! Play notification
//! \param volume 0-100 //! \param volume 0-100
//! \param notification //! \param notification
static void playNotificationSound(int volume, BlackMisc::Audio::CNotificationSounds::Notification notification); static void playNotificationSound(int volume, BlackMisc::Audio::CNotificationSounds::NotificationFlag notification);
//! For debugging purposes //! For debugging purposes
static void printAllQtSoundDevices(QTextStream &qtout); static void printAllQtSoundDevices(QTextStream &qtout);