Added MIDIPlayer (WIP)

4 files changed, 67 insertions, 7 deletions

diff --git a/MIDIPlayer.cpp b/MIDIPlayer.cpp
new file mode 100644
index 0000000..41f852e
--- /dev/null
+++ b/MIDIPlayer.cpp
@@ -0,0 +1,27 @@
+#include "MIDIPlayer.h"
+
+MIDIPlayer::MIDIPlayer()
+{
+}
+
+
+void MIDIPlayer::start()
+{
+  "aplaymidi -p24 locked_out_of_heaven.midi"
+}
+
+void MIDIPlayer::stop()
+{
+}
+
+bool MIDIPlayer::is_playing()
+{
+}
+
+void MIDIPlayer::set_file(const std::string& filename)
+{
+}
+
+std::vector<std::string> MIDIPlayer::get_filelist()
+{
+}
diff --git a/MIDIPlayer.h b/MIDIPlayer.h
new file mode 100644
index 0000000..e859bed
--- /dev/null
+++ b/MIDIPlayer.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+class MIDIPlayer
+{
+public:
+  MIDIPlayer();
+
+  void start();
+
+  void stop();
+
+  bool is_playing();
+
+  void set_file(const std::string& filename);
+
+  std::vector<std::string> get_filelist();
+};
+
diff --git a/Makefile b/Makefile
index 5f24c4e..7ceb738 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,15 @@
 TARGET=midiplay
 
+SRCS=\
+     midiplay.cpp \
+     MIDIPlayer.cpp
+
+OBJS=$(SRCS:.cpp=.o)
+
+CXX=clang++
+CXXFLAGS=-Wall -g -O2 -fPIC -std=c++20
+CXXLIBS=-lfcgi -lreichwein -lfmt
+
 all: $(TARGET)
 
 play:
@@ -8,12 +18,11 @@ play:
 run-fcgi:
 	spawn-fcgi -a 127.0.0.1 -p 9090 -n -- ./midiplay
 
-midiplay.o: midiplay.cpp
-	g++ -Wall -g -O2 -fPIC -o $@ -c $^
-
-$(TARGET): midiplay.o
-	g++ -Wall -g -O2 -fPIC -o $@ $^ -lfcgi -lreichwein -lfmt
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -o $@ -c $^
 
+$(TARGET): $(OBJS)
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(CXXLIBS)
 
 clean:
 	-rm -rf $(TARGET)
diff --git a/midiplay.cpp b/midiplay.cpp
index 75f33da..d5c0ef0 100644
--- a/midiplay.cpp
+++ b/midiplay.cpp
@@ -1,3 +1,5 @@
+#include "MIDIPlayer.h"
+
 #include <string>
 
 #include <fcgiapp.h>
@@ -17,7 +19,7 @@ std::string getPostData(FCGX_Request& request)
 
     unsigned int status = FCGX_GetStr(result.data(), result.size(), request.in);
     if (status != result.size()) {
-      return fmt::format("Read error: {}/{}", status, result);
+      return fmt::format("Read error: {}/{}", status, result.size());
     }
 
     return result;
@@ -46,8 +48,9 @@ int main(int argc, char* argv[]) {
             FCGX_PutS("Content-Type: text/xml\r\n\r\n", request.out);
 
             std::string data = getPostData(request);
-            if (data == "<data><value1>3</value1></data>")
+            if (data == "<data><command>3</command></data>") {
               FCGX_PutS("<data><value1>4</value1></data>", request.out);
+            }
           } else {
             FCGX_PutS("Content-Type: text/text\r\n\r\n", request.out);
             FCGX_PutS("Bad request method: POST expected", request.out);