1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

macOS: Remove 32 bit specific functionality

This includes Carbon support
This commit is contained in:
Tom Poole 2022-04-22 12:02:16 +01:00
parent b48dddcf4e
commit c2ecde591b
71 changed files with 18 additions and 3001 deletions

View file

@ -577,18 +577,11 @@ private:
PlayerController (Pimpl& ownerToUse, bool useNativeControlsIfAvailable)
: PlayerControllerBase (ownerToUse, useNativeControlsIfAvailable)
{
#if JUCE_32BIT
// 32-bit builds don't have AVPlayerView, so need to use a layer
useNativeControls = false;
#endif
wrappedPlayer = [&]() -> std::unique_ptr<WrappedPlayer>
{
#if ! JUCE_32BIT
if (@available (macOS 10.9, *))
if (useNativeControls)
return std::make_unique<WrappedPlayerView>();
#endif
return std::make_unique<WrappedPlayerLayer> ();
}();
@ -658,7 +651,6 @@ private:
NSUniquePtr<AVPlayerLayer> playerLayer { [[AVPlayerLayer alloc] init] };
};
#if ! JUCE_32BIT
class API_AVAILABLE (macos (10.9)) WrappedPlayerView : public WrappedPlayer
{
public:
@ -670,7 +662,6 @@ private:
private:
NSUniquePtr<AVPlayerView> playerView { [[AVPlayerView alloc] init] };
};
#endif
std::unique_ptr<WrappedPlayer> wrappedPlayer;
};