diff --git a/README.md b/README.md index a999437..e7e02ec 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,21 @@ MidiLogLevel = MidiDebug; // or MidiInfo, MidiWarning, MidiError All the midi classes are defined using the midi namespace. If you include Midi.h the using namespace is already defined. However, if you include the individual class specific header files you need to add a using namespace midi; in your sketch. +### Class Templates / Alternatives Networking Stacks + +The following classes support class templates for selecting the networking stack: + +- ```AppleMidiServer``` (= ```AppleMidiServer``` ) +- ```MidiIpserver``` (= ```AppleMidiServer``` ) +- ```MidiUdp``` (= ```MidiUdp``` ) +- ```MidiUdpServer``` (= ```MidiUdpServer``` ) + +By default the WiFi classes are used. If you want to use it with Ethernet please use the corresponding class template parameters: + +- ```AppleMidiServer``` +- ```MidiIpserver``` +- ```MidiUdp``` +- ```MidiUdpServer``` ### Installation in Arduino diff --git a/docs/html/_apple_midi_server_8h_source.html b/docs/html/_apple_midi_server_8h_source.html index dcaf9c7..cadd9d2 100644 --- a/docs/html/_apple_midi_server_8h_source.html +++ b/docs/html/_apple_midi_server_8h_source.html @@ -73,86 +73,193 @@
2 #include "ConfigMidi.h"
3 #if TCP_ACTIVE
4 #include <WiFi.h>
-
5 #include "MidiAction.h"
-
6 #include "MidiCommon.h"
-
7 #include "MidiLogger.h"
-
8 #include "apple-midi/applemidi.h"
-
9 #include <WiFiUdp.h>
-
10 #if MDNS_ACTIVE
-
11 #include <ESPmDNS.h>
-
12 #endif
-
13 
-
14 #define MIDI_BUFFER_SIZE 80
-
15 
-
16 namespace midi {
-
17 
-
18 class AppleMidiServer;
-
19 extern AppleMidiServer *SelfAppleMidi;
-
20 typedef void* apple_midi_cb_t;
-
21 
-
22 /***************************************************/
-
32 /***************************************************/
-
33 
-
34 class AppleMidiServer : public MidiCommon {
-
35  public:
-
36  AppleMidiServer() {
-
37  SelfAppleMidi = this;
-
38  };
-
39 
-
40  AppleMidiServer(MidiAction *action, int midiPort=-1){
-
41  SelfAppleMidi = this;
-
42  apple_event_handler.begin(action, midiPort);
-
43  }
-
44 
-
46  void setName(const char* name){
-
47  dns_name = name;
-
48  }
-
49 
-
51  bool begin(int control_port=APPLEMIDI_DEFAULT_PORT);
-
53  bool begin(IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1);
-
55  void end();
-
57  bool loop() {
-
58  return tick(millis());
-
59  }
-
60 
-
61  protected:
-
62  MidiParser apple_event_handler;
-
63  WiFiUDP udpControl;
-
64  WiFiUDP udpData;
-
65  uint8_t rx_buffer[MIDI_BUFFER_SIZE];
-
66  int remote_port;
-
67  bool is_setup = false;
-
68  const char* dns_name = "AppleMidi";
-
69 
-
71  virtual bool tick(uint32_t timestamp);
-
73  virtual void writeData(MidiMessage *msg, int len);
-
75  virtual void setupMDns(int port);
-
77  const char* toStr(IPAddress &adress);
-
79  void setupLogger();
-
81  static void applemidi_callback_midi_message_received(uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos);
-
83  static int32_t applemidi_if_send_udp_datagram(uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len);
-
84 
-
85 
-
86 };
-
87 
-
88 }
-
89 #endif
-
midi::AppleMidiServer
A Sender and Receiver which supports Apple Midi using the implementation from midibox....
Definition: AppleMidiServer.h:34
-
midi::AppleMidiServer::loop
bool loop()
Processing logic to be executed in loop.
Definition: AppleMidiServer.h:57
-
midi::AppleMidiServer::setupMDns
virtual void setupMDns(int port)
Setup MDNS apple-midi service.
Definition: AppleMidiServer.cpp:96
-
midi::AppleMidiServer::tick
virtual bool tick(uint32_t timestamp)
process input from the control and the data port
Definition: AppleMidiServer.cpp:61
-
midi::AppleMidiServer::applemidi_callback_midi_message_received
static void applemidi_callback_midi_message_received(uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos)
Callback method to parse midi message.
Definition: AppleMidiServer.cpp:127
-
midi::AppleMidiServer::setupLogger
void setupLogger()
Activate apple midi debug messages.
Definition: AppleMidiServer.cpp:109
-
midi::AppleMidiServer::toStr
const char * toStr(IPAddress &adress)
provides the network address as string
Definition: AppleMidiServer.cpp:47
-
midi::AppleMidiServer::end
void end()
Closes the connections.
Definition: AppleMidiServer.cpp:54
-
midi::AppleMidiServer::begin
bool begin(int control_port=APPLEMIDI_DEFAULT_PORT)
Starts the listening.
Definition: AppleMidiServer.cpp:9
-
midi::AppleMidiServer::setName
void setName(const char *name)
Defines the dns name.
Definition: AppleMidiServer.h:46
-
midi::AppleMidiServer::applemidi_if_send_udp_datagram
static int32_t applemidi_if_send_udp_datagram(uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len)
Callback method to send UDP message with the help of the Arduino API.
Definition: AppleMidiServer.cpp:137
-
midi::AppleMidiServer::writeData
virtual void writeData(MidiMessage *msg, int len)
MidiCommon implementation.
Definition: AppleMidiServer.cpp:90
+
5 #include <WiFiUdp.h>
+
6 
+
7 #include "MidiAction.h"
+
8 #include "MidiCommon.h"
+
9 #include "MidiLogger.h"
+
10 #include "apple-midi/applemidi.h"
+
11 #if MDNS_ACTIVE
+
12 #include <ESPmDNS.h>
+
13 #endif
+
14 
+
15 #define MIDI_BUFFER_SIZE 80
+
16 
+
17 namespace midi {
+
18 
+
19 typedef void* apple_midi_cb_t;
+
20 
+
21 /***************************************************/
+
31 /***************************************************/
+
32 template <class UDPClass = WiFiUDP>
+
33 class AppleMidiServer : public MidiCommon {
+
34  public:
+
35  AppleMidiServer() {
+
36  _instance = this;
+
37  };
+
38 
+
39  AppleMidiServer(MidiAction* action, int midiPort = -1) {
+
40  _instance = this;
+
41  apple_event_handler.begin(action, midiPort);
+
42  }
+
43 
+
44  void setName(const char* name) { dns_name = name; }
+
45 
+
46  bool begin(int control_port = APPLEMIDI_DEFAULT_PORT) {
+
47  MIDI_LOGI(__PRETTY_FUNCTION__);
+
48  setupLogger();
+
49  setupMDns(control_port);
+
50  MIDI_LOGI("MIDI using port: %d", control_port);
+
51  applemidi_init((apple_midi_cb_t)applemidi_callback_midi_message_received,
+
52  (apple_midi_cb_t)applemidi_if_send_udp_datagram);
+
53  udpControl.begin(control_port); // control port
+
54  udpData.begin(control_port + 1); // data port
+
55  return true;
+
56  }
+
57 
+
58  bool begin(IPAddress adress, int control_port = APPLEMIDI_DEFAULT_PORT,
+
59  int data_port_opt = -1) {
+
60  _instance = this;
+
61  MIDI_LOGI(__PRETTY_FUNCTION__);
+
62  setupLogger();
+
63  setupMDns(control_port);
+
64  applemidi_init((apple_midi_cb_t)applemidi_callback_midi_message_received,
+
65  (apple_midi_cb_t)applemidi_if_send_udp_datagram);
+
66  int data_port = data_port_opt > 0 ? data_port_opt : control_port + 1;
+
67  MIDI_LOGI("MIDI using address: %s port: %d", toStr(adress), control_port);
+
68  udpControl.begin(control_port);
+
69  udpData.begin(data_port);
+
70  int status =
+
71  applemidi_start_session(data_port, (uint8_t*)&adress, control_port);
+
72  return status >= 0;
+
73  }
+
74 
+
75  void end() {
+
76  MIDI_LOGI(__PRETTY_FUNCTION__);
+
77  udpControl.stop();
+
78  udpData.stop();
+
79  }
+
80 
+
81  bool loop() { return tick(millis()); }
+
82 
+
83  protected:
+
84  MidiParser apple_event_handler;
+
85  UDPClass udpControl;
+
86  UDPClass udpData;
+
87  uint8_t rx_buffer[MIDI_BUFFER_SIZE];
+
88  int remote_port;
+
89  bool is_setup = false;
+
90  const char* dns_name = "AppleMidi";
+
91  static AppleMidiServer<UDPClass>* _instance;
+
92 
+
93  virtual bool tick(uint32_t timestamp) {
+
94  bool active = false;
+
95  int packetSize = udpControl.parsePacket();
+
96  remote_port = udpControl.remotePort();
+
97  if (packetSize > 0) {
+
98  IPAddress remote_address = udpControl.remoteIP();
+
99  int len = udpControl.read(rx_buffer, MIDI_BUFFER_SIZE);
+
100  MIDI_LOGD("control: %d -> %d ", remote_port, len);
+
101  applemidi_parse_udp_datagram((uint8_t*)&remote_address, remote_port,
+
102  rx_buffer, len, false);
+
103  active = true;
+
104  }
+
105  packetSize = udpData.parsePacket();
+
106  if (packetSize > 0) {
+
107  int remote_port = udpData.remotePort();
+
108  IPAddress remote_address = udpData.remoteIP();
+
109  int len = udpData.read(rx_buffer, MIDI_BUFFER_SIZE);
+
110  MIDI_LOGD("data: %d -> %d", remote_port, len);
+
111  applemidi_parse_udp_datagram((uint8_t*)&remote_address, remote_port,
+
112  rx_buffer, len, true);
+
113  active = true;
+
114  }
+
115  return active;
+
116  }
+
117 
+
118  virtual void writeData(MidiMessage* msg, int len) {
+
119  MIDI_LOGI(__PRETTY_FUNCTION__);
+
120  applemidi_send_message(remote_port, (uint8_t*)msg,
+
121  len * sizeof(MidiMessage));
+
122  }
+
123 
+
124  virtual void setupMDns(int port) {
+
125 #if MDNS_ACTIVE
+
126  if (MDNS.begin(dns_name)) {
+
127  MDNS.addService("_apple-midi", "_udp", port);
+
128  } else {
+
129  MIDI_LOGE("Error starting mDNS");
+
130  }
+
131 #else
+
132  MIDI_LOGW("MDNS has been deactivated");
+
133 #endif
+
134  }
+
135 
+
136  const char* toStr(IPAddress& adress) {
+
137  static char networ_str[20];
+
138  sprintf(networ_str, "%u.%u.%u.%u", adress[0], adress[1], adress[2],
+
139  adress[3]);
+
140  return networ_str;
+
141  }
+
142 
+
143  void setupLogger() {
+
144  switch (MidiLogLevel) {
+
145  case MidiInfo:
+
146  applemidi_set_debug_level(2);
+
147  break;
+
148  case MidiDebug:
+
149  applemidi_set_debug_level(3);
+
150  break;
+
151  case MidiWarning:
+
152  applemidi_set_debug_level(1);
+
153  break;
+
154  case MidiError:
+
155  applemidi_set_debug_level(1);
+
156  break;
+
157  }
+
158  }
+
159 
+
160  static void applemidi_callback_midi_message_received(
+
161  uint8_t port, uint32_t timestamp, uint8_t midi_status,
+
162  uint8_t* remaining_message, size_t len, size_t continued_sysex_pos) {
+
163  MIDI_LOGI("applemidi_callback_midi_message_received: port=%d", port);
+
164  if (_instance) {
+
165  uint8_t message[len + 1];
+
166  message[0] = midi_status;
+
167  memmove(message + 1, remaining_message, len);
+
168  _instance->apple_event_handler.parse(message, len + 1);
+
169  }
+
170  }
+
171 
+
172  static int32_t applemidi_if_send_udp_datagram(uint8_t* ip_addr, uint16_t port,
+
173  uint8_t* tx_data,
+
174  size_t tx_len) {
+
175  MIDI_LOGD("applemidi_if_send_udp_datagram: port=%d", port);
+
176  if (_instance) {
+
177  IPAddress* p_adr = (IPAddress*)ip_addr;
+
178  UDPClass* p_udp = port == _instance->remote_port
+
179  ? &(_instance->udpControl)
+
180  : &(_instance->udpData);
+
181  p_udp->beginPacket(*p_adr, port);
+
182  int32_t result = p_udp->write(tx_data, tx_len);
+
183  p_udp->endPacket();
+
184  return result;
+
185  }
+
186  return 0;
+
187  }
+
188 };
+
189 
+
190 template <class UDPClass>
+
191 AppleMidiServer<UDPClass>* AppleMidiServer<UDPClass>::_instance = nullptr;
+
192 
+
193 } // namespace midi
+
194 #endif
+
midi::AppleMidiServer
A Sender and Receiver which supports Apple Midi using the implementation from midibox....
Definition: AppleMidiServer.h:33
midi::MidiAction
Abstract class for a MidiAction.
Definition: MidiAction.h:15
midi::MidiCommon
The common methods provided by all Arduino Midi subclasses which can be used to generate Midi message...
Definition: MidiCommon.h:75
midi::MidiParser
A simple Midi Parser which calls the corresponding events. It supports Midi and BLE Midi messages....
Definition: MidiParser.h:29
midi::MidiParser::begin
void begin(MidiAction *MidiAction, int filter_channel=-1)
Assigns the MidiAction and optinally defines a midi channel.
Definition: MidiParser.cpp:14
+
midi::MidiParser::parse
void parse(uint8_t *msg, uint8_t len)
Parse a string into midi messages.
Definition: MidiParser.cpp:25
midi::MidiMessage
The content of the midi message: timestamp, status, arg1 and arg2.
Definition: MidiCommon.h:48
diff --git a/docs/html/_midi_common_8h_source.html b/docs/html/_midi_common_8h_source.html index 2680c8f..06ed16c 100644 --- a/docs/html/_midi_common_8h_source.html +++ b/docs/html/_midi_common_8h_source.html @@ -171,40 +171,41 @@
132  void setConnectionStatus(ConnectionStatus status) {connectionStatus=status; }
133  void updateTimestamp(MidiMessage *pMsg);
134  virtual void writeData(MidiMessage *msg, int len);
-
135 
-
136  ConnectionStatus connectionStatus;
-
137  MidiAction *pMidiAction;
-
138  MidiMessage outMessage;
-
139  int receivingChannel = -1;
-
140  uint8_t sendingChannel = 0;
-
141  uint8_t timestampLow;
-
142  uint8_t timestampHigh;
-
143  char *name;
-
144 };
-
145 
+
135  uint8_t getChannel(uint8_t ch);
+
136 
+
137  ConnectionStatus connectionStatus;
+
138  MidiAction *pMidiAction;
+
139  MidiMessage outMessage;
+
140  int receivingChannel = -1;
+
141  uint8_t sendingChannel = 0;
+
142  uint8_t timestampLow;
+
143  uint8_t timestampHigh;
+
144  char *name;
+
145 };
146 
-
147 } // namespace
-
148 
-
149 #endif
+
147 
+
148 } // namespace
+
149 
+
150 #endif
midi::MidiAction
Abstract class for a MidiAction.
Definition: MidiAction.h:15
midi::MidiCommon
The common methods provided by all Arduino Midi subclasses which can be used to generate Midi message...
Definition: MidiCommon.h:75
-
midi::MidiCommon::polyPressure
virtual void polyPressure(uint8_t valuePar, int8_t channel=-1)
Sends a polyPressure MIDI command to the output.
Definition: MidiCommon.cpp:68
+
midi::MidiCommon::polyPressure
virtual void polyPressure(uint8_t valuePar, int8_t channel=-1)
Sends a polyPressure MIDI command to the output.
Definition: MidiCommon.cpp:69
midi::MidiCommon::setFilterReceivingChannel
virtual void setFilterReceivingChannel(int channel)
Activates a filter on receiving messages to the indicated channel.
Definition: MidiCommon.cpp:19
-
midi::MidiCommon::localControl
virtual void localControl(bool active, int8_t channel=-1)
Sends a localControl MIDI command to the output.
Definition: MidiCommon.cpp:90
+
midi::MidiCommon::localControl
virtual void localControl(bool active, int8_t channel=-1)
Sends a localControl MIDI command to the output.
Definition: MidiCommon.cpp:93
midi::MidiCommon::setDefaultSendingChannel
virtual void setDefaultSendingChannel(int8_t channel)
Sets the default channel for the sending commands.
Definition: MidiCommon.cpp:15
-
midi::MidiCommon::frequencyToNote
static uint8_t frequencyToNote(float freq)
Converts a Frequency (in Hz) to a MIDI note.
Definition: MidiCommon.cpp:106
+
midi::MidiCommon::frequencyToNote
static uint8_t frequencyToNote(float freq)
Converts a Frequency (in Hz) to a MIDI note.
Definition: MidiCommon.cpp:110
midi::MidiCommon::channelPressure
virtual void channelPressure(uint8_t value, int8_t channel=-1)
Sends a channelPressure MIDI command to the output.
Definition: MidiCommon.cpp:61
midi::MidiCommon::MidiCommon
MidiCommon()
Default Constructor.
Definition: MidiCommon.cpp:5
-
midi::MidiCommon::resetAllControllers
virtual void resetAllControllers(int8_t channel=-1)
Sends a resetAllControllers MIDI command to the output.
Definition: MidiCommon.cpp:86
+
midi::MidiCommon::resetAllControllers
virtual void resetAllControllers(int8_t channel=-1)
Sends a resetAllControllers MIDI command to the output.
Definition: MidiCommon.cpp:89
midi::MidiCommon::noteOff
virtual void noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)
Sends a noteOff MIDI command to the output.
Definition: MidiCommon.cpp:45
midi::MidiCommon::noteOn
virtual void noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)
Sends a noteOn MIDI command to the output.
Definition: MidiCommon.cpp:37
-
midi::MidiCommon::noteToFrequency
static float noteToFrequency(uint8_t note)
Converts a MIDI note to a frequency in Hz.
Definition: MidiCommon.cpp:101
-
midi::MidiCommon::controlChange
virtual void controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)
Sends a control change MIDI command to the output.
Definition: MidiCommon.cpp:94
-
midi::MidiCommon::write
void write(MidiMessage *msg, int len)
write multiple MidiMessage objects to final output
Definition: MidiCommon.cpp:113
+
midi::MidiCommon::noteToFrequency
static float noteToFrequency(uint8_t note)
Converts a MIDI note to a frequency in Hz.
Definition: MidiCommon.cpp:105
+
midi::MidiCommon::controlChange
virtual void controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)
Sends a control change MIDI command to the output.
Definition: MidiCommon.cpp:97
+
midi::MidiCommon::write
void write(MidiMessage *msg, int len)
write multiple MidiMessage objects to final output
Definition: MidiCommon.cpp:117
midi::MidiCommon::getConnectionStatus
virtual ConnectionStatus getConnectionStatus()
Determines the connection status.
Definition: MidiCommon.h:126
midi::MidiCommon::pitchBend
virtual void pitchBend(uint16_t value, int8_t channel=-1)
Sends a pitchBend MIDI command to the output.
Definition: MidiCommon.cpp:53
-
midi::MidiCommon::allNotesOff
virtual void allNotesOff(int8_t channel=-1)
Sends a allNotesOff MIDI command to the output.
Definition: MidiCommon.cpp:82
-
midi::MidiCommon::programChange
virtual void programChange(uint8_t program, int8_t channel=-1)
Sends a programChange MIDI command to the output.
Definition: MidiCommon.cpp:75
+
midi::MidiCommon::allNotesOff
virtual void allNotesOff(int8_t channel=-1)
Sends a allNotesOff MIDI command to the output.
Definition: MidiCommon.cpp:85
+
midi::MidiCommon::programChange
virtual void programChange(uint8_t program, int8_t channel=-1)
Sends a programChange MIDI command to the output.
Definition: MidiCommon.cpp:77
midi::MidiCommon::setMidiAction
virtual void setMidiAction(MidiAction &MidiAction)
Defines the voice which is used in inbound processing.
Definition: MidiCommon.cpp:11
midi::MidiMessage
The content of the midi message: timestamp, status, arg1 and arg2.
Definition: MidiCommon.h:48
diff --git a/docs/html/_midi_ip_server_8h_source.html b/docs/html/_midi_ip_server_8h_source.html index f22dec4..c558f21 100644 --- a/docs/html/_midi_ip_server_8h_source.html +++ b/docs/html/_midi_ip_server_8h_source.html @@ -82,7 +82,7 @@
11 
12 /***************************************************/
19 /***************************************************/
-
20 
+
20 template <class ServerClass = WiFiServer, class ClientClass = WiFiClient>
21 class MidiIpServer : public MidiServer {
22  public:
23  MidiIpServer(MidiAction *action) : MidiServer(action){
@@ -97,58 +97,55 @@
32  bool begin(int serverPort=5008){
33  MIDI_LOGI( __PRETTY_FUNCTION__);
34 
-
35  if (WiFi.status() != WL_CONNECTED){
-
36  MIDI_LOGE("WiFi not connected");
-
37  return false;
-
38  }
-
39 
-
40  if (p_wifi_server==nullptr){
-
41  p_wifi_server = new WiFiServer(serverPort);
-
42  }
-
43  p_wifi_server->begin();
-
44  MIDI_LOGI("server started on port %d", serverPort);
-
45  return true;
-
46  }
-
47 
-
48  void end() {
-
49  if (p_wifi_server!=nullptr){
-
50  delete p_wifi_server;
-
51  p_wifi_server = nullptr;
-
52  }
-
53  }
-
54 
-
55  void loop() {
-
56  if (p_wifi_server!=nullptr){
-
57  if (!client.connected()){
-
58  client = p_wifi_server->accept();
-
59  if (client.connected()){
-
60  MIDI_LOGI("MidiIpServer->connected");
-
61  in.setup(&client, new MidiParser(p_action), true);
-
62  out.setup(&client);
-
63  out.resetAllControllers();
-
64  }
-
65  } else {
-
66  MIDI_LOGD("MidiIpServer::loop");
-
67  in.loop();
-
68  }
-
69  }
-
70  }
-
71 
-
72  protected:
-
73  WiFiServer *p_wifi_server = nullptr;
-
74  WiFiClient client;
+
35  if (p_wifi_server==nullptr){
+
36  p_wifi_server = new WiFiServer(serverPort);
+
37  }
+
38  p_wifi_server->begin();
+
39  MIDI_LOGI("server started on port %d", serverPort);
+
40  return true;
+
41  }
+
42 
+
43  void end() {
+
44  if (p_wifi_server!=nullptr){
+
45  delete p_wifi_server;
+
46  p_wifi_server = nullptr;
+
47  }
+
48  }
+
49 
+
50  void loop() {
+
51  if (p_wifi_server!=nullptr){
+
52  if (!client.connected()){
+
53  client = p_wifi_server->accept();
+
54  if (client.connected()){
+
55  MIDI_LOGI("MidiIpServer->connected");
+
56  in.setup(&client, new MidiParser(p_action), true);
+
57  out.setup(&client);
+
58  out.resetAllControllers();
+
59  }
+
60  } else {
+
61  MIDI_LOGD("MidiIpServer::loop");
+
62  in.loop();
+
63  }
+
64  }
+
65  }
+
66 
+
67  protected:
+
68  ServerClass *p_wifi_server = nullptr;
+
69  ClientClass client;
+
70 
+
71 };
+
72 
+
73 
+
74 }
75 
-
76 };
-
77 
-
78 
-
79 }
-
80 
-
81 #endif
+
76 #endif
midi::MidiAction
Abstract class for a MidiAction.
Definition: MidiAction.h:15
-
midi::MidiCommon::resetAllControllers
virtual void resetAllControllers(int8_t channel=-1)
Sends a resetAllControllers MIDI command to the output.
Definition: MidiCommon.cpp:86
+
midi::MidiCommon::resetAllControllers
virtual void resetAllControllers(int8_t channel=-1)
Sends a resetAllControllers MIDI command to the output.
Definition: MidiCommon.cpp:89
midi::MidiIpServer
A simple IP Server which which receives and creates MIDI messages.
Definition: MidiIpServer.h:21
midi::MidiParser
A simple Midi Parser which calls the corresponding events. It supports Midi and BLE Midi messages....
Definition: MidiParser.h:29
midi::MidiServer
A simple Serial Server which which receives and creates MIDI messages.
Definition: MidiServer.h:20
+
midi::MidiStreamIn::setup
void setup(Stream *stream, MidiParser *handler, bool releaseHandler)
Call setup when created with empty constructor.
Definition: MidiStreamIn.cpp:25
+
midi::MidiStreamOut::setup
virtual void setup(Print *stream)
Call setup when created with empty constructor.
Definition: MidiStreamOut.cpp:12
diff --git a/docs/html/_midi_server_8h_source.html b/docs/html/_midi_server_8h_source.html index 94ed831..ed12728 100644 --- a/docs/html/_midi_server_8h_source.html +++ b/docs/html/_midi_server_8h_source.html @@ -90,8 +90,8 @@
25 
26  bool begin(Stream &stream){
27  MIDI_LOGI( __PRETTY_FUNCTION__);
-
28  in.setup(&stream, new MidiParser(p_action), true);
-
29  out.setup(&stream);
+
28  in.setup(&stream, new MidiParser(p_action), true);
+
29  out.setup(&stream);
30  return true;
31  }
32 
@@ -124,7 +124,9 @@
midi::MidiParser
A simple Midi Parser which calls the corresponding events. It supports Midi and BLE Midi messages....
Definition: MidiParser.h:29
midi::MidiServer
A simple Serial Server which which receives and creates MIDI messages.
Definition: MidiServer.h:20
midi::MidiStreamIn
Input of Midi Messages from the Aruduino HardwareSerial port. You need to give the default MidiParser...
Definition: MidiStreamIn.h:27
+
midi::MidiStreamIn::setup
void setup(Stream *stream, MidiParser *handler, bool releaseHandler)
Call setup when created with empty constructor.
Definition: MidiStreamIn.cpp:25
midi::MidiStreamOut
Output of Midi Messages to an Arduino Stream (eg output to Serial, UDP or IP).
Definition: MidiStreamOut.h:17
+
midi::MidiStreamOut::setup
virtual void setup(Print *stream)
Call setup when created with empty constructor.
Definition: MidiStreamOut.cpp:12
midi::MidiMessage
The content of the midi message: timestamp, status, arg1 and arg2.
Definition: MidiCommon.h:48
diff --git a/docs/html/_midi_stream_in_8h_source.html b/docs/html/_midi_stream_in_8h_source.html index 0bef405..e6f9cb7 100644 --- a/docs/html/_midi_stream_in_8h_source.html +++ b/docs/html/_midi_stream_in_8h_source.html @@ -85,40 +85,32 @@
26 /***************************************************/
27 class MidiStreamIn : public MidiCommon {
28  public:
-
30  MidiStreamIn(Stream &stream, MidiAction &action);
-
32  MidiStreamIn(Stream &stream, MidiParser &handler);
-
34  ~MidiStreamIn();
-
35  // Parse/Process the next midi message
-
36  bool loop();
-
37 
-
38  protected:
-
39  friend class MidiServer;
-
40  friend class MidiIpServer;
-
41  friend class MidiUdpServer;
-
42 
-
43  int getLastStatusPos(uint8_t *buffer, int endPos);
-
44  Stream *pStream = nullptr;
-
45  MidiParser *pHandler = nullptr;
-
46  bool ownsHandler = false;
-
47  uint8_t buffer[BUFFER_LEN];
-
48  int startPos = 0;
+
29  MidiStreamIn() = default;
+
31  MidiStreamIn(Stream &stream, MidiAction &action);
+
33  MidiStreamIn(Stream &stream, MidiParser &handler);
+
35  ~MidiStreamIn();
+
36  // Parse/Process the next midi message
+
37  bool loop();
+
39  void setup(Stream *stream, MidiParser *handler, bool releaseHandler);
+
40  protected:
+
41  int getLastStatusPos(uint8_t *buffer, int endPos);
+
42  Stream *pStream = nullptr;
+
43  MidiParser *pHandler = nullptr;
+
44  bool ownsHandler = false;
+
45  uint8_t buffer[BUFFER_LEN];
+
46  int startPos = 0;
+
47 
+
48 };
49 
-
50  MidiStreamIn() = default;
+
50 } // namespace
51 
-
52  void setup(Stream *stream, MidiParser *handler, bool releaseHandler);
-
53 };
-
54 
-
55 } // namespace
-
56 
-
57 #endif
+
52 #endif
midi::MidiAction
Abstract class for a MidiAction.
Definition: MidiAction.h:15
midi::MidiCommon
The common methods provided by all Arduino Midi subclasses which can be used to generate Midi message...
Definition: MidiCommon.h:75
-
midi::MidiIpServer
A simple IP Server which which receives and creates MIDI messages.
Definition: MidiIpServer.h:21
midi::MidiParser
A simple Midi Parser which calls the corresponding events. It supports Midi and BLE Midi messages....
Definition: MidiParser.h:29
-
midi::MidiServer
A simple Serial Server which which receives and creates MIDI messages.
Definition: MidiServer.h:20
midi::MidiStreamIn
Input of Midi Messages from the Aruduino HardwareSerial port. You need to give the default MidiParser...
Definition: MidiStreamIn.h:27
+
midi::MidiStreamIn::setup
void setup(Stream *stream, MidiParser *handler, bool releaseHandler)
Call setup when created with empty constructor.
Definition: MidiStreamIn.cpp:25
midi::MidiStreamIn::~MidiStreamIn
~MidiStreamIn()
Destructor.
Definition: MidiStreamIn.cpp:17
-
midi::MidiUdpServer
A simple UDP Server which receives and creates MIDI messages.
Definition: MidiUdpServer.h:21
diff --git a/docs/html/_midi_stream_out_8h_source.html b/docs/html/_midi_stream_out_8h_source.html index 8270667..66a4a0c 100644 --- a/docs/html/_midi_stream_out_8h_source.html +++ b/docs/html/_midi_stream_out_8h_source.html @@ -81,31 +81,22 @@
16 /***************************************************/
17 class MidiStreamOut : public MidiCommon {
18  public:
-
20  MidiStreamOut(Print &stream);
-
21 
-
22  protected:
-
23  friend class MidiServer;
-
24  friend class MidiIpServer;
-
25  friend class MidiUdpServer;
+
19  MidiStreamOut() = default;
+
21  MidiStreamOut(Print &stream);
+
23  virtual void setup(Print *stream);
+
24  virtual void writeData(MidiMessage *pMsg, int len);
+
25  protected:
26 
-
27  MidiStreamOut() = default;
-
28 
-
29  virtual void writeData(MidiMessage *pMsg, int len);
+
27  Print *pStream;
+
28  uint8_t buffer[4];
+
29 };
30 
-
31  virtual void setup(Print *stream);
+
31 } // namespace
32 
-
33  Print *pStream;
-
34  uint8_t buffer[4];
-
35 };
-
36 
-
37 } // namespace
-
38 
-
39 #endif
+
33 #endif
midi::MidiCommon
The common methods provided by all Arduino Midi subclasses which can be used to generate Midi message...
Definition: MidiCommon.h:75
-
midi::MidiIpServer
A simple IP Server which which receives and creates MIDI messages.
Definition: MidiIpServer.h:21
-
midi::MidiServer
A simple Serial Server which which receives and creates MIDI messages.
Definition: MidiServer.h:20
midi::MidiStreamOut
Output of Midi Messages to an Arduino Stream (eg output to Serial, UDP or IP).
Definition: MidiStreamOut.h:17
-
midi::MidiUdpServer
A simple UDP Server which receives and creates MIDI messages.
Definition: MidiUdpServer.h:21
+
midi::MidiStreamOut::setup
virtual void setup(Print *stream)
Call setup when created with empty constructor.
Definition: MidiStreamOut.cpp:12
midi::MidiMessage
The content of the midi message: timestamp, status, arg1 and arg2.
Definition: MidiCommon.h:48
diff --git a/docs/html/_midi_udp_8h_source.html b/docs/html/_midi_udp_8h_source.html index 8e9db12..a7693a0 100644 --- a/docs/html/_midi_udp_8h_source.html +++ b/docs/html/_midi_udp_8h_source.html @@ -76,30 +76,61 @@
5 #include <WiFi.h>
6 #include <WiFiClient.h>
7 #include <WiFiUdp.h>
-
8 
-
9 namespace midi {
-
10 
-
11 /***************************************************/
-
22 /***************************************************/
-
23 
-
24 class MidiUdp : public WiFiUDP { // EthernetUDP {
-
25  public:
-
26  MidiUdp(char* targetUdpAddressStr,int targetPort);
-
27  MidiUdp(IPAddress targetUdpAddress,int targetPort);
-
28  size_t write(const uint8_t * buffer,size_t size );
-
29  bool isValidHost();
-
30  void setTargetPort(int port);
-
31 
-
32  protected:
-
33  IPAddress targetUdpAddress;
-
34  int targetPort;
-
35  bool isValidHostFlag;
-
36 };
-
37 
-
38 }
-
39 
-
40 #endif
-
midi::MidiUdp
Simple UDP wrapper class which sends all packages to the same destination.
Definition: MidiUdp.h:24
+
8 #include "MidiLogger.h"
+
9 
+
10 namespace midi {
+
11 
+
12 /***************************************************/
+
23 /***************************************************/
+
24 
+
25 template <class UDPClass = WiFiUDP>
+
26 class MidiUdp : public UDPClass { // EthernetUDP {
+
27 
+
28  public:
+
29  MidiUdp(char* addessStr, int targetPort) {
+
30  this->isValidHostFlag = WiFi.hostByName(addessStr, targetUdpAddress);
+
31  if (!this->isValidHostFlag) {
+
32  MIDI_LOGE("x%x, Could not resolve host %s ", __func__, addessStr);
+
33  }
+
34  this->targetPort = targetPort;
+
35  }
+
36 
+
37  MidiUdp(IPAddress address, int targetPort) {
+
38  this->targetUdpAddress = address;
+
39  this->targetPort = targetPort;
+
40  }
+
41 
+
42  size_t write(const uint8_t* buffer, size_t size) {
+
43  size_t result = 0;
+
44  if (this->beginPacket(targetUdpAddress, targetPort) == 1) {
+
45  result = WiFiUDP::write(buffer, size);
+
46  if (result > 0) {
+
47  bool packetOk = this->endPacket();
+
48  MIDI_LOGD("x%x, Number of bytes have %s been sent out: %d ", __func__,
+
49  packetOk ? "" : "not", result);
+
50  }
+
51  // this->flush();
+
52  } else {
+
53  MIDI_LOGD("x%x, beginPacked has failed ", __func__);
+
54  this->isValidHostFlag = false;
+
55  }
+
56  return result;
+
57  }
+
58 
+
59  bool isValidHost() { return this->isValidHostFlag; }
+
60 
+
61  void setTargetPort(int port) { targetPort = port; }
+
62 
+
63  protected:
+
64  IPAddress targetUdpAddress;
+
65  int targetPort;
+
66  bool isValidHostFlag;
+
67 };
+
68 
+
69 } // namespace midi
+
70 
+
71 #endif
+
midi::MidiUdp
Simple UDP wrapper class which sends all packages to the same destination.
Definition: MidiUdp.h:26
diff --git a/docs/html/_midi_udp_server_8h_source.html b/docs/html/_midi_udp_server_8h_source.html index 3ec41f5..5bd847f 100644 --- a/docs/html/_midi_udp_server_8h_source.html +++ b/docs/html/_midi_udp_server_8h_source.html @@ -83,66 +83,69 @@
12 /***************************************************/
19 /***************************************************/
20 
-
21 class MidiUdpServer : public MidiServer {
-
22  public:
-
23  MidiUdpServer(MidiAction *action):MidiServer(action){
-
24  }
-
25 
-
26  ~MidiUdpServer() {
-
27  if (udp!=nullptr){
-
28  delete udp;
-
29  }
-
30  }
-
31 
-
32  bool begin(IPAddress ip, int serverPort=5008){
-
33  MIDI_LOGI( __PRETTY_FUNCTION__);
-
34 
-
35  if (WiFi.status() != WL_CONNECTED){
-
36  MIDI_LOGE("WiFi not connected");
-
37  return false;
-
38  }
-
39 
-
40  udp = new MidiUdp(ip, serverPort);
-
41  in.setup(udp, new MidiParser(p_action), true);
-
42  out.setup(udp);
-
43  return true;
-
44  }
-
45 
-
46  void loop() {
-
47  if (udp!=nullptr){
-
48  int len = udp->parsePacket();
-
49  if (!is_connected){
-
50  remote_port = udp->remotePort();
-
51  if (remote_port!=0){
-
52  is_connected = true;
-
53  // we might use a different port on the server
-
54  udp->setTargetPort(remote_port);
-
55  MIDI_LOGI("setting traget port: %d", remote_port);
-
56  }
-
57  }
-
58 
-
59  if (udp->available()){
-
60  in.loop();
-
61  }
-
62  }
-
63  }
-
64 
-
65  protected:
-
66  MidiUdp *udp=nullptr;
-
67  bool is_connected = false;
-
68  int remote_port = 0;
-
69 
-
70 };
-
71 
+
21 template <class UDPClass = WiFiUDP>
+
22 class MidiUdpServer : public MidiServer {
+
23  public:
+
24  MidiUdpServer(MidiAction *action):MidiServer(action){
+
25  }
+
26 
+
27  ~MidiUdpServer() {
+
28  if (udp!=nullptr){
+
29  delete udp;
+
30  }
+
31  }
+
32 
+
33  bool begin(IPAddress ip, int serverPort=5008){
+
34  MIDI_LOGI( __PRETTY_FUNCTION__);
+
35 
+
36  if (WiFi.status() != WL_CONNECTED){
+
37  MIDI_LOGE("WiFi not connected");
+
38  return false;
+
39  }
+
40 
+
41  udp = new MidiUdp(ip, serverPort);
+
42  in.setup(udp, new MidiParser(p_action), true);
+
43  out.setup(udp);
+
44  return true;
+
45  }
+
46 
+
47  void loop() {
+
48  if (udp!=nullptr){
+
49  int len = udp->parsePacket();
+
50  if (!is_connected){
+
51  remote_port = udp->remotePort();
+
52  if (remote_port!=0){
+
53  is_connected = true;
+
54  // we might use a different port on the server
+
55  udp->setTargetPort(remote_port);
+
56  MIDI_LOGI("setting traget port: %d", remote_port);
+
57  }
+
58  }
+
59 
+
60  if (udp->available()){
+
61  in.loop();
+
62  }
+
63  }
+
64  }
+
65 
+
66  protected:
+
67  MidiUdp<UDPClass> *udp=nullptr;
+
68  bool is_connected = false;
+
69  int remote_port = 0;
+
70 
+
71 };
72 
-
73 }
-
74 
-
75 #endif
+
73 
+
74 }
+
75 
+
76 #endif
midi::MidiAction
Abstract class for a MidiAction.
Definition: MidiAction.h:15
midi::MidiParser
A simple Midi Parser which calls the corresponding events. It supports Midi and BLE Midi messages....
Definition: MidiParser.h:29
midi::MidiServer
A simple Serial Server which which receives and creates MIDI messages.
Definition: MidiServer.h:20
-
midi::MidiUdp
Simple UDP wrapper class which sends all packages to the same destination.
Definition: MidiUdp.h:24
-
midi::MidiUdpServer
A simple UDP Server which receives and creates MIDI messages.
Definition: MidiUdpServer.h:21
+
midi::MidiStreamIn::setup
void setup(Stream *stream, MidiParser *handler, bool releaseHandler)
Call setup when created with empty constructor.
Definition: MidiStreamIn.cpp:25
+
midi::MidiStreamOut::setup
virtual void setup(Print *stream)
Call setup when created with empty constructor.
Definition: MidiStreamOut.cpp:12
+
midi::MidiUdp
Simple UDP wrapper class which sends all packages to the same destination.
Definition: MidiUdp.h:26
+
midi::MidiUdpServer
A simple UDP Server which receives and creates MIDI messages.
Definition: MidiUdpServer.h:22
diff --git a/docs/html/classmidi_1_1_apple_midi_server-members.html b/docs/html/classmidi_1_1_apple_midi_server-members.html index 23f12a8..c4bffc4 100644 --- a/docs/html/classmidi_1_1_apple_midi_server-members.html +++ b/docs/html/classmidi_1_1_apple_midi_server-members.html @@ -66,30 +66,32 @@
-
midi::AppleMidiServer Member List
+
midi::AppleMidiServer< UDPClass > Member List
-

