diff --git a/bufferoverride/gui/bufferoverrideeditor.cpp b/bufferoverride/gui/bufferoverrideeditor.cpp index c59b41a1..797f2fd4 100644 --- a/bufferoverride/gui/bufferoverrideeditor.cpp +++ b/bufferoverride/gui/bufferoverrideeditor.cpp @@ -25,6 +25,7 @@ To contact the author, use the contact form at http://destroyfx.org #include #include #include +#include #include #include "bufferoverride-base.h" @@ -182,7 +183,7 @@ static bool divisorDisplayProc(float inValue, char* outText, void*) { int const precision = (inValue <= 99.99f) ? 2 : 1; float const effectiveValue = (inValue < 2.0f) ? 1.0f : inValue; - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.*f", precision, effectiveValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.*f", precision, effectiveValue) > 0; } static bool bufferSizeDisplayProc(float inValue, char* outText, void* inEditor) @@ -198,7 +199,7 @@ static bool bufferSizeDisplayProc(float inValue, char* outText, void* inEditor) } else { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; } } @@ -211,13 +212,13 @@ static bool lfoRateGenDisplayProc(float inValue, char* outText, void* inEditor, { if (std::optional const valueString = dgEditor->getparametervaluestring(rateSyncParameterID)) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%s / beat", valueString->c_str()) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%s / beat", valueString->c_str()) > 0; } return false; } int const precision = (inValue <= 9.99f) ? 2 : 1; - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.*f Hz", precision, inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.*f Hz", precision, inValue) > 0; } static bool divisorLFORateDisplayProc(float inValue, char* outText, void* inEditor) @@ -232,23 +233,23 @@ static bool bufferLFORateDisplayProc(float inValue, char* outText, void* inEdito static bool lfoDepthDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue) > 0; } static bool dryWetMixDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue) > 0; } static bool pitchBendRangeDisplayProc(float inValue, char* outText, void*) { int const precision = (inValue <= 9.99f) ? 2 : 1; - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%s %.*f", dfx::kPlusMinusUTF8, precision, inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%s %.*f", dfx::kPlusMinusUTF8, precision, inValue) > 0; } static bool tempoDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f", inValue) > 0; } diff --git a/dfx-library/dfxplugin-audiounit.cpp b/dfx-library/dfxplugin-audiounit.cpp index c46e22ca..18499b18 100644 --- a/dfx-library/dfxplugin-audiounit.cpp +++ b/dfx-library/dfxplugin-audiounit.cpp @@ -888,9 +888,9 @@ OSStatus DfxPlugin::SetProperty(AudioUnitPropertyID inPropertyID, else { #if 0 - fprintf(stderr, "\tSetProperty(AUHostIdentifier)\n"); + std::fprintf(stderr, "\tSetProperty(AUHostIdentifier)\n"); CFShow(hostID.hostName); - fprintf(stderr, "version: 0x%X\n", hostID.hostVersion); + std::fprintf(stderr, "version: 0x%X\n", hostID.hostVersion); #endif } break; @@ -1550,8 +1550,8 @@ OSStatus DfxPlugin::ChangeStreamFormat(AudioUnitScope inScope, AudioUnitElement AudioStreamBasicDescription const& inPrevFormat, AudioStreamBasicDescription const& inNewFormat) { -//fprintf(stderr, "\nDfxPlugin::ChangeStreamFormat, new sr = %.3lf, old sr = %.3lf\n\n", inNewFormat.mSampleRate, inPrevFormat.mSampleRate); -//fprintf(stderr, "\nDfxPlugin::ChangeStreamFormat, new num channels = %lu, old num channels = %lu\n\n", inNewFormat.mChannelsPerFrame, inPrevFormat.mChannelsPerFrame); +//std::fprintf(stderr, "\nDfxPlugin::ChangeStreamFormat, new sr = %.3lf, old sr = %.3lf\n\n", inNewFormat.mSampleRate, inPrevFormat.mSampleRate); +//std::fprintf(stderr, "\nDfxPlugin::ChangeStreamFormat, new num channels = %lu, old num channels = %lu\n\n", inNewFormat.mChannelsPerFrame, inPrevFormat.mChannelsPerFrame); // if this AU supports only specific I/O channel count configs, // then check whether the incoming format is allowed if (!mChannelConfigs.empty()) diff --git a/dfx-library/dfxplugin-rtas.cpp b/dfx-library/dfxplugin-rtas.cpp index 73a45a7c..fe06d69a 100644 --- a/dfx-library/dfxplugin-rtas.cpp +++ b/dfx-library/dfxplugin-rtas.cpp @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------ Destroy FX Library is a collection of foundation code for creating audio processing plug-ins. -Copyright (C) 2009-2022 Sophia Poirier +Copyright (C) 2009-2023 Sophia Poirier This file is part of the Destroy FX Library (version 1.0). @@ -29,6 +29,7 @@ This is where we connect the RTAS/AudioSuite API to our DfxPlugin system. #include #include +#include #include "CEffectTypeAS.h" #include "CEffectTypeRTAS.h" @@ -94,7 +95,7 @@ ComponentResult bypassResult = GetMasterBypassControl(&bypassControlIndex); CPluginControl_Discrete* bypassControl = dynamic_cast( GetControl(bypassControlIndex) ); char bypassName[32] {}; bypassControl->GetNameOfLength(bypassName, std::size(bypassName) - 1, 0); -fprintf(stderr, "%s IsAutomatable() = %s (error = %ld)\n", bypassName, bypassControl->IsAutomatable() ? "true" : "false", bypassResult); +std::fprintf(stderr, "%s IsAutomatable() = %s (error = %ld)\n", bypassName, bypassControl->IsAutomatable() ? "true" : "false", bypassResult); */ } @@ -307,7 +308,7 @@ ComponentResult DfxPlugin::GetValueString(long inParameterIndex, long inValue, S if (shortValueString != nullptr) { strlcpy((char*)(outValueString + 1), shortValueString, inMaxLength + 1); - outValueString[0] = ((signed)strlen(shortValueString) > inMaxLength) ? inMaxLength : strlen(shortValueString); + outValueString[0] = (static_cast(std::strlen(shortValueString)) > inMaxLength) ? inMaxLength : std::strlen(shortValueString); return noErr; } } @@ -681,14 +682,14 @@ CPlugInView* DfxPlugin::CreateCPlugInView() #else OSType meterFourCharID = 0; - OSType meterIDs[EffectLayerDef::MAX_NUM_CONNECTIONS]; + OSType meterIDs[EffectLayerDef::MAX_NUM_CONNECTIONS] {}; for (UInt32 i = 0; i < EffectLayerDef::MAX_NUM_CONNECTIONS; i++) { meterFourCharID = DFX_IterateAlphaNumericFourCharCode(meterFourCharID); meterIDs[i] = meterFourCharID; } - OSType clipIDs[EffectLayerDef::MAX_NUM_CONNECTIONS]; + OSType clipIDs[EffectLayerDef::MAX_NUM_CONNECTIONS] {}; for (UInt32 i = 0; i < EffectLayerDef::MAX_NUM_CONNECTIONS; i++) { meterFourCharID = DFX_IterateAlphaNumericFourCharCode(meterFourCharID); diff --git a/dfx-library/dfxplugin-vst.cpp b/dfx-library/dfxplugin-vst.cpp index f1b7fdd6..43fedfcb 100644 --- a/dfx-library/dfxplugin-vst.cpp +++ b/dfx-library/dfxplugin-vst.cpp @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------ Destroy FX Library is a collection of foundation code for creating audio processing plug-ins. -Copyright (C) 2002-2022 Sophia Poirier +Copyright (C) 2002-2023 Sophia Poirier This file is part of the Destroy FX Library (version 1.0). @@ -123,8 +123,8 @@ bool DfxPlugin::getInputProperties(VstInt32 index, VstPinProperties* properties) { if ((index >= 0) && (dfx::math::ToIndex(index) < getnuminputs()) && properties) { - snprintf(properties->label, kVstMaxLabelLen, "%s input %d", PLUGIN_NAME_STRING, index + 1); - snprintf(properties->shortLabel, kVstMaxShortLabelLen, "in %d", index + 1); + std::snprintf(properties->label, kVstMaxLabelLen, "%s input %d", PLUGIN_NAME_STRING, index + 1); + std::snprintf(properties->shortLabel, kVstMaxShortLabelLen, "in %d", index + 1); properties->flags = kVstPinIsActive; if (getnuminputs() == 2) { @@ -140,8 +140,8 @@ bool DfxPlugin::getOutputProperties(VstInt32 index, VstPinProperties* properties { if ((index >= 0) && (dfx::math::ToIndex(index) < getnumoutputs()) && properties) { - snprintf(properties->label, kVstMaxLabelLen, "%s output %d", PLUGIN_NAME_STRING, index + 1); - snprintf(properties->shortLabel, kVstMaxShortLabelLen, "out %d", index + 1); + std::snprintf(properties->label, kVstMaxLabelLen, "%s output %d", PLUGIN_NAME_STRING, index + 1); + std::snprintf(properties->shortLabel, kVstMaxShortLabelLen, "out %d", index + 1); properties->flags = kVstPinIsActive; if (getnumoutputs() == 2) { @@ -303,7 +303,7 @@ bool DfxPlugin::getProgramNameIndexed(VstInt32 /*inCategory*/, VstInt32 inIndex, } else { - snprintf(outText, kVstMaxProgNameLen + 1, "default %" PRIi32, inIndex + 1); + std::snprintf(outText, kVstMaxProgNameLen + 1, "default %" PRIi32, inIndex + 1); } return true; } @@ -405,10 +405,10 @@ void DfxPlugin::getParameterDisplay(VstInt32 index, char* text) switch (getparametervaluetype(parameterID)) { case DfxParam::ValueType::Float: - snprintf(text, kVstMaxParamStrLen + 1, "%.3f", getparameter_f(parameterID)); + std::snprintf(text, kVstMaxParamStrLen + 1, "%.3f", getparameter_f(parameterID)); break; case DfxParam::ValueType::Int: - snprintf(text, kVstMaxParamStrLen + 1, "%" PRIi64, getparameter_i(parameterID)); + std::snprintf(text, kVstMaxParamStrLen + 1, "%" PRIi64, getparameter_i(parameterID)); break; case DfxParam::ValueType::Boolean: vst_strncpy(text, getparameter_b(parameterID) ? "on" : "off", kVstMaxParamStrLen); @@ -586,7 +586,7 @@ VstInt32 DfxPlugin::processEvents(VstEvents* events) } // cast the incoming event as a VstMidiEvent - auto const midiEvent = reinterpret_cast(events->events[i]); + auto const midiEvent = reinterpret_cast(events->events[i]); // address the midiData[4] string from the event to this temp data pointer auto const midiData = midiEvent->midiData; diff --git a/dfx-library/dfxplugin.cpp b/dfx-library/dfxplugin.cpp index 6e7985c8..f9c94a55 100644 --- a/dfx-library/dfxplugin.cpp +++ b/dfx-library/dfxplugin.cpp @@ -1786,7 +1786,7 @@ void DfxPlugin::processtimeinfo() if (status == noErr) { #ifdef DFX_DEBUG_PRINT_MUSICAL_TIME_INFO -fprintf(stderr, "\ntempo = %.2f\nbeat = %.2f\n", tempo, beat); +std::fprintf(stderr, "\ntempo = %.2f\nbeat = %.2f\n", tempo, beat); #endif mTimeInfo.mTempoBPS = bpmToBPS(tempo); mTimeInfo.mBeatPos = beat; @@ -1794,7 +1794,7 @@ fprintf(stderr, "\ntempo = %.2f\nbeat = %.2f\n", tempo, beat); mHostCanDoTempo = true; } #ifdef DFX_DEBUG_PRINT_MUSICAL_TIME_INFO -else fprintf(stderr, "CallHostBeatAndTempo() error %ld\n", status); +else std::fprintf(stderr, "CallHostBeatAndTempo() error %ld\n", status); #endif // the number of samples until the next beat from the start sample of the current rendering buffer @@ -1811,7 +1811,7 @@ else fprintf(stderr, "CallHostBeatAndTempo() error %ld\n", status); // get the song beat position of the beginning of the current measure mTimeInfo.mBarPos = currentMeasureDownBeat; #ifdef DFX_DEBUG_PRINT_MUSICAL_TIME_INFO -fprintf(stderr, "time sig = %.0f/%lu\nmeasure beat = %.2f\n", timeSigNumerator, timeSigDenominator, currentMeasureDownBeat); +std::fprintf(stderr, "time sig = %.0f/%lu\nmeasure beat = %.2f\n", timeSigNumerator, timeSigDenominator, currentMeasureDownBeat); #endif // get the numerator of the time signature - this is the number of beats per measure mTimeInfo.mTimeSignature = @@ -1821,7 +1821,7 @@ fprintf(stderr, "time sig = %.0f/%lu\nmeasure beat = %.2f\n", timeSigNumerator, }; } #ifdef DFX_DEBUG_PRINT_MUSICAL_TIME_INFO -else fprintf(stderr, "CallHostMusicalTimeLocation() error %ld\n", status); +else std::fprintf(stderr, "CallHostMusicalTimeLocation() error %ld\n", status); #endif Boolean isPlaying {}; @@ -1834,13 +1834,13 @@ else fprintf(stderr, "CallHostMusicalTimeLocation() error %ld\n", status); if (status == noErr) { #ifdef DFX_DEBUG_PRINT_MUSICAL_TIME_INFO -fprintf(stderr, "is playing = %s\ntransport changed = %s\n", isPlaying ? "true" : "false", transportStateChanged ? "true" : "false"); +std::fprintf(stderr, "is playing = %s\ntransport changed = %s\n", isPlaying ? "true" : "false", transportStateChanged ? "true" : "false"); #endif mTimeInfo.mPlaybackChanged = transportStateChanged; mTimeInfo.mPlaybackIsOccurring = isPlaying; } #ifdef DFX_DEBUG_PRINT_MUSICAL_TIME_INFO -else fprintf(stderr, "CallHostTransportState() error %ld\n", status); +else std::fprintf(stderr, "CallHostTransportState() error %ld\n", status); #endif #endif // TARGET_API_AUDIOUNIT @@ -2060,7 +2060,7 @@ DfxPluginCore* DfxPlugin::getplugincore(size_t inChannel) const void DfxPlugin::handlemidi_noteon(int inChannel, int inNote, int inVelocity, size_t inOffsetFrames) { #ifdef DFX_DEBUG_PRINT_MUSIC_EVENTS -fprintf(stderr, "note on: note = %d, velocity = %d, channel = %d, sample offset = %zu\n", inNote, inVelocity, inChannel, inOffsetFrames); +std::fprintf(stderr, "note on: note = %d, velocity = %d, channel = %d, sample offset = %zu\n", inNote, inVelocity, inChannel, inOffsetFrames); #endif mMidiState.handleNoteOn(inChannel, inNote, inVelocity, inOffsetFrames); mDfxSettings->handleNoteOn(inChannel, inNote, inVelocity, inOffsetFrames); @@ -2070,7 +2070,7 @@ fprintf(stderr, "note on: note = %d, velocity = %d, channel = %d, sample offset void DfxPlugin::handlemidi_noteoff(int inChannel, int inNote, int inVelocity, size_t inOffsetFrames) { #ifdef DFX_DEBUG_PRINT_MUSIC_EVENTS -fprintf(stderr, "note off: note = %d, velocity = %d, channel = %d, sample offset = %zu\n", inNote, inVelocity, inChannel, inOffsetFrames); +std::fprintf(stderr, "note off: note = %d, velocity = %d, channel = %d, sample offset = %zu\n", inNote, inVelocity, inChannel, inOffsetFrames); #endif mMidiState.handleNoteOff(inChannel, inNote, inVelocity, inOffsetFrames); mDfxSettings->handleNoteOff(inChannel, inNote, inVelocity, inOffsetFrames); @@ -2080,7 +2080,7 @@ fprintf(stderr, "note off: note = %d, velocity = %d, channel = %d, sample offse void DfxPlugin::handlemidi_allnotesoff(int inChannel, size_t inOffsetFrames) { #ifdef DFX_DEBUG_PRINT_MUSIC_EVENTS -fprintf(stderr, "all notes off: channel = %d, sample offset = %zu\n", inChannel, inOffsetFrames); +std::fprintf(stderr, "all notes off: channel = %d, sample offset = %zu\n", inChannel, inOffsetFrames); #endif mMidiState.handleAllNotesOff(inChannel, inOffsetFrames); mDfxSettings->handleAllNotesOff(inChannel, inOffsetFrames); @@ -2090,7 +2090,7 @@ fprintf(stderr, "all notes off: channel = %d, sample offset = %zu\n", inChannel void DfxPlugin::handlemidi_channelaftertouch(int inChannel, int inValue, size_t inOffsetFrames) { #ifdef DFX_DEBUG_PRINT_MUSIC_EVENTS -fprintf(stderr, "channel aftertouch: value = %d, channel = %d, sample offset = %zu\n", inValue, inChannel, inOffsetFrames); +std::fprintf(stderr, "channel aftertouch: value = %d, channel = %d, sample offset = %zu\n", inValue, inChannel, inOffsetFrames); #endif mMidiState.handleChannelAftertouch(inChannel, inValue, inOffsetFrames); mDfxSettings->handleChannelAftertouch(inChannel, inValue, inOffsetFrames); @@ -2100,7 +2100,7 @@ fprintf(stderr, "channel aftertouch: value = %d, channel = %d, sample offset = void DfxPlugin::handlemidi_pitchbend(int inChannel, int inValueLSB, int inValueMSB, size_t inOffsetFrames) { #ifdef DFX_DEBUG_PRINT_MUSIC_EVENTS -fprintf(stderr, "pitchbend: LSB = %d, MSB = %d, channel = %d, sample offset = %zu\n", inValueLSB, inValueMSB, inChannel, inOffsetFrames); +std::fprintf(stderr, "pitchbend: LSB = %d, MSB = %d, channel = %d, sample offset = %zu\n", inValueLSB, inValueMSB, inChannel, inOffsetFrames); #endif mMidiState.handlePitchBend(inChannel, inValueLSB, inValueMSB, inOffsetFrames); mDfxSettings->handlePitchBend(inChannel, inValueLSB, inValueMSB, inOffsetFrames); @@ -2110,7 +2110,7 @@ fprintf(stderr, "pitchbend: LSB = %d, MSB = %d, channel = %d, sample offset = % void DfxPlugin::handlemidi_cc(int inChannel, int inControllerNum, int inValue, size_t inOffsetFrames) { #ifdef DFX_DEBUG_PRINT_MUSIC_EVENTS -fprintf(stderr, "MIDI CC: controller = 0x%02X, value = %d, channel = %d, sample offset = %zu\n", inControllerNum, inValue, inChannel, inOffsetFrames); +std::fprintf(stderr, "MIDI CC: controller = 0x%02X, value = %d, channel = %d, sample offset = %zu\n", inControllerNum, inValue, inChannel, inOffsetFrames); #endif mMidiState.handleCC(inChannel, inControllerNum, inValue, inOffsetFrames); mDfxSettings->handleCC(inChannel, inControllerNum, inValue, inOffsetFrames); @@ -2120,7 +2120,7 @@ fprintf(stderr, "MIDI CC: controller = 0x%02X, value = %d, channel = %d, sample void DfxPlugin::handlemidi_programchange(int inChannel, int inProgramNum, size_t inOffsetFrames) { #ifdef DFX_DEBUG_PRINT_MUSIC_EVENTS -fprintf(stderr, "program change: program num = %d, channel = %d, sample offset = %zu\n", inProgramNum, inChannel, inOffsetFrames); +std::fprintf(stderr, "program change: program num = %d, channel = %d, sample offset = %zu\n", inProgramNum, inChannel, inOffsetFrames); #endif mMidiState.handleProgramChange(inChannel, inProgramNum, inOffsetFrames); } diff --git a/dfx-library/dfxsettings.cpp b/dfx-library/dfxsettings.cpp index 9e1ee1d3..f7a5d40a 100644 --- a/dfx-library/dfxsettings.cpp +++ b/dfx-library/dfxsettings.cpp @@ -32,6 +32,7 @@ Welcome to our settings persistence mess. #include #include #include +#include #include #include #include @@ -465,7 +466,7 @@ try #endif validateRange(firstNewPresetByteAddress, sizeOfStoredPreset * numStoredPresets, "presets"); - auto const getPresetNameWithFallback = [](std::string_view presetName) -> std::string_view + constexpr auto getPresetNameWithFallback = [](std::string_view presetName) -> std::string_view { return presetName.empty() ? "(unnamed)" : presetName; }; @@ -1641,10 +1642,10 @@ void DfxSettings::debugAlertCorruptData(char const* inDataItemName, size_t inDat } #elif TARGET_OS_WIN32 std::array msg {}; - snprintf(msg.data(), msg.size(), - "Something is wrong with the settings data! " - "Info for bug reports: name: %s size: %zu total: %zu", - inDataItemName, inDataItemSize, inDataTotalSize); + std::snprintf(msg.data(), msg.size(), + "Something is wrong with the settings data! " + "Info for bug reports: name: %s size: %zu total: %zu", + inDataItemName, inDataItemSize, inDataTotalSize); MessageBoxA(nullptr, msg.data(), "DFX Error!", 0); #else #warning "implementation missing" diff --git a/dfxgui/dfxguieditor.cpp b/dfxgui/dfxguieditor.cpp index 384fbe7f..617ed8ca 100644 --- a/dfxgui/dfxguieditor.cpp +++ b/dfxgui/dfxguieditor.cpp @@ -27,6 +27,7 @@ To contact the author, use the contact form at http://destroyfx.org #include #include #include +#include #include #include #include @@ -769,11 +770,11 @@ void DfxGuiEditor::TextEntryForParameterValue(dfx::ParameterID inParameterID) std::array textValue {}; if (GetParameterValueType(inParameterID) == DfxParam::ValueType::Float) { - snprintf(textValue.data(), textValue.size(), "%.6lf", getparameter_f(inParameterID)); + std::snprintf(textValue.data(), textValue.size(), "%.6lf", getparameter_f(inParameterID)); } else { - snprintf(textValue.data(), textValue.size(), "%ld", getparameter_i(inParameterID)); + std::snprintf(textValue.data(), textValue.size(), "%ld", getparameter_i(inParameterID)); } mTextEntryDialog->setText(textValue.data()); @@ -1891,7 +1892,7 @@ void DfxGuiEditor::TextEntryForParameterMidiCC(dfx::ParameterID inParameterID) auto const currentParameterAssignment = getparametermidiassignment(inParameterID); if (currentParameterAssignment.mEventType == dfx::MidiEventType::CC) { - snprintf(initialText.data(), initialText.size(), "%d", currentParameterAssignment.mEventNum); + std::snprintf(initialText.data(), initialText.size(), "%d", currentParameterAssignment.mEventNum); } mTextEntryDialog->setText(initialText.data()); @@ -2776,7 +2777,7 @@ void DfxGuiEditor::ShowMessage(std::string const& inMessage) } if (!shown) { - fprintf(stderr, "%s\n", inMessage.c_str()); + std::fprintf(stderr, "%s\n", inMessage.c_str()); } } diff --git a/dfxgui/dfxguimisc.cpp b/dfxgui/dfxguimisc.cpp index 2465a639..b07d6d13 100644 --- a/dfxgui/dfxguimisc.cpp +++ b/dfxgui/dfxguimisc.cpp @@ -96,7 +96,7 @@ DGColor DGColor::getSystem(System inSystemColorID) auto const rgbColor = [inColor colorUsingColorSpace:NSColorSpace.sRGBColorSpace]; if (rgbColor) { -//printf("%lf %lf %lf %lf\n", rgbColor.redComponent * 255., rgbColor.greenComponent * 255., rgbColor.blueComponent * 255., rgbColor.alphaComponent); +//std::printf("%lf %lf %lf %lf\n", rgbColor.redComponent * 255., rgbColor.greenComponent * 255., rgbColor.blueComponent * 255., rgbColor.alphaComponent); return DGColor(static_cast(rgbColor.redComponent), static_cast(rgbColor.greenComponent), static_cast(rgbColor.blueComponent), static_cast(rgbColor.alphaComponent)); } diff --git a/eqsync/gui/eqsynceditor.cpp b/eqsync/gui/eqsynceditor.cpp index c6902c37..d459987e 100644 --- a/eqsync/gui/eqsynceditor.cpp +++ b/eqsync/gui/eqsynceditor.cpp @@ -21,6 +21,8 @@ To contact the author, use the contact form at http://destroyfx.org #include "eqsynceditor.h" +#include + #include "dfxmisc.h" #include "eqsync.h" #include "temporatetable.h" @@ -215,14 +217,14 @@ void EQSyncEditor::OpenEditor() { textProc = [](float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f%%", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f%%", inValue) > 0; }; } else if (i == kTempo) { textProc = [](float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f", inValue) > 0; }; } pos.set(wideFaderX + kDisplayOffsetX, wideFaderY + kDisplayOffsetY + (kWideFaderInc * i), kDisplayWidth, kDisplayHeight); diff --git a/exemplar/exemplar.cpp b/exemplar/exemplar.cpp index 7d125d47..8182d9b4 100644 --- a/exemplar/exemplar.cpp +++ b/exemplar/exemplar.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2006-2022 Tom Murphy 7 +Copyright (C) 2006-2023 Tom Murphy 7 This file is part of Exemplar. @@ -67,9 +67,9 @@ PLUGIN::PLUGIN(TARGET_API_BASE_INSTANCE_TYPE inInstance) std::array bufstr {}; for (long i=0; i < BUFFERSIZESSIZE; i++) { if (buffersizes[i] > 1000) - snprintf(bufstr.data(), bufstr.size(), "%ld,%03ld", buffersizes[i]/1000, buffersizes[i]%1000); + std::snprintf(bufstr.data(), bufstr.size(), "%ld,%03ld", buffersizes[i]/1000, buffersizes[i]%1000); else - snprintf(bufstr.data(), bufstr.size(), "%ld", buffersizes[i]); + std::snprintf(bufstr.data(), bufstr.size(), "%ld", buffersizes[i]); setparametervaluestring(P_BUFSIZE, i, bufstr.data()); } @@ -151,9 +151,9 @@ void PLUGINCORE::reset() { } nntree = std::make_unique(cap_point, npoints, DIMENSION); - char msg[512]; - // sprintf(msg, "ok %p", this); - // MessageBoxA(0, "match mode", msg, MB_OK); + std::array msg {}; + // std::snprintf(msg.data(), msg.size(), "ok %p", this); + // MessageBoxA(0, "match mode", msg.data(), MB_OK); #if 0 std::ofstream f; f.open("c:\\code\\vstplugins\\exemplar\\dump.ann"); diff --git a/geometer/geometer.cpp b/geometer/geometer.cpp index 9f5c249f..177fae5e 100644 --- a/geometer/geometer.cpp +++ b/geometer/geometer.cpp @@ -31,6 +31,7 @@ Featuring the Super Destroy FX Windowing System! #include #include #include +#include #include #include #include @@ -112,9 +113,9 @@ PLUGIN::PLUGIN(TARGET_API_BASE_INSTANCE_TYPE inInstance) std::array bufstr {}; constexpr int thousand = 1000; if (buffersizes[i] >= thousand) { - snprintf(bufstr.data(), bufstr.size(), "%d,%03d", buffersizes[i] / thousand, buffersizes[i] % thousand); + std::snprintf(bufstr.data(), bufstr.size(), "%d,%03d", buffersizes[i] / thousand, buffersizes[i] % thousand); } else { - snprintf(bufstr.data(), bufstr.size(), "%d", buffersizes[i]); + std::snprintf(bufstr.data(), bufstr.size(), "%d", buffersizes[i]); } setparametervaluestring(P_BUFSIZE, static_cast(i), bufstr.data()); } diff --git a/geometer/gui/geometereditor.cpp b/geometer/gui/geometereditor.cpp index 52bb4187..37e2ef5d 100644 --- a/geometer/gui/geometereditor.cpp +++ b/geometer/gui/geometereditor.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2022 Tom Murphy 7 and Sophia Poirier +Copyright (C) 2002-2023 Tom Murphy 7 and Sophia Poirier This file is part of Geometer. @@ -23,6 +23,7 @@ To contact the author, use the contact form at http://destroyfx.org #include #include +#include #include #include "geometer-base.h" @@ -265,7 +266,7 @@ void GeometerEditor::OpenEditor() { // value display auto const geometerDisplayProc = [](float value, char * outText, void *) -> bool { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.7f", value) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.7f", value) > 0; }; displays[i] = emplaceControl(this, param, dpos, geometerDisplayProc, nullptr, nullptr, dfx::TextAlignment::Right, dfx::kFontSize_Snooty10px, diff --git a/midigater/gui/midigatereditor.cpp b/midigater/gui/midigatereditor.cpp index 9a2703bf..466b3c33 100644 --- a/midigater/gui/midigatereditor.cpp +++ b/midigater/gui/midigatereditor.cpp @@ -22,6 +22,7 @@ To contact the author, use the contact form at http://destroyfx.org #include "midigatereditor.h" #include +#include #include "dfxmath.h" #include "dfxmisc.h" @@ -76,11 +77,11 @@ static bool envelopeDisplayProc(float inValue, char* outText, void*) bool success = false; if (thousands > 0) { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%05.1f", thousands, remainder) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%05.1f", thousands, remainder) > 0; } else { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; } dfx::StrlCat(outText, " ms", DGTextDisplay::kTextMaxLength); diff --git a/monomaker/gui/monomakereditor.cpp b/monomaker/gui/monomakereditor.cpp index aecbc128..2f693eca 100644 --- a/monomaker/gui/monomakereditor.cpp +++ b/monomaker/gui/monomakereditor.cpp @@ -21,6 +21,8 @@ To contact the author, use the contact form at http://destroyfx.org #include "monomakereditor.h" +#include + #include "monomaker.h" @@ -65,13 +67,13 @@ constexpr float kUnusedControlAlpha = 0.36f; static bool monomergeDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, " %.1f%%", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, " %.1f%%", inValue) > 0; } static bool panDisplayProc(float inValue, char* outText, void*) { char const* const prefix = (inValue >= 0.0005f) ? "+" : ""; - return snprintf(outText, DGTextDisplay::kTextMaxLength, " %s%.1f%%", prefix, inValue * 100.0f) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, " %s%.1f%%", prefix, inValue * 100.0f) > 0; } diff --git a/polarizer/gui/polarizereditor.cpp b/polarizer/gui/polarizereditor.cpp index 0b62038b..680f29a6 100644 --- a/polarizer/gui/polarizereditor.cpp +++ b/polarizer/gui/polarizereditor.cpp @@ -22,6 +22,7 @@ To contact the author, use the contact form at http://destroyfx.org #include "polarizereditor.h" #include +#include #include "dfxmisc.h" #include "polarizer.h" @@ -60,7 +61,7 @@ constexpr float kValueTextSize = 16.8f; static bool leapDisplayProc(float inValue, char* outText, void*) { auto const value_i = static_cast(inValue); - bool const success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%ld sample", value_i) > 0; + bool const success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%ld sample", value_i) > 0; if (success && (std::abs(value_i) > 1)) { dfx::StrlCat(outText, "s", DGTextDisplay::kTextMaxLength); @@ -70,7 +71,7 @@ static bool leapDisplayProc(float inValue, char* outText, void*) static bool amountDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue * 10.0f) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue * 10.0f) > 0; } static float amountValueFromTextConvertProc(float inValue, DGTextDisplay*) diff --git a/rezsynth/gui/rezsyntheditor.cpp b/rezsynth/gui/rezsyntheditor.cpp index e4c1ffd0..962e0849 100644 --- a/rezsynth/gui/rezsyntheditor.cpp +++ b/rezsynth/gui/rezsyntheditor.cpp @@ -23,6 +23,7 @@ To contact the author, use the contact form at http://destroyfx.org #include #include +#include #include #include "dfxmath.h" @@ -111,7 +112,7 @@ constexpr float kUnusedControlAlpha = 0.39f; static bool bandwidthAmountDisplayProc(float inValue, char* outText, void* inEditor) { - auto const success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f", inValue) > 0; + auto const success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f", inValue) > 0; if (static_cast(inEditor)->getparameter_i(kBandwidthMode) == kBandwidthMode_Hz) { dfx::StrlCat(outText, " Hz", DGTextDisplay::kTextMaxLength); @@ -125,18 +126,18 @@ static bool bandwidthAmountDisplayProc(float inValue, char* outText, void* inEdi static bool numBandsDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f", inValue) > 0; } static bool sepAmountDisplayProc(float inValue, char* outText, void* inEditor) { if (static_cast(inEditor)->getparameter_i(kSepMode) == kSeparationMode_Octaval) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f semitones", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f semitones", inValue) > 0; } else // linear values { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f x", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f x", inValue) > 0; } } @@ -148,11 +149,11 @@ static bool attackDecayReleaseDisplayProc(float inValue, char* outText, void*) bool success = false; if (thousands > 0) { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%05.1f", thousands, remainder) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%05.1f", thousands, remainder) > 0; } else { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; } dfx::StrlCat(outText, " ms", DGTextDisplay::kTextMaxLength); @@ -161,7 +162,7 @@ static bool attackDecayReleaseDisplayProc(float inValue, char* outText, void*) static bool percentGenDisplayProc(float inValue, char* outText, int inPrecision) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.*f%%", inPrecision, inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.*f%%", inPrecision, inValue) > 0; } static bool percentDisplayProc(float inValue, char* outText, void*) @@ -178,12 +179,12 @@ static bool sustainDisplayProc(float inValue, char* outText, void*) static bool velocityCurveDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f", inValue) > 0; } static bool pitchBendDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%s%.2f semitones", dfx::kPlusMinusUTF8, inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%s%.2f semitones", dfx::kPlusMinusUTF8, inValue) > 0; } diff --git a/scrubby/gui/scrubbyeditor.cpp b/scrubby/gui/scrubbyeditor.cpp index b7926161..fe2f6c0f 100644 --- a/scrubby/gui/scrubbyeditor.cpp +++ b/scrubby/gui/scrubbyeditor.cpp @@ -23,6 +23,7 @@ To contact the author, use the contact form at http://destroyfx.org #include #include +#include #include "dfxmisc.h" #include "scrubby.h" @@ -153,7 +154,7 @@ enum : size_t static bool seekRangeDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f ms", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f ms", inValue) > 0; } static bool seekRateGenDisplayProc(float inValue, dfx::ParameterID inParameterID, char* outText, DfxGuiEditor* inEditor) @@ -162,12 +163,12 @@ static bool seekRateGenDisplayProc(float inValue, dfx::ParameterID inParameterID { if (auto const valueString = inEditor->getparametervaluestring(inParameterID)) //&& (valueString->length() <= 3) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%s cycles/beat", valueString->c_str()) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%s cycles/beat", valueString->c_str()) > 0; } } else { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f Hz", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f Hz", inValue) > 0; } return false; } @@ -189,7 +190,7 @@ static bool octaveMinDisplayProc(float inValue, char* outText, void*) { return dfx::StrLCpy(outText, "no min", DGTextDisplay::kTextMaxLength) > 0; } - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%ld", octaves) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%ld", octaves) > 0; } static bool octaveMaxDisplayProc(float inValue, char* outText, void*) @@ -201,19 +202,19 @@ static bool octaveMaxDisplayProc(float inValue, char* outText, void*) } if (octaves == 0) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "0") > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "0") > 0; } - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%+ld", octaves) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%+ld", octaves) > 0; } static bool tempoDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f bpm", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f bpm", inValue) > 0; } static bool predelayDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f%%", inValue) > 0; } diff --git a/scrubby/scrubbyprocess.cpp b/scrubby/scrubbyprocess.cpp index 40dc9894..998eecd7 100644 --- a/scrubby/scrubbyprocess.cpp +++ b/scrubby/scrubbyprocess.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2022 Sophia Poirier +Copyright (C) 2002-2023 Sophia Poirier This file is part of Scrubby. @@ -299,9 +299,9 @@ void Scrubby::generateNewTarget(size_t channel) mPortamentoStep[channel] = std::pow(std::fabs(targetReadStep) / oldReadStep, 1.0 / static_cast(mMoveCount[channel])); mPortamentoStep[channel] = std::fabs(mPortamentoStep[channel]); //auto const ktest = static_cast(std::fabs((targetReadStep * static_cast(mMoveCount[channel])) / std::log(std::fabs(targetReadStep / oldReadStep)))); -//printf("oldReadStep = %.6f\nreadStep = %.6f\ntargetReadStep = %.6f\nportamentoStep = %.6f\nmovecount = %ld\ntargetDistance = %ld\nktest = %ld\n\n", oldReadStep, newReadStep, targetReadStep, mPortamentoStep[channel], mMoveCount[channel], targetDistance, ktest); -//printf("a = %.3f,\tb = %.3f,\tn = %ld,\tk = %ld\tportamentoStep = %.6f\n", oldReadStep, targetReadStep, mMoveCount[channel], targetDistance, mPortamentoStep[channel]); -//printf("\noldReadStep = %.6f\treadStep = %.6f\ttargetReadStep = %.6f\tportamentoStep = %.6f\n", oldReadStep, newReadStep, targetReadStep, mPortamentoStep[channel]); +//std::printf("oldReadStep = %.6f\nreadStep = %.6f\ntargetReadStep = %.6f\nportamentoStep = %.6f\nmovecount = %ld\ntargetDistance = %ld\nktest = %ld\n\n", oldReadStep, newReadStep, targetReadStep, mPortamentoStep[channel], mMoveCount[channel], targetDistance, ktest); +//std::printf("a = %.3f,\tb = %.3f,\tn = %ld,\tk = %ld\tportamentoStep = %.6f\n", oldReadStep, targetReadStep, mMoveCount[channel], targetDistance, mPortamentoStep[channel]); +//std::printf("\noldReadStep = %.6f\treadStep = %.6f\ttargetReadStep = %.6f\tportamentoStep = %.6f\n", oldReadStep, newReadStep, targetReadStep, mPortamentoStep[channel]); #endif newReadStep = oldReadStep; diff --git a/skidder/gui/skiddereditor.cpp b/skidder/gui/skiddereditor.cpp index 891d0fd4..f0e601bf 100644 --- a/skidder/gui/skiddereditor.cpp +++ b/skidder/gui/skiddereditor.cpp @@ -24,6 +24,8 @@ To contact the author, use the contact form at http://destroyfx.org #include #include #include +#include +#include #include "dfxmath.h" #include "dfxmisc.h" @@ -121,7 +123,7 @@ static bool rateGenDisplayProc(float inValue, dfx::ParameterID inSyncParameterID } else { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f%s", inValue, inShowUnits ? " Hz" : "") > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f%s", inValue, inShowUnits ? " Hz" : "") > 0; } return false; } @@ -138,16 +140,16 @@ static bool rateRandMinDisplayProc(float inValue, char* outText, void* inEditor) static bool slopeDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f ms", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.3f ms", inValue) > 0; } static bool crossoverDisplayProc(float inValue, char* outText, void*) { if (inValue >= 1'000.f) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f kHz", inValue / 1'000.f) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f kHz", inValue / 1'000.f) > 0; } - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f Hz", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.0f Hz", inValue) > 0; } static std::optional crossoverTextToValueProc(std::string const& inText, DGTextDisplay* inTextDisplay) @@ -166,7 +168,7 @@ static bool gainRandMinDisplayProc(float inValue, char* outText, void* inUserDat if (success) { // truncate units or any suffix beyond the numerical value - std::transform(outText, outText + strlen(outText), outText, [](auto character) + std::transform(outText, outText + std::strlen(outText), outText, [](auto character) { return std::isspace(character) ? '\0' : character; }); @@ -176,7 +178,7 @@ static bool gainRandMinDisplayProc(float inValue, char* outText, void* inUserDat static bool tempoDisplayProc(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f bpm", inValue) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f bpm", inValue) > 0; } diff --git a/slowft/slowft.cpp b/slowft/slowft.cpp index 5f893354..73882066 100644 --- a/slowft/slowft.cpp +++ b/slowft/slowft.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2005-2022 Tom Murphy 7 +Copyright (C) 2005-2023 Tom Murphy 7 This file is part of Slowft. @@ -44,9 +44,9 @@ PLUGIN::PLUGIN(TARGET_API_BASE_INSTANCE_TYPE inInstance) std::array bufstr {}; for (long i = 0; i < BUFFERSIZESSIZE; i++) { if (buffersizes[i] > 1000) - snprintf(bufstr.data(), bufstr.size(), "%ld,%03ld", buffersizes[i]/1000, buffersizes[i]%1000); + std::snprintf(bufstr.data(), bufstr.size(), "%ld,%03ld", buffersizes[i]/1000, buffersizes[i]%1000); else - snprintf(bufstr.data(), bufstr.size(), "%ld", buffersizes[i]); + std::snprintf(bufstr.data(), bufstr.size(), "%ld", buffersizes[i]); setparametervaluestring(P_BUFSIZE, i, bufstr.data()); } diff --git a/transverb/gui/transverbeditor.cpp b/transverb/gui/transverbeditor.cpp index 616d602a..389e3e57 100644 --- a/transverb/gui/transverbeditor.cpp +++ b/transverb/gui/transverbeditor.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2001-2022 Tom Murphy 7 and Sophia Poirier +Copyright (C) 2001-2023 Tom Murphy 7 and Sophia Poirier This file is part of Transverb. @@ -105,11 +105,11 @@ static bool bsizeDisplayProcedure(float inValue, char* outText, void*) bool success = false; if (thousands > 0) { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%05.1f", thousands, remainder) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%05.1f", thousands, remainder) > 0; } else { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.1f", inValue) > 0; } dfx::StrlCat(outText, " ms", DGTextDisplay::kTextMaxLength); @@ -124,7 +124,7 @@ static bool speedDisplayProcedure(float inValue, char* outText, void*) float semitones = remainder * kSemitonesPerOctave; // make sure that these float crap doesn't result in wacky stuff // like displays that say "-1 octave & 12.00 semitones" - snprintf(semitonesString.data(), semitonesString.size(), "%.3f", semitones); + std::snprintf(semitonesString.data(), semitonesString.size(), "%.3f", semitones); std::string const semitonesStdString(semitonesString.data()); if ((semitonesStdString == "12.000") || (semitonesStdString == "-12.000")) { @@ -144,19 +144,19 @@ static bool speedDisplayProcedure(float inValue, char* outText, void*) { if (octaves == 0) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%s%.2f semitones", (semitones < 0.000003f) ? "" : "+", semitones) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%s%.2f semitones", (semitones < 0.000003f) ? "" : "+", semitones) > 0; } auto const octavesSuffix = (octaves == 1) ? "" : "s"; - return snprintf(outText, DGTextDisplay::kTextMaxLength, "+%d octave%s & %.2f semitones", octaves, octavesSuffix, semitones) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "+%d octave%s & %.2f semitones", octaves, octavesSuffix, semitones) > 0; } else if (octaves == 0) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "-%.2f semitones", semitones) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "-%.2f semitones", semitones) > 0; } else { auto const octavesSuffix = (octaves == -1) ? "" : "s"; - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%d octave%s & %.2f semitones", octaves, octavesSuffix, semitones) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%d octave%s & %.2f semitones", octaves, octavesSuffix, semitones) > 0; } } @@ -197,7 +197,7 @@ static std::optional speedTextConvertProcedure(std::string const& inText, static bool feedbackDisplayProcedure(float inValue, char* outText, void*) { - return snprintf(outText, DGTextDisplay::kTextMaxLength, "%d%%", static_cast(inValue)) > 0; + return std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%d%%", static_cast(inValue)) > 0; } static bool distDisplayProcedure(float inValue, char* outText, void* inEditor) @@ -209,11 +209,11 @@ static bool distDisplayProcedure(float inValue, char* outText, void* inEditor) bool success = false; if (thousands > 0) { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%06.2f", thousands, remainder) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%d,%06.2f", thousands, remainder) > 0; } else { - success = snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f", distance) > 0; + success = std::snprintf(outText, DGTextDisplay::kTextMaxLength, "%.2f", distance) > 0; } dfx::StrlCat(outText, " ms", DGTextDisplay::kTextMaxLength); diff --git a/turntablist/turntablist.cpp b/turntablist/turntablist.cpp index 5e62d544..6095b920 100644 --- a/turntablist/turntablist.cpp +++ b/turntablist/turntablist.cpp @@ -27,6 +27,7 @@ To contact the developer, use the contact form at http://destroyfx.org #include #include #include +#include #include #include @@ -257,8 +258,8 @@ void Turntablist::processparameters() #pragma mark - #pragma mark plugin state -static const CFStringRef kTurntablistPreset_AudioFileReferenceKey = CFSTR("audiofile"); -static const CFStringRef kTurntablistPreset_AudioFileAliasKey = CFSTR("DestroyFX-audiofile-alias"); +static CFStringRef const kTurntablistPreset_AudioFileReferenceKey = CFSTR("audiofile"); +static CFStringRef const kTurntablistPreset_AudioFileAliasKey = CFSTR("DestroyFX-audiofile-alias"); //----------------------------------------------------------------------------------------- OSStatus Turntablist::SaveState(CFPropertyListRef* outData) @@ -334,7 +335,7 @@ OSStatus Turntablist::RestoreState(CFPropertyListRef inData) auto const audioFileUrl = dfx::MakeUniqueCFType(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, audioFileUrlString, kCFURLPOSIXPathStyle, false)); if (audioFileUrl) { - FSRef audioFileRef; + FSRef audioFileRef {}; if (CFURLGetFSRef(audioFileUrl.get(), &audioFileRef)) { loadAudioFile(audioFileRef); @@ -367,8 +368,8 @@ OSStatus Turntablist::RestoreState(CFPropertyListRef inData) auto aliasError = PtrToHand(aliasData, reinterpret_cast(&aliasHandle), aliasDataSize); if ((aliasError == noErr) && aliasHandle) { - FSRef audioFileRef; - Boolean wasChanged; + FSRef audioFileRef {}; + Boolean wasChanged {}; aliasError = FSResolveAlias(nullptr, aliasHandle, &audioFileRef, &wasChanged); if (aliasError == noErr) { @@ -658,8 +659,8 @@ OSStatus Turntablist::createAudioFileAlias(AliasHandle* outAlias, Size* outDataS //----------------------------------------------------------------------------- OSStatus Turntablist::resolveAudioFileAlias(AliasHandle const inAlias) { - FSRef audioFileRef; - Boolean wasChanged; + FSRef audioFileRef {}; + Boolean wasChanged {}; auto status = FSResolveAlias(nullptr, inAlias, &audioFileRef, &wasChanged); if (status == noErr) { @@ -709,7 +710,7 @@ OSStatus Turntablist::loadAudioFile(FSRef const& inFileRef) if (audioFileNumFrames_temp != static_cast(audioFileNumFrames)) // XXX do something? { // XXX error? - fprintf(stderr, PLUGIN_NAME_STRING ": audio data size mismatch!\nsize requested: %ld, size read: %u\n\n", static_cast(audioFileNumFrames), static_cast(audioFileNumFrames_temp)); + std::fprintf(stderr, PLUGIN_NAME_STRING ": audio data size mismatch!\nsize requested: %ld, size read: %u\n\n", static_cast(audioFileNumFrames), static_cast(audioFileNumFrames_temp)); } status = ExtAudioFileDispose(audioFileRef); @@ -731,7 +732,7 @@ OSStatus Turntablist::loadAudioFile(FSRef const& inFileRef) #else UInt8 file[2048] {}; AUSDK_Require_noerr(FSRefMakePath(&inFileRef, file, std::size(file))); -//fprintf(stderr, PLUGIN_NAME_STRING " audio file: %s\n", file); +//std::fprintf(stderr, PLUGIN_NAME_STRING " audio file: %s\n", file); SF_INFO sfInfo {}; SNDFILE* const sndFile = sf_open(reinterpret_cast(file), SFM_READ, &sfInfo); @@ -741,18 +742,18 @@ OSStatus Turntablist::loadAudioFile(FSRef const& inFileRef) // print error char buffer[256] {}; sf_error_str(sndFile, buffer, std::size(buffer) - 1); - fprintf(stderr, "\n" PLUGIN_NAME_STRING " could not open the audio file: %s\nlibsndfile error message: %s\n", file, buffer); + std::fprintf(stderr, "\n" PLUGIN_NAME_STRING " could not open the audio file: %s\nlibsndfile error message: %s\n", file, buffer); return sf_error(sndFile); } #if 0 - fprintf(stderr, "**** SF_INFO dump for: %s\n", file); - fprintf(stderr, " samplerate: %d\n", sfInfo.samplerate); - fprintf(stderr, " frames: %d (0x%08x)\n", sfInfo.frames, sfInfo.frames); - fprintf(stderr, " channels: %d\n", sfInfo.channels); - fprintf(stderr, " format: %d\n", sfInfo.format); - fprintf(stderr, " sections: %d\n", sfInfo.sections); - fprintf(stderr, " seekable: %d\n", sfInfo.seekable); + std::fprintf(stderr, "**** SF_INFO dump for: %s\n", file); + std::fprintf(stderr, " samplerate: %d\n", sfInfo.samplerate); + std::fprintf(stderr, " frames: %d (0x%08x)\n", sfInfo.frames, sfInfo.frames); + std::fprintf(stderr, " channels: %d\n", sfInfo.channels); + std::fprintf(stderr, " format: %d\n", sfInfo.format); + std::fprintf(stderr, " sections: %d\n", sfInfo.sections); + std::fprintf(stderr, " seekable: %d\n", sfInfo.seekable); #endif sf_command(sndFile, SFC_SET_NORM_FLOAT, nullptr, SF_TRUE); @@ -784,7 +785,7 @@ OSStatus Turntablist::loadAudioFile(FSRef const& inFileRef) if (sizeout != sizein) { // XXX error? - fprintf(stderr, PLUGIN_NAME_STRING ": audio data size mismatch!\nsize-in: %ld, size-out: %ld\n\n", static_cast(sizein), static_cast(sizeout)); + std::fprintf(stderr, PLUGIN_NAME_STRING ": audio data size mismatch!\nsize-in: %ld, size-out: %ld\n\n", static_cast(sizein), static_cast(sizeout)); } if (m_nNumChannels >= 2) @@ -1006,7 +1007,7 @@ void Turntablist::processaudio(float const* const* /*inAudio*/, float* const* ou #ifdef USE_LIBSNDFILE auto const output = (ch == 0) ? m_fLeft : m_fRight; #else - AudioBufferList& abl = m_auBufferList.GetBufferList(); + AudioBufferList const& abl = m_auBufferList.GetBufferList(); size_t ablChannel = ch; if (ch >= abl.mNumberBuffers) { @@ -1017,7 +1018,7 @@ void Turntablist::processaudio(float const* const* /*inAudio*/, float* const* ou break; } } - auto const output = static_cast(abl.mBuffers[ablChannel].mData); + auto const output = static_cast(abl.mBuffers[ablChannel].mData); #endif #ifdef NO_INTERPOLATION diff --git a/windowingstub/windowingstub.cpp b/windowingstub/windowingstub.cpp index 99d5446a..08dfd3f7 100644 --- a/windowingstub/windowingstub.cpp +++ b/windowingstub/windowingstub.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2022 Tom Murphy 7 +Copyright (C) 2002-2023 Tom Murphy 7 This file is part of Windowingstub. @@ -47,9 +47,9 @@ PLUGIN::PLUGIN(TARGET_API_BASE_INSTANCE_TYPE inInstance) for (long i = 0; i < BUFFERSIZESSIZE; i++) { std::array bufstr {}; if (buffersizes[i] > 1000) - snprintf(bufstr.data(), bufstr.size(), "%ld,%03ld", buffersizes[i] / 1000, buffersizes[i] % 1000); + std::snprintf(bufstr.data(), bufstr.size(), "%ld,%03ld", buffersizes[i] / 1000, buffersizes[i] % 1000); else - snprintf(bufstr.data(), bufstr.size(), "%ld", buffersizes[i]); + std::snprintf(bufstr.data(), bufstr.size(), "%ld", buffersizes[i]); setparametervaluestring(P_BUFSIZE, i, bufstr.data()); }