77#include " esp32-hal-tinyusb.h"
88
99// Initialize static members
10- char * USBMIDI::midiUserDeviceName = nullptr ;
10+ char * USBMIDI::midiUserDeviceName = nullptr ;
1111// Weak definition of getUSBMIDIDefaultDeviceName to provide a default name
12- __attribute__ ((weak)) const char* getUSBMIDIDefaultDeviceName() {
12+ __attribute__ ((weak)) const char * getUSBMIDIDefaultDeviceName() {
1313 return ESP32_USB_MIDI_DEFAULT_NAME;
1414}
1515
@@ -49,25 +49,25 @@ USBMIDI::USBMIDI() {
4949}
5050
5151// private function for setting a not null/empty MIDI device name limited to 32 characters
52- void USBMIDI::setDeviceName (const char * name) {
53- const uint8_t maxNameLength = 32 ; // tinyUSB Descriptor limit
54- if (name != nullptr && strlen (name) > 0 ) {
55- if (strlen (name) > maxNameLength) {
56- log_w (" USBMIDI: Device name too long, truncating to %d characters." , maxNameLength);
57- }
58- if (!midiUserDeviceName) {
59- midiUserDeviceName = new char [maxNameLength + 1 ]; // +1 for null-terminator
60- }
61- if (midiUserDeviceName) {
62- strncpy (midiUserDeviceName, name, maxNameLength);
63- // Ensure null-termination when overflowing
64- midiUserDeviceName[maxNameLength] = ' \0 ' ;
65- } else {
66- log_e (" USBMIDI: Failed to allocate memory for device name, using default name." );
67- }
52+ void USBMIDI::setDeviceName (const char *name) {
53+ const uint8_t maxNameLength = 32 ; // tinyUSB Descriptor limit
54+ if (name != nullptr && strlen (name) > 0 ) {
55+ if (strlen (name) > maxNameLength) {
56+ log_w (" USBMIDI: Device name too long, truncating to %d characters." , maxNameLength);
57+ }
58+ if (!midiUserDeviceName) {
59+ midiUserDeviceName = new char [maxNameLength + 1 ]; // +1 for null-terminator
60+ }
61+ if (midiUserDeviceName) {
62+ strncpy (midiUserDeviceName, name, maxNameLength);
63+ // Ensure null-termination when overflowing
64+ midiUserDeviceName[maxNameLength] = ' \0 ' ;
6865 } else {
69- log_w (" USBMIDI: No device name provided , using default name [%s]. " , getUSBMIDIDefaultDeviceName () );
66+ log_e (" USBMIDI: Failed to allocate memory for device name, using default name. " );
7067 }
68+ } else {
69+ log_w (" USBMIDI: No device name provided, using default name [%s]." , getUSBMIDIDefaultDeviceName ());
70+ }
7171}
7272
7373/* *
@@ -77,7 +77,7 @@ void USBMIDI::setDeviceName(const char* name) {
7777* 3. Default name "TinyUSB MIDI"
7878* If device name is set as "", it will be ignored
7979*/
80- USBMIDI::USBMIDI (const char * name) {
80+ USBMIDI::USBMIDI (const char * name) {
8181 if (!tinyusb_midi_interface_enabled) {
8282 setDeviceName (name);
8383 tinyusb_midi_interface_enabled = true ;
@@ -92,17 +92,17 @@ USBMIDI::~USBMIDI() {
9292 delete[] midiUserDeviceName;
9393 midiUserDeviceName = nullptr ;
9494 }
95- }
95+ }
9696
9797void USBMIDI::begin () {}
9898void USBMIDI::end () {}
9999
100- const char * USBMIDI::getCurrentDeviceName (void ) {
100+ const char * USBMIDI::getCurrentDeviceName (void ) {
101101 if (midiUserDeviceName) {
102102 return midiUserDeviceName;
103103 }
104104 // If no user name set, use the compile-time default name limited to 32 characters
105- setDeviceName (getUSBMIDIDefaultDeviceName ());
105+ setDeviceName (getUSBMIDIDefaultDeviceName ());
106106 if (midiUserDeviceName && strlen (midiUserDeviceName)) {
107107 return midiUserDeviceName;
108108 } else {
0 commit comments