4 files changed, 22 insertions, 5 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 957d7f6b..ab738220 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -567,6 +567,10 @@ private slots:
 public slots:
   void server_disconnected();
   void loading_cancelled();
+
+signals:
+  void qt_log_message(QtMsgType type, const QMessageLogContext &context,
+                      const QString &msg);
 };
 
 #endif // AOAPPLICATION_H
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index f899b9a2..7c9bfb34 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -10,6 +10,8 @@
 #include <QDebug>
 #include <QWidget>
 #include <string.h>
+#include <QFuture>
+#include <QFutureWatcher>
 
 class AOMusicPlayer {
 public:
@@ -24,8 +26,10 @@ public:
   int loop_start[4] = {0, 0, 0, 0};
   int loop_end[4] = {0, 0, 0, 0};
 
+  QFutureWatcher<QString> music_watcher;
+
 public slots:
-  int play(QString p_song, int channel = 0, bool loop = false,
+  QString play(QString p_song, int channel = 0, bool loop = false,
             int effect_flags = 0);
   void stop(int channel = 0);
 
diff --git a/include/aotextarea.h b/include/aotextarea.h
index 453e9659..d9a960db 100644
--- a/include/aotextarea.h
+++ b/include/aotextarea.h
@@ -12,7 +12,8 @@ public:
   AOTextArea(QWidget *p_parent = nullptr);
 
   void append_linked(QString p_message);
-  void append_chatmessage(QString p_name, QString p_message, QString p_colur);
+  void append_chatmessage(QString p_name, QString p_message,
+                          QString p_name_colour, QString p_color = QString());
   void append_error(QString p_message);
 
 private:
diff --git a/include/courtroom.h b/include/courtroom.h
index 4bc86242..8a41b605 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -57,6 +57,8 @@
 #include <QTextCharFormat>
 #include <QElapsedTimer>
 
+#include <QFuture>
+
 #include <algorithm>
 #include <stack>
 
@@ -214,8 +216,12 @@ public:
   void list_music();
   void list_areas();
 
-  // these are for OOC chat
-  void append_ms_chatmessage(QString f_name, QString f_message);
+  // Debug log (formerly master server chat log)
+  void debug_message_handler(QtMsgType type, const QMessageLogContext &context,
+                             const QString &msg);
+  void append_debug_message(QString f_message);
+
+  // OOC chat log
   void append_server_chatmessage(QString p_name, QString p_message,
                                  QString p_color);
 
@@ -628,7 +634,7 @@ private:
 
   QTextEdit *ui_ic_chatlog;
 
-  AOTextArea *ui_ms_chatlog;
+  AOTextArea *ui_debug_log;
   AOTextArea *ui_server_chatlog;
 
   QListWidget *ui_mute_list;
@@ -814,6 +820,8 @@ public slots:
                    bool steno);
   void on_reload_theme_clicked();
 
+  void update_ui_music_name();
+
 private slots:
   void start_chat_ticking();
   void play_sfx();