aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h3
-rw-r--r--include/aoblipplayer.h3
-rw-r--r--include/aomusicplayer.h2
-rw-r--r--include/aooptionsdialog.h2
-rw-r--r--include/aosfxplayer.h4
-rw-r--r--include/courtroom.h7
6 files changed, 20 insertions, 1 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index cf9eb2b2..48b30a10 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -204,6 +204,9 @@ public:
// Returns the value of default_blip in config.ini
int get_default_blip();
+ // Returns the value of suppress_audio in config.ini
+ int get_default_suppress_audio();
+
// Returns the value if objections interrupt and skip the message queue
// from the config.ini.
bool is_instant_objection_enabled();
diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h
index a11e29db..ea2dcd38 100644
--- a/include/aoblipplayer.h
+++ b/include/aoblipplayer.h
@@ -18,6 +18,7 @@ public:
void set_blips(QString p_sfx);
void blip_tick();
void set_volume(int p_volume);
+ void set_muted(bool toggle);
int m_cycle = 0;
@@ -26,6 +27,8 @@ private:
AOApplication *ao_app;
qreal m_volume;
+ bool m_muted = false;
+
void set_volume_internal(qreal p_volume);
HSTREAM m_stream_list[5];
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index d00ab8e8..037525fc 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -20,6 +20,7 @@ public:
virtual ~AOMusicPlayer();
void set_volume(int p_value, int channel = -1);
void set_looping(bool toggle, int channel = 0);
+ void set_muted(bool toggle);
const int m_channelmax = 4;
@@ -39,6 +40,7 @@ private:
AOApplication *ao_app;
bool m_looping = false;
+ bool m_muted = false;
int m_volume[4] = {0, 0, 0, 0};
// Channel 0 = music
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 21803795..cb9b71b0 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -127,8 +127,10 @@ private:
QLabel *ui_music_volume_lbl;
QSpinBox *ui_sfx_volume_spinbox;
QSpinBox *ui_blips_volume_spinbox;
+ QSpinBox *ui_suppress_audio_spinbox;
QLabel *ui_sfx_volume_lbl;
QLabel *ui_blips_volume_lbl;
+ QLabel *ui_suppress_audio_lbl;
QFrame *ui_volume_blip_divider;
QSpinBox *ui_bliprate_spinbox;
QLabel *ui_bliprate_lbl;
diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h
index 75976368..077a7efd 100644
--- a/include/aosfxplayer.h
+++ b/include/aosfxplayer.h
@@ -20,14 +20,16 @@ public:
void stop(int channel = -1);
void set_volume(qreal p_volume);
void set_looping(bool toggle, int channel = -1);
+ void set_muted(bool toggle);
int m_channel = 0;
-
+ int get_volume() { return m_volume * 100; };
private:
QWidget *m_parent;
AOApplication *ao_app;
qreal m_volume = 0;
bool m_looping = true;
+ bool m_muted = false;
void set_volume_internal(qreal p_volume);
const int m_channelmax = 5;
diff --git a/include/courtroom.h b/include/courtroom.h
index 73ef6fbb..43cecf36 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -69,6 +69,8 @@ class Courtroom : public QMainWindow {
public:
explicit Courtroom(AOApplication *p_ao_app);
+ void update_audio_volume();
+
void append_char(char_type p_char) { char_list.append(p_char); }
void append_evidence(evi_type p_evi) { evidence_list.append(p_evi); }
void append_music(QString f_music) { music_list.append(f_music); }
@@ -338,6 +340,9 @@ public:
private:
AOApplication *ao_app;
+ // Percentage of audio that is suppressed when client is not in focus
+ int suppress_audio = 0;
+
int m_courtroom_width = 714;
int m_courtroom_height = 668;
@@ -988,6 +993,8 @@ private slots:
void on_casing_clicked();
+ void on_application_state_changed(Qt::ApplicationState state);
+
void ping_server();
// Proceed to parse the oldest chatmessage and remove it from the stack