Răsfoiți Sursa

set midi client name

Fabian Peter Hammerle 9 ani în urmă
părinte
comite
f6f1945a6e
3 a modificat fișierele cu 11 adăugiri și 4 ștergeri
  1. 5 2
      Sequencer.cpp
  2. 5 1
      Sequencer.h
  3. 1 1
      midi

+ 5 - 2
Sequencer.cpp

@@ -1,8 +1,11 @@
 #include "Sequencer.h"
 #include <iostream>
 
+const std::string Sequencer::midiClientName = std::string("Launchpad Sequencer");
+
 Sequencer::Sequencer()
-    : launchpad(), playbackScreen(*this), configScreen(*this), messages(),
+    : launchpad(midiClientName), midiOut(midi::Output::Api::UNSPECIFIED, midiClientName),
+      playbackScreen(*this), configScreen(*this), messages(),
       defaultOutputChannel(9), player(&midiOut, &beats, *this)
 {
     playbackScreen.setLaunchpad(launchpad);
@@ -14,7 +17,7 @@ void Sequencer::run()
 {
     std::cout << __func__ << std::endl;
 
-    midiOut.openVirtualPort("launchpad sequencer");
+    midiOut.openVirtualPort("Sequencer out");
 
     messages.resize(17);
     for(int i=0; i<messages.size(); i++) {

+ 5 - 1
Sequencer.h

@@ -1,6 +1,8 @@
 #pragma once
+#include <string>
 #include <vector>
 #include <memory>
+#include "midi/Output.h"
 #include "midi/Launchpad.h"
 #include "midi/Message.h"
 #include "BeatSequence.h"
@@ -11,12 +13,14 @@
 class Sequencer
 {
 public:
+    static const std::string midiClientName;
+
     midi::Launchpad launchpad;
+    midi::Output midiOut;
     PlaybackScreen playbackScreen;
     ConfigurationScreen configScreen;
     std::vector<std::shared_ptr<midi::Message>> messages;
     unsigned char defaultOutputChannel;
-    midi::Output midiOut;
     BeatSequence beats;
     Player player;
 

+ 1 - 1
midi

@@ -1 +1 @@
-Subproject commit f82e5a1c2eec79d6b86fd4dd289b571dac5e03f4
+Subproject commit 4d24a37431aadb298098827653659185e77f87ec