oh my god i thought doing this with mac was bad enough

Author: solamint

Encore/src/gameplay/GameplayInputHandler.cpp

@@ -1,12 +1,12 @@
 //
 // Created by marie on 15/09/2024.
 
-#include "GameplayInputHandler.h"
+//#include "GameplayInputHandler.h"
 
-#include "enctime.h"
-#include "settings-old.h"
-#include "GLFW/glfw3.h"
-#include "song/songlist.h"
+//#include "enctime.h"
+//#include "settings-old.h"
+//#include "GLFW/glfw3.h"
+//#include "song/songlist.h"
 /*
 int GameplayInputHandler::calculatePressedMask(PlayerGameplayStats *&stats) {
     int mask = 0;

Encore/src/gameplay/GameplayInputHandler.h

@@ -5,7 +5,7 @@
 #ifndef INPUTHANDLER_H
 #define INPUTHANDLER_H
 
-#include "users/playerManager.h"
+// #include "users/playerManager.h"
 
 // enum EventLanes {
 //    OVERDRIVE_ACT = -1,

Encore/src/song/song.h

@@ -225,43 +225,43 @@ class Song {
                                     jsonPath.parent_path() / path.value.GetString()
                                 )) {
                                 if (stem == "drums")
-                                    stemsPath.push_back(
-                                        { (jsonPath.parent_path() / path.value.GetString()
+                                    stemsPath.emplace_back(
+                                         (jsonPath.parent_path() / path.value.GetString()
                                           )
                                               .string(),
-                                          PartDrums }
+                                          PartDrums
                                     );
 
                                 else if (stem == "bass")
-                                    stemsPath.push_back(
-                                        { (jsonPath.parent_path() / path.value.GetString()
+                                    stemsPath.emplace_back(
+                                         (jsonPath.parent_path() / path.value.GetString()
                                           )
                                               .string(),
-                                          PartBass }
+                                          PartBass
                                     );
 
                                 else if (stem == "lead")
-                                    stemsPath.push_back(
-                                        { (jsonPath.parent_path() / path.value.GetString()
+                                    stemsPath.emplace_back(
+                                         (jsonPath.parent_path() / path.value.GetString()
                                           )
                                               .string(),
-                                          PartGuitar }
+                                          PartGuitar
                                     );
 
                                 else if (stem == "vocals")
-                                    stemsPath.push_back(
-                                        { (jsonPath.parent_path() / path.value.GetString()
+                                    stemsPath.emplace_back(
+                                         (jsonPath.parent_path() / path.value.GetString()
                                           )
                                               .string(),
-                                          PartVocals }
+                                          PartVocals
                                     );
 
                                 else if (stem == "backing")
-                                    stemsPath.push_back(
-                                        { (jsonPath.parent_path() / path.value.GetString()
+                                    stemsPath.emplace_back(
+                                         (jsonPath.parent_path() / path.value.GetString()
                                           )
                                               .string(),
-                                          5 }
+                                          5
                                     );
                             }
                         } else if (path.value.IsArray()) {
@@ -270,38 +270,38 @@ class Song {
                                         jsonPath.parent_path() / path2.GetString()
                                     )) {
                                     if (stem == "drums")
-                                        stemsPath.push_back(
-                                            { (jsonPath.parent_path() / path2.GetString())
+                                        stemsPath.emplace_back(
+                                             (jsonPath.parent_path() / path2.GetString())
                                                   .string(),
-                                              PartDrums }
+                                              PartDrums
                                         );
 
                                     else if (stem == "bass")
-                                        stemsPath.push_back(
-                                            { (jsonPath.parent_path() / path2.GetString())
+                                        stemsPath.emplace_back(
+                                             (jsonPath.parent_path() / path2.GetString())
                                                   .string(),
-                                              PartBass }
+                                              PartBass
                                         );
 
                                     else if (stem == "lead")
-                                        stemsPath.push_back(
-                                            { (jsonPath.parent_path() / path2.GetString())
+                                        stemsPath.emplace_back(
+                                             (jsonPath.parent_path() / path2.GetString())
                                                   .string(),
-                                              PartGuitar }
+                                              PartGuitar
                                         );
 
                                     else if (stem == "vocals")
-                                        stemsPath.push_back(
-                                            { (jsonPath.parent_path() / path2.GetString())
+                                        stemsPath.emplace_back(
+                                             (jsonPath.parent_path() / path2.GetString())
                                                   .string(),
-                                              PartVocals }
+                                              PartVocals
                                         );
 
                                     else if (stem == "backing")
-                                        stemsPath.push_back(
-                                            { (jsonPath.parent_path() / path2.GetString())
+                                        stemsPath.emplace_back(
+                                             (jsonPath.parent_path() / path2.GetString())
                                                   .string(),
-                                              5 }
+                                              5
                                         );
                                 }
                             }