diff --git a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp index 5c353dc93e..baf423f3d6 100644 --- a/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp @@ -2829,7 +2829,7 @@ private: ts += 2; } - int bt = granule.blockType; + const int bt = granule.blockType; if (bt == 2) { for (; sb < (int) granule.maxb; sb += 2, ts += 2, rawout1 += 36, rawout2 += 36) @@ -2972,7 +2972,7 @@ public: { decodedStart = decodedEnd = 0; const int64 streamPos = stream.currentFrameIndex * 1152; - int toSkip = startSampleInFile - streamPos; + int toSkip = (int) (startSampleInFile - streamPos); jassert (toSkip >= 0); while (toSkip > 0) diff --git a/modules/juce_data_structures/values/juce_Value.cpp b/modules/juce_data_structures/values/juce_Value.cpp index 1a28a470d6..4da83a049a 100644 --- a/modules/juce_data_structures/values/juce_Value.cpp +++ b/modules/juce_data_structures/values/juce_Value.cpp @@ -82,7 +82,7 @@ private: } } - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SharedValueSourceUpdater); + JUCE_DECLARE_NON_COPYABLE (SharedValueSourceUpdater); }; Value::ValueSource::ValueSource() diff --git a/modules/juce_opengl/native/juce_OpenGL_osx.h b/modules/juce_opengl/native/juce_OpenGL_osx.h index bc06aa9b69..f06632a7c2 100644 --- a/modules/juce_opengl/native/juce_OpenGL_osx.h +++ b/modules/juce_opengl/native/juce_OpenGL_osx.h @@ -35,6 +35,7 @@ struct ThreadSafeNSOpenGLViewClass : public ObjCClass addMethod (@selector (_surfaceNeedsUpdate:), surfaceNeedsUpdate, "v@:@"); addMethod (@selector (rightMouseDown:), rightMouseDown, "v@:@"); addMethod (@selector (rightMouseUp:), rightMouseUp, "v@:@"); + addMethod (@selector (acceptsFirstMouse:), acceptsFirstMouse, "v@:@"); registerClass(); } @@ -86,6 +87,7 @@ private: sendSuperclassMessage (self, @selector (dealloc)); } + static BOOL acceptsFirstMouse (id, SEL, NSEvent*) { return YES; } static void surfaceNeedsUpdate (id self, SEL, NSNotification*) { setNeedsUpdateLocked (self, YES); } static void update (id self, SEL) { setNeedsUpdateLocked (self, YES); } static void reshape (id self, SEL) { setNeedsUpdateLocked (self, YES); }