2
0
Эх сурвалжийг харах

Merge pull request #22726 from marcelofg55/coremidi_warn

Fix CoreMidi warnings
Rémi Verschelde 7 жил өмнө
parent
commit
936cfd44ee

+ 3 - 3
drivers/coreaudio/audio_driver_coreaudio.cpp

@@ -277,7 +277,7 @@ OSStatus AudioDriverCoreAudio::input_callback(void *inRefCon,
 			}
 		}
 	} else {
-		ERR_PRINT(("AudioUnitRender failed, code: " + itos(result)).utf8().get_data());
+		ERR_PRINTS("AudioUnitRender failed, code: " + itos(result));
 	}
 
 	ad->unlock();
@@ -289,7 +289,7 @@ void AudioDriverCoreAudio::start() {
 	if (!active) {
 		OSStatus result = AudioOutputUnitStart(audio_unit);
 		if (result != noErr) {
-			ERR_PRINT(("AudioOutputUnitStart failed, code: " + itos(result)).utf8().get_data());
+			ERR_PRINTS("AudioOutputUnitStart failed, code: " + itos(result));
 		} else {
 			active = true;
 		}
@@ -300,7 +300,7 @@ void AudioDriverCoreAudio::stop() {
 	if (active) {
 		OSStatus result = AudioOutputUnitStop(audio_unit);
 		if (result != noErr) {
-			ERR_PRINT(("AudioOutputUnitStop failed, code: " + itos(result)).utf8().get_data());
+			ERR_PRINTS("AudioOutputUnitStop failed, code: " + itos(result));
 		} else {
 			active = false;
 		}

+ 3 - 3
drivers/coremidi/core_midi.cpp

@@ -51,13 +51,13 @@ Error MIDIDriverCoreMidi::open() {
 	OSStatus result = MIDIClientCreate(name, NULL, NULL, &client);
 	CFRelease(name);
 	if (result != noErr) {
-		ERR_PRINTS("MIDIClientCreate failed: " + String(GetMacOSStatusErrorString(result)));
+		ERR_PRINTS("MIDIClientCreate failed, code: " + itos(result));
 		return ERR_CANT_OPEN;
 	}
 
 	result = MIDIInputPortCreate(client, CFSTR("Godot Input"), MIDIDriverCoreMidi::read, (void *)this, &port_in);
 	if (result != noErr) {
-		ERR_PRINTS("MIDIInputPortCreate failed: " + String(GetMacOSStatusErrorString(result)));
+		ERR_PRINTS("MIDIInputPortCreate failed, code: " + itos(result));
 		return ERR_CANT_OPEN;
 	}
 
@@ -65,7 +65,7 @@ Error MIDIDriverCoreMidi::open() {
 	for (int i = 0; i < sources; i++) {
 
 		MIDIEndpointRef source = MIDIGetSource(i);
-		if (source != NULL) {
+		if (source) {
 			MIDIPortConnectSource(port_in, source, (void *)this);
 			connected_sources.insert(i, source);
 		}