Merge branch 'music_list_update'

2 files changed, 45 insertions, 3 deletions

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 04826876..db97bb9c 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -981,9 +981,9 @@ void Courtroom::list_areas()
   for (int n_area = 0 ; n_area < area_list.size() ; ++n_area)
   {
     QString i_area = "";
-    i_area.append("[");
-    i_area.append(QString::number(n_area));
-    i_area.append("] ");
+//    i_area.append("[");
+//    i_area.append(QString::number(n_area));
+//    i_area.append("] ");
 
     i_area.append(area_list.at(n_area));
 
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 40015fda..cfd6d8c6 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -525,6 +525,48 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     send_server_packet(new AOPacket("RD#%"));
   }
+  else if (header == "FM")
+  {
+    if (!courtroom_constructed)
+      goto end;
+
+    w_courtroom->clear_music();
+    w_courtroom->clear_areas();
+
+    bool musics_time = false;
+    int areas = 0;
+
+    for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element)
+    {
+      if (musics_time)
+      {
+          w_courtroom->append_music(f_contents.at(n_element));
+      }
+      else
+      {
+          if (f_contents.at(n_element).endsWith(".wav") ||
+                  f_contents.at(n_element).endsWith(".mp3") ||
+                  f_contents.at(n_element).endsWith(".mp4") ||
+                  f_contents.at(n_element).endsWith(".ogg") ||
+                  f_contents.at(n_element).endsWith(".opus"))
+          {
+              musics_time = true;
+              w_courtroom->fix_last_area();
+              w_courtroom->append_music(f_contents.at(n_element));
+              areas--;
+//              qDebug() << "wtf!!" << f_contents.at(n_element);
+          }
+          else
+          {
+              w_courtroom->append_area(f_contents.at(n_element));
+              areas++;
+          }
+      }
+    }
+
+    w_courtroom->list_music();
+    w_courtroom->list_areas();
+  }
   else if (header == "DONE")
   {
     if (!courtroom_constructed)