This is the complete list of members for midi::AppleMidiServer, including all inherited members.

+

This is the complete list of members for midi::AppleMidiServer< UDPClass >, including all inherited members.

- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + @@ -101,26 +103,26 @@ - + - + - - - - + + + + - - - + + + - +
allNotesOff(int8_t channel=-1)midi::MidiCommonvirtual
apple_event_handler (defined in midi::AppleMidiServer)midi::AppleMidiServerprotected
applemidi_callback_midi_message_received(uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos)midi::AppleMidiServerprotectedstatic
applemidi_if_send_udp_datagram(uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len)midi::AppleMidiServerprotectedstatic
AppleMidiServer() (defined in midi::AppleMidiServer)midi::AppleMidiServerinline
AppleMidiServer(MidiAction *action, int midiPort=-1) (defined in midi::AppleMidiServer)midi::AppleMidiServerinline
begin(int control_port=APPLEMIDI_DEFAULT_PORT)midi::AppleMidiServer
begin(IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1)midi::AppleMidiServer
channelPressure(uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected
controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
dns_name (defined in midi::AppleMidiServer)midi::AppleMidiServerprotected
end()midi::AppleMidiServer
frequencyToNote(float freq)midi::MidiCommonstatic
_instance (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protectedstatic
allNotesOff(int8_t channel=-1)midi::MidiCommonvirtual
apple_event_handler (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protected
applemidi_callback_midi_message_received(uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inlineprotectedstatic
applemidi_if_send_udp_datagram(uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inlineprotectedstatic
AppleMidiServer() (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inline
AppleMidiServer(MidiAction *action, int midiPort=-1) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inline
begin(int control_port=APPLEMIDI_DEFAULT_PORT) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inline
begin(IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inline
channelPressure(uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected
controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
dns_name (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protected
end() (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inline
frequencyToNote(float freq)midi::MidiCommonstatic
getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected
getConnectionStatus()midi::MidiCommoninlinevirtual
is_setup (defined in midi::AppleMidiServer)midi::AppleMidiServerprotected
is_setup (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protected
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
loop()midi::AppleMidiServerinline
loop() (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inline
MidiCommon()midi::MidiCommon
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
remote_port (defined in midi::AppleMidiServer)midi::AppleMidiServerprotected
remote_port (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
rx_buffer (defined in midi::AppleMidiServer)midi::AppleMidiServerprotected
rx_buffer (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protected
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
setName(const char *name)midi::AppleMidiServerinline
setupLogger()midi::AppleMidiServerprotected
setupMDns(int port)midi::AppleMidiServerprotectedvirtual
tick(uint32_t timestamp)midi::AppleMidiServerprotectedvirtual
setName(const char *name) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inline
setupLogger() (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inlineprotected
setupMDns(int port) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inlineprotectedvirtual
tick(uint32_t timestamp) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inlineprotectedvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
toStr(IPAddress &adress)midi::AppleMidiServerprotected
udpControl (defined in midi::AppleMidiServer)midi::AppleMidiServerprotected
udpData (defined in midi::AppleMidiServer)midi::AppleMidiServerprotected
toStr(IPAddress &adress) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inlineprotected
udpControl (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protected
udpData (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >protected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *msg, int len)midi::AppleMidiServerprotectedvirtual
writeData(MidiMessage *msg, int len) (defined in midi::AppleMidiServer< UDPClass >)midi::AppleMidiServer< UDPClass >inlineprotectedvirtual
diff --git a/docs/html/classmidi_1_1_apple_midi_server.html b/docs/html/classmidi_1_1_apple_midi_server.html index 45d5717..f7ce3ce 100644 --- a/docs/html/classmidi_1_1_apple_midi_server.html +++ b/docs/html/classmidi_1_1_apple_midi_server.html @@ -5,7 +5,7 @@ -arduino-midi: midi::AppleMidiServer Class Reference +arduino-midi: midi::AppleMidiServer< UDPClass > Class Template Reference @@ -71,9 +71,10 @@ Protected Member Functions | Static Protected Member Functions | Protected Attributes | +Static Protected Attributes | List of all members
-
midi::AppleMidiServer Class Reference
+
midi::AppleMidiServer< UDPClass > Class Template Reference
@@ -82,32 +83,30 @@

#include <AppleMidiServer.h>

-Inheritance diagram for midi::AppleMidiServer:
+Inheritance diagram for midi::AppleMidiServer< UDPClass >:
- - -midi::MidiCommon + + +midi::MidiCommon
- - + - - - - - - + + + + @@ -116,10 +115,9 @@ virtual void  - - - + + @@ -128,10 +126,9 @@ virtual void  - - - + + @@ -168,10 +165,9 @@ virtual void  - - - + + @@ -190,58 +186,54 @@

Public Member Functions

+
 AppleMidiServer (MidiAction *action, int midiPort=-1)
 
 
virtual void allNotesOff (int8_t channel=-1)
 Sends a allNotesOff MIDI command to the output.
 
-bool begin (int control_port=APPLEMIDI_DEFAULT_PORT)
 Starts the listening.
 
-bool begin (IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1)
 Starts a session with the indicated address.
 
+bool begin (int control_port=APPLEMIDI_DEFAULT_PORT)
 
+bool begin (IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1)
 
virtual void channelPressure (uint8_t value, int8_t channel=-1)
 Sends a channelPressure MIDI command to the output.
controlChange (uint8_t msg, uint8_t value, int8_t channel=-1)
 Sends a control change MIDI command to the output.
 
-void end ()
 Closes the connections.
 
+void end ()
 
virtual ConnectionStatus getConnectionStatus ()
 Determines the connection status.
localControl (bool active, int8_t channel=-1)
 Sends a localControl MIDI command to the output.
 
-bool loop ()
 Processing logic to be executed in loop.
 
+bool loop ()
 
virtual void noteOff (uint8_t note, uint8_t velocity, int8_t channel=-1)
 Sends a noteOff MIDI command to the output.
setMidiAction (MidiAction &MidiAction)
 Defines the voice which is used in inbound processing.
 
-void setName (const char *name)
 Defines the dns name.
 
+void setName (const char *name)
 
void write (MidiMessage *msg, int len)
 write multiple MidiMessage objects to final output
+ + - - - - - - - - - - - - + + + + + + + + - - - + +

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
-void setupLogger ()
 Activate apple midi debug messages.
 
-virtual void setupMDns (int port)
 Setup MDNS apple-midi service.
 
-virtual bool tick (uint32_t timestamp)
 process input from the control and the data port
 
-const char * toStr (IPAddress &adress)
 provides the network address as string
 
+void setupLogger ()
 
+virtual void setupMDns (int port)
 
+virtual bool tick (uint32_t timestamp)
 
+const char * toStr (IPAddress &adress)
 
void updateTimestamp (MidiMessage *pMsg)
 
-virtual void writeData (MidiMessage *msg, int len)
 MidiCommon implementation.
 
+virtual void writeData (MidiMessage *msg, int len)
 
- - - - - - + + + +

Static Protected Member Functions

-static void applemidi_callback_midi_message_received (uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos)
 Callback method to parse midi message.
 
-static int32_t applemidi_if_send_udp_datagram (uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len)
 Callback method to send UDP message with the help of the Arduino API.
 
+static void applemidi_callback_midi_message_received (uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos)
 
+static int32_t applemidi_if_send_udp_datagram (uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len)
 
- - + - - - + - + @@ -254,12 +246,12 @@ - - - + - + @@ -269,19 +261,27 @@ - - - - + + + + +

Protected Attributes

+
MidiParser apple_event_handler
 
 
ConnectionStatus connectionStatus
 
+
const char * dns_name = "AppleMidi"
 
+
 
bool is_setup = false
 
 
char * name
 
int receivingChannel = -1
 
+
int remote_port
 
+
 
uint8_t rx_buffer [MIDI_BUFFER_SIZE]
 
 
uint8_t sendingChannel = 0
 
uint8_t timestampLow
 
-WiFiUDP udpControl
 
-WiFiUDP udpData
 
+UDPClass udpControl
 
+UDPClass udpData
 
+ + +

+Static Protected Attributes

+static AppleMidiServer< UDPClass > * _instance = nullptr
 

Detailed Description

-

A Sender and Receiver which supports Apple Midi using the implementation from midibox. Apple midi uses UDP on a control and a data port. https://github.com/midibox/esp32-idf-applemidi.

+

template<class UDPClass = WiFiUDP>
+class midi::AppleMidiServer< UDPClass >

+ +

A Sender and Receiver which supports Apple Midi using the implementation from midibox. Apple midi uses UDP on a control and a data port. https://github.com/midibox/esp32-idf-applemidi.

by Phil Schatzmann

-
The documentation for this class was generated from the following files:
    +
The documentation for this class was generated from the following file: diff --git a/docs/html/classmidi_1_1_apple_midi_server.png b/docs/html/classmidi_1_1_apple_midi_server.png index d5c830e..1d0f62b 100644 Binary files a/docs/html/classmidi_1_1_apple_midi_server.png and b/docs/html/classmidi_1_1_apple_midi_server.png differ diff --git a/docs/html/classmidi_1_1_midi_ble_client-members.html b/docs/html/classmidi_1_1_midi_ble_client-members.html index 66fe0fe..1260d35 100644 --- a/docs/html/classmidi_1_1_midi_ble_client-members.html +++ b/docs/html/classmidi_1_1_midi_ble_client-members.html @@ -80,33 +80,34 @@ controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual frequencyToNote(float freq)midi::MidiCommonstatic getBLEAdvertisedDevice()midi::MidiBleClient - getConnectionStatus()midi::MidiCommoninlinevirtual - localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual - MidiBleClient(const char *serverName, MidiBleParser *pEventHandler=nullptr)midi::MidiBleClient - MidiCommon()midi::MidiCommon - name (defined in midi::MidiBleClient)midi::MidiBleClientprotected - noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual - noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual - noteToFrequency(uint8_t note)midi::MidiCommonstatic - outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected - pDevice (defined in midi::MidiBleClient)midi::MidiBleClientprotected - pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual - pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected - polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual - pRemoteCharacteristic (defined in midi::MidiBleClient)midi::MidiBleClientprotected - programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual - receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected - resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual - sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected - setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected - setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual - setFilterReceivingChannel(int channel)midi::MidiCommonvirtual - setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual - timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected - timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected - updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected - write(MidiMessage *msg, int len)midi::MidiCommon - writeData(MidiMessage *pMsg, int len)midi::MidiBleClientvirtual + getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected + getConnectionStatus()midi::MidiCommoninlinevirtual + localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual + MidiBleClient(const char *serverName, MidiBleParser *pEventHandler=nullptr)midi::MidiBleClient + MidiCommon()midi::MidiCommon + name (defined in midi::MidiBleClient)midi::MidiBleClientprotected + noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual + noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual + noteToFrequency(uint8_t note)midi::MidiCommonstatic + outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected + pDevice (defined in midi::MidiBleClient)midi::MidiBleClientprotected + pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual + pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected + polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual + pRemoteCharacteristic (defined in midi::MidiBleClient)midi::MidiBleClientprotected + programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual + receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected + resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual + sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected + setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected + setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual + setFilterReceivingChannel(int channel)midi::MidiCommonvirtual + setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual + timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected + timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected + updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected + write(MidiMessage *msg, int len)midi::MidiCommon + writeData(MidiMessage *pMsg, int len)midi::MidiBleClientvirtual
diff --git a/docs/html/classmidi_1_1_midi_ble_client.html b/docs/html/classmidi_1_1_midi_ble_client.html index 168a63f..c951024 100644 --- a/docs/html/classmidi_1_1_midi_ble_client.html +++ b/docs/html/classmidi_1_1_midi_ble_client.html @@ -186,6 +186,9 @@ + + diff --git a/docs/html/classmidi_1_1_midi_ble_server-members.html b/docs/html/classmidi_1_1_midi_ble_server-members.html index 3cd2ccf..959e6e5 100644 --- a/docs/html/classmidi_1_1_midi_ble_server-members.html +++ b/docs/html/classmidi_1_1_midi_ble_server-members.html @@ -79,35 +79,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected
controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
frequencyToNote(float freq)midi::MidiCommonstatic
getConnectionStatus()midi::MidiCommoninlinevirtual
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
MidiBleServer(const char *name, MidiBleParser *pEventHandler=nullptr)midi::MidiBleServer
MidiBleServer(const char *name, MidiAction *MidiAction, int channelFilter=-1)midi::MidiBleServer
MidiCommon()midi::MidiCommon
name (defined in midi::MidiBleServer)midi::MidiBleServerprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
pCharacteristic (defined in midi::MidiBleServer)midi::MidiBleServerprotected
pEventHandler (defined in midi::MidiBleServer)midi::MidiBleServerprotected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
pServer (defined in midi::MidiBleServer)midi::MidiBleServerprotected
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *pMsg, int len) (defined in midi::MidiBleServer)midi::MidiBleServervirtual
getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected
getConnectionStatus()midi::MidiCommoninlinevirtual
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
MidiBleServer(const char *name, MidiBleParser *pEventHandler=nullptr)midi::MidiBleServer
MidiBleServer(const char *name, MidiAction *MidiAction, int channelFilter=-1)midi::MidiBleServer
MidiCommon()midi::MidiCommon
name (defined in midi::MidiBleServer)midi::MidiBleServerprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
pCharacteristic (defined in midi::MidiBleServer)midi::MidiBleServerprotected
pEventHandler (defined in midi::MidiBleServer)midi::MidiBleServerprotected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
pServer (defined in midi::MidiBleServer)midi::MidiBleServerprotected
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *pMsg, int len) (defined in midi::MidiBleServer)midi::MidiBleServervirtual
diff --git a/docs/html/classmidi_1_1_midi_ble_server.html b/docs/html/classmidi_1_1_midi_ble_server.html index cb0f731..6f49153 100644 --- a/docs/html/classmidi_1_1_midi_ble_server.html +++ b/docs/html/classmidi_1_1_midi_ble_server.html @@ -184,6 +184,9 @@ + + diff --git a/docs/html/classmidi_1_1_midi_common-members.html b/docs/html/classmidi_1_1_midi_common-members.html index d8cc6ab..0ec5738 100644 --- a/docs/html/classmidi_1_1_midi_common-members.html +++ b/docs/html/classmidi_1_1_midi_common-members.html @@ -77,30 +77,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected
controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
frequencyToNote(float freq)midi::MidiCommonstatic
getConnectionStatus()midi::MidiCommoninlinevirtual
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
MidiCommon()midi::MidiCommon
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *msg, int len) (defined in midi::MidiCommon)midi::MidiCommonprotectedvirtual
getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected
getConnectionStatus()midi::MidiCommoninlinevirtual
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
MidiCommon()midi::MidiCommon
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *msg, int len) (defined in midi::MidiCommon)midi::MidiCommonprotectedvirtual
diff --git a/docs/html/classmidi_1_1_midi_common.html b/docs/html/classmidi_1_1_midi_common.html index a456f28..0e4e619 100644 --- a/docs/html/classmidi_1_1_midi_common.html +++ b/docs/html/classmidi_1_1_midi_common.html @@ -86,14 +86,14 @@
-midi::AppleMidiServer -midi::MidiBleClient -midi::MidiBleServer -midi::MidiServer -midi::MidiStreamIn -midi::MidiStreamOut -midi::MidiIpServer -midi::MidiUdpServer +midi::AppleMidiServer< UDPClass > +midi::MidiBleClient +midi::MidiBleServer +midi::MidiServer +midi::MidiStreamIn +midi::MidiStreamOut +midi::MidiIpServer< ServerClass, ClientClass > +midi::MidiUdpServer< UDPClass >
@@ -177,6 +177,9 @@
+ + diff --git a/docs/html/classmidi_1_1_midi_common.png b/docs/html/classmidi_1_1_midi_common.png index 6ff3630..b7f4ffb 100644 Binary files a/docs/html/classmidi_1_1_midi_common.png and b/docs/html/classmidi_1_1_midi_common.png differ diff --git a/docs/html/classmidi_1_1_midi_ip_server-members.html b/docs/html/classmidi_1_1_midi_ip_server-members.html index a353b1b..6141534 100644 --- a/docs/html/classmidi_1_1_midi_ip_server-members.html +++ b/docs/html/classmidi_1_1_midi_ip_server-members.html @@ -66,53 +66,54 @@
-
midi::MidiIpServer Member List
+
midi::MidiIpServer< ServerClass, ClientClass > Member List
-

This is the complete list of members for midi::MidiIpServer, including all inherited members.

+

This is the complete list of members for midi::MidiIpServer< ServerClass, ClientClass >, including all inherited members.

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
- + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
allNotesOff(int8_t channel=-1)midi::MidiCommonvirtual
begin(int serverPort=5008) (defined in midi::MidiIpServer)midi::MidiIpServerinline
begin(int serverPort=5008) (defined in midi::MidiIpServer< ServerClass, ClientClass >)midi::MidiIpServer< ServerClass, ClientClass >inline
begin(Stream &stream) (defined in midi::MidiServer)midi::MidiServerinline
channelPressure(uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
client (defined in midi::MidiIpServer)midi::MidiIpServerprotected
client (defined in midi::MidiIpServer< ServerClass, ClientClass >)midi::MidiIpServer< ServerClass, ClientClass >protected
connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected
controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
end() (defined in midi::MidiIpServer)midi::MidiIpServerinlinevirtual
end() (defined in midi::MidiIpServer< ServerClass, ClientClass >)midi::MidiIpServer< ServerClass, ClientClass >inlinevirtual
frequencyToNote(float freq)midi::MidiCommonstatic
getConnectionStatus()midi::MidiCommoninlinevirtual
in (defined in midi::MidiServer)midi::MidiServerprotected
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
loop() (defined in midi::MidiIpServer)midi::MidiIpServerinlinevirtual
MidiCommon()midi::MidiCommon
MidiIpServer(MidiAction *action) (defined in midi::MidiIpServer)midi::MidiIpServerinline
MidiServer(MidiAction *action) (defined in midi::MidiServer)midi::MidiServerinline
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
out (defined in midi::MidiServer)midi::MidiServerprotected
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
p_action (defined in midi::MidiServer)midi::MidiServerprotected
p_wifi_server (defined in midi::MidiIpServer)midi::MidiIpServerprotected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *msg, int len) (defined in midi::MidiServer)midi::MidiServerinlineprotectedvirtual
~MidiIpServer() (defined in midi::MidiIpServer)midi::MidiIpServerinline
getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected
getConnectionStatus()midi::MidiCommoninlinevirtual
in (defined in midi::MidiServer)midi::MidiServerprotected
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
loop() (defined in midi::MidiIpServer< ServerClass, ClientClass >)midi::MidiIpServer< ServerClass, ClientClass >inlinevirtual
MidiCommon()midi::MidiCommon
MidiIpServer(MidiAction *action) (defined in midi::MidiIpServer< ServerClass, ClientClass >)midi::MidiIpServer< ServerClass, ClientClass >inline
MidiServer(MidiAction *action) (defined in midi::MidiServer)midi::MidiServerinline
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
out (defined in midi::MidiServer)midi::MidiServerprotected
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
p_action (defined in midi::MidiServer)midi::MidiServerprotected
p_wifi_server (defined in midi::MidiIpServer< ServerClass, ClientClass >)midi::MidiIpServer< ServerClass, ClientClass >protected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *msg, int len) (defined in midi::MidiServer)midi::MidiServerinlineprotectedvirtual
~MidiIpServer() (defined in midi::MidiIpServer< ServerClass, ClientClass >)midi::MidiIpServer< ServerClass, ClientClass >inline
diff --git a/docs/html/classmidi_1_1_midi_ip_server.html b/docs/html/classmidi_1_1_midi_ip_server.html index 8412eb7..1a48cee 100644 --- a/docs/html/classmidi_1_1_midi_ip_server.html +++ b/docs/html/classmidi_1_1_midi_ip_server.html @@ -5,7 +5,7 @@ -arduino-midi: midi::MidiIpServer Class Reference +arduino-midi: midi::MidiIpServer< ServerClass, ClientClass > Class Template Reference @@ -72,7 +72,7 @@ Protected Attributes | List of all members
-
midi::MidiIpServer Class Reference
+
midi::MidiIpServer< ServerClass, ClientClass > Class Template Reference
@@ -81,28 +81,28 @@

#include <MidiIpServer.h>

-Inheritance diagram for midi::MidiIpServer:
+Inheritance diagram for midi::MidiIpServer< ServerClass, ClientClass >:
- - -midi::MidiServer -midi::MidiCommon + + +midi::MidiServer +midi::MidiCommon
- - + - - + @@ -114,9 +114,9 @@ virtual void  - - + @@ -125,9 +125,9 @@ virtual void  - - + @@ -182,6 +182,9 @@

Public Member Functions

+
 MidiIpServer (MidiAction *action)
 
 
virtual void allNotesOff (int8_t channel=-1)
 Sends a allNotesOff MIDI command to the output.
 
+
bool begin (int serverPort=5008)
 
 
bool begin (Stream &stream)
 
controlChange (uint8_t msg, uint8_t value, int8_t channel=-1)
 Sends a control change MIDI command to the output.
 
+
void end ()
 
 
virtual ConnectionStatus getConnectionStatus ()
 Determines the connection status.
localControl (bool active, int8_t channel=-1)
 Sends a localControl MIDI command to the output.
 
+
void loop ()
 
 
virtual void noteOff (uint8_t note, uint8_t velocity, int8_t channel=-1)
 Sends a noteOff MIDI command to the output.
+ + @@ -194,9 +197,9 @@

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
- - + + @@ -215,9 +218,9 @@ - - + + @@ -235,7 +238,10 @@

Protected Attributes

-WiFiClient client
 
+ClientClass client
 
ConnectionStatus connectionStatus
 
MidiAction * p_action
 
-WiFiServer * p_wifi_server = nullptr
 
+ServerClass * p_wifi_server = nullptr
 
MidiAction * pMidiAction
 
 

Detailed Description

-

A simple IP Server which which receives and creates MIDI messages.

+

template<class ServerClass = WiFiServer, class ClientClass = WiFiClient>
+class midi::MidiIpServer< ServerClass, ClientClass >

+ +

A simple IP Server which which receives and creates MIDI messages.

by Phil Schatzmann

The documentation for this class was generated from the following file:
diff --git a/docs/html/classmidi_1_1_midi_server.html b/docs/html/classmidi_1_1_midi_server.html index f72ff58..3c36ae6 100644 --- a/docs/html/classmidi_1_1_midi_server.html +++ b/docs/html/classmidi_1_1_midi_server.html @@ -86,9 +86,9 @@
-midi::MidiCommon -midi::MidiIpServer -midi::MidiUdpServer +midi::MidiCommon +midi::MidiIpServer< ServerClass, ClientClass > +midi::MidiUdpServer< UDPClass >
@@ -180,6 +180,9 @@
+ + diff --git a/docs/html/classmidi_1_1_midi_server.png b/docs/html/classmidi_1_1_midi_server.png index f304dc4..a2705f2 100644 Binary files a/docs/html/classmidi_1_1_midi_server.png and b/docs/html/classmidi_1_1_midi_server.png differ diff --git a/docs/html/classmidi_1_1_midi_stream_in-members.html b/docs/html/classmidi_1_1_midi_stream_in-members.html index 79350f9..e474e3a 100644 --- a/docs/html/classmidi_1_1_midi_stream_in-members.html +++ b/docs/html/classmidi_1_1_midi_stream_in-members.html @@ -78,17 +78,15 @@ - - - - - - - + + + + + + + - - @@ -108,7 +106,7 @@ - + diff --git a/docs/html/classmidi_1_1_midi_stream_in.html b/docs/html/classmidi_1_1_midi_stream_in.html index df12479..a6a0006 100644 --- a/docs/html/classmidi_1_1_midi_stream_in.html +++ b/docs/html/classmidi_1_1_midi_stream_in.html @@ -70,7 +70,6 @@ Static Public Member Functions | Protected Member Functions | Protected Attributes | -Friends | List of all members
midi::MidiStreamIn Class Reference
@@ -164,6 +163,10 @@ virtual void  + + + @@ -182,15 +185,15 @@

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected
controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
frequencyToNote(float freq)midi::MidiCommonstatic
getConnectionStatus()midi::MidiCommoninlinevirtual
getLastStatusPos(uint8_t *buffer, int endPos) (defined in midi::MidiStreamIn)midi::MidiStreamInprotected
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
loop() (defined in midi::MidiStreamIn)midi::MidiStreamIn
MidiCommon()midi::MidiCommon
MidiIpServer (defined in midi::MidiStreamIn)midi::MidiStreamInfriend
MidiServer (defined in midi::MidiStreamIn)midi::MidiStreamInfriend
getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected
getConnectionStatus()midi::MidiCommoninlinevirtual
getLastStatusPos(uint8_t *buffer, int endPos) (defined in midi::MidiStreamIn)midi::MidiStreamInprotected
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
loop() (defined in midi::MidiStreamIn)midi::MidiStreamIn
MidiCommon()midi::MidiCommon
MidiStreamIn()=default (defined in midi::MidiStreamIn)midi::MidiStreamIn
MidiStreamIn(Stream &stream, MidiAction &action)midi::MidiStreamIn
MidiStreamIn(Stream &stream, MidiParser &handler)midi::MidiStreamIn
MidiStreamIn()=default (defined in midi::MidiStreamIn)midi::MidiStreamInprotected
MidiUdpServer (defined in midi::MidiStreamIn)midi::MidiStreamInfriend
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
setup(Stream *stream, MidiParser *handler, bool releaseHandler) (defined in midi::MidiStreamIn)midi::MidiStreamInprotected
setup(Stream *stream, MidiParser *handler, bool releaseHandler)midi::MidiStreamIn
startPos (defined in midi::MidiStreamIn)midi::MidiStreamInprotected
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
setMidiAction (MidiAction &MidiAction)
 Defines the voice which is used in inbound processing.
 
+void setup (Stream *stream, MidiParser *handler, bool releaseHandler)
 Call setup when created with empty constructor.
 
void write (MidiMessage *msg, int len)
 write multiple MidiMessage objects to final output
+ + - - @@ -239,18 +242,6 @@ -

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
int getLastStatusPos (uint8_t *buffer, int endPos)
 
void setConnectionStatus (ConnectionStatus status)
 
-void setup (Stream *stream, MidiParser *handler, bool releaseHandler)
 
void updateTimestamp (MidiMessage *pMsg)
 
uint8_t timestampLow
 
- - - - - - -

-Friends

-class MidiIpServer
 
-class MidiServer
 
-class MidiUdpServer
 

Detailed Description

Input of Midi Messages from the Aruduino HardwareSerial port. You need to give the default MidiParser or your own subclassed implementation in the constructor to process the midi records.

diff --git a/docs/html/classmidi_1_1_midi_stream_out-members.html b/docs/html/classmidi_1_1_midi_stream_out-members.html index 256aac2..03d38c4 100644 --- a/docs/html/classmidi_1_1_midi_stream_out-members.html +++ b/docs/html/classmidi_1_1_midi_stream_out-members.html @@ -78,14 +78,12 @@ connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual frequencyToNote(float freq)midi::MidiCommonstatic - getConnectionStatus()midi::MidiCommoninlinevirtual - localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual - MidiCommon()midi::MidiCommon - MidiIpServer (defined in midi::MidiStreamOut)midi::MidiStreamOutfriend - MidiServer (defined in midi::MidiStreamOut)midi::MidiStreamOutfriend + getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected + getConnectionStatus()midi::MidiCommoninlinevirtual + localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual + MidiCommon()midi::MidiCommon + MidiStreamOut()=default (defined in midi::MidiStreamOut)midi::MidiStreamOut MidiStreamOut(Print &stream)midi::MidiStreamOut - MidiStreamOut()=default (defined in midi::MidiStreamOut)midi::MidiStreamOutprotected - MidiUdpServer (defined in midi::MidiStreamOut)midi::MidiStreamOutfriend name (defined in midi::MidiCommon)midi::MidiCommonprotected noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual @@ -103,12 +101,12 @@ setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual setFilterReceivingChannel(int channel)midi::MidiCommonvirtual setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual - setup(Print *stream) (defined in midi::MidiStreamOut)midi::MidiStreamOutprotectedvirtual + setup(Print *stream)midi::MidiStreamOutvirtual timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected write(MidiMessage *msg, int len)midi::MidiCommon - writeData(MidiMessage *pMsg, int len) (defined in midi::MidiStreamOut)midi::MidiStreamOutprotectedvirtual + writeData(MidiMessage *pMsg, int len) (defined in midi::MidiStreamOut)midi::MidiStreamOutvirtual
diff --git a/docs/html/classmidi_1_1_midi_stream_out.html b/docs/html/classmidi_1_1_midi_stream_out.html index ed27493..bf362fa 100644 --- a/docs/html/classmidi_1_1_midi_stream_out.html +++ b/docs/html/classmidi_1_1_midi_stream_out.html @@ -70,7 +70,6 @@ Static Public Member Functions | Protected Member Functions | Protected Attributes | -Friends | List of all members
midi::MidiStreamOut Class Reference
@@ -153,10 +152,17 @@ virtual void setMidiAction (MidiAction &MidiAction)  Defines the voice which is used in inbound processing.
  + +virtual void setup (Print *stream) + Call setup when created with empty constructor.
+  void write (MidiMessage *msg, int len)  write multiple MidiMessage objects to final output
  + +virtual void writeData (MidiMessage *pMsg, int len) +  @@ -171,18 +177,15 @@

Static Public Member Functions

+ + - - - -

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
-virtual void setup (Print *stream)
 
void updateTimestamp (MidiMessage *pMsg)
 
-virtual void writeData (MidiMessage *pMsg, int len)
 
@@ -216,18 +219,6 @@ -

Protected Attributes

uint8_t timestampLow
 
- - - - - - -

-Friends

-class MidiIpServer
 
-class MidiServer
 
-class MidiUdpServer
 

Detailed Description

Output of Midi Messages to an Arduino Stream (eg output to Serial, UDP or IP).

diff --git a/docs/html/classmidi_1_1_midi_udp-members.html b/docs/html/classmidi_1_1_midi_udp-members.html index a87f40f..3f22d5d 100644 --- a/docs/html/classmidi_1_1_midi_udp-members.html +++ b/docs/html/classmidi_1_1_midi_udp-members.html @@ -66,20 +66,20 @@
-
midi::MidiUdp Member List
+
midi::MidiUdp< UDPClass > Member List
-

This is the complete list of members for midi::MidiUdp, including all inherited members.

+

This is the complete list of members for midi::MidiUdp< UDPClass >, including all inherited members.

- - - - - - - - + + + + + + + +
isValidHost() (defined in midi::MidiUdp)midi::MidiUdp
isValidHostFlag (defined in midi::MidiUdp)midi::MidiUdpprotected
MidiUdp(char *targetUdpAddressStr, int targetPort) (defined in midi::MidiUdp)midi::MidiUdp
MidiUdp(IPAddress targetUdpAddress, int targetPort) (defined in midi::MidiUdp)midi::MidiUdp
setTargetPort(int port) (defined in midi::MidiUdp)midi::MidiUdp
targetPort (defined in midi::MidiUdp)midi::MidiUdpprotected
targetUdpAddress (defined in midi::MidiUdp)midi::MidiUdpprotected
write(const uint8_t *buffer, size_t size) (defined in midi::MidiUdp)midi::MidiUdp
isValidHost() (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >inline
isValidHostFlag (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >protected
MidiUdp(char *addessStr, int targetPort) (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >inline
MidiUdp(IPAddress address, int targetPort) (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >inline
setTargetPort(int port) (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >inline
targetPort (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >protected
targetUdpAddress (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >protected
write(const uint8_t *buffer, size_t size) (defined in midi::MidiUdp< UDPClass >)midi::MidiUdp< UDPClass >inline
diff --git a/docs/html/classmidi_1_1_midi_udp.html b/docs/html/classmidi_1_1_midi_udp.html index 5f7f9dc..29c3e6c 100644 --- a/docs/html/classmidi_1_1_midi_udp.html +++ b/docs/html/classmidi_1_1_midi_udp.html @@ -5,7 +5,7 @@ -arduino-midi: midi::MidiUdp Class Reference +arduino-midi: midi::MidiUdp< UDPClass > Class Template Reference @@ -70,7 +70,7 @@ Protected Attributes | List of all members
-
midi::MidiUdp Class Reference
+
midi::MidiUdp< UDPClass > Class Template Reference
@@ -79,7 +79,7 @@

#include <MidiUdp.h>

-Inheritance diagram for midi::MidiUdp:
+Inheritance diagram for midi::MidiUdp< UDPClass >:
@@ -87,41 +87,43 @@ - - - - - + + + + - - + - - + - +

Public Member Functions

- MidiUdp (char *targetUdpAddressStr, int targetPort)
 
- MidiUdp (IPAddress targetUdpAddress, int targetPort)
 
+
+ MidiUdp (char *addessStr, int targetPort)
 
+ MidiUdp (IPAddress address, int targetPort)
 
bool isValidHost ()
 
+
 
void setTargetPort (int port)
 
+
 
size_t write (const uint8_t *buffer, size_t size)
 
 
- - - + - - + - +

Protected Attributes

+
bool isValidHostFlag
 
+
 
int targetPort
 
+
 
IPAddress targetUdpAddress
 
 

Detailed Description

-

Simple UDP wrapper class which sends all packages to the same destination.

+

template<class UDPClass = WiFiUDP>
+class midi::MidiUdp< UDPClass >

+ +

Simple UDP wrapper class which sends all packages to the same destination.

This is useful when the API asks for a stream as parameter to output data.

by Phil Schatzmann

-
The documentation for this class was generated from the following files:
    +
The documentation for this class was generated from the following file:
diff --git a/docs/html/classmidi_1_1_midi_udp.png b/docs/html/classmidi_1_1_midi_udp.png index 34a768f..4fc573e 100644 Binary files a/docs/html/classmidi_1_1_midi_udp.png and b/docs/html/classmidi_1_1_midi_udp.png differ diff --git a/docs/html/classmidi_1_1_midi_udp_server-members.html b/docs/html/classmidi_1_1_midi_udp_server-members.html index 53a2781..5489601 100644 --- a/docs/html/classmidi_1_1_midi_udp_server-members.html +++ b/docs/html/classmidi_1_1_midi_udp_server-members.html @@ -66,54 +66,55 @@
-
midi::MidiUdpServer Member List
+
midi::MidiUdpServer< UDPClass > Member List
-

This is the complete list of members for midi::MidiUdpServer, including all inherited members.

+

This is the complete list of members for midi::MidiUdpServer< UDPClass >, including all inherited members.

- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
allNotesOff(int8_t channel=-1)midi::MidiCommonvirtual
begin(IPAddress ip, int serverPort=5008) (defined in midi::MidiUdpServer)midi::MidiUdpServerinline
begin(IPAddress ip, int serverPort=5008) (defined in midi::MidiUdpServer< UDPClass >)midi::MidiUdpServer< UDPClass >inline
begin(Stream &stream) (defined in midi::MidiServer)midi::MidiServerinline
channelPressure(uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
connectionStatus (defined in midi::MidiCommon)midi::MidiCommonprotected
controlChange(uint8_t msg, uint8_t value, int8_t channel=-1)midi::MidiCommonvirtual
end() (defined in midi::MidiServer)midi::MidiServerinlinevirtual
frequencyToNote(float freq)midi::MidiCommonstatic
getConnectionStatus()midi::MidiCommoninlinevirtual
in (defined in midi::MidiServer)midi::MidiServerprotected
is_connected (defined in midi::MidiUdpServer)midi::MidiUdpServerprotected
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
loop() (defined in midi::MidiUdpServer)midi::MidiUdpServerinlinevirtual
MidiCommon()midi::MidiCommon
MidiServer(MidiAction *action) (defined in midi::MidiServer)midi::MidiServerinline
MidiUdpServer(MidiAction *action) (defined in midi::MidiUdpServer)midi::MidiUdpServerinline
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
out (defined in midi::MidiServer)midi::MidiServerprotected
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
p_action (defined in midi::MidiServer)midi::MidiServerprotected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
remote_port (defined in midi::MidiUdpServer)midi::MidiUdpServerprotected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
udp (defined in midi::MidiUdpServer)midi::MidiUdpServerprotected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *msg, int len) (defined in midi::MidiServer)midi::MidiServerinlineprotectedvirtual
~MidiUdpServer() (defined in midi::MidiUdpServer)midi::MidiUdpServerinline
getChannel(uint8_t ch) (defined in midi::MidiCommon)midi::MidiCommonprotected
getConnectionStatus()midi::MidiCommoninlinevirtual
in (defined in midi::MidiServer)midi::MidiServerprotected
is_connected (defined in midi::MidiUdpServer< UDPClass >)midi::MidiUdpServer< UDPClass >protected
localControl(bool active, int8_t channel=-1)midi::MidiCommonvirtual
loop() (defined in midi::MidiUdpServer< UDPClass >)midi::MidiUdpServer< UDPClass >inlinevirtual
MidiCommon()midi::MidiCommon
MidiServer(MidiAction *action) (defined in midi::MidiServer)midi::MidiServerinline
MidiUdpServer(MidiAction *action) (defined in midi::MidiUdpServer< UDPClass >)midi::MidiUdpServer< UDPClass >inline
name (defined in midi::MidiCommon)midi::MidiCommonprotected
noteOff(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteOn(uint8_t note, uint8_t velocity, int8_t channel=-1)midi::MidiCommonvirtual
noteToFrequency(uint8_t note)midi::MidiCommonstatic
out (defined in midi::MidiServer)midi::MidiServerprotected
outMessage (defined in midi::MidiCommon)midi::MidiCommonprotected
p_action (defined in midi::MidiServer)midi::MidiServerprotected
pitchBend(uint16_t value, int8_t channel=-1)midi::MidiCommonvirtual
pMidiAction (defined in midi::MidiCommon)midi::MidiCommonprotected
polyPressure(uint8_t valuePar, int8_t channel=-1)midi::MidiCommonvirtual
programChange(uint8_t program, int8_t channel=-1)midi::MidiCommonvirtual
receivingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
remote_port (defined in midi::MidiUdpServer< UDPClass >)midi::MidiUdpServer< UDPClass >protected
resetAllControllers(int8_t channel=-1)midi::MidiCommonvirtual
sendingChannel (defined in midi::MidiCommon)midi::MidiCommonprotected
setConnectionStatus(ConnectionStatus status) (defined in midi::MidiCommon)midi::MidiCommoninlineprotected
setDefaultSendingChannel(int8_t channel)midi::MidiCommonvirtual
setFilterReceivingChannel(int channel)midi::MidiCommonvirtual
setMidiAction(MidiAction &MidiAction)midi::MidiCommonvirtual
timestampHigh (defined in midi::MidiCommon)midi::MidiCommonprotected
timestampLow (defined in midi::MidiCommon)midi::MidiCommonprotected
udp (defined in midi::MidiUdpServer< UDPClass >)midi::MidiUdpServer< UDPClass >protected
updateTimestamp(MidiMessage *pMsg) (defined in midi::MidiCommon)midi::MidiCommonprotected
write(MidiMessage *msg, int len)midi::MidiCommon
writeData(MidiMessage *msg, int len) (defined in midi::MidiServer)midi::MidiServerinlineprotectedvirtual
~MidiUdpServer() (defined in midi::MidiUdpServer< UDPClass >)midi::MidiUdpServer< UDPClass >inline
diff --git a/docs/html/classmidi_1_1_midi_udp_server.html b/docs/html/classmidi_1_1_midi_udp_server.html index b9511e8..d1cbbdc 100644 --- a/docs/html/classmidi_1_1_midi_udp_server.html +++ b/docs/html/classmidi_1_1_midi_udp_server.html @@ -5,7 +5,7 @@ -arduino-midi: midi::MidiUdpServer Class Reference +arduino-midi: midi::MidiUdpServer< UDPClass > Class Template Reference @@ -72,7 +72,7 @@ Protected Attributes | List of all members
-
midi::MidiUdpServer Class Reference
+
midi::MidiUdpServer< UDPClass > Class Template Reference
@@ -81,28 +81,28 @@

#include <MidiUdpServer.h>

-Inheritance diagram for midi::MidiUdpServer:
+Inheritance diagram for midi::MidiUdpServer< UDPClass >:
- - -midi::MidiServer -midi::MidiCommon + + +midi::MidiServer +midi::MidiCommon
- - + - - + @@ -125,9 +125,9 @@ virtual void  - - + @@ -182,6 +182,9 @@

Public Member Functions

+
 MidiUdpServer (MidiAction *action)
 
 
virtual void allNotesOff (int8_t channel=-1)
 Sends a allNotesOff MIDI command to the output.
 
+
bool begin (IPAddress ip, int serverPort=5008)
 
 
bool begin (Stream &stream)
 
localControl (bool active, int8_t channel=-1)
 Sends a localControl MIDI command to the output.
 
+
void loop ()
 
 
virtual void noteOff (uint8_t note, uint8_t velocity, int8_t channel=-1)
 Sends a noteOff MIDI command to the output.
+ + @@ -200,9 +203,9 @@ - - + @@ -221,9 +224,9 @@ - - + @@ -233,12 +236,15 @@ - - + +

Protected Member Functions

+uint8_t getChannel (uint8_t ch)
 
void setConnectionStatus (ConnectionStatus status)
 
MidiStreamIn in
 
+
bool is_connected = false
 
 
char * name
 
int receivingChannel = -1
 
+
int remote_port = 0
 
 
uint8_t sendingChannel = 0
 
uint8_t timestampLow
 
-MidiUdp * udp =nullptr
 
+MidiUdp< UDPClass > * udp =nullptr
 

Detailed Description

-

A simple UDP Server which receives and creates MIDI messages.

+

template<class UDPClass = WiFiUDP>
+class midi::MidiUdpServer< UDPClass >

+ +

A simple UDP Server which receives and creates MIDI messages.

by Phil Schatzmann

The documentation for this class was generated from the following file:
diff --git a/docs/html/index.html b/docs/html/index.html index e65bb5e..9029939 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -138,6 +138,22 @@

Namespace

All the midi classes are defined using the midi namespace. If you include Midi.h the using namespace is already defined. However, if you include the individual class specific header files you need to add a using namespace midi; in your sketch.

+Class Templates / Alternatives Networking Stacks

+

The following classes support class templates for selecting the networking stack:

+
    +
  • AppleMidiServer
    • +
  • MidiIpserver
    • +
  • MidiUdp
    • +
  • MidiUdpServer
    • +
+

By default the WiFi classes are used. If you want to use it with Ethernet please select the corresponding clases:

+
    +
  • AppleMidiServer<EthernetUDP>
    • +
  • MidiIpserver<EthernetServer, EthernetClient>
    • +
  • MidiUdp<EthernetUDP>
    • +
  • MidiUdpServer<EthernetUDP>
    • +
+

Installation in Arduino

You can download the library as zip and call include Library -> zip library. Or you can git clone this project into the Arduino libraries folder e.g. with

cd ~/Documents/Arduino/libraries
diff --git a/docs/html/menudata.js b/docs/html/menudata.js index 0cabee2..9b974d0 100644 --- a/docs/html/menudata.js +++ b/docs/html/menudata.js @@ -33,7 +33,6 @@ var menudata={children:[ {text:"a",url:"functions.html#index_a"}, {text:"b",url:"functions.html#index_b"}, {text:"c",url:"functions.html#index_c"}, -{text:"e",url:"functions.html#index_e"}, {text:"f",url:"functions.html#index_f"}, {text:"g",url:"functions.html#index_g"}, {text:"l",url:"functions.html#index_l"}, @@ -43,14 +42,12 @@ var menudata={children:[ {text:"p",url:"functions.html#index_p"}, {text:"r",url:"functions.html#index_r"}, {text:"s",url:"functions.html#index_s"}, -{text:"t",url:"functions.html#index_t"}, {text:"w",url:"functions.html#index_w"}, {text:"~",url:"functions.html#index__7E"}]}, {text:"Functions",url:"functions_func.html",children:[ {text:"a",url:"functions_func.html#index_a"}, {text:"b",url:"functions_func.html#index_b"}, {text:"c",url:"functions_func.html#index_c"}, -{text:"e",url:"functions_func.html#index_e"}, {text:"f",url:"functions_func.html#index_f"}, {text:"g",url:"functions_func.html#index_g"}, {text:"l",url:"functions_func.html#index_l"}, @@ -60,7 +57,6 @@ var menudata={children:[ {text:"p",url:"functions_func.html#index_p"}, {text:"r",url:"functions_func.html#index_r"}, {text:"s",url:"functions_func.html#index_s"}, -{text:"t",url:"functions_func.html#index_t"}, {text:"w",url:"functions_func.html#index_w"}, {text:"~",url:"functions_func.html#index__7E"}]}]}]}, {text:"Files",url:"files.html",children:[ diff --git a/docs/html/search/all_0.js b/docs/html/search/all_0.js index 5bbd88c..0e5bb15 100644 --- a/docs/html/search/all_0.js +++ b/docs/html/search/all_0.js @@ -1,8 +1,6 @@ var searchData= [ ['allnotesoff_0',['allNotesOff',['../classmidi_1_1_midi_common.html#ae14155807a18449e6c3a2117b99aef82',1,'midi::MidiCommon']]], - ['applemidi_5fcallback_5fmidi_5fmessage_5freceived_1',['applemidi_callback_midi_message_received',['../classmidi_1_1_apple_midi_server.html#a64f4b542d24758152aca731d2aa4efac',1,'midi::AppleMidiServer']]], - ['applemidi_5fif_5fsend_5fudp_5fdatagram_2',['applemidi_if_send_udp_datagram',['../classmidi_1_1_apple_midi_server.html#ad581bec85909cfe3a21ae92f1f99c4a6',1,'midi::AppleMidiServer']]], - ['applemidiserver_3',['AppleMidiServer',['../classmidi_1_1_apple_midi_server.html',1,'midi']]], - ['arduino_20midi_20library_4',['Arduino MIDI Library',['../index.html',1,'']]] + ['applemidiserver_1',['AppleMidiServer',['../classmidi_1_1_apple_midi_server.html',1,'midi']]], + ['arduino_20midi_20library_2',['Arduino MIDI Library',['../index.html',1,'']]] ]; diff --git a/docs/html/search/all_1.js b/docs/html/search/all_1.js index b10353c..c828d16 100644 --- a/docs/html/search/all_1.js +++ b/docs/html/search/all_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['begin_5',['begin',['../classmidi_1_1_apple_midi_server.html#aa000d4daf57fbbfa35e9c32833f0dddd',1,'midi::AppleMidiServer::begin(int control_port=APPLEMIDI_DEFAULT_PORT)'],['../classmidi_1_1_apple_midi_server.html#a16a4047422def0acca488ed6727e95f2',1,'midi::AppleMidiServer::begin(IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1)'],['../classmidi_1_1_midi_ble_client.html#a149d7fcadf59b4fc97fb5497126866d1',1,'midi::MidiBleClient::begin(MidiAction &MidiAction)'],['../classmidi_1_1_midi_ble_client.html#a6331498692fdad1b2bfb58e21c1ce407',1,'midi::MidiBleClient::begin(BLEAdvertisedDevice *pDevice)'],['../classmidi_1_1_midi_ble_server.html#aacab3b85bf2fc7565f51eae9e8632251',1,'midi::MidiBleServer::begin()'],['../classmidi_1_1_midi_parser.html#a9db739297e9dba37b5e814da6f079b42',1,'midi::MidiParser::begin()']]] + ['begin_3',['begin',['../classmidi_1_1_midi_ble_client.html#a149d7fcadf59b4fc97fb5497126866d1',1,'midi::MidiBleClient::begin(MidiAction &MidiAction)'],['../classmidi_1_1_midi_ble_client.html#a6331498692fdad1b2bfb58e21c1ce407',1,'midi::MidiBleClient::begin(BLEAdvertisedDevice *pDevice)'],['../classmidi_1_1_midi_ble_server.html#aacab3b85bf2fc7565f51eae9e8632251',1,'midi::MidiBleServer::begin()'],['../classmidi_1_1_midi_parser.html#a9db739297e9dba37b5e814da6f079b42',1,'midi::MidiParser::begin()']]] ]; diff --git a/docs/html/search/all_2.js b/docs/html/search/all_2.js index e4dc688..dcd4ce7 100644 --- a/docs/html/search/all_2.js +++ b/docs/html/search/all_2.js @@ -1,5 +1,5 @@ var searchData= [ - ['channelpressure_6',['channelPressure',['../classmidi_1_1_midi_common.html#a599481be137cbc0ae57c288a593e8dcf',1,'midi::MidiCommon']]], - ['controlchange_7',['controlChange',['../classmidi_1_1_midi_common.html#aa80729b4b9932838ddef4fe48242510b',1,'midi::MidiCommon']]] + ['channelpressure_4',['channelPressure',['../classmidi_1_1_midi_common.html#a599481be137cbc0ae57c288a593e8dcf',1,'midi::MidiCommon']]], + ['controlchange_5',['controlChange',['../classmidi_1_1_midi_common.html#aa80729b4b9932838ddef4fe48242510b',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/all_3.js b/docs/html/search/all_3.js index c1187c2..86393f1 100644 --- a/docs/html/search/all_3.js +++ b/docs/html/search/all_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['end_8',['end',['../classmidi_1_1_apple_midi_server.html#a9b495dd596d1aa3f146e07e675c8be4e',1,'midi::AppleMidiServer']]] + ['frequencytonote_6',['frequencyToNote',['../classmidi_1_1_midi_common.html#a3e35624c72c46369acd5eda8e293b056',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/all_4.js b/docs/html/search/all_4.js index e750882..daefe46 100644 --- a/docs/html/search/all_4.js +++ b/docs/html/search/all_4.js @@ -1,4 +1,5 @@ var searchData= [ - ['frequencytonote_9',['frequencyToNote',['../classmidi_1_1_midi_common.html#a3e35624c72c46369acd5eda8e293b056',1,'midi::MidiCommon']]] + ['getbleadvertiseddevice_7',['getBLEAdvertisedDevice',['../classmidi_1_1_midi_ble_client.html#aca50f8ddc38a5939e17db59434d0f485',1,'midi::MidiBleClient']]], + ['getconnectionstatus_8',['getConnectionStatus',['../classmidi_1_1_midi_common.html#abe9bfaacf6e738555f1394ef24fcb200',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/all_5.js b/docs/html/search/all_5.js index 1ffaf15..ef38d95 100644 --- a/docs/html/search/all_5.js +++ b/docs/html/search/all_5.js @@ -1,5 +1,4 @@ var searchData= [ - ['getbleadvertiseddevice_10',['getBLEAdvertisedDevice',['../classmidi_1_1_midi_ble_client.html#aca50f8ddc38a5939e17db59434d0f485',1,'midi::MidiBleClient']]], - ['getconnectionstatus_11',['getConnectionStatus',['../classmidi_1_1_midi_common.html#abe9bfaacf6e738555f1394ef24fcb200',1,'midi::MidiCommon']]] + ['localcontrol_9',['localControl',['../classmidi_1_1_midi_common.html#a164dfde583e2e3fdf3e8a277954a3632',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/all_6.js b/docs/html/search/all_6.js index a5fefc0..4973bbf 100644 --- a/docs/html/search/all_6.js +++ b/docs/html/search/all_6.js @@ -1,5 +1,21 @@ var searchData= [ - ['localcontrol_12',['localControl',['../classmidi_1_1_midi_common.html#a164dfde583e2e3fdf3e8a277954a3632',1,'midi::MidiCommon']]], - ['loop_13',['loop',['../classmidi_1_1_apple_midi_server.html#a06c6802d81d37bb6e9770a9939bb42f6',1,'midi::AppleMidiServer']]] + ['midiaction_10',['MidiAction',['../classmidi_1_1_midi_action.html',1,'midi']]], + ['midibleclient_11',['MidiBleClient',['../classmidi_1_1_midi_ble_client.html',1,'midi::MidiBleClient'],['../classmidi_1_1_midi_ble_client.html#a84dd40db5d96e88040ecfae823e9c6bf',1,'midi::MidiBleClient::MidiBleClient()']]], + ['midibleclientadvertiseddevicecallbacks_12',['MidiBleClientAdvertisedDeviceCallbacks',['../classmidi_1_1_midi_ble_client_advertised_device_callbacks.html',1,'midi']]], + ['midibleclientcallback_13',['MidiBleClientCallback',['../classmidi_1_1_midi_ble_client_callback.html',1,'midi']]], + ['midibleparser_14',['MidiBleParser',['../classmidi_1_1_midi_ble_parser.html',1,'midi']]], + ['midibleserver_15',['MidiBleServer',['../classmidi_1_1_midi_ble_server.html',1,'midi::MidiBleServer'],['../classmidi_1_1_midi_ble_server.html#a088de9cfdaef1106d379dd5362df25dc',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiAction *MidiAction, int channelFilter=-1)'],['../classmidi_1_1_midi_ble_server.html#a638f856c98c372fc8c701dbd3b456d7a',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiBleParser *pEventHandler=nullptr)']]], + ['midibleservercallback_16',['MidiBleServerCallback',['../classmidi_1_1_midi_ble_server_callback.html',1,'midi']]], + ['midicallbackaction_17',['MidiCallbackAction',['../classmidi_1_1_midi_callback_action.html',1,'midi']]], + ['midicommon_18',['MidiCommon',['../classmidi_1_1_midi_common.html',1,'midi::MidiCommon'],['../classmidi_1_1_midi_common.html#a5d28740bb1ff94ae47c41fbf6fa6386f',1,'midi::MidiCommon::MidiCommon()']]], + ['midiipserver_19',['MidiIpServer',['../classmidi_1_1_midi_ip_server.html',1,'midi']]], + ['midimessage_20',['MidiMessage',['../structmidi_1_1_midi_message.html',1,'midi']]], + ['midiparser_21',['MidiParser',['../classmidi_1_1_midi_parser.html',1,'midi']]], + ['midiserver_22',['MidiServer',['../classmidi_1_1_midi_server.html',1,'midi']]], + ['midistreamin_23',['MidiStreamIn',['../classmidi_1_1_midi_stream_in.html',1,'midi::MidiStreamIn'],['../classmidi_1_1_midi_stream_in.html#a73ec2d94884c80251c1c6e361fd8de7a',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiAction &action)'],['../classmidi_1_1_midi_stream_in.html#ab46aa6df8e812940fb428ae16febce74',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiParser &handler)']]], + ['midistreamout_24',['MidiStreamOut',['../classmidi_1_1_midi_stream_out.html',1,'midi::MidiStreamOut'],['../classmidi_1_1_midi_stream_out.html#a0fbeff09783349216997619e9eadd9a7',1,'midi::MidiStreamOut::MidiStreamOut()']]], + ['midiudp_25',['MidiUdp',['../classmidi_1_1_midi_udp.html',1,'midi']]], + ['midiudp_3c_20wifiudp_20_3e_26',['MidiUdp< WiFiUDP >',['../classmidi_1_1_midi_udp.html',1,'midi']]], + ['midiudpserver_27',['MidiUdpServer',['../classmidi_1_1_midi_udp_server.html',1,'midi']]] ]; diff --git a/docs/html/search/all_7.js b/docs/html/search/all_7.js index af4f967..b75097c 100644 --- a/docs/html/search/all_7.js +++ b/docs/html/search/all_7.js @@ -1,20 +1,6 @@ var searchData= [ - ['midiaction_14',['MidiAction',['../classmidi_1_1_midi_action.html',1,'midi']]], - ['midibleclient_15',['MidiBleClient',['../classmidi_1_1_midi_ble_client.html',1,'midi::MidiBleClient'],['../classmidi_1_1_midi_ble_client.html#a84dd40db5d96e88040ecfae823e9c6bf',1,'midi::MidiBleClient::MidiBleClient()']]], - ['midibleclientadvertiseddevicecallbacks_16',['MidiBleClientAdvertisedDeviceCallbacks',['../classmidi_1_1_midi_ble_client_advertised_device_callbacks.html',1,'midi']]], - ['midibleclientcallback_17',['MidiBleClientCallback',['../classmidi_1_1_midi_ble_client_callback.html',1,'midi']]], - ['midibleparser_18',['MidiBleParser',['../classmidi_1_1_midi_ble_parser.html',1,'midi']]], - ['midibleserver_19',['MidiBleServer',['../classmidi_1_1_midi_ble_server.html',1,'midi::MidiBleServer'],['../classmidi_1_1_midi_ble_server.html#a088de9cfdaef1106d379dd5362df25dc',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiAction *MidiAction, int channelFilter=-1)'],['../classmidi_1_1_midi_ble_server.html#a638f856c98c372fc8c701dbd3b456d7a',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiBleParser *pEventHandler=nullptr)']]], - ['midibleservercallback_20',['MidiBleServerCallback',['../classmidi_1_1_midi_ble_server_callback.html',1,'midi']]], - ['midicallbackaction_21',['MidiCallbackAction',['../classmidi_1_1_midi_callback_action.html',1,'midi']]], - ['midicommon_22',['MidiCommon',['../classmidi_1_1_midi_common.html',1,'midi::MidiCommon'],['../classmidi_1_1_midi_common.html#a5d28740bb1ff94ae47c41fbf6fa6386f',1,'midi::MidiCommon::MidiCommon()']]], - ['midiipserver_23',['MidiIpServer',['../classmidi_1_1_midi_ip_server.html',1,'midi']]], - ['midimessage_24',['MidiMessage',['../structmidi_1_1_midi_message.html',1,'midi']]], - ['midiparser_25',['MidiParser',['../classmidi_1_1_midi_parser.html',1,'midi']]], - ['midiserver_26',['MidiServer',['../classmidi_1_1_midi_server.html',1,'midi']]], - ['midistreamin_27',['MidiStreamIn',['../classmidi_1_1_midi_stream_in.html',1,'midi::MidiStreamIn'],['../classmidi_1_1_midi_stream_in.html#a73ec2d94884c80251c1c6e361fd8de7a',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiAction &action)'],['../classmidi_1_1_midi_stream_in.html#ab46aa6df8e812940fb428ae16febce74',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiParser &handler)']]], - ['midistreamout_28',['MidiStreamOut',['../classmidi_1_1_midi_stream_out.html',1,'midi::MidiStreamOut'],['../classmidi_1_1_midi_stream_out.html#a0fbeff09783349216997619e9eadd9a7',1,'midi::MidiStreamOut::MidiStreamOut()']]], - ['midiudp_29',['MidiUdp',['../classmidi_1_1_midi_udp.html',1,'midi']]], - ['midiudpserver_30',['MidiUdpServer',['../classmidi_1_1_midi_udp_server.html',1,'midi']]] + ['noteoff_28',['noteOff',['../classmidi_1_1_midi_common.html#a7bffbeb8f4f625a551f741d6ec515da3',1,'midi::MidiCommon']]], + ['noteon_29',['noteOn',['../classmidi_1_1_midi_common.html#a7e026258c4355d38dedda82f1862141c',1,'midi::MidiCommon']]], + ['notetofrequency_30',['noteToFrequency',['../classmidi_1_1_midi_common.html#a95a089c4af7d0809094255de9a4bf242',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/all_8.js b/docs/html/search/all_8.js index 58c2c1f..04c9863 100644 --- a/docs/html/search/all_8.js +++ b/docs/html/search/all_8.js @@ -1,6 +1,5 @@ var searchData= [ - ['noteoff_31',['noteOff',['../classmidi_1_1_midi_common.html#a7bffbeb8f4f625a551f741d6ec515da3',1,'midi::MidiCommon']]], - ['noteon_32',['noteOn',['../classmidi_1_1_midi_common.html#a7e026258c4355d38dedda82f1862141c',1,'midi::MidiCommon']]], - ['notetofrequency_33',['noteToFrequency',['../classmidi_1_1_midi_common.html#a95a089c4af7d0809094255de9a4bf242',1,'midi::MidiCommon']]] + ['onread_31',['onRead',['../classmidi_1_1_midi_ble_parser.html#ae33ee6f66d6f3db8c66a9ef12d90342d',1,'midi::MidiBleParser']]], + ['onwrite_32',['onWrite',['../classmidi_1_1_midi_ble_parser.html#a942cea11308ec90ebaa61935cc543986',1,'midi::MidiBleParser']]] ]; diff --git a/docs/html/search/all_9.js b/docs/html/search/all_9.js index 4a99fe6..a84e2e7 100644 --- a/docs/html/search/all_9.js +++ b/docs/html/search/all_9.js @@ -1,5 +1,7 @@ var searchData= [ - ['onread_34',['onRead',['../classmidi_1_1_midi_ble_parser.html#ae33ee6f66d6f3db8c66a9ef12d90342d',1,'midi::MidiBleParser']]], - ['onwrite_35',['onWrite',['../classmidi_1_1_midi_ble_parser.html#a942cea11308ec90ebaa61935cc543986',1,'midi::MidiBleParser']]] + ['parse_33',['parse',['../classmidi_1_1_midi_parser.html#acc0c2865b2ebb8d40d8c0b81e9b2d9b6',1,'midi::MidiParser']]], + ['pitchbend_34',['pitchBend',['../classmidi_1_1_midi_common.html#ac1ef192cf2b1adfcc89d4cf3db5e80a3',1,'midi::MidiCommon']]], + ['polypressure_35',['polyPressure',['../classmidi_1_1_midi_common.html#a00771509caca2e46fb273b1ae8178517',1,'midi::MidiCommon']]], + ['programchange_36',['programChange',['../classmidi_1_1_midi_common.html#aee00ffec71667ca134c697a115e649f9',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/all_a.js b/docs/html/search/all_a.js index fa235f2..e599479 100644 --- a/docs/html/search/all_a.js +++ b/docs/html/search/all_a.js @@ -1,7 +1,4 @@ var searchData= [ - ['parse_36',['parse',['../classmidi_1_1_midi_parser.html#acc0c2865b2ebb8d40d8c0b81e9b2d9b6',1,'midi::MidiParser']]], - ['pitchbend_37',['pitchBend',['../classmidi_1_1_midi_common.html#ac1ef192cf2b1adfcc89d4cf3db5e80a3',1,'midi::MidiCommon']]], - ['polypressure_38',['polyPressure',['../classmidi_1_1_midi_common.html#a00771509caca2e46fb273b1ae8178517',1,'midi::MidiCommon']]], - ['programchange_39',['programChange',['../classmidi_1_1_midi_common.html#aee00ffec71667ca134c697a115e649f9',1,'midi::MidiCommon']]] + ['resetallcontrollers_37',['resetAllControllers',['../classmidi_1_1_midi_common.html#a64a34fef651a7ad879975e9feef2394c',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/all_b.js b/docs/html/search/all_b.js index da240f9..9e9cabe 100644 --- a/docs/html/search/all_b.js +++ b/docs/html/search/all_b.js @@ -1,4 +1,7 @@ var searchData= [ - ['resetallcontrollers_40',['resetAllControllers',['../classmidi_1_1_midi_common.html#a64a34fef651a7ad879975e9feef2394c',1,'midi::MidiCommon']]] + ['setdefaultsendingchannel_38',['setDefaultSendingChannel',['../classmidi_1_1_midi_common.html#a1fc898c0b3dfeddef8515df50abac9d2',1,'midi::MidiCommon']]], + ['setfilterreceivingchannel_39',['setFilterReceivingChannel',['../classmidi_1_1_midi_common.html#a0ccfb10ae26c6855310de2443c319af1',1,'midi::MidiCommon']]], + ['setmidiaction_40',['setMidiAction',['../classmidi_1_1_midi_common.html#afdc7e84bfe245486503768f271680e1f',1,'midi::MidiCommon']]], + ['setup_41',['setup',['../classmidi_1_1_midi_stream_in.html#a0d28ac77f721f80b1a2c6e812b3804a9',1,'midi::MidiStreamIn::setup()'],['../classmidi_1_1_midi_stream_out.html#a3d9f4f789bd9e65c43e660f8b19fb704',1,'midi::MidiStreamOut::setup()']]] ]; diff --git a/docs/html/search/all_c.js b/docs/html/search/all_c.js index b767210..3017a6a 100644 --- a/docs/html/search/all_c.js +++ b/docs/html/search/all_c.js @@ -1,9 +1,5 @@ var searchData= [ - ['setdefaultsendingchannel_41',['setDefaultSendingChannel',['../classmidi_1_1_midi_common.html#a1fc898c0b3dfeddef8515df50abac9d2',1,'midi::MidiCommon']]], - ['setfilterreceivingchannel_42',['setFilterReceivingChannel',['../classmidi_1_1_midi_common.html#a0ccfb10ae26c6855310de2443c319af1',1,'midi::MidiCommon']]], - ['setmidiaction_43',['setMidiAction',['../classmidi_1_1_midi_common.html#afdc7e84bfe245486503768f271680e1f',1,'midi::MidiCommon']]], - ['setname_44',['setName',['../classmidi_1_1_apple_midi_server.html#aaa7580134db96147cbd55be63d0f2bdc',1,'midi::AppleMidiServer']]], - ['setuplogger_45',['setupLogger',['../classmidi_1_1_apple_midi_server.html#a6696d18b0d9d65b1e9f6a514b597a47f',1,'midi::AppleMidiServer']]], - ['setupmdns_46',['setupMDns',['../classmidi_1_1_apple_midi_server.html#a16d4cd3d35d5f02ced5d69f453f2f143',1,'midi::AppleMidiServer']]] + ['write_42',['write',['../classmidi_1_1_midi_common.html#ab6d5f15c999e24882e9ddade36af1577',1,'midi::MidiCommon']]], + ['writedata_43',['writeData',['../classmidi_1_1_midi_ble_client.html#a893c26eb05a3b52e1168d9713bc67096',1,'midi::MidiBleClient']]] ]; diff --git a/docs/html/search/all_d.js b/docs/html/search/all_d.js index 93608e0..2db3440 100644 --- a/docs/html/search/all_d.js +++ b/docs/html/search/all_d.js @@ -1,5 +1,4 @@ var searchData= [ - ['tick_47',['tick',['../classmidi_1_1_apple_midi_server.html#a34bca48f3788242ea90d5883912e2b0a',1,'midi::AppleMidiServer']]], - ['tostr_48',['toStr',['../classmidi_1_1_apple_midi_server.html#a8052a1bf508977c07f5cf9a012e4af51',1,'midi::AppleMidiServer']]] + ['_7emidistreamin_44',['~MidiStreamIn',['../classmidi_1_1_midi_stream_in.html#aadf64b3479f9b35bf466c49595622131',1,'midi::MidiStreamIn']]] ]; diff --git a/docs/html/search/classes_0.js b/docs/html/search/classes_0.js index 8d55e6f..dc7a764 100644 --- a/docs/html/search/classes_0.js +++ b/docs/html/search/classes_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['applemidiserver_52',['AppleMidiServer',['../classmidi_1_1_apple_midi_server.html',1,'midi']]] + ['applemidiserver_45',['AppleMidiServer',['../classmidi_1_1_apple_midi_server.html',1,'midi']]] ]; diff --git a/docs/html/search/classes_1.js b/docs/html/search/classes_1.js index b5459a0..a79930b 100644 --- a/docs/html/search/classes_1.js +++ b/docs/html/search/classes_1.js @@ -1,20 +1,21 @@ var searchData= [ - ['midiaction_53',['MidiAction',['../classmidi_1_1_midi_action.html',1,'midi']]], - ['midibleclient_54',['MidiBleClient',['../classmidi_1_1_midi_ble_client.html',1,'midi']]], - ['midibleclientadvertiseddevicecallbacks_55',['MidiBleClientAdvertisedDeviceCallbacks',['../classmidi_1_1_midi_ble_client_advertised_device_callbacks.html',1,'midi']]], - ['midibleclientcallback_56',['MidiBleClientCallback',['../classmidi_1_1_midi_ble_client_callback.html',1,'midi']]], - ['midibleparser_57',['MidiBleParser',['../classmidi_1_1_midi_ble_parser.html',1,'midi']]], - ['midibleserver_58',['MidiBleServer',['../classmidi_1_1_midi_ble_server.html',1,'midi']]], - ['midibleservercallback_59',['MidiBleServerCallback',['../classmidi_1_1_midi_ble_server_callback.html',1,'midi']]], - ['midicallbackaction_60',['MidiCallbackAction',['../classmidi_1_1_midi_callback_action.html',1,'midi']]], - ['midicommon_61',['MidiCommon',['../classmidi_1_1_midi_common.html',1,'midi']]], - ['midiipserver_62',['MidiIpServer',['../classmidi_1_1_midi_ip_server.html',1,'midi']]], - ['midimessage_63',['MidiMessage',['../structmidi_1_1_midi_message.html',1,'midi']]], - ['midiparser_64',['MidiParser',['../classmidi_1_1_midi_parser.html',1,'midi']]], - ['midiserver_65',['MidiServer',['../classmidi_1_1_midi_server.html',1,'midi']]], - ['midistreamin_66',['MidiStreamIn',['../classmidi_1_1_midi_stream_in.html',1,'midi']]], - ['midistreamout_67',['MidiStreamOut',['../classmidi_1_1_midi_stream_out.html',1,'midi']]], - ['midiudp_68',['MidiUdp',['../classmidi_1_1_midi_udp.html',1,'midi']]], - ['midiudpserver_69',['MidiUdpServer',['../classmidi_1_1_midi_udp_server.html',1,'midi']]] + ['midiaction_46',['MidiAction',['../classmidi_1_1_midi_action.html',1,'midi']]], + ['midibleclient_47',['MidiBleClient',['../classmidi_1_1_midi_ble_client.html',1,'midi']]], + ['midibleclientadvertiseddevicecallbacks_48',['MidiBleClientAdvertisedDeviceCallbacks',['../classmidi_1_1_midi_ble_client_advertised_device_callbacks.html',1,'midi']]], + ['midibleclientcallback_49',['MidiBleClientCallback',['../classmidi_1_1_midi_ble_client_callback.html',1,'midi']]], + ['midibleparser_50',['MidiBleParser',['../classmidi_1_1_midi_ble_parser.html',1,'midi']]], + ['midibleserver_51',['MidiBleServer',['../classmidi_1_1_midi_ble_server.html',1,'midi']]], + ['midibleservercallback_52',['MidiBleServerCallback',['../classmidi_1_1_midi_ble_server_callback.html',1,'midi']]], + ['midicallbackaction_53',['MidiCallbackAction',['../classmidi_1_1_midi_callback_action.html',1,'midi']]], + ['midicommon_54',['MidiCommon',['../classmidi_1_1_midi_common.html',1,'midi']]], + ['midiipserver_55',['MidiIpServer',['../classmidi_1_1_midi_ip_server.html',1,'midi']]], + ['midimessage_56',['MidiMessage',['../structmidi_1_1_midi_message.html',1,'midi']]], + ['midiparser_57',['MidiParser',['../classmidi_1_1_midi_parser.html',1,'midi']]], + ['midiserver_58',['MidiServer',['../classmidi_1_1_midi_server.html',1,'midi']]], + ['midistreamin_59',['MidiStreamIn',['../classmidi_1_1_midi_stream_in.html',1,'midi']]], + ['midistreamout_60',['MidiStreamOut',['../classmidi_1_1_midi_stream_out.html',1,'midi']]], + ['midiudp_61',['MidiUdp',['../classmidi_1_1_midi_udp.html',1,'midi']]], + ['midiudp_3c_20wifiudp_20_3e_62',['MidiUdp< WiFiUDP >',['../classmidi_1_1_midi_udp.html',1,'midi']]], + ['midiudpserver_63',['MidiUdpServer',['../classmidi_1_1_midi_udp_server.html',1,'midi']]] ]; diff --git a/docs/html/search/functions_0.js b/docs/html/search/functions_0.js index 80a608e..c1be66e 100644 --- a/docs/html/search/functions_0.js +++ b/docs/html/search/functions_0.js @@ -1,6 +1,4 @@ var searchData= [ - ['allnotesoff_70',['allNotesOff',['../classmidi_1_1_midi_common.html#ae14155807a18449e6c3a2117b99aef82',1,'midi::MidiCommon']]], - ['applemidi_5fcallback_5fmidi_5fmessage_5freceived_71',['applemidi_callback_midi_message_received',['../classmidi_1_1_apple_midi_server.html#a64f4b542d24758152aca731d2aa4efac',1,'midi::AppleMidiServer']]], - ['applemidi_5fif_5fsend_5fudp_5fdatagram_72',['applemidi_if_send_udp_datagram',['../classmidi_1_1_apple_midi_server.html#ad581bec85909cfe3a21ae92f1f99c4a6',1,'midi::AppleMidiServer']]] + ['allnotesoff_64',['allNotesOff',['../classmidi_1_1_midi_common.html#ae14155807a18449e6c3a2117b99aef82',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_1.js b/docs/html/search/functions_1.js index 7d7f0d8..ed8a39c 100644 --- a/docs/html/search/functions_1.js +++ b/docs/html/search/functions_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['begin_73',['begin',['../classmidi_1_1_apple_midi_server.html#aa000d4daf57fbbfa35e9c32833f0dddd',1,'midi::AppleMidiServer::begin(int control_port=APPLEMIDI_DEFAULT_PORT)'],['../classmidi_1_1_apple_midi_server.html#a16a4047422def0acca488ed6727e95f2',1,'midi::AppleMidiServer::begin(IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1)'],['../classmidi_1_1_midi_ble_client.html#a149d7fcadf59b4fc97fb5497126866d1',1,'midi::MidiBleClient::begin(MidiAction &MidiAction)'],['../classmidi_1_1_midi_ble_client.html#a6331498692fdad1b2bfb58e21c1ce407',1,'midi::MidiBleClient::begin(BLEAdvertisedDevice *pDevice)'],['../classmidi_1_1_midi_ble_server.html#aacab3b85bf2fc7565f51eae9e8632251',1,'midi::MidiBleServer::begin()'],['../classmidi_1_1_midi_parser.html#a9db739297e9dba37b5e814da6f079b42',1,'midi::MidiParser::begin()']]] + ['begin_65',['begin',['../classmidi_1_1_midi_ble_client.html#a149d7fcadf59b4fc97fb5497126866d1',1,'midi::MidiBleClient::begin(MidiAction &MidiAction)'],['../classmidi_1_1_midi_ble_client.html#a6331498692fdad1b2bfb58e21c1ce407',1,'midi::MidiBleClient::begin(BLEAdvertisedDevice *pDevice)'],['../classmidi_1_1_midi_ble_server.html#aacab3b85bf2fc7565f51eae9e8632251',1,'midi::MidiBleServer::begin()'],['../classmidi_1_1_midi_parser.html#a9db739297e9dba37b5e814da6f079b42',1,'midi::MidiParser::begin()']]] ]; diff --git a/docs/html/search/functions_2.js b/docs/html/search/functions_2.js index 303349c..af7f827 100644 --- a/docs/html/search/functions_2.js +++ b/docs/html/search/functions_2.js @@ -1,5 +1,5 @@ var searchData= [ - ['channelpressure_74',['channelPressure',['../classmidi_1_1_midi_common.html#a599481be137cbc0ae57c288a593e8dcf',1,'midi::MidiCommon']]], - ['controlchange_75',['controlChange',['../classmidi_1_1_midi_common.html#aa80729b4b9932838ddef4fe48242510b',1,'midi::MidiCommon']]] + ['channelpressure_66',['channelPressure',['../classmidi_1_1_midi_common.html#a599481be137cbc0ae57c288a593e8dcf',1,'midi::MidiCommon']]], + ['controlchange_67',['controlChange',['../classmidi_1_1_midi_common.html#aa80729b4b9932838ddef4fe48242510b',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_3.js b/docs/html/search/functions_3.js index 51c7a1c..110d91d 100644 --- a/docs/html/search/functions_3.js +++ b/docs/html/search/functions_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['end_76',['end',['../classmidi_1_1_apple_midi_server.html#a9b495dd596d1aa3f146e07e675c8be4e',1,'midi::AppleMidiServer']]] + ['frequencytonote_68',['frequencyToNote',['../classmidi_1_1_midi_common.html#a3e35624c72c46369acd5eda8e293b056',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_4.js b/docs/html/search/functions_4.js index c77ee0d..19bce0a 100644 --- a/docs/html/search/functions_4.js +++ b/docs/html/search/functions_4.js @@ -1,4 +1,5 @@ var searchData= [ - ['frequencytonote_77',['frequencyToNote',['../classmidi_1_1_midi_common.html#a3e35624c72c46369acd5eda8e293b056',1,'midi::MidiCommon']]] + ['getbleadvertiseddevice_69',['getBLEAdvertisedDevice',['../classmidi_1_1_midi_ble_client.html#aca50f8ddc38a5939e17db59434d0f485',1,'midi::MidiBleClient']]], + ['getconnectionstatus_70',['getConnectionStatus',['../classmidi_1_1_midi_common.html#abe9bfaacf6e738555f1394ef24fcb200',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_5.js b/docs/html/search/functions_5.js index dfa09f0..4c2a9b8 100644 --- a/docs/html/search/functions_5.js +++ b/docs/html/search/functions_5.js @@ -1,5 +1,4 @@ var searchData= [ - ['getbleadvertiseddevice_78',['getBLEAdvertisedDevice',['../classmidi_1_1_midi_ble_client.html#aca50f8ddc38a5939e17db59434d0f485',1,'midi::MidiBleClient']]], - ['getconnectionstatus_79',['getConnectionStatus',['../classmidi_1_1_midi_common.html#abe9bfaacf6e738555f1394ef24fcb200',1,'midi::MidiCommon']]] + ['localcontrol_71',['localControl',['../classmidi_1_1_midi_common.html#a164dfde583e2e3fdf3e8a277954a3632',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_6.js b/docs/html/search/functions_6.js index 99efc4c..23fa7a1 100644 --- a/docs/html/search/functions_6.js +++ b/docs/html/search/functions_6.js @@ -1,5 +1,8 @@ var searchData= [ - ['localcontrol_80',['localControl',['../classmidi_1_1_midi_common.html#a164dfde583e2e3fdf3e8a277954a3632',1,'midi::MidiCommon']]], - ['loop_81',['loop',['../classmidi_1_1_apple_midi_server.html#a06c6802d81d37bb6e9770a9939bb42f6',1,'midi::AppleMidiServer']]] + ['midibleclient_72',['MidiBleClient',['../classmidi_1_1_midi_ble_client.html#a84dd40db5d96e88040ecfae823e9c6bf',1,'midi::MidiBleClient']]], + ['midibleserver_73',['MidiBleServer',['../classmidi_1_1_midi_ble_server.html#a638f856c98c372fc8c701dbd3b456d7a',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiBleParser *pEventHandler=nullptr)'],['../classmidi_1_1_midi_ble_server.html#a088de9cfdaef1106d379dd5362df25dc',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiAction *MidiAction, int channelFilter=-1)']]], + ['midicommon_74',['MidiCommon',['../classmidi_1_1_midi_common.html#a5d28740bb1ff94ae47c41fbf6fa6386f',1,'midi::MidiCommon']]], + ['midistreamin_75',['MidiStreamIn',['../classmidi_1_1_midi_stream_in.html#a73ec2d94884c80251c1c6e361fd8de7a',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiAction &action)'],['../classmidi_1_1_midi_stream_in.html#ab46aa6df8e812940fb428ae16febce74',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiParser &handler)']]], + ['midistreamout_76',['MidiStreamOut',['../classmidi_1_1_midi_stream_out.html#a0fbeff09783349216997619e9eadd9a7',1,'midi::MidiStreamOut']]] ]; diff --git a/docs/html/search/functions_7.js b/docs/html/search/functions_7.js index 0e14dcb..4025a52 100644 --- a/docs/html/search/functions_7.js +++ b/docs/html/search/functions_7.js @@ -1,8 +1,6 @@ var searchData= [ - ['midibleclient_82',['MidiBleClient',['../classmidi_1_1_midi_ble_client.html#a84dd40db5d96e88040ecfae823e9c6bf',1,'midi::MidiBleClient']]], - ['midibleserver_83',['MidiBleServer',['../classmidi_1_1_midi_ble_server.html#a638f856c98c372fc8c701dbd3b456d7a',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiBleParser *pEventHandler=nullptr)'],['../classmidi_1_1_midi_ble_server.html#a088de9cfdaef1106d379dd5362df25dc',1,'midi::MidiBleServer::MidiBleServer(const char *name, MidiAction *MidiAction, int channelFilter=-1)']]], - ['midicommon_84',['MidiCommon',['../classmidi_1_1_midi_common.html#a5d28740bb1ff94ae47c41fbf6fa6386f',1,'midi::MidiCommon']]], - ['midistreamin_85',['MidiStreamIn',['../classmidi_1_1_midi_stream_in.html#a73ec2d94884c80251c1c6e361fd8de7a',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiAction &action)'],['../classmidi_1_1_midi_stream_in.html#ab46aa6df8e812940fb428ae16febce74',1,'midi::MidiStreamIn::MidiStreamIn(Stream &stream, MidiParser &handler)']]], - ['midistreamout_86',['MidiStreamOut',['../classmidi_1_1_midi_stream_out.html#a0fbeff09783349216997619e9eadd9a7',1,'midi::MidiStreamOut']]] + ['noteoff_77',['noteOff',['../classmidi_1_1_midi_common.html#a7bffbeb8f4f625a551f741d6ec515da3',1,'midi::MidiCommon']]], + ['noteon_78',['noteOn',['../classmidi_1_1_midi_common.html#a7e026258c4355d38dedda82f1862141c',1,'midi::MidiCommon']]], + ['notetofrequency_79',['noteToFrequency',['../classmidi_1_1_midi_common.html#a95a089c4af7d0809094255de9a4bf242',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_8.js b/docs/html/search/functions_8.js index adfdb18..1aa0bb9 100644 --- a/docs/html/search/functions_8.js +++ b/docs/html/search/functions_8.js @@ -1,6 +1,5 @@ var searchData= [ - ['noteoff_87',['noteOff',['../classmidi_1_1_midi_common.html#a7bffbeb8f4f625a551f741d6ec515da3',1,'midi::MidiCommon']]], - ['noteon_88',['noteOn',['../classmidi_1_1_midi_common.html#a7e026258c4355d38dedda82f1862141c',1,'midi::MidiCommon']]], - ['notetofrequency_89',['noteToFrequency',['../classmidi_1_1_midi_common.html#a95a089c4af7d0809094255de9a4bf242',1,'midi::MidiCommon']]] + ['onread_80',['onRead',['../classmidi_1_1_midi_ble_parser.html#ae33ee6f66d6f3db8c66a9ef12d90342d',1,'midi::MidiBleParser']]], + ['onwrite_81',['onWrite',['../classmidi_1_1_midi_ble_parser.html#a942cea11308ec90ebaa61935cc543986',1,'midi::MidiBleParser']]] ]; diff --git a/docs/html/search/functions_9.js b/docs/html/search/functions_9.js index e2c4f86..71330b2 100644 --- a/docs/html/search/functions_9.js +++ b/docs/html/search/functions_9.js @@ -1,5 +1,7 @@ var searchData= [ - ['onread_90',['onRead',['../classmidi_1_1_midi_ble_parser.html#ae33ee6f66d6f3db8c66a9ef12d90342d',1,'midi::MidiBleParser']]], - ['onwrite_91',['onWrite',['../classmidi_1_1_midi_ble_parser.html#a942cea11308ec90ebaa61935cc543986',1,'midi::MidiBleParser']]] + ['parse_82',['parse',['../classmidi_1_1_midi_parser.html#acc0c2865b2ebb8d40d8c0b81e9b2d9b6',1,'midi::MidiParser']]], + ['pitchbend_83',['pitchBend',['../classmidi_1_1_midi_common.html#ac1ef192cf2b1adfcc89d4cf3db5e80a3',1,'midi::MidiCommon']]], + ['polypressure_84',['polyPressure',['../classmidi_1_1_midi_common.html#a00771509caca2e46fb273b1ae8178517',1,'midi::MidiCommon']]], + ['programchange_85',['programChange',['../classmidi_1_1_midi_common.html#aee00ffec71667ca134c697a115e649f9',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_a.js b/docs/html/search/functions_a.js index 3ac4565..9fa6b20 100644 --- a/docs/html/search/functions_a.js +++ b/docs/html/search/functions_a.js @@ -1,7 +1,4 @@ var searchData= [ - ['parse_92',['parse',['../classmidi_1_1_midi_parser.html#acc0c2865b2ebb8d40d8c0b81e9b2d9b6',1,'midi::MidiParser']]], - ['pitchbend_93',['pitchBend',['../classmidi_1_1_midi_common.html#ac1ef192cf2b1adfcc89d4cf3db5e80a3',1,'midi::MidiCommon']]], - ['polypressure_94',['polyPressure',['../classmidi_1_1_midi_common.html#a00771509caca2e46fb273b1ae8178517',1,'midi::MidiCommon']]], - ['programchange_95',['programChange',['../classmidi_1_1_midi_common.html#aee00ffec71667ca134c697a115e649f9',1,'midi::MidiCommon']]] + ['resetallcontrollers_86',['resetAllControllers',['../classmidi_1_1_midi_common.html#a64a34fef651a7ad879975e9feef2394c',1,'midi::MidiCommon']]] ]; diff --git a/docs/html/search/functions_b.js b/docs/html/search/functions_b.js index 03b4880..43c504f 100644 --- a/docs/html/search/functions_b.js +++ b/docs/html/search/functions_b.js @@ -1,4 +1,7 @@ var searchData= [ - ['resetallcontrollers_96',['resetAllControllers',['../classmidi_1_1_midi_common.html#a64a34fef651a7ad879975e9feef2394c',1,'midi::MidiCommon']]] + ['setdefaultsendingchannel_87',['setDefaultSendingChannel',['../classmidi_1_1_midi_common.html#a1fc898c0b3dfeddef8515df50abac9d2',1,'midi::MidiCommon']]], + ['setfilterreceivingchannel_88',['setFilterReceivingChannel',['../classmidi_1_1_midi_common.html#a0ccfb10ae26c6855310de2443c319af1',1,'midi::MidiCommon']]], + ['setmidiaction_89',['setMidiAction',['../classmidi_1_1_midi_common.html#afdc7e84bfe245486503768f271680e1f',1,'midi::MidiCommon']]], + ['setup_90',['setup',['../classmidi_1_1_midi_stream_in.html#a0d28ac77f721f80b1a2c6e812b3804a9',1,'midi::MidiStreamIn::setup()'],['../classmidi_1_1_midi_stream_out.html#a3d9f4f789bd9e65c43e660f8b19fb704',1,'midi::MidiStreamOut::setup()']]] ]; diff --git a/docs/html/search/functions_c.js b/docs/html/search/functions_c.js index 91a8bce..de7225c 100644 --- a/docs/html/search/functions_c.js +++ b/docs/html/search/functions_c.js @@ -1,9 +1,5 @@ var searchData= [ - ['setdefaultsendingchannel_97',['setDefaultSendingChannel',['../classmidi_1_1_midi_common.html#a1fc898c0b3dfeddef8515df50abac9d2',1,'midi::MidiCommon']]], - ['setfilterreceivingchannel_98',['setFilterReceivingChannel',['../classmidi_1_1_midi_common.html#a0ccfb10ae26c6855310de2443c319af1',1,'midi::MidiCommon']]], - ['setmidiaction_99',['setMidiAction',['../classmidi_1_1_midi_common.html#afdc7e84bfe245486503768f271680e1f',1,'midi::MidiCommon']]], - ['setname_100',['setName',['../classmidi_1_1_apple_midi_server.html#aaa7580134db96147cbd55be63d0f2bdc',1,'midi::AppleMidiServer']]], - ['setuplogger_101',['setupLogger',['../classmidi_1_1_apple_midi_server.html#a6696d18b0d9d65b1e9f6a514b597a47f',1,'midi::AppleMidiServer']]], - ['setupmdns_102',['setupMDns',['../classmidi_1_1_apple_midi_server.html#a16d4cd3d35d5f02ced5d69f453f2f143',1,'midi::AppleMidiServer']]] + ['write_91',['write',['../classmidi_1_1_midi_common.html#ab6d5f15c999e24882e9ddade36af1577',1,'midi::MidiCommon']]], + ['writedata_92',['writeData',['../classmidi_1_1_midi_ble_client.html#a893c26eb05a3b52e1168d9713bc67096',1,'midi::MidiBleClient']]] ]; diff --git a/docs/html/search/functions_d.js b/docs/html/search/functions_d.js index 7f24a78..6050905 100644 --- a/docs/html/search/functions_d.js +++ b/docs/html/search/functions_d.js @@ -1,5 +1,4 @@ var searchData= [ - ['tick_103',['tick',['../classmidi_1_1_apple_midi_server.html#a34bca48f3788242ea90d5883912e2b0a',1,'midi::AppleMidiServer']]], - ['tostr_104',['toStr',['../classmidi_1_1_apple_midi_server.html#a8052a1bf508977c07f5cf9a012e4af51',1,'midi::AppleMidiServer']]] + ['_7emidistreamin_93',['~MidiStreamIn',['../classmidi_1_1_midi_stream_in.html#aadf64b3479f9b35bf466c49595622131',1,'midi::MidiStreamIn']]] ]; diff --git a/docs/html/search/pages_0.js b/docs/html/search/pages_0.js index dd09855..b088ae9 100644 --- a/docs/html/search/pages_0.js +++ b/docs/html/search/pages_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['arduino_20midi_20library_108',['Arduino MIDI Library',['../index.html',1,'']]] + ['arduino_20midi_20library_94',['Arduino MIDI Library',['../index.html',1,'']]] ]; diff --git a/docs/html/search/searchdata.js b/docs/html/search/searchdata.js index 9cd6b5d..dc2357c 100644 --- a/docs/html/search/searchdata.js +++ b/docs/html/search/searchdata.js @@ -1,8 +1,8 @@ var indexSectionsWithContent = { - 0: "abcefglmnoprstw~", + 0: "abcfglmnoprsw~", 1: "am", - 2: "abcefglmnoprstw~", + 2: "abcfglmnoprsw~", 3: "a" }; diff --git a/examples/ble-receive/ble-receive.ino b/examples/ble-receive/ble-receive.ino index 263ad5b..43c2e16 100644 --- a/examples/ble-receive/ble-receive.ino +++ b/examples/ble-receive/ble-receive.ino @@ -7,8 +7,8 @@ * @copyright Copyright (c) 2021 * */ -#include +#include MidiCallbackAction action; MidiBleServer ble("MidiServer", &action); @@ -27,8 +27,7 @@ void setup() { Serial.begin(115200); action.setCallbacks(onNoteOn, onNoteOff); - ble.begin(action); + ble.begin(); } -void loop() { -} +void loop() {} diff --git a/examples/ble-send/ble-send.ino b/examples/ble-send/ble-send.ino index 8327bf6..e749f16 100644 --- a/examples/ble-send/ble-send.ino +++ b/examples/ble-send/ble-send.ino @@ -11,10 +11,12 @@ #include MidiBleServer ble("MidiServer"); +int note = 30; +uint16_t amplitude = 100; // 0 to 128 void setup() { Serial.begin(115200); - ble.begin(action); + ble.begin(); ble.setDefaultSendingChannel(0); } diff --git a/examples/serialbt-send/serialbt-send.ino b/examples/serialbt-send/serialbt-send.ino index 684b6ad..de47632 100644 --- a/examples/serialbt-send/serialbt-send.ino +++ b/examples/serialbt-send/serialbt-send.ino @@ -7,6 +7,7 @@ * */ #include "Midi.h" +#include "BluetoothSerial.h" BluetoothSerial SerialBT; MidiStreamOut out(SerialBT); diff --git a/library.properties b/library.properties index c6296b3..e764bd6 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=audio-tools midi -version=0.8 +version=0.8.2 author=Phil Schatzmann maintainer=Phil Schatzmann sentence=Arduino Audio Tools - Midi Support diff --git a/src/AppleMidiServer.cpp b/src/AppleMidiServer.cpp deleted file mode 100644 index 67e6a07..0000000 --- a/src/AppleMidiServer.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include "AppleMidiServer.h" -#if TCP_ACTIVE - -namespace midi { - -AppleMidiServer *SelfAppleMidi = nullptr; - -/// Starts the listening -bool AppleMidiServer :: begin(int control_port){ - MIDI_LOGI( __PRETTY_FUNCTION__); - if (WiFi.status() != WL_CONNECTED){ - MIDI_LOGE("WIFI is not connected"); - return false; - } - setupLogger(); - setupMDns(control_port); - MIDI_LOGI("MIDI using port: %d", control_port); - applemidi_init((apple_midi_cb_t) applemidi_callback_midi_message_received, (apple_midi_cb_t) applemidi_if_send_udp_datagram); - - // setup udp - udpControl.begin(control_port); // control port - udpData.begin(control_port+1); // data port - return true; -} - - -/// Starts a session with the indicated address -bool AppleMidiServer :: begin(IPAddress adress, int control_port, int data_port_opt){ - MIDI_LOGI( __PRETTY_FUNCTION__); - if (WiFi.status() != WL_CONNECTED){ - MIDI_LOGE("WIFI is not connected"); - return false; - } - setupLogger(); - setupMDns(control_port); - applemidi_init((apple_midi_cb_t) applemidi_callback_midi_message_received, (apple_midi_cb_t) applemidi_if_send_udp_datagram); - int data_port = data_port_opt > 0 ? data_port_opt : control_port+1; - MIDI_LOGI("MIDI using address: %s port: %d",toStr(adress), control_port); - // listen for udp on port - udpControl.begin(control_port); - udpData.begin(data_port); - int status = applemidi_start_session(data_port, (uint8_t*) &adress, control_port); - - return status>=0; -} - -const char* AppleMidiServer :: toStr(IPAddress &adress){ - static char networ_str[20]; - //adress.toString() is not supported on all environemnts - sprintf(networ_str,"%u.%u.%u.%u",adress[0],adress[1],adress[2],adress[3]); - return networ_str; -} - -void AppleMidiServer :: end(){ - MIDI_LOGI( __PRETTY_FUNCTION__); - udpControl.stop(); - udpData.stop(); -} - -/// process input from the control and the data port -bool AppleMidiServer :: tick(uint32_t timestamp){ - bool active = false; - - // process control port - int packetSize = udpControl.parsePacket(); - remote_port = udpControl.remotePort(); - if (packetSize>0){ - // We got some control data - IPAddress remote_address = udpControl.remoteIP(); - int len = udpControl.read(rx_buffer, MIDI_BUFFER_SIZE); - MIDI_LOGD("control: %d -> %d ",remote_port, len); - applemidi_parse_udp_datagram((uint8_t*)&remote_address, remote_port, rx_buffer, len, false); - active = true; - } - - // process data port - packetSize = udpData.parsePacket(); - if (packetSize>0){ - int remote_port = udpData.remotePort(); - IPAddress remote_address = udpData.remoteIP(); - int len = udpData.read(rx_buffer, MIDI_BUFFER_SIZE); - MIDI_LOGD("data: %d -> %d",remote_port, len); - applemidi_parse_udp_datagram((uint8_t*) &remote_address, remote_port, rx_buffer, len, true); - active = true; - } - return active; -} - -/// MidiCommon implementation -void AppleMidiServer :: writeData(MidiMessage *msg, int len){ - MIDI_LOGI( __PRETTY_FUNCTION__); - applemidi_send_message(remote_port, (uint8_t*) msg, len*sizeof(MidiMessage)); -} - -/// Setup MDNS apple-midi service -void AppleMidiServer :: setupMDns(int port) { -#if MDNS_ACTIVE - if(MDNS.begin(dns_name)) { - MDNS.addService("_apple-midi", "_udp", port); - } else { - MIDI_LOGE("Error starting mDNS"); - } -#else - MIDI_LOGW("MDNS has been deactivated"); -#endif -} - -/// Activate apple midi debug messages -void AppleMidiServer :: setupLogger() { - switch(MidiLogLevel){ - case MidiInfo: - applemidi_set_debug_level(2); - break; - case MidiDebug: - applemidi_set_debug_level(3); - break; - case MidiWarning: - applemidi_set_debug_level(1); - break; - case MidiError: - applemidi_set_debug_level(1); - break; - } -} - -/// Callback method to parse midi message -void AppleMidiServer :: applemidi_callback_midi_message_received(uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos) { - MIDI_LOGI("applemidi_callback_midi_message_received: port=%d", port); - // the parser expects a midi message with the status and the parameters - uint8_t message[len+1]; - message[0]=midi_status; - memmove(message+1,remaining_message, len); - SelfAppleMidi->apple_event_handler.parse(message, len+1); -} - -/// Callback method to send UDP message with the help of the Arduino API -int32_t AppleMidiServer :: applemidi_if_send_udp_datagram(uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len){ - MIDI_LOGD( "applemidi_if_send_udp_datagram: port=%d", port); - IPAddress *p_adr = (IPAddress *) ip_addr; - WiFiUDP *p_udp = port == SelfAppleMidi->remote_port ? &(SelfAppleMidi->udpControl) : &(SelfAppleMidi->udpData); - p_udp->beginPacket(*p_adr, port); - int32_t result = p_udp->write(tx_data, tx_len); - p_udp->endPacket(); - return result; -} - -} - -#endif \ No newline at end of file diff --git a/src/AppleMidiServer.h b/src/AppleMidiServer.h index 438b83d..0923193 100644 --- a/src/AppleMidiServer.h +++ b/src/AppleMidiServer.h @@ -2,11 +2,12 @@ #include "ConfigMidi.h" #if TCP_ACTIVE #include +#include + #include "MidiAction.h" #include "MidiCommon.h" #include "MidiLogger.h" #include "apple-midi/applemidi.h" -#include #if MDNS_ACTIVE #include #endif @@ -15,75 +16,179 @@ namespace midi { -class AppleMidiServer; -extern AppleMidiServer *SelfAppleMidi; typedef void* apple_midi_cb_t; /***************************************************/ -/*! \class AppleMidiServer +/*! \class AppleMidiServer \brief A Sender and Receiver which supports Apple Midi using the implementation from midibox. Apple midi uses UDP on a control and a data port. https://github.com/midibox/esp32-idf-applemidi - + by Phil Schatzmann */ /***************************************************/ +template +class AppleMidiServer : public MidiCommon { + public: + AppleMidiServer() { + _instance = this; + }; + + AppleMidiServer(MidiAction* action, int midiPort = -1) { + _instance = this; + apple_event_handler.begin(action, midiPort); + } + + void setName(const char* name) { dns_name = name; } + + bool begin(int control_port = APPLEMIDI_DEFAULT_PORT) { + MIDI_LOGI(__PRETTY_FUNCTION__); + setupLogger(); + setupMDns(control_port); + MIDI_LOGI("MIDI using port: %d", control_port); + applemidi_init((apple_midi_cb_t)applemidi_callback_midi_message_received, + (apple_midi_cb_t)applemidi_if_send_udp_datagram); + udpControl.begin(control_port); // control port + udpData.begin(control_port + 1); // data port + return true; + } + + bool begin(IPAddress adress, int control_port = APPLEMIDI_DEFAULT_PORT, + int data_port_opt = -1) { + _instance = this; + MIDI_LOGI(__PRETTY_FUNCTION__); + setupLogger(); + setupMDns(control_port); + applemidi_init((apple_midi_cb_t)applemidi_callback_midi_message_received, + (apple_midi_cb_t)applemidi_if_send_udp_datagram); + int data_port = data_port_opt > 0 ? data_port_opt : control_port + 1; + MIDI_LOGI("MIDI using address: %s port: %d", toStr(adress), control_port); + udpControl.begin(control_port); + udpData.begin(data_port); + int status = + applemidi_start_session(data_port, (uint8_t*)&adress, control_port); + return status >= 0; + } + + void end() { + MIDI_LOGI(__PRETTY_FUNCTION__); + udpControl.stop(); + udpData.stop(); + } -class AppleMidiServer : public MidiCommon { - public: - AppleMidiServer() { - SelfAppleMidi = this; - }; - - AppleMidiServer(MidiAction *action, int midiPort=-1){ - SelfAppleMidi = this; - apple_event_handler.begin(action, midiPort); - } - - /// Defines the dns name - void setName(const char* name){ - dns_name = name; - } - - /// Starts the listening - bool begin(int control_port=APPLEMIDI_DEFAULT_PORT); - /// Starts a session with the indicated address - bool begin(IPAddress adress, int control_port=APPLEMIDI_DEFAULT_PORT, int data_port_opt=-1); - /// Closes the connections - void end(); - /// Processing logic to be executed in loop - bool loop() { - return tick(millis()); - } - - protected: - MidiParser apple_event_handler; - WiFiUDP udpControl; - WiFiUDP udpData; - uint8_t rx_buffer[MIDI_BUFFER_SIZE]; - int remote_port; - bool is_setup = false; - const char* dns_name = "AppleMidi"; - - /// process input from the control and the data port - virtual bool tick(uint32_t timestamp); - /// MidiCommon implementation - virtual void writeData(MidiMessage *msg, int len); - /// Setup MDNS apple-midi service - virtual void setupMDns(int port); - /// provides the network address as string - const char* toStr(IPAddress &adress); - /// Activate apple midi debug messages - void setupLogger(); - /// Callback method to parse midi message - static void applemidi_callback_midi_message_received(uint8_t port, uint32_t timestamp, uint8_t midi_status, uint8_t *remaining_message, size_t len, size_t continued_sysex_pos); - /// Callback method to send UDP message with the help of the Arduino API - static int32_t applemidi_if_send_udp_datagram(uint8_t *ip_addr, uint16_t port, uint8_t *tx_data, size_t tx_len); + bool loop() { return tick(millis()); } + protected: + MidiParser apple_event_handler; + UDPClass udpControl; + UDPClass udpData; + uint8_t rx_buffer[MIDI_BUFFER_SIZE]; + int remote_port; + bool is_setup = false; + const char* dns_name = "AppleMidi"; + static AppleMidiServer* _instance; + virtual bool tick(uint32_t timestamp) { + bool active = false; + int packetSize = udpControl.parsePacket(); + remote_port = udpControl.remotePort(); + if (packetSize > 0) { + IPAddress remote_address = udpControl.remoteIP(); + int len = udpControl.read(rx_buffer, MIDI_BUFFER_SIZE); + MIDI_LOGD("control: %d -> %d ", remote_port, len); + applemidi_parse_udp_datagram((uint8_t*)&remote_address, remote_port, + rx_buffer, len, false); + active = true; + } + packetSize = udpData.parsePacket(); + if (packetSize > 0) { + int remote_port = udpData.remotePort(); + IPAddress remote_address = udpData.remoteIP(); + int len = udpData.read(rx_buffer, MIDI_BUFFER_SIZE); + MIDI_LOGD("data: %d -> %d", remote_port, len); + applemidi_parse_udp_datagram((uint8_t*)&remote_address, remote_port, + rx_buffer, len, true); + active = true; + } + return active; + } + + virtual void writeData(MidiMessage* msg, int len) { + MIDI_LOGI(__PRETTY_FUNCTION__); + applemidi_send_message(remote_port, (uint8_t*)msg, + len * sizeof(MidiMessage)); + } + + virtual void setupMDns(int port) { +#if MDNS_ACTIVE + if (MDNS.begin(dns_name)) { + MDNS.addService("_apple-midi", "_udp", port); + } else { + MIDI_LOGE("Error starting mDNS"); + } +#else + MIDI_LOGW("MDNS has been deactivated"); +#endif + } + + const char* toStr(IPAddress& adress) { + static char networ_str[20]; + sprintf(networ_str, "%u.%u.%u.%u", adress[0], adress[1], adress[2], + adress[3]); + return networ_str; + } + + void setupLogger() { + switch (MidiLogLevel) { + case MidiInfo: + applemidi_set_debug_level(2); + break; + case MidiDebug: + applemidi_set_debug_level(3); + break; + case MidiWarning: + applemidi_set_debug_level(1); + break; + case MidiError: + applemidi_set_debug_level(1); + break; + } + } + + static void applemidi_callback_midi_message_received( + uint8_t port, uint32_t timestamp, uint8_t midi_status, + uint8_t* remaining_message, size_t len, size_t continued_sysex_pos) { + MIDI_LOGI("applemidi_callback_midi_message_received: port=%d", port); + if (_instance) { + uint8_t message[len + 1]; + message[0] = midi_status; + memmove(message + 1, remaining_message, len); + _instance->apple_event_handler.parse(message, len + 1); + } + } + + static int32_t applemidi_if_send_udp_datagram(uint8_t* ip_addr, uint16_t port, + uint8_t* tx_data, + size_t tx_len) { + MIDI_LOGD("applemidi_if_send_udp_datagram: port=%d", port); + if (_instance) { + IPAddress* p_adr = (IPAddress*)ip_addr; + UDPClass* p_udp = port == _instance->remote_port + ? &(_instance->udpControl) + : &(_instance->udpData); + p_udp->beginPacket(*p_adr, port); + int32_t result = p_udp->write(tx_data, tx_len); + p_udp->endPacket(); + return result; + } + return 0; + } }; -} +template +AppleMidiServer* AppleMidiServer::_instance = nullptr; + +} // namespace midi #endif \ No newline at end of file diff --git a/src/MidiIpServer.h b/src/MidiIpServer.h index 7088068..75bbf32 100644 --- a/src/MidiIpServer.h +++ b/src/MidiIpServer.h @@ -17,7 +17,7 @@ namespace midi { by Phil Schatzmann */ /***************************************************/ - +template class MidiIpServer : public MidiServer { public: MidiIpServer(MidiAction *action) : MidiServer(action){ @@ -32,13 +32,8 @@ class MidiIpServer : public MidiServer { bool begin(int serverPort=5008){ MIDI_LOGI( __PRETTY_FUNCTION__); - if (WiFi.status() != WL_CONNECTED){ - MIDI_LOGE("WiFi not connected"); - return false; - } - if (p_wifi_server==nullptr){ - p_wifi_server = new WiFiServer(serverPort); + p_wifi_server = new ServerClass(serverPort); } p_wifi_server->begin(); MIDI_LOGI("server started on port %d", serverPort); @@ -70,8 +65,8 @@ class MidiIpServer : public MidiServer { } protected: - WiFiServer *p_wifi_server = nullptr; - WiFiClient client; + ServerClass *p_wifi_server = nullptr; + ClientClass client; }; diff --git a/src/MidiStreamIn.h b/src/MidiStreamIn.h index 56d65c3..d1c893e 100644 --- a/src/MidiStreamIn.h +++ b/src/MidiStreamIn.h @@ -26,6 +26,7 @@ namespace midi { /***************************************************/ class MidiStreamIn : public MidiCommon { public: + MidiStreamIn() = default; /// Default Constructor MidiStreamIn(Stream &stream, MidiAction &action); /// Constructor to implement you custom MidiParser @@ -33,13 +34,10 @@ class MidiStreamIn : public MidiCommon { /// Destructor ~MidiStreamIn(); // Parse/Process the next midi message - bool loop(); - + bool loop(); + /// Call setup when created with empty constructor + void setup(Stream *stream, MidiParser *handler, bool releaseHandler); protected: - friend class MidiServer; - friend class MidiIpServer; - friend class MidiUdpServer; - int getLastStatusPos(uint8_t *buffer, int endPos); Stream *pStream = nullptr; MidiParser *pHandler = nullptr; @@ -47,9 +45,6 @@ class MidiStreamIn : public MidiCommon { uint8_t buffer[BUFFER_LEN]; int startPos = 0; - MidiStreamIn() = default; - - void setup(Stream *stream, MidiParser *handler, bool releaseHandler); }; } // namespace diff --git a/src/MidiStreamOut.h b/src/MidiStreamOut.h index a80b2e6..0a58e3b 100644 --- a/src/MidiStreamOut.h +++ b/src/MidiStreamOut.h @@ -16,19 +16,13 @@ namespace midi { /***************************************************/ class MidiStreamOut : public MidiCommon { public: + MidiStreamOut() = default; /// Default Constructor MidiStreamOut(Print &stream); - - protected: - friend class MidiServer; - friend class MidiIpServer; - friend class MidiUdpServer; - - MidiStreamOut() = default; - - virtual void writeData(MidiMessage *pMsg, int len); - + /// Call setup when created with empty constructor virtual void setup(Print *stream); + virtual void writeData(MidiMessage *pMsg, int len); + protected: Print *pStream; uint8_t buffer[4]; diff --git a/src/MidiUdp.cpp b/src/MidiUdp.cpp deleted file mode 100644 index f879a4a..0000000 --- a/src/MidiUdp.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include -#if MIDI_ACTIVE && TCP_ACTIVE - -#include "MidiLogger.h" - -namespace midi { - -const char* APP_MidiUdp = "MidiUdp"; - -MidiUdp :: MidiUdp(char* addessStr,int targetPort) { - this->isValidHostFlag = WiFi.hostByName(addessStr, targetUdpAddress); - if (!this->isValidHostFlag){ - MIDI_LOGE( "x%x, Could not resolve host %s ", __func__, addessStr); - } - this->targetPort = targetPort; -} - -MidiUdp :: MidiUdp(IPAddress address,int targetPort) { - this->targetUdpAddress = address; - this->targetPort = targetPort; -} - -bool MidiUdp :: isValidHost() { - return this->isValidHostFlag; -} - -void MidiUdp :: setTargetPort(int port){ - targetPort = port; -} - -size_t MidiUdp :: write(const uint8_t * buffer, size_t size ) { - size_t result = 0; - if (this->beginPacket(targetUdpAddress, targetPort) == 1){ - result = WiFiUDP::write(buffer, size); - if (result>0){ - bool packetOk = this->endPacket(); - MIDI_LOGD( "x%x, Number of bytes have %s been sent out: %d ", __func__, packetOk?"":"not", result); - } - //this->flush(); - } else { - MIDI_LOGD( "x%x, beginPacked has failed ", __func__); - this->isValidHostFlag = false; - } - return result; -} - -} // stk - -#endif - diff --git a/src/MidiUdp.h b/src/MidiUdp.h index a1fac7d..f76f91c 100644 --- a/src/MidiUdp.h +++ b/src/MidiUdp.h @@ -5,12 +5,13 @@ #include #include #include +#include "MidiLogger.h" namespace midi { /***************************************************/ /*! \class MidiUdp - \brief Simple UDP wrapper class which sends all + \brief Simple UDP wrapper class which sends all packages to the same destination. This is useful when the API asks for a stream @@ -21,20 +22,50 @@ namespace midi { */ /***************************************************/ -class MidiUdp : public WiFiUDP { // EthernetUDP { - public: - MidiUdp(char* targetUdpAddressStr,int targetPort); - MidiUdp(IPAddress targetUdpAddress,int targetPort); - size_t write(const uint8_t * buffer,size_t size ); - bool isValidHost(); - void setTargetPort(int port); - - protected: - IPAddress targetUdpAddress; - int targetPort; - bool isValidHostFlag; +template +class MidiUdp : public UDPClass { // EthernetUDP { + + public: + MidiUdp(char* addessStr, int targetPort) { + this->isValidHostFlag = WiFi.hostByName(addessStr, targetUdpAddress); + if (!this->isValidHostFlag) { + MIDI_LOGE("x%x, Could not resolve host %s ", __func__, addessStr); + } + this->targetPort = targetPort; + } + + MidiUdp(IPAddress address, int targetPort) { + this->targetUdpAddress = address; + this->targetPort = targetPort; + } + + size_t write(const uint8_t* buffer, size_t size) { + size_t result = 0; + if (this->beginPacket(targetUdpAddress, targetPort) == 1) { + result = UDPClass::write(buffer, size); + if (result > 0) { + bool packetOk = this->endPacket(); + MIDI_LOGD("x%x, Number of bytes have %s been sent out: %d ", __func__, + packetOk ? "" : "not", result); + } + // this->flush(); + } else { + MIDI_LOGD("x%x, beginPacked has failed ", __func__); + this->isValidHostFlag = false; + } + return result; + } + + bool isValidHost() { return this->isValidHostFlag; } + + void setTargetPort(int port) { targetPort = port; } + + protected: + IPAddress targetUdpAddress; + int targetPort; + bool isValidHostFlag; }; -} +} // namespace midi #endif \ No newline at end of file diff --git a/src/MidiUdpServer.h b/src/MidiUdpServer.h index 5425c53..a463114 100644 --- a/src/MidiUdpServer.h +++ b/src/MidiUdpServer.h @@ -18,6 +18,7 @@ namespace midi { */ /***************************************************/ +template class MidiUdpServer : public MidiServer { public: MidiUdpServer(MidiAction *action):MidiServer(action){ @@ -63,7 +64,7 @@ class MidiUdpServer : public MidiServer { } protected: - MidiUdp *udp=nullptr; + MidiUdp *udp=nullptr; bool is_connected = false; int remote_port = 0;