From 9d973f0089c5fec900d461dd7ba057d2016e5e55 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 20 Feb 2012 12:04:49 +0000 Subject: [PATCH] Fixes for CoreAudio, MidiFile, TextEditor, Tooltip. --- modules/juce_audio_basics/midi/juce_MidiFile.cpp | 2 +- .../juce_audio_devices/native/juce_mac_CoreAudio.cpp | 12 ++++++++---- modules/juce_core/containers/juce_AbstractFifo.h | 8 ++++---- .../juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp | 12 +++++------- .../native/juce_android_Windowing.cpp | 2 +- modules/juce_gui_basics/widgets/juce_TextEditor.cpp | 4 +--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/juce_audio_basics/midi/juce_MidiFile.cpp b/modules/juce_audio_basics/midi/juce_MidiFile.cpp index b07cb847f8..3a5e34522d 100644 --- a/modules/juce_audio_basics/midi/juce_MidiFile.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiFile.cpp @@ -401,7 +401,7 @@ void MidiFile::writeTrack (OutputStream& mainOut, const int trackNum) ++data; --dataSize; } - else if ((statusByte & 0xf0) == 0xf0) // Write sysex message with length bytes. + else if (statusByte == 0xf0) // Write sysex message with length bytes. { out.writeByte ((char) statusByte); diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp index 1678294c0f..81fa4a81ef 100644 --- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp +++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp @@ -919,11 +919,15 @@ public: int getDefaultBufferSize() { - for (int i = 0; i < getNumBufferSizesAvailable(); ++i) - if (getBufferSizeSamples(i) >= 512) - return getBufferSizeSamples(i); + int best = 0; - return 512; + for (int i = 0; best < 512 && i < getNumBufferSizesAvailable(); ++i) + best = getBufferSizeSamples(i); + + if (best == 0) + best = 512; + + return best; } String open (const BigInteger& inputChannels, diff --git a/modules/juce_core/containers/juce_AbstractFifo.h b/modules/juce_core/containers/juce_AbstractFifo.h index 27eecbb59e..3faa5b1493 100644 --- a/modules/juce_core/containers/juce_AbstractFifo.h +++ b/modules/juce_core/containers/juce_AbstractFifo.h @@ -54,7 +54,7 @@ void addToFifo (const int* someData, int numItems) { int start1, size1, start2, size2; - prepareToWrite (numItems, start1, size1, start2, size2); + abstractFifo.prepareToWrite (numItems, start1, size1, start2, size2); if (size1 > 0) copySomeData (myBuffer + start1, someData, size1); @@ -62,13 +62,13 @@ if (size2 > 0) copySomeData (myBuffer + start2, someData + size1, size2); - finishedWrite (size1 + size2); + abstractFifo.finishedWrite (size1 + size2); } void readFromFifo (int* someData, int numItems) { int start1, size1, start2, size2; - prepareToRead (numSamples, start1, size1, start2, size2); + abstractFifo.prepareToRead (numSamples, start1, size1, start2, size2); if (size1 > 0) copySomeData (someData, myBuffer + start1, size1); @@ -76,7 +76,7 @@ if (size2 > 0) copySomeData (someData + size1, myBuffer + start2, size2); - finishedRead (size1 + size2); + abstractFifo.finishedRead (size1 + size2); } private: diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp index 75268a7414..5a283d21b9 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp @@ -94,14 +94,14 @@ namespace LookAndFeelHelpers return baseColour; } - TextLayout layoutTooltipText (const String& text) noexcept + TextLayout layoutTooltipText (const String& text, const Colour& colour) noexcept { const float tooltipFontSize = 13.0f; const int maxToolTipWidth = 400; AttributedString s; s.setJustification (Justification::centred); - s.append (text, Font (tooltipFontSize, Font::bold)); + s.append (text, Font (tooltipFontSize, Font::bold), colour); TextLayout tl; tl.createLayoutWithBalancedLineLengths (s, (float) maxToolTipWidth); @@ -1653,7 +1653,7 @@ ImageEffectFilter* LookAndFeel::getSliderEffect() //============================================================================== void LookAndFeel::getTooltipSize (const String& tipText, int& width, int& height) { - const TextLayout tl (LookAndFeelHelpers::layoutTooltipText (tipText)); + const TextLayout tl (LookAndFeelHelpers::layoutTooltipText (tipText, Colours::black)); width = (int) (tl.getWidth() + 14.0f); height = (int) (tl.getHeight() + 6.0f); @@ -1668,10 +1668,8 @@ void LookAndFeel::drawTooltip (Graphics& g, const String& text, int width, int h g.drawRect (0, 0, width, height, 1); #endif - const TextLayout tl (LookAndFeelHelpers::layoutTooltipText (text)); - - g.setColour (findColour (TooltipWindow::textColourId)); - tl.draw (g, Rectangle (0.0f, 0.0f, (float) width, (float) height)); + const TextLayout tl (LookAndFeelHelpers::layoutTooltipText (text, findColour (TooltipWindow::textColourId))); + tl.draw (g, Rectangle ((float) width, (float) height)); } //============================================================================== diff --git a/modules/juce_gui_basics/native/juce_android_Windowing.cpp b/modules/juce_gui_basics/native/juce_android_Windowing.cpp index a1c53e4ddc..7a4fa84f41 100644 --- a/modules/juce_gui_basics/native/juce_android_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_android_Windowing.cpp @@ -457,6 +457,7 @@ public: // TODO } + #if USE_ANDROID_CANVAS StringArray getAvailableRenderingEngines() { StringArray s (ComponentPeer::getAvailableRenderingEngines()); @@ -464,7 +465,6 @@ public: return s; } - #if USE_ANDROID_CANVAS int getCurrentRenderingEngine() const { return usingAndroidGraphics ? 1 : 0; diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp index 0a7a901c41..f1c365bada 100644 --- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp +++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp @@ -1753,9 +1753,7 @@ void TextEditor::paintOverChildren (Graphics& g) else { g.drawText (textToShowWhenEmpty, - leftIndent, topIndent, - viewport->getWidth() - leftIndent, - viewport->getHeight() - topIndent, + leftIndent, 0, viewport->getWidth() - leftIndent, getHeight(), Justification::centredLeft, true); } }