From 1b0930b977b5e7ee1b7bd1c7eeb9625702d928e3 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Fri, 13 Mar 2020 16:29:01 +0100
Subject: [PATCH] move area list detection algorithm into a seperate function

---
 include/aoapplication.h     |  2 ++
 src/packet_distribution.cpp | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/aoapplication.h b/include/aoapplication.h
index e4f2ee6..03aa01a 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -58,6 +58,8 @@ public:
   void construct_courtroom();
   void destruct_courtroom();
 
+  bool is_music_track(QString trackname);
+
   void ms_packet_received(AOPacket *p_packet);
   void server_packet_received(AOPacket *p_packet);
 
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index da59c20..9f072ae 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -151,6 +151,16 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
   delete p_packet;
 }
 
+bool AOApplication::is_music_track(QString trackname)
+{
+    return (trackname.startsWith("==") ||
+            trackname.endsWith(".wav") ||
+            trackname.endsWith(".mp3") ||
+            trackname.endsWith(".mp4") ||
+            trackname.endsWith(".ogg") ||
+            trackname.endsWith(".opus"));
+}
+
 void AOApplication::server_packet_received(AOPacket *p_packet)
 {
   p_packet->net_decode();
@@ -434,11 +444,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       }
       else
       {
-          if (f_music.endsWith(".wav") ||
-                  f_music.endsWith(".mp3") ||
-                  f_music.endsWith(".mp4") ||
-                  f_music.endsWith(".ogg") ||
-                  f_music.endsWith(".opus"))
+          if (is_music_track(f_music))
           {
               musiclist_start = true;
               areas--;
@@ -519,12 +525,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
           for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element)
           {
-            if (!musiclist_start && (f_contents.at(n_element).startsWith("==") ||
-                                 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")))
+            if (!musiclist_start && is_music_track(f_contents.at(n_element)))
             {
                 musiclist_start = true;
                 continue;