add messaging for loading

Author: schollz

clients/oooooooo/src/Display.cpp

@@ -581,7 +581,7 @@ void Display::init(SoftcutClient* sc, int numVoices) {
   }
 
   // setup keyboard handler
-  keyboardHandler_.Init(softCutClient_, params_, numVoices_);
+  keyboardHandler_.Init(softCutClient_, params_, numVoices_, this);
 
   // setup help system
   helpSystem_.Init(font);

clients/oooooooo/src/DisplayMessage.cpp

@@ -91,7 +91,7 @@ void DisplayMessage::Render(SDL_Renderer* renderer, int windowWidth,
   }
   // Position the message in the bottom-right corner with some padding
   int padding = 10;
-  int x = windowWidth - surface->w - padding;
+  int x = padding;
   int y = windowHeight - surface->h - padding;
 
   SDL_Rect destRect = {x, y, surface->w, surface->h};

clients/oooooooo/src/KeyboardHandler.cpp

@@ -1,12 +1,22 @@
+
 #include "KeyboardHandler.h"
 
+#include <chrono>
+#include <ctime>
+#include <filesystem>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+
+#include "Display.h"
 #include "Parameters.h"
 #include "SoftcutClient.h"
 
 using namespace softcut_jack_osc;
 
 void KeyboardHandler::handleKeyDown(SDL_Keycode key, bool isRepeat,
-                                    SDL_Keymod modifiers, int *selectedLoop) {
+                                    SDL_Keymod modifiers [[maybe_unused]],
+                                    int *selectedLoop) {
   keysHeld_[key] = true;
 
   // std::cerr << "KeyboardHandler::handleKeyDown Key pressed: "
@@ -125,10 +135,33 @@ void KeyboardHandler::handleKeyDown(SDL_Keycode key, bool isRepeat,
             std::string path = "oooooooo/loop_" + std::to_string(i) + ".wav";
             softcut_->loadBufferToLoop(path, i);
           }
+
+          std::filesystem::path filePath("oooooooo/loop_0.wav");
+          if (std::filesystem::exists(filePath)) {
+            auto ftime = std::filesystem::last_write_time(filePath);
+            // Convert file_time_type to system_clock::time_point
+            auto sctp = std::chrono::time_point_cast<
+                std::chrono::system_clock::duration>(
+                ftime - decltype(ftime)::clock::now() +
+                std::chrono::system_clock::now());
+            // Convert to time_t
+            std::time_t cftime = std::chrono::system_clock::to_time_t(sctp);
+            // Format time
+            char timeStr[100];
+            std::strftime(timeStr, sizeof(timeStr), "%Y-%m-%d %H:%M:%S",
+                          std::localtime(&cftime));
+
+            display_->SetMessage(
+                "Audio loaded from "
+                "modified: " +
+                    std::string(timeStr),
+                3);
+          }
         } else {
           // load the parameters
           JSON json;
           std::ifstream file("oooooooo/parameters.json");
+          // get the last-modified date from the file
           if (file.is_open()) {
             file >> json;
             file.close();
@@ -140,6 +173,26 @@ void KeyboardHandler::handleKeyDown(SDL_Keycode key, bool isRepeat,
             for (int i = 0; i < numVoices_; i++) {
               params_[i].Bang();
             }
+
+            std::filesystem::path filePath("oooooooo/parameters.json");
+            auto ftime = std::filesystem::last_write_time(filePath);
+            // Convert file_time_type to system_clock::time_point
+            auto sctp = std::chrono::time_point_cast<
+                std::chrono::system_clock::duration>(
+                ftime - decltype(ftime)::clock::now() +
+                std::chrono::system_clock::now());
+            // Convert to time_t
+            std::time_t cftime = std::chrono::system_clock::to_time_t(sctp);
+            // Format time
+            char timeStr[100];
+            std::strftime(timeStr, sizeof(timeStr), "%Y-%m-%d %H:%M:%S",
+                          std::localtime(&cftime));
+
+            display_->SetMessage(
+                "Parameters loaded from "
+                "modified: " +
+                    std::string(timeStr),
+                3);
           } else {
             std::cerr << "Error opening file for reading" << std::endl;
           }
@@ -220,7 +273,8 @@ void KeyboardHandler::handleKeyDown(SDL_Keycode key, bool isRepeat,
   }
 }
 
-void KeyboardHandler::handleKeyUp(SDL_Keycode key, int selectedLoop) {
+void KeyboardHandler::handleKeyUp(SDL_Keycode key,
+                                  int selectedLoop [[maybe_unused]]) {
   keysHeld_[key] = false;
   // std::cerr << "KeyboardHandler::handleKeyUp Key released: "
   //           << SDL_GetKeyName(key) << " " << selectedLoop << std::endl;

clients/oooooooo/src/KeyboardHandler.h

@@ -11,15 +11,19 @@
 #include "Parameters.h"
 #include "SoftcutClient.h"
 
+class Display;
+
 class KeyboardHandler {
  public:
   KeyboardHandler() = default;
   ~KeyboardHandler() = default;
 
-  void Init(SoftcutClient* sc, Parameters* params, int numVoices) {
+  void Init(SoftcutClient* sc, Parameters* params, int numVoices,
+            Display* display) {
     softcut_ = sc;
     params_ = params;
     numVoices_ = numVoices;
+    display_ = display;
   }
 
   void handleKeyDown(SDL_Keycode key, bool isRepeat, SDL_Keymod modifiers,
@@ -31,6 +35,7 @@ class KeyboardHandler {
   Parameters* params_;
   int numVoices_;
   int voiceToCopy_ = -1;
+  Display* display_;
 
   std::unordered_map<SDL_Keycode, bool> keysHeld_;
 };

clients/oooooooo/src/Parameters.cpp

@@ -156,27 +156,20 @@ void Parameters::Init(SoftcutClient* sc, int voice, float sample_rate) {
             sample_rate_, 0.0, softCutClient_->getLoopEnd(voice), 0.01f,
             default_value, 0.0f, 0.2f, 0.1f, random_lfo, "start", "s",
             [this, voice](float value) {
-              std::cerr << "start: " << value << std::endl;
-              float loop_duration = softCutClient_->getDuration(voice);
               softCutClient_->handleCommand(new Commands::CommandPacket(
                   Commands::Id::SET_CUT_LOOP_START, voice,
                   value + softCutClient_->getLoopMin(voice)));
-              softCutClient_->handleCommand(new Commands::CommandPacket(
-                  Commands::Id::SET_CUT_LOOP_END, voice,
-                  value + softCutClient_->getLoopMin(voice) + loop_duration));
             });
         break;
       case PARAM_DURATION:
         default_value = 2.0f;
         param_[i].Init(
-            sample_rate_, 0.0, 60.0f, 0.01f, default_value,
+            sample_rate_, 0.0, 600.0f, 0.01f, default_value,
             default_value - 1.0f, default_value + 1.0f, 0.1f, random_lfo,
             "duration", "s", [this, voice](float value) {
-              std::cerr << "duration: " << value << std::endl;
               float start = softCutClient_->getLoopStart(voice);
               softCutClient_->handleCommand(new Commands::CommandPacket(
                   Commands::Id::SET_CUT_LOOP_END, voice, value + start));
-              param_[PARAM_START].SetMax(value);
             });
         break;
       case PARAM_REC_LEVEL: