From 82f1fd57a44a377f14cdb98d818e268ca5da6bd5 Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Fri, 18 Aug 2023 15:14:51 +0100 Subject: [PATCH] Fix some compiler warnings --- examples/Assets/DSPDemos_Common.h | 26 +++++++------------ .../app/src/main/assets/DSPDemos_Common.h | 26 +++++++------------ examples/GUI/CodeEditorDemo.h | 9 +++++-- examples/GUI/OpenGLDemo.h | 4 +-- examples/GUI/PropertiesDemo.h | 2 +- examples/Plugins/HostPluginDemo.h | 3 --- .../Plugins/ReaperEmbeddedViewPluginDemo.h | 10 +++---- examples/Utilities/MultithreadingDemo.h | 9 +++++-- .../app/src/main/assets/DSPDemos_Common.h | 26 +++++++------------ .../native/juce_Audio_ios.cpp | 4 +-- .../juce_audio_plugin_client_AAX.cpp | 2 +- .../juce_audio_plugin_client_AU_1.mm | 14 +++++----- .../juce_AudioUnitPluginFormat.mm | 10 +++---- .../juce_core/native/juce_SystemStats_mac.mm | 4 +-- .../native/juce_CoreGraphicsContext_mac.mm | 6 ++--- .../native/juce_CGMetalLayerRenderer_mac.h | 2 +- .../native/juce_NSViewComponentPeer_mac.mm | 4 +-- .../juce_NativeModalWrapperComponent_ios.h | 2 +- .../native/juce_UIViewComponentPeer_ios.mm | 10 +++---- .../native/juce_PushNotifications_ios.cpp | 2 +- .../native/juce_PushNotifications_mac.cpp | 6 ++--- .../juce_video/native/juce_CameraDevice_ios.h | 4 +-- modules/juce_video/native/juce_Video_mac.h | 4 +-- 23 files changed, 88 insertions(+), 101 deletions(-) diff --git a/examples/Assets/DSPDemos_Common.h b/examples/Assets/DSPDemos_Common.h index 26d0e3b966..555fba1bc1 100644 --- a/examples/Assets/DSPDemos_Common.h +++ b/examples/Assets/DSPDemos_Common.h @@ -412,6 +412,7 @@ public: readerSource->setLooping (loopState.getValue()); init(); + resized(); return true; } @@ -461,7 +462,15 @@ public: audioSourcePlayer.setSource (currentDemo.get()); - initParameters(); + auto& parameters = currentDemo->getParameters(); + + parametersComponent.reset(); + + if (! parameters.empty()) + { + parametersComponent = std::make_unique (parameters); + addAndMakeVisible (parametersComponent.get()); + } } void play() @@ -485,21 +494,6 @@ public: AudioThumbnailComponent& getThumbnailComponent() { return header.thumbnailComp; } - void initParameters() - { - auto& parameters = currentDemo->getParameters(); - - parametersComponent.reset(); - - if (parameters.size() > 0) - { - parametersComponent.reset (new DemoParametersComponent (parameters)); - addAndMakeVisible (parametersComponent.get()); - } - - resized(); - } - private: //============================================================================== class AudioPlayerHeader : public Component, diff --git a/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h b/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h index 26d0e3b966..555fba1bc1 100644 --- a/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h +++ b/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h @@ -412,6 +412,7 @@ public: readerSource->setLooping (loopState.getValue()); init(); + resized(); return true; } @@ -461,7 +462,15 @@ public: audioSourcePlayer.setSource (currentDemo.get()); - initParameters(); + auto& parameters = currentDemo->getParameters(); + + parametersComponent.reset(); + + if (! parameters.empty()) + { + parametersComponent = std::make_unique (parameters); + addAndMakeVisible (parametersComponent.get()); + } } void play() @@ -485,21 +494,6 @@ public: AudioThumbnailComponent& getThumbnailComponent() { return header.thumbnailComp; } - void initParameters() - { - auto& parameters = currentDemo->getParameters(); - - parametersComponent.reset(); - - if (parameters.size() > 0) - { - parametersComponent.reset (new DemoParametersComponent (parameters)); - addAndMakeVisible (parametersComponent.get()); - } - - resized(); - } - private: //============================================================================== class AudioPlayerHeader : public Component, diff --git a/examples/GUI/CodeEditorDemo.h b/examples/GUI/CodeEditorDemo.h index 5b6872e2d3..11521fafa9 100644 --- a/examples/GUI/CodeEditorDemo.h +++ b/examples/GUI/CodeEditorDemo.h @@ -78,7 +78,7 @@ public: addAndMakeVisible (fileChooser); fileChooser.addListener (this); - lookAndFeelChanged(); + updateLookAndFeel(); setSize (500, 500); } @@ -121,7 +121,7 @@ private: editor->loadContent (fileChooser.getCurrentFile().loadFileAsString()); } - void lookAndFeelChanged() override + void updateLookAndFeel() { if (auto* v4 = dynamic_cast (&LookAndFeel::getDefaultLookAndFeel())) { @@ -135,6 +135,11 @@ private: } } + void lookAndFeelChanged() override + { + updateLookAndFeel(); + } + CodeEditorComponent::ColourScheme getDarkCodeEditorColourScheme() { struct Type diff --git a/examples/GUI/OpenGLDemo.h b/examples/GUI/OpenGLDemo.h index 564e9b3b91..5f38288dfd 100644 --- a/examples/GUI/OpenGLDemo.h +++ b/examples/GUI/OpenGLDemo.h @@ -1044,12 +1044,12 @@ private: addAndMakeVisible (textureLabel); textureLabel.attachToComponent (&textureBox, true); - - lookAndFeelChanged(); } void initialise() { + lookAndFeelChanged(); + showBackgroundToggle.setToggleState (false, sendNotification); textureBox.setSelectedItemIndex (0); presetBox .setSelectedItemIndex (0); diff --git a/examples/GUI/PropertiesDemo.h b/examples/GUI/PropertiesDemo.h index 346b1a79bf..39b90167fe 100644 --- a/examples/GUI/PropertiesDemo.h +++ b/examples/GUI/PropertiesDemo.h @@ -86,7 +86,7 @@ public: DemoSliderPropertyComponent (const String& propertyName) : SliderPropertyComponent (propertyName, 0.0, 100.0, 0.001) { - setValue (Random::getSystemRandom().nextDouble() * 42.0); + slider.setValue (Random::getSystemRandom().nextDouble() * 42.0); } void setValue (double newValue) override diff --git a/examples/Plugins/HostPluginDemo.h b/examples/Plugins/HostPluginDemo.h index 804f96898b..3a73aafef3 100644 --- a/examples/Plugins/HostPluginDemo.h +++ b/examples/Plugins/HostPluginDemo.h @@ -298,9 +298,6 @@ private: } }; -constexpr const char* HostAudioProcessorImpl::innerStateTag; -constexpr const char* HostAudioProcessorImpl::editorStyleTag; - //============================================================================== constexpr auto margin = 10; diff --git a/examples/Plugins/ReaperEmbeddedViewPluginDemo.h b/examples/Plugins/ReaperEmbeddedViewPluginDemo.h index 3fbccb80ac..ae74adc9c9 100644 --- a/examples/Plugins/ReaperEmbeddedViewPluginDemo.h +++ b/examples/Plugins/ReaperEmbeddedViewPluginDemo.h @@ -155,13 +155,9 @@ public: pointer_sized_int handleVstPluginCanDo (int32, pointer_sized_int, void* ptr, float) override { if (auto* str = static_cast (ptr)) - { - if (strcmp (str, "hasCockosEmbeddedUI") == 0) - return 0xbeef0000; - - if (strcmp (str, "hasCockosExtensions") == 0) - return 0xbeef0000; - } + for (auto* key : { "hasCockosEmbeddedUI", "hasCockosExtensions" }) + if (strcmp (str, key) == 0) + return (pointer_sized_int) 0xbeef0000; return 0; } diff --git a/examples/Utilities/MultithreadingDemo.h b/examples/Utilities/MultithreadingDemo.h index d674e39028..ce3ccee54e 100644 --- a/examples/Utilities/MultithreadingDemo.h +++ b/examples/Utilities/MultithreadingDemo.h @@ -70,7 +70,7 @@ public: .withAlpha (0.5f) .withBrightness (0.7f); - componentMovedOrResized (containerComponent, true, true); + updateParentSize (comp); x = Random::getSystemRandom().nextFloat() * parentWidth; y = Random::getSystemRandom().nextFloat() * parentHeight; @@ -117,7 +117,7 @@ public: } private: - void componentMovedOrResized (Component& comp, bool, bool) override + void updateParentSize (Component& comp) { const ScopedLock lock (drawing); @@ -125,6 +125,11 @@ private: parentHeight = (float) comp.getHeight() - size; } + void componentMovedOrResized (Component& comp, bool, bool) override + { + updateParentSize (comp); + } + float x = 0.0f, y = 0.0f, size = Random::getSystemRandom().nextFloat() * 30.0f + 30.0f, dx = 0.0f, dy = 0.0f, diff --git a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h index 26d0e3b966..555fba1bc1 100644 --- a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h +++ b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h @@ -412,6 +412,7 @@ public: readerSource->setLooping (loopState.getValue()); init(); + resized(); return true; } @@ -461,7 +462,15 @@ public: audioSourcePlayer.setSource (currentDemo.get()); - initParameters(); + auto& parameters = currentDemo->getParameters(); + + parametersComponent.reset(); + + if (! parameters.empty()) + { + parametersComponent = std::make_unique (parameters); + addAndMakeVisible (parametersComponent.get()); + } } void play() @@ -485,21 +494,6 @@ public: AudioThumbnailComponent& getThumbnailComponent() { return header.thumbnailComp; } - void initParameters() - { - auto& parameters = currentDemo->getParameters(); - - parametersComponent.reset(); - - if (parameters.size() > 0) - { - parametersComponent.reset (new DemoParametersComponent (parameters)); - addAndMakeVisible (parametersComponent.get()); - } - - resized(); - } - private: //============================================================================== class AudioPlayerHeader : public Component, diff --git a/modules/juce_audio_devices/native/juce_Audio_ios.cpp b/modules/juce_audio_devices/native/juce_Audio_ios.cpp index 4c94a1655d..ff3b01b60a 100644 --- a/modules/juce_audio_devices/native/juce_Audio_ios.cpp +++ b/modules/juce_audio_devices/native/juce_Audio_ios.cpp @@ -660,7 +660,7 @@ struct iOSAudioIODevice::Pimpl : public AsyncUpdater result.setIsRecording (hostIsRecording); result.setIsLooping (hostIsCycling); result.setLoopPoints (LoopPoints { hostCycleStartBeat, hostCycleEndBeat }); - result.setTimeInSeconds (*result.getTimeInSamples() / impl.sampleRate); + result.setTimeInSeconds ((double) *result.getTimeInSamples() / impl.sampleRate); Float64 hostBeat = 0; Float64 hostTempo = 0; @@ -707,7 +707,7 @@ struct iOSAudioIODevice::Pimpl : public AsyncUpdater { if (interAppAudioConnected) { - if (UIImage* hostUIImage = AudioOutputUnitGetHostIcon (audioUnit, size)) + if (UIImage* hostUIImage = AudioOutputUnitGetHostIcon (audioUnit, (float) size)) return juce_createImageFromUIImage (hostUIImage); } } diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp index 55cf1dbcf4..d3a0c89b70 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp @@ -1257,7 +1257,7 @@ namespace AAXClasses }()); } - const auto offset = timeCodeIfAvailable.has_value() ? timeCodeIfAvailable->offset : int64_t{}; + const auto offset = timeCodeIfAvailable.has_value() ? (double) timeCodeIfAvailable->offset : 0.0; const auto effectiveRate = info.getFrameRate().hasValue() ? info.getFrameRate()->getEffectiveRate() : 0.0; info.setEditOriginTime (makeOptional (effectiveRate != 0.0 ? offset / effectiveRate : offset)); diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm index 7d6f7aa822..e6beb0d61c 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm @@ -245,23 +245,25 @@ public: //============================================================================== bool BusCountWritable ([[maybe_unused]] AudioUnitScope scope) override { - #ifdef JucePlugin_PreferredChannelConfigurations + #ifdef JucePlugin_PreferredChannelConfigurations return false; - #else + #else bool isInput; if (scopeToDirection (scope, isInput) != noErr) return false; - #if JucePlugin_IsMidiEffect + #if JucePlugin_IsMidiEffect return false; - #elif JucePlugin_IsSynth + #else + #if JucePlugin_IsSynth if (isInput) return false; #endif const int busCount = AudioUnitHelpers::getBusCount (*juceFilter, isInput); return (juceFilter->canAddBus (isInput) || (busCount > 0 && juceFilter->canRemoveBus (isInput))); - #endif + #endif + #endif } OSStatus SetBusCount (AudioUnitScope scope, UInt32 count) override @@ -1197,7 +1199,7 @@ public: const auto setTimeInSamples = [&] (auto timeInSamples) { info.setTimeInSamples ((int64) (timeInSamples + 0.5)); - info.setTimeInSeconds (*info.getTimeInSamples() / audioUnit.getSampleRate()); + info.setTimeInSeconds ((double) (*info.getTimeInSamples()) / audioUnit.getSampleRate()); }; if (audioUnit.CallHostTransportState (&playing, diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm index 6540a88213..86a82cc8e3 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm @@ -675,7 +675,7 @@ public: { if (! auValueStrings.isEmpty()) { - auto index = roundToInt (jlimit (0.0f, 1.0f, value) * (auValueStrings.size() - 1)); + auto index = roundToInt (jlimit (0.0f, 1.0f, value) * (float) (auValueStrings.size() - 1)); return auValueStrings[index]; } @@ -714,7 +714,7 @@ public: auto index = auValueStrings.indexOf (text); if (index != -1) - return ((float) index) / (auValueStrings.size() - 1); + return ((float) index) / (float) (auValueStrings.size() - 1); } if (valuesHaveStrings) @@ -2299,8 +2299,8 @@ private: setIfNotNull (outCurrentMeasureDownBeat, getFromPlayHead (&AudioPlayHead::PositionInfo::getPpqPositionOfLastBarStart).orFallback (0.0)); const auto signature = getFromPlayHead (&AudioPlayHead::PositionInfo::getTimeSignature).orFallback (AudioPlayHead::TimeSignature{}); - setIfNotNull (outTimeSig_Numerator, (UInt32) signature.numerator); - setIfNotNull (outTimeSig_Denominator, (UInt32) signature.denominator); + setIfNotNull (outTimeSig_Numerator, (Float32) signature.numerator); + setIfNotNull (outTimeSig_Denominator, (UInt32) signature.denominator); return noErr; } @@ -2312,7 +2312,7 @@ private: const auto nowPlaying = getFromPlayHead (&AudioPlayHead::PositionInfo::getIsPlaying); setIfNotNull (outIsPlaying, nowPlaying); setIfNotNull (outTransportStateChanged, std::exchange (wasPlaying, nowPlaying) != nowPlaying); - setIfNotNull (outCurrentSampleInTimeLine, getFromPlayHead (&AudioPlayHead::PositionInfo::getTimeInSamples).orFallback (0)); + setIfNotNull (outCurrentSampleInTimeLine, (double) getFromPlayHead (&AudioPlayHead::PositionInfo::getTimeInSamples).orFallback (0)); setIfNotNull (outIsCycling, getFromPlayHead (&AudioPlayHead::PositionInfo::getIsLooping)); const auto loopPoints = getFromPlayHead (&AudioPlayHead::PositionInfo::getLoopPoints).orFallback (AudioPlayHead::LoopPoints{}); diff --git a/modules/juce_core/native/juce_SystemStats_mac.mm b/modules/juce_core/native/juce_SystemStats_mac.mm index 2d643035a1..d02638fa62 100644 --- a/modules/juce_core/native/juce_SystemStats_mac.mm +++ b/modules/juce_core/native/juce_SystemStats_mac.mm @@ -311,7 +311,7 @@ public: } highResTimerFrequency = (timebase.denom * (uint64) 1000000000) / timebase.numer; - highResTimerToMillisecRatio = hiResCounterNumerator / (double) hiResCounterDenominator; + highResTimerToMillisecRatio = (double) hiResCounterNumerator / (double) hiResCounterDenominator; } uint32 millisecondsSinceStartup() const noexcept @@ -321,7 +321,7 @@ public: double getMillisecondCounterHiRes() const noexcept { - return mach_absolute_time() * highResTimerToMillisecRatio; + return (double) mach_absolute_time() * highResTimerToMillisecRatio; } int64 highResTimerFrequency; diff --git a/modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm b/modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm index 96ea26b850..b21c986ed2 100644 --- a/modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm +++ b/modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm @@ -323,7 +323,7 @@ void CoreGraphicsContext::clipToImageAlpha (const Image& sourceImage, const Affi auto image = detail::ImagePtr { CoreGraphicsPixelData::createImage (singleChannelImage, greyColourSpace.get()) }; flip(); - auto t = AffineTransform::verticalFlip (sourceImage.getHeight()).followedBy (transform); + auto t = AffineTransform::verticalFlip ((float) sourceImage.getHeight()).followedBy (transform); applyTransform (t); auto r = convertToCGRect (sourceImage.getBounds()); @@ -531,7 +531,7 @@ void CoreGraphicsContext::drawImage (const Image& sourceImage, const AffineTrans CGContextSetAlpha (context.get(), state->fillType.getOpacity()); flip(); - applyTransform (AffineTransform::verticalFlip (ih).followedBy (transform)); + applyTransform (AffineTransform::verticalFlip ((float) ih).followedBy (transform)); auto imageRect = CGRectMake (0, 0, iw, ih); if (fillEntireClipAsTiles) @@ -912,7 +912,7 @@ CGContextRef juce_getImageContext (const Image& image) Image retval (Image::ARGB, (int) CGImageGetWidth (image), (int) CGImageGetHeight (image), true); CGContextRef ctx = juce_getImageContext (retval); - CGContextDrawImage (ctx, CGRectMake (0.0f, 0.0f, CGImageGetWidth (image), CGImageGetHeight (image)), image); + CGContextDrawImage (ctx, CGRectMake (0.0f, 0.0f, (CGFloat) CGImageGetWidth (image), (CGFloat) CGImageGetHeight (image)), image); return retval; } diff --git a/modules/juce_gui_basics/native/juce_CGMetalLayerRenderer_mac.h b/modules/juce_gui_basics/native/juce_CGMetalLayerRenderer_mac.h index 59ca3ddb3a..5c2687bb87 100644 --- a/modules/juce_gui_basics/native/juce_CGMetalLayerRenderer_mac.h +++ b/modules/juce_gui_basics/native/juce_CGMetalLayerRenderer_mac.h @@ -310,7 +310,7 @@ private: if (alignedSize > size) { - size = std::max (alignedSize, alignTo ((size_t) (size * growthFactor), pagesize)); + size = std::max (alignedSize, alignTo ((size_t) ((float) size * growthFactor), pagesize)); allocation = std::make_unique (pagesize, size); } diff --git a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm index 550f68068a..d04672091b 100644 --- a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm +++ b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm @@ -1039,8 +1039,8 @@ public: if (! clip.isEmpty()) { Image temp (component.isOpaque() ? Image::RGB : Image::ARGB, - roundToInt (clipW * displayScale), - roundToInt (clipH * displayScale), + roundToInt ((float) clipW * displayScale), + roundToInt ((float) clipH * displayScale), ! component.isOpaque()); { diff --git a/modules/juce_gui_basics/native/juce_NativeModalWrapperComponent_ios.h b/modules/juce_gui_basics/native/juce_NativeModalWrapperComponent_ios.h index 183aaa01ac..d74906ea44 100644 --- a/modules/juce_gui_basics/native/juce_NativeModalWrapperComponent_ios.h +++ b/modules/juce_gui_basics/native/juce_NativeModalWrapperComponent_ios.h @@ -49,7 +49,7 @@ public: if (auto* popoverController = getViewController().popoverPresentationController) { popoverController.sourceView = peer->view; - popoverController.sourceRect = CGRectMake (0.f, getHeight() - 10.f, getWidth(), 10.f); + popoverController.sourceRect = CGRectMake (0.0f, (float) getHeight() - 10.0f, (float) getWidth(), 10.0f); popoverController.canOverlapSourceViewRect = YES; popoverController.delegate = popoverDelegate.get(); } diff --git a/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm b/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm index cc6211b7d6..cb0e62701a 100644 --- a/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm +++ b/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm @@ -1929,11 +1929,11 @@ void UIViewComponentPeer::updateScreenBounds() { // this will re-centre the window, but leave its size unchanged - auto centreRelX = oldArea.getCentreX() / (float) oldDesktop.getWidth(); - auto centreRelY = oldArea.getCentreY() / (float) oldDesktop.getHeight(); + auto centreRelX = (float) oldArea.getCentreX() / (float) oldDesktop.getWidth(); + auto centreRelY = (float) oldArea.getCentreY() / (float) oldDesktop.getHeight(); - auto x = ((int) (newDesktop.getWidth() * centreRelX)) - (oldArea.getWidth() / 2); - auto y = ((int) (newDesktop.getHeight() * centreRelY)) - (oldArea.getHeight() / 2); + auto x = ((int) ((float) newDesktop.getWidth() * centreRelX)) - (oldArea.getWidth() / 2); + auto y = ((int) ((float) newDesktop.getHeight() * centreRelY)) - (oldArea.getHeight() / 2); component.setBounds (oldArea.withPosition (x, y)); } @@ -2232,7 +2232,7 @@ void UIViewComponentPeer::drawRectWithContext (CGContextRef cg, CGRect) CGContextClearRect (cg, CGContextGetClipBoundingBox (cg)); CGContextConcatCTM (cg, CGAffineTransformMake (1, 0, 0, -1, 0, getComponent().getHeight())); - CoreGraphicsContext g (cg, getComponent().getHeight()); + CoreGraphicsContext g (cg, (float) getComponent().getHeight()); insideDrawRect = true; handlePaint (g); diff --git a/modules/juce_gui_extra/native/juce_PushNotifications_ios.cpp b/modules/juce_gui_extra/native/juce_PushNotifications_ios.cpp index d7c85d0824..2b9b1c53e8 100644 --- a/modules/juce_gui_extra/native/juce_PushNotifications_ios.cpp +++ b/modules/juce_gui_extra/native/juce_PushNotifications_ios.cpp @@ -119,7 +119,7 @@ struct PushNotificationsDelegateDetails notification.applicationIconBadgeNumber = n.badgeNumber; auto triggerTime = Time::getCurrentTime() + RelativeTime (n.triggerIntervalSec); - notification.fireDate = [NSDate dateWithTimeIntervalSince1970: triggerTime.toMilliseconds() / 1000.]; + notification.fireDate = [NSDate dateWithTimeIntervalSince1970: (double) triggerTime.toMilliseconds() / 1000.0]; notification.userInfo = varObjectToNSDictionary (n.properties); auto soundToPlayString = n.soundToPlay.toString (true); diff --git a/modules/juce_gui_extra/native/juce_PushNotifications_mac.cpp b/modules/juce_gui_extra/native/juce_PushNotifications_mac.cpp index 4a06ebb167..c3b2475604 100644 --- a/modules/juce_gui_extra/native/juce_PushNotifications_mac.cpp +++ b/modules/juce_gui_extra/native/juce_PushNotifications_mac.cpp @@ -43,14 +43,14 @@ namespace PushNotificationsDelegateDetailsOsx notification.userInfo = varObjectToNSDictionary (n.properties); auto triggerTime = Time::getCurrentTime() + RelativeTime (n.triggerIntervalSec); - notification.deliveryDate = [NSDate dateWithTimeIntervalSince1970: triggerTime.toMilliseconds() / 1000.]; + notification.deliveryDate = [NSDate dateWithTimeIntervalSince1970: (double) triggerTime.toMilliseconds() / 1000.0]; if (n.repeat && n.triggerIntervalSec >= 60) { auto dateComponents = [[NSDateComponents alloc] init]; auto intervalSec = NSInteger (n.triggerIntervalSec); dateComponents.second = intervalSec; - dateComponents.nanosecond = NSInteger ((n.triggerIntervalSec - intervalSec) * 1000000000); + dateComponents.nanosecond = NSInteger ((n.triggerIntervalSec - (double) intervalSec) * 1000000000); notification.deliveryRepeatInterval = dateComponents; @@ -143,7 +143,7 @@ namespace PushNotificationsDelegateDetailsOsx if (n.deliveryRepeatInterval != nil) { - notif.triggerIntervalSec = n.deliveryRepeatInterval.second + (n.deliveryRepeatInterval.nanosecond / 1000000000.); + notif.triggerIntervalSec = (double) n.deliveryRepeatInterval.second + ((double) n.deliveryRepeatInterval.nanosecond / 1000000000.0); } else { diff --git a/modules/juce_video/native/juce_CameraDevice_ios.h b/modules/juce_video/native/juce_CameraDevice_ios.h index c589f74124..86d48b4b35 100644 --- a/modules/juce_video/native/juce_CameraDevice_ios.h +++ b/modules/juce_video/native/juce_CameraDevice_ios.h @@ -836,7 +836,7 @@ private: break; case kCGImagePropertyOrientationRight: CGContextRotateCTM (context, 90 * MathConstants::pi / 180); - CGContextScaleCTM (context, targetSize.height / origHeight, -targetSize.width / origWidth); + CGContextScaleCTM (context, targetSize.height / (CGFloat) origHeight, -targetSize.width / (CGFloat) origWidth); break; case kCGImagePropertyOrientationDown: CGContextTranslateCTM (context, targetSize.width, 0.0); @@ -844,7 +844,7 @@ private: break; case kCGImagePropertyOrientationLeft: CGContextRotateCTM (context, -90 * MathConstants::pi / 180); - CGContextScaleCTM (context, targetSize.height / origHeight, -targetSize.width / origWidth); + CGContextScaleCTM (context, targetSize.height / (CGFloat) origHeight, -targetSize.width / (CGFloat) origWidth); CGContextTranslateCTM (context, -targetSize.width, -targetSize.height); break; case kCGImagePropertyOrientationUpMirrored: diff --git a/modules/juce_video/native/juce_Video_mac.h b/modules/juce_video/native/juce_Video_mac.h index 2ad8e824ce..8f89843029 100644 --- a/modules/juce_video/native/juce_Video_mac.h +++ b/modules/juce_video/native/juce_Video_mac.h @@ -592,7 +592,7 @@ private: if (useNativeControls) return std::make_unique(); - return std::make_unique (); + return std::make_unique(); }(); } @@ -650,7 +650,7 @@ private: class WrappedPlayerLayer : public WrappedPlayer { public: - WrappedPlayerLayer () { [view.get() setLayer: playerLayer.get()]; } + WrappedPlayerLayer() { [view.get() setLayer: playerLayer.get()]; } NSView* getView() const override { return view.get(); } AVPlayer* getPlayer() const override { return [playerLayer.get() player]; } void setPlayer (AVPlayer* player) override { [playerLayer.get() setPlayer: player]; }