Calculate CC/PBmodulation amplitudes from the full/half range

Author: juzzlin

src/application/application.cpp

@@ -72,10 +72,12 @@ Application::Application(int & argc, char ** argv)
   , m_applicationService { std::make_shared<ApplicationService>() }
   , m_settingsService { std::make_shared<SettingsService>() }
   , m_selectionService { std::make_shared<SelectionService>() }
-  , m_editorService { std::make_shared<EditorService>(m_selectionService, m_settingsService) }
+  , m_utilService { std::make_shared<UtilService>() }
+  , m_propertyService { std::make_shared<PropertyService>() }
+  , m_automationService { std::make_shared<AutomationService>(m_propertyService) }
+  , m_editorService { std::make_shared<EditorService>(m_selectionService, m_settingsService, m_automationService) }
   , m_jackService { std::make_shared<JackService>(m_settingsService) }
   , m_audioService { std::make_shared<AudioService>(m_settingsService, m_jackService) }
-  , m_automationService { std::make_shared<AutomationService>() }
   , m_eventSelectionModel { std::make_shared<EventSelectionModel>() }
   , m_midiService { std::make_shared<MidiService>() }
   , m_mixerService { std::make_shared<MixerService>() }
@@ -93,15 +95,12 @@ Application::Application(int & argc, char ** argv)
   , m_trackSettingsModel { std::make_unique<TrackSettingsModel>() }
   , m_midiSettingsModel { std::make_unique<MidiSettingsModel>(m_settingsService) }
   , m_audioSettingsModel { std::make_unique<AudioSettingsModel>(m_audioService, m_settingsService) }
-  , m_utilService { std::make_shared<UtilService>() }
-  , m_propertyService { std::make_shared<PropertyService>() }
   , m_noteColumnLineContainerHelper { std::make_shared<NoteColumnLineContainerHelper>(
       m_automationService, m_editorService, m_selectionService, m_utilService) }
   , m_noteColumnModelHandler { std::make_unique<NoteColumnModelHandler>(m_editorService, m_selectionService, m_automationService, m_settingsService) }
   , m_engine { std::make_unique<QQmlApplicationEngine>() }
 {
     m_editorService->setMixerService(m_mixerService);
-    m_editorService->setAutomationService(m_automationService);
     registerTypes();
 
     handleCommandLineArguments(argc, argv); // Handle command-line arguments at initialization

src/application/application.hpp

@@ -126,14 +126,17 @@ class Application : public QObject
     std::shared_ptr<SettingsService> m_settingsService;
 
     std::shared_ptr<SelectionService> m_selectionService;
+
+    std::shared_ptr<UtilService> m_utilService;
+    std::shared_ptr<PropertyService> m_propertyService;
+    std::shared_ptr<AutomationService> m_automationService;
+
     std::shared_ptr<EditorService> m_editorService;
 
     std::shared_ptr<JackService> m_jackService;
 
     std::shared_ptr<AudioService> m_audioService;
 
-    std::shared_ptr<AutomationService> m_automationService;
-
     std::shared_ptr<EventSelectionModel> m_eventSelectionModel;
 
     std::shared_ptr<MidiService> m_midiService;
@@ -157,9 +160,6 @@ class Application : public QObject
     std::unique_ptr<MidiSettingsModel> m_midiSettingsModel;
     std::unique_ptr<AudioSettingsModel> m_audioSettingsModel;
 
-    std::shared_ptr<UtilService> m_utilService;
-    std::shared_ptr<PropertyService> m_propertyService;
-
     std::shared_ptr<NoteColumnLineContainerHelper> m_noteColumnLineContainerHelper;
     std::unique_ptr<NoteColumnModelHandler> m_noteColumnModelHandler;
 

src/application/service/automation_service.cpp

@@ -21,6 +21,7 @@
 #include "../../domain/midi_cc_data.hpp"
 #include "../../domain/pitch_bend_data.hpp"
 #include "../position.hpp"
+#include "property_service.hpp"
 
 #include <algorithm>
 #include <cmath> // For std::sin and M_PI
@@ -34,7 +35,8 @@ namespace noteahead {
 
 static const auto TAG = "AutomationService";
 
-AutomationService::AutomationService()
+AutomationService::AutomationService(std::shared_ptr<PropertyService> propertyService) :
+    m_propertyService { propertyService }
 {
 }
 
@@ -416,9 +418,9 @@ AutomationService::EventList AutomationService::renderMidiCcToEventsByLine(size_
                     totalModulation = modulationValue * modulation.amplitude / 100.0; // Amplitude is a percentage
                 }
                 totalModulation += modulation.offset / 100.0;
-                interpolatedValue += interpolatedValue * totalModulation;
+                interpolatedValue += totalModulation * m_propertyService->maxValue(automation.controller());
 
-                const auto clampedValue = std::clamp(static_cast<int>(std::round(interpolatedValue)), 0, 127); // MIDI CC value range
+                const auto clampedValue = std::clamp(static_cast<int>(std::round(interpolatedValue)), 0, m_propertyService->maxValue(automation.controller())); // MIDI CC value range
                 events.push_back(std::make_shared<Event>(tick, MidiCcData { track, column, automation.controller(), static_cast<uint8_t>(clampedValue) }));
             }
         }
