From 85e83bbdff9f07132b9fcdddeeccb9d252a13b8c Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 2 Dec 2018 19:34:09 -0800 Subject: [PATCH] Use a std::string for the source state change message --- OpenAL32/event.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/OpenAL32/event.cpp b/OpenAL32/event.cpp index 4980abee..d263acc5 100644 --- a/OpenAL32/event.cpp +++ b/OpenAL32/event.cpp @@ -45,17 +45,14 @@ static int EventThread(ALCcontext *context) { if(!(enabledevts&EventType_SourceStateChange)) continue; - char msg[1024]{}; - int msglen{snprintf(msg, sizeof(msg), "Source ID %u state changed to %s", - evt.u.srcstate.id, - (evt.u.srcstate.state==AL_INITIAL) ? "AL_INITIAL" : + std::string msg{"Source ID " + std::to_string(evt.u.srcstate.id)}; + msg += " state has changed to "; + msg += (evt.u.srcstate.state==AL_INITIAL) ? "AL_INITIAL" : (evt.u.srcstate.state==AL_PLAYING) ? "AL_PLAYING" : (evt.u.srcstate.state==AL_PAUSED) ? "AL_PAUSED" : - (evt.u.srcstate.state==AL_STOPPED) ? "AL_STOPPED" : "" - )}; - if(msglen < 1) msglen = strlen(msg); + (evt.u.srcstate.state==AL_STOPPED) ? "AL_STOPPED" : ""; context->EventCb(AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT, evt.u.srcstate.id, - evt.u.srcstate.state, msglen, msg, context->EventParam + evt.u.srcstate.state, msg.length(), msg.c_str(), context->EventParam ); } else if((enabledevts&evt.EnumType) == evt.EnumType)