Merge pull request #549 from Salanto/asset-packet-musiclist

Music list streaming support over ASSet packet

2 files changed, 11 insertions, 1 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 7f7f3e1..835c7fd 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -501,6 +501,16 @@ public:
   // The file name of the log file in base/logs.
   QString log_filename;
 
+  /**
+   * @brief A QString of an URL that defines the content repository
+   *        send by the server.
+   *
+   * @details Introduced in Version 2.9.2.
+   *        Addresses the issue of contenturl devlivery for WebAO
+   *        without relying on someone adding the link manually.
+   */
+  QString asset_url;
+
   void initBASS();
   static void load_bass_opus_plugin();
   static void CALLBACK BASSreset(HSTREAM handle, DWORD channel, DWORD data,
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 36031f1..f899b9a 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -25,7 +25,7 @@ public:
   int loop_end[4] = {0, 0, 0, 0};
 
 public slots:
-  void play(QString p_song, int channel = 0, bool loop = false,
+  int play(QString p_song, int channel = 0, bool loop = false,
             int effect_flags = 0);
   void stop(int channel = 0);