@@ -473,7 +475,7 @@ AutomationService::EventList AutomationService::renderPitchBendToEventsByLine(si
                     totalModulation = modulationValue * modulation.amplitude / 100.0; // Amplitude is a percentage
                 }
                 totalModulation += modulation.offset / 100.0;
-                interpolatedValue += interpolatedValue * totalModulation;
+                interpolatedValue += totalModulation * 100.0;
 
                 const auto percentage = std::clamp(static_cast<int>(std::round(interpolatedValue)), -100, 100);
                 events.push_back(std::make_shared<Event>(tick, PitchBendData { track, column, static_cast<double>(percentage) }));
@@ -548,9 +550,9 @@ AutomationService::EventList AutomationService::renderMidiCcToEventsByColumn(siz
                         totalModulation = modulationValue * modulation.amplitude / 100.0;
                     }
                     totalModulation += modulation.offset / 100.0;
-                    interpolatedValue += interpolatedValue * totalModulation;
+                    interpolatedValue += totalModulation * m_propertyService->maxValue(automation.controller());
 
-                    const auto clampedValue = std::clamp(static_cast<int>(std::round(interpolatedValue)), 0, 127); // MIDI CC value range
+                    const auto clampedValue = std::clamp(static_cast<int>(std::round(interpolatedValue)), 0, m_propertyService->maxValue(automation.controller())); // MIDI CC value range
                     if (!prevValue || *prevValue != clampedValue) {
                         events.push_back(std::make_shared<Event>(tick + line * ticksPerLine, MidiCcData { track, column, automation.controller(), static_cast<uint8_t>(clampedValue) }));
                         prevValue = clampedValue;
@@ -595,7 +597,7 @@ AutomationService::EventList AutomationService::renderPitchBendToEventsByColumn(
                         totalModulation = modulationValue * modulation.amplitude / 100.0;
                     }
                     totalModulation += modulation.offset / 100.0;
-                    interpolatedValue += interpolatedValue * totalModulation;
+                    interpolatedValue += totalModulation * 100.0;
 
                     const auto percentage = std::clamp(static_cast<int>(std::round(interpolatedValue)), -100, 100);
                     const double minDiff = 200.0 / 16383;

src/application/service/automation_service.hpp

@@ -33,12 +33,14 @@ namespace noteahead {
 
 struct Position;
 
+class PropertyService;
+
 class AutomationService : public QObject
 {
     Q_OBJECT
 
 public:
-    AutomationService();
+    AutomationService(std::shared_ptr<PropertyService> propertyService);
 
     void clear();
 
@@ -122,6 +124,7 @@ public slots:
     };
 
     Automations m_automations;
+    std::shared_ptr<PropertyService> m_propertyService;
 };
 
 } // namespace noteahead

src/application/service/editor_service.cpp

@@ -13,7 +13,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Noteahead. If not, see <http://www.gnu.org/licenses/>.
 
-#include "automation_service.hpp"
 #include "../../domain/pattern.hpp"
 #include "editor_service.hpp"
 
@@ -28,8 +27,10 @@
 #include "../command/composite_command.hpp"
 #include "../instrument_request.hpp"
 #include "../note_converter.hpp"
+#include "automation_service.hpp"
 #include "copy_manager.hpp"
 #include "mixer_service.hpp"
+#include "property_service.hpp"
 #include "selection_service.hpp"
 #include "settings_service.hpp"
 
@@ -45,15 +46,15 @@ using namespace std::chrono_literals;
 static const auto TAG = "EditorService";
 
 EditorService::EditorService()
-  : EditorService { std::make_shared<SelectionService>(), std::make_shared<SettingsService>() }
+  : EditorService { std::make_shared<SelectionService>(), std::make_shared<SettingsService>(), std::make_shared<AutomationService>(std::make_shared<PropertyService>()) }
 {
 }
 
-EditorService::EditorService(SelectionServiceS selectionService, SettingsServiceS settingsService)
+EditorService::EditorService(SelectionServiceS selectionService, SettingsServiceS settingsService, AutomationServiceS automationService)
   : m_undoStack { std::make_unique<UndoStack>() }
   , m_selectionService { selectionService }
   , m_settingsService { settingsService }
-  , m_automationService { std::make_shared<AutomationService>() }
+  , m_automationService { automationService }
 {
     initialize();
     m_undoStack->setCanUndoChangedCallback([this] { emit canUndoChanged(); });

src/application/service/editor_service.hpp

@@ -80,7 +80,7 @@ class EditorService : public QObject
     using SettingsServiceS = std::shared_ptr<SettingsService>;
     using MixerServiceS = std::shared_ptr<MixerService>;
     using AutomationServiceS = std::shared_ptr<AutomationService>;
-    EditorService(SelectionServiceS selectionService, SettingsServiceS settingsService);
+    EditorService(SelectionServiceS selectionService, SettingsServiceS settingsService, AutomationServiceS automationService);
     ~EditorService() override;
 
     void initialize();

src/domain/pitch_bend_data.cpp

@@ -15,6 +15,8 @@
 
 #include "pitch_bend_data.hpp"
 
+#include <cmath>
+
 namespace noteahead {
 
 PitchBendData::PitchBendData(size_t track, size_t column, uint8_t msb, uint8_t lsb)
@@ -30,7 +32,7 @@ PitchBendData::PitchBendData(size_t track, size_t column, uint16_t value)
 }
 
 PitchBendData::PitchBendData(size_t track, size_t column, double percentage)
-  : PitchBendData { track, column, static_cast<uint16_t>((percentage + 100.0) * (16383.0 / 200.0)) }
+  : PitchBendData { track, column, static_cast<uint16_t>(std::round((percentage + 100.0) * (16383.0 / 200.0))) }
 {
 }
 

src/infra/video/video_generator.cpp

@@ -16,6 +16,7 @@
 #include "video_generator.hpp"
 
 #include "../../application/service/automation_service.hpp"
+#include "../../application/service/property_service.hpp"
 #include "../../application/service/side_chain_service.hpp"
 #include "../../common/utils.hpp"
 #include "../../contrib/SimpleLogger/src/simple_logger.hpp"
@@ -56,7 +57,7 @@ void VideoGenerator::initialize(const VideoConfig & config, SongS song)
     m_config.logo = !config.logoPath.empty() ? QImage { QString::fromStdString(config.logoPath) } : QImage {};
 
     m_eventMap.clear();
-    for (auto && event : m_song->renderToEvents(std::make_shared<AutomationService>(), std::make_shared<SideChainService>(), config.startPosition)) {
+    for (auto && event : m_song->renderToEvents(std::make_shared<AutomationService>(std::make_shared<PropertyService>()), std::make_shared<SideChainService>(), config.startPosition)) {
         m_eventMap[event->tick()].push_back(event);
     }
     const double tickDurationMs = 60'000 / (static_cast<double>(m_song->beatsPerMinute() * m_song->linesPerBeat() * m_song->ticksPerLine()));

src/unit_tests/application_service_test/CMakeLists.txt

@@ -5,6 +5,7 @@ set(SRC
     ${NAME}.hpp
     ../../application/service/application_service.cpp
     ../../application/service/editor_service.cpp
+    ../../application/service/property_service.cpp
     ../../application/service/player_service.cpp
     ../../application/service/recent_files_manager.cpp
     ../../application/service/automation_service.cpp

src/unit_tests/automation_service_test/CMakeLists.txt

@@ -5,6 +5,7 @@ set(SRC
     ${NAME}.hpp
     ../../application/position.hpp
     ../../application/service/automation_service.cpp
+    ../../application/service/property_service.cpp
     ../../application/service/random_service.cpp
     ../../common/constants.cpp
     ../../common/utils.cpp
@@ -18,6 +19,7 @@ set(SRC
     ../../domain/note_data.cpp
     ../../domain/pitch_bend_automation.cpp
     ../../domain/pitch_bend_data.cpp
+    ../../infra/midi/midi_cc_mapping.cpp
 )
 qt_add_executable(${NAME} ${SRC})
 set_target_properties(${NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${UNIT_TEST_BASE_DIR})