Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

read and store qt audio device

Browse Source
This commit is contained in:
stonedDiscord 2019-08-19 19:38:47 +02:00
parent 35f2333403
commit d94d2fb405
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/aoapplication.h
View File

@ -23,6 +23,9 @@
#include <QStringList> #include <QStringList>
#include <QColor> #include <QColor>
#include <QScreen> #include <QScreen>
#ifdef QTAUDIO
#include <QAudioDeviceInfo>
#endif
class NetworkManager; class NetworkManager;
class Lobby; class Lobby;
@ -173,6 +176,9 @@ public:
// Returns the audio device used for the client. // Returns the audio device used for the client.
QString get_audio_output_device(); QString get_audio_output_device();
#ifdef QTAUDIO
QAudioDeviceInfo QtAudioDevice;
#endif
// Returns whether the user would like to have custom shownames on by default. // Returns whether the user would like to have custom shownames on by default.
bool get_showname_enabled_by_default(); bool get_showname_enabled_by_default();
@ -196,8 +202,7 @@ public:
pos_size_type get_element_dimensions(QString p_identifier, QString p_file); pos_size_type get_element_dimensions(QString p_identifier, QString p_file);
//Returns the name of the font with p_identifier from p_file //Returns the name of the font with p_identifier from p_file
QString get_font_name(QString p_identifier, QString p_file); QString get_font_name(QString p_identifier, QString p_file);
//Returns the value of font_size with p_identifier from p_file //Returns the value of font_size with p_identifier from p_file
int get_font_size(QString p_identifier, QString p_file); int get_font_size(QString p_identifier, QString p_file);

1
include/courtroom.h
View File

@ -10,6 +10,7 @@
#include "aomovie.h" #include "aomovie.h"
#include "aocharmovie.h" #include "aocharmovie.h"
#include "aomusicplayer.h" #include "aomusicplayer.h"
#include "aooptionsdialog.h"
#include "aosfxplayer.h" #include "aosfxplayer.h"
#include "aoblipplayer.h" #include "aoblipplayer.h"
#include "aoevidencebutton.h" #include "aoevidencebutton.h"

14
src/courtroom.cpp
View File

@ -28,6 +28,20 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
} }
} }
} }
#elif defined QTAUDIO
if (ao_app->get_audio_output_device() != "default")
{
foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
{
if (ao_app->get_audio_output_device() == deviceInfo.deviceName())
{
ao_app->QtAudioDevice = deviceInfo;
qDebug() << deviceInfo.deviceName() << "was set as the default audio output device.";
break;
}
}
}
#endif #endif
keepalive_timer = new QTimer(this); keepalive_timer = new QTimer(this);