aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2019-08-19 19:38:47 +0200
committerstonedDiscord <stoned@derpymail.org>2019-08-19 19:38:47 +0200
commitd94d2fb405a0d3634951cc8fa4b0e22c7979c438 (patch)
tree8cc1abb9044101e5162b1f7c52cb894698ed0b32 /include
parent35f2333403cdd930848fb998739583c6c829f5d3 (diff)
read and store qt audio device
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h9
-rw-r--r--include/courtroom.h1
2 files changed, 8 insertions, 2 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index af43cf3c..5475eb7b 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -23,6 +23,9 @@
#include <QStringList>
#include <QColor>
#include <QScreen>
+#ifdef QTAUDIO
+#include <QAudioDeviceInfo>
+#endif
class NetworkManager;
class Lobby;
@@ -173,6 +176,9 @@ public:
// Returns the audio device used for the client.
QString get_audio_output_device();
+ #ifdef QTAUDIO
+ QAudioDeviceInfo QtAudioDevice;
+ #endif
// Returns whether the user would like to have custom shownames on 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);
//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
int get_font_size(QString p_identifier, QString p_file);
diff --git a/include/courtroom.h b/include/courtroom.h
index 99a090b0..f0b69967 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -10,6 +10,7 @@
#include "aomovie.h"
#include "aocharmovie.h"
#include "aomusicplayer.h"
+#include "aooptionsdialog.h"
#include "aosfxplayer.h"
#include "aoblipplayer.h"
#include "aoevidencebutton.h"