From e89983a1ab6307c9b540d1c6aee5a32df3e42c30 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 22 Jun 2012 11:12:14 +0100 Subject: [PATCH] Removed confusing enums from HeapBlock. Fixed warnings in win32 midi. --- .../native/juce_win32_Midi.cpp | 10 +++++----- modules/juce_core/memory/juce_HeapBlock.h | 19 ++++++------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/modules/juce_audio_devices/native/juce_win32_Midi.cpp b/modules/juce_audio_devices/native/juce_win32_Midi.cpp index bec10c4939..4284e91ae8 100644 --- a/modules/juce_audio_devices/native/juce_win32_Midi.cpp +++ b/modules/juce_audio_devices/native/juce_win32_Midi.cpp @@ -199,18 +199,18 @@ private: double convertTimeStamp (uint32 timeStamp) { - timeStamp += startTime; + double t = startTime + timeStamp; const double now = Time::getMillisecondCounterHiRes(); - if (timeStamp > now) + if (t > now) { - if (timeStamp > now + 2.0) + if (t > now + 2.0) startTime -= 1.0; - timeStamp = now; + t = now; } - return timeStamp * 0.001; + return t * 0.001; } JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MidiInCollector); diff --git a/modules/juce_core/memory/juce_HeapBlock.h b/modules/juce_core/memory/juce_HeapBlock.h index ee58e6c1f9..9939a8501d 100644 --- a/modules/juce_core/memory/juce_HeapBlock.h +++ b/modules/juce_core/memory/juce_HeapBlock.h @@ -87,13 +87,6 @@ template class HeapBlock { public: - /** Flags used to indicate whether a newly allocated block should be cleared or not. */ - enum InitialisationState - { - leaveUnitialised = 0, - clearToZero - }; - //============================================================================== /** Creates a HeapBlock which is initially just a null pointer. @@ -120,13 +113,13 @@ public: /** Creates a HeapBlock containing a number of elements. - The initState parameter determines whether the new memory should be cleared, or - left uninitialised. + The initialiseToZero parameter determines whether the new memory should be cleared, + or left uninitialised. */ - HeapBlock (const size_t numElements, InitialisationState initState) - : data (static_cast (initState == leaveUnitialised - ? std::malloc (numElements * sizeof (ElementType)) - : std::calloc (numElements, sizeof (ElementType)))) + HeapBlock (const size_t numElements, const bool initialiseToZero) + : data (static_cast (initialiseToZero + ? std::calloc (numElements, sizeof (ElementType)) + : std::malloc (numElements * sizeof (ElementType)))) { throwOnAllocationFailure(); }