From 096b4e94c085e21a1b27b919a83ac47c864c738a Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 7 Jul 2017 15:38:31 +0100 Subject: [PATCH] Removed zombie MovieComponent files that should have been deleted with the new video playback changes --- .../AnimationAppExample_App.vcxproj | 1 - .../AnimationAppExample_App.vcxproj.filters | 6 - .../AudioAppExample_App.vcxproj | 1 - .../AudioAppExample_App.vcxproj.filters | 6 - .../BouncingBallWavetableDemo_App.vcxproj | 1 - ...ncingBallWavetableDemo_App.vcxproj.filters | 6 - .../BouncingBallWavetableDemo_App.vcxproj | 1 - ...ncingBallWavetableDemo_App.vcxproj.filters | 6 - .../Demo/Builds/Android/app/CMakeLists.txt | 4 - .../VisualStudio2013/JuceDemo_App.vcxproj | 1 - .../JuceDemo_App.vcxproj.filters | 6 - .../VisualStudio2015/JuceDemo_App.vcxproj | 1 - .../JuceDemo_App.vcxproj.filters | 6 - .../VisualStudio2017/JuceDemo_App.vcxproj | 1 - .../JuceDemo_App.vcxproj.filters | 6 - .../VisualStudio2015/MPETest_App.vcxproj | 1 - .../MPETest_App.vcxproj.filters | 6 - .../VisualStudio2017/MPETest_App.vcxproj | 1 - .../MPETest_App.vcxproj.filters | 6 - .../VisualStudio2015/OSCMonitor_App.vcxproj | 1 - .../OSCMonitor_App.vcxproj.filters | 6 - .../VisualStudio2017/OSCMonitor_App.vcxproj | 1 - .../OSCMonitor_App.vcxproj.filters | 6 - .../OpenGLAppExample_App.vcxproj | 1 - .../OpenGLAppExample_App.vcxproj.filters | 6 - .../Arpeggiator_SharedCode.vcxproj | 1 - .../Arpeggiator_SharedCode.vcxproj.filters | 6 - .../Arpeggiator_SharedCode.vcxproj | 1 - .../Arpeggiator_SharedCode.vcxproj.filters | 6 - .../GainPlugIn_SharedCode.vcxproj | 1 - .../GainPlugIn_SharedCode.vcxproj.filters | 6 - .../GainPlugIn_SharedCode.vcxproj | 1 - .../GainPlugIn_SharedCode.vcxproj.filters | 6 - .../MultiOutSynth_SharedCode.vcxproj | 1 - .../MultiOutSynth_SharedCode.vcxproj.filters | 6 - .../MultiOutSynth_SharedCode.vcxproj | 1 - .../MultiOutSynth_SharedCode.vcxproj.filters | 6 - .../NoiseGate_SharedCode.vcxproj | 1 - .../NoiseGate_SharedCode.vcxproj.filters | 6 - .../NoiseGate_SharedCode.vcxproj | 1 - .../NoiseGate_SharedCode.vcxproj.filters | 6 - .../Surround_SharedCode.vcxproj | 1 - .../Surround_SharedCode.vcxproj.filters | 6 - .../Surround_SharedCode.vcxproj | 1 - .../Surround_SharedCode.vcxproj.filters | 6 - .../VisualStudio2013/Plugin Host_App.vcxproj | 1 - .../Plugin Host_App.vcxproj.filters | 6 - .../VisualStudio2015/Plugin Host_App.vcxproj | 1 - .../Plugin Host_App.vcxproj.filters | 6 - .../VisualStudio2017/Plugin Host_App.vcxproj | 1 - .../Plugin Host_App.vcxproj.filters | 6 - .../UnitTestRunner_ConsoleApp.vcxproj | 1 - .../UnitTestRunner_ConsoleApp.vcxproj.filters | 6 - .../UnitTestRunner_ConsoleApp.vcxproj | 1 - .../UnitTestRunner_ConsoleApp.vcxproj.filters | 6 - .../juce_dll_StaticLibrary.vcxproj | 1 - .../juce_dll_StaticLibrary.vcxproj.filters | 6 - .../native/juce_mac_MovieComponent.mm | 226 ------------------ .../juce_video/playback/juce_MovieComponent.h | 67 ------ 59 files changed, 493 deletions(-) delete mode 100644 modules/juce_video/native/juce_mac_MovieComponent.mm delete mode 100644 modules/juce_video/playback/juce_MovieComponent.h diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj index ad09e9ebdf..63dca5252d 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj @@ -2291,7 +2291,6 @@ - diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters index 3fdd53ab16..8f887b0986 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters @@ -1993,9 +1993,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3822,9 +3819,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj index a1470cd59d..b1211f85ec 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj @@ -2353,7 +2353,6 @@ - diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters index a7f1e709f1..bc6c7057f2 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters @@ -2071,9 +2071,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3942,9 +3939,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj index 3028b8dddf..0954f3f215 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj @@ -2301,7 +2301,6 @@ - diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters index a48ec163d4..f2cfc40bc9 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters @@ -2023,9 +2023,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3825,9 +3822,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj index 27e7c7b237..83ee941f30 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj @@ -2300,7 +2300,6 @@ - diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters index 319017af92..d70a670296 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters @@ -2023,9 +2023,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3825,9 +3822,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index a345a375e6..e2d13b0bf3 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -1350,11 +1350,9 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_video/native/juce_android_CameraDevice.h" "../../../../../modules/juce_video/native/juce_android_Video.h" "../../../../../modules/juce_video/native/juce_mac_CameraDevice.h" - "../../../../../modules/juce_video/native/juce_mac_MovieComponent.mm" "../../../../../modules/juce_video/native/juce_mac_Video.h" "../../../../../modules/juce_video/native/juce_win32_CameraDevice.h" "../../../../../modules/juce_video/native/juce_win32_Video.h" - "../../../../../modules/juce_video/playback/juce_MovieComponent.h" "../../../../../modules/juce_video/playback/juce_VideoComponent.cpp" "../../../../../modules/juce_video/playback/juce_VideoComponent.h" "../../../../../modules/juce_video/juce_video.cpp" @@ -2663,11 +2661,9 @@ set_source_files_properties("../../../../../modules/juce_video/capture/juce_Came set_source_files_properties("../../../../../modules/juce_video/native/juce_android_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/native/juce_android_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_MovieComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/native/juce_win32_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/native/juce_win32_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_video/playback/juce_MovieComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/playback/juce_VideoComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/playback/juce_VideoComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/juce_video.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj index 950f224f72..af15844e8a 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj @@ -2591,7 +2591,6 @@ - diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters index 8620c50e0d..5d69f1dfc3 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters @@ -2365,9 +2365,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4401,9 +4398,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj index 79aadccc27..0a563eb1f4 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj @@ -2590,7 +2590,6 @@ - diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters index 484fe3d7e9..025273faf4 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters @@ -2365,9 +2365,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4401,9 +4398,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj index b96beff458..56d9e64992 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj @@ -2590,7 +2590,6 @@ - diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters index 063098bf12..c354654ea6 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters @@ -2365,9 +2365,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4401,9 +4398,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj index 056bcf686d..58eef5c310 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj @@ -2359,7 +2359,6 @@ - diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters index 5576028812..10273dc054 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters @@ -2068,9 +2068,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3957,9 +3954,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj index c13dbf87a6..4e83f5820b 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj @@ -2358,7 +2358,6 @@ - diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters index d6602a82fe..5c1a34c1c7 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters @@ -2068,9 +2068,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3957,9 +3954,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj index 8442254521..70f8336e26 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj @@ -2330,7 +2330,6 @@ - diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters index 9c701fae35..4cf1a40c35 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters @@ -2023,9 +2023,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3888,9 +3885,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj index 195ca09198..819ded4d04 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj @@ -2329,7 +2329,6 @@ - diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters index f61215cf41..56b167893f 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters @@ -2023,9 +2023,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3888,9 +3885,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj index f465820e39..b802e2be06 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj @@ -2293,7 +2293,6 @@ - diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters index 7cfac1a34b..ab45d1e6e2 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters @@ -1996,9 +1996,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3831,9 +3828,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj index 1efcd42dbd..ae079be850 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj @@ -2416,7 +2416,6 @@ - diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters index 8da85e238c..82ebabbb55 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4056,9 +4053,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj index a34cea285d..c659bc5e38 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj @@ -2409,7 +2409,6 @@ - diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters index 6645495fd3..f3f562b8ad 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4056,9 +4053,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj index fe30e1983f..5fd5d3ed50 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj @@ -2416,7 +2416,6 @@ - diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters index d225c1cc3d..753971b943 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4056,9 +4053,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj index fc9136e7c5..c931a3f158 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj @@ -2409,7 +2409,6 @@ - diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters index ac7f0c11dc..f0c1cf5581 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4056,9 +4053,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj index 70bbde6807..c0f4ca9dc9 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj @@ -2417,7 +2417,6 @@ - diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters index 902a20d970..668346622e 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters @@ -2089,9 +2089,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4062,9 +4059,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj index 2021cd763f..01ee448887 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj @@ -2410,7 +2410,6 @@ - diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters index 54c88d5aff..f9725d7835 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters @@ -2089,9 +2089,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4062,9 +4059,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj index 7761a70cb3..b4ad031e23 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj @@ -2416,7 +2416,6 @@ - diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters index 5988b2ed77..51de907d24 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4056,9 +4053,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj index a8311c7a53..b7f514aab7 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj @@ -2409,7 +2409,6 @@ - diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters index 13db55f315..3f66737b7c 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4056,9 +4053,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj index b93d13353b..83dcbeb277 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj @@ -2410,7 +2410,6 @@ - diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters index 3d5db4c07d..48f4ea4b3e 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4059,9 +4056,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj index 30ae0e0e03..dfc70f3f21 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj @@ -2410,7 +2410,6 @@ - diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters index 033ac68f91..1d9c03f5d4 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters @@ -2086,9 +2086,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4059,9 +4056,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj index 8d258a6c5a..32b4c9c6a2 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj @@ -2363,7 +2363,6 @@ - diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters index 444cb240f8..04be5632d8 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters @@ -2080,9 +2080,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3966,9 +3963,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj index 4d25acdd9c..f796e58d66 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj @@ -2362,7 +2362,6 @@ - diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters index 3b7b088b8d..cbad86a487 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters @@ -2080,9 +2080,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3966,9 +3963,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj index a822dde946..09f8a7e2bb 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj @@ -2362,7 +2362,6 @@ - diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters index d52b7aba52..9eba4ad65b 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters @@ -2080,9 +2080,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3966,9 +3963,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj index b0c8da31b8..ec884c8b38 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj @@ -2451,7 +2451,6 @@ - diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters index 4e07a3871a..7ba45e3258 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -2155,9 +2155,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4146,9 +4143,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index 8871a3a112..f9d1783f77 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -2450,7 +2450,6 @@ - diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index b3b0c7bab8..9d482b1de0 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -2155,9 +2155,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -4146,9 +4143,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj index a4c07e4892..a0ecae4f4b 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj @@ -2351,7 +2351,6 @@ - diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters index f5da5ee5d0..c78f0fc9ba 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters @@ -2059,9 +2059,6 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - Juce Modules\juce_video\playback @@ -3930,9 +3927,6 @@ Juce Modules\juce_video\native - - Juce Modules\juce_video\playback - Juce Modules\juce_video\playback diff --git a/modules/juce_video/native/juce_mac_MovieComponent.mm b/modules/juce_video/native/juce_mac_MovieComponent.mm deleted file mode 100644 index 095ab151e5..0000000000 --- a/modules/juce_video/native/juce_mac_MovieComponent.mm +++ /dev/null @@ -1,226 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2017 - ROLI Ltd. - - JUCE is an open source library subject to commercial or open-source - licensing. - - By using JUCE, you agree to the terms of both the JUCE 5 End-User License - Agreement and JUCE 5 Privacy Policy (both updated and effective as of the - 27th April 2017). - - End User License Agreement: www.juce.com/juce-5-licence - Privacy Policy: www.juce.com/juce-5-privacy-policy - - Or: You may also use this code under the terms of the GPL v3 (see - www.gnu.org/licenses). - - JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER - EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE - DISCLAIMED. - - ============================================================================== -*/ - -struct MovieComponent::Pimpl -{ - bool open (MovieComponent& parent, const String& newPath) - { - JUCE_AUTORELEASEPOOL - { - close(); - - NSURL* url = createNSURLFromFile (newPath); - AVAsset* asset = [AVAsset assetWithURL: url]; - duration = CMTimeGetSeconds (asset.duration); - nativeSize = [[[asset tracksWithMediaType: AVMediaTypeVideo] objectAtIndex: 0] naturalSize]; - - if (duration <= 0) - return false; - - auto frame = CGRectMake (0, 0, nativeSize.width, nativeSize.height); - - view = [[NSView alloc] initWithFrame: NSRectFromCGRect (frame)]; - [view setHidden: NO]; - [view setNeedsDisplay: YES]; - [view setWantsLayer: YES]; - [view makeBackingLayer]; - - parent.setView (view); - path = newPath; - - player = [[AVPlayer alloc] initWithURL: url]; - player.actionAtItemEnd = AVPlayerActionAtItemEndPause; - player.masterClock = CMClockGetHostTimeClock(); - - if ([player respondsToSelector: @selector (setAutomaticallyWaitsToMinimizeStalling:)]) - [player performSelector: @selector (setAutomaticallyWaitsToMinimizeStalling:) - withObject: nil]; - - [player pause]; - - playerLayer = [[AVPlayerLayer playerLayerWithPlayer: player] retain]; - [playerLayer setFrame: frame]; - [playerLayer setHidden: NO]; - - [[view layer] addSublayer: playerLayer]; - - parent.resized(); - } - - return true; - } - - void close() - { - [playerLayer release]; - playerLayer = nil; - - [player release]; - player = nil; - - [view release]; - view = nil; - - playing = false; - duration = 0; - nativeSize = { 0, 0 }; - path = {}; - } - - String path; - NSView* view = nil; - AVPlayer* player = nil; - AVPlayerLayer* playerLayer = nil; - double duration = 0; - CGSize nativeSize = { 0, 0 }; - bool playing = false; -}; - -MovieComponent::MovieComponent() : pimpl (new Pimpl()) {} - -MovieComponent::~MovieComponent() -{ - closeMovie(); - pimpl = nullptr; -} - -bool MovieComponent::loadMovie (const File& file) -{ - return file.existsAsFile() - && pimpl->open (*this, file.getFullPathName()); -} - -bool MovieComponent::loadMovie (const URL& file) -{ - return pimpl->open (*this, file.toString (true)); -} - -void MovieComponent::closeMovie() -{ - setView (nullptr); - pimpl->close(); -} - -bool MovieComponent::isMovieOpen() const -{ - return pimpl->player != nil && pimpl->player.status != AVPlayerStatusFailed; -} - -String MovieComponent::getCurrentMoviePath() const -{ - return pimpl->path; -} - -void MovieComponent::play() -{ - pimpl->playing = true; - [pimpl->player play]; -} - -void MovieComponent::stop() -{ - pimpl->playing = false; - [pimpl->player pause]; -} - -double MovieComponent::getDuration() const -{ - return pimpl->duration; -} - -double MovieComponent::getPosition() const -{ - return CMTimeGetSeconds ([pimpl->player currentTime]); -} - -void MovieComponent::setPosition (double seconds) -{ - auto delta = std::abs (seconds - getPosition()); - auto newTime = CMTimeMakeWithSeconds (seconds, 600); - - if (! pimpl->playing) - { - [pimpl->player seekToTime: newTime - toleranceBefore: kCMTimeZero - toleranceAfter: kCMTimeZero]; - } - else if (delta > 0.035) - { - auto masterClock = CMClockGetTime (CMClockGetHostTimeClock()); - - try - { - [pimpl->player setRate: 1.0f - time: newTime - atHostTime: masterClock]; - } - catch (...) - { - // We should never end up in here, unless somehow automaticallyWaitsToMinimizeStalling - // got reset to YES - jassertfalse; - - if (delta > 0.3) - [pimpl->player seekToTime: newTime - toleranceBefore: kCMTimeZero - toleranceAfter: kCMTimeZero]; - } - } -} - -void MovieComponent::setVolume (float newVolume) -{ - pimpl->player.volume = static_cast (newVolume); -} - -float MovieComponent::getVolume() const -{ - return (float) pimpl->player.volume; -} - -Rectangle MovieComponent::getNativeSize() const -{ - return { 0, 0, roundToInt (pimpl->nativeSize.width), roundToInt (pimpl->nativeSize.height) }; -} - -void MovieComponent::setBoundsWithCorrectAspectRatio (Rectangle spaceToFitWithin, RectanglePlacement placement) -{ - auto nativeSize = getNativeSize(); - - setBounds ((spaceToFitWithin.isEmpty() || nativeSize.isEmpty()) - ? spaceToFitWithin - : placement.appliedTo (nativeSize, spaceToFitWithin)); -} - -void MovieComponent::resized() -{ - JUCE_AUTORELEASEPOOL - { - auto frame = CGRectMake (0, 0, (CGFloat) getWidth(), (CGFloat) getHeight()); - [pimpl->view setFrame: NSRectFromCGRect (frame)]; - [pimpl->playerLayer setFrame: frame]; - } -} diff --git a/modules/juce_video/playback/juce_MovieComponent.h b/modules/juce_video/playback/juce_MovieComponent.h deleted file mode 100644 index ff04064a1a..0000000000 --- a/modules/juce_video/playback/juce_MovieComponent.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2017 - ROLI Ltd. - - JUCE is an open source library subject to commercial or open-source - licensing. - - By using JUCE, you agree to the terms of both the JUCE 5 End-User License - Agreement and JUCE 5 Privacy Policy (both updated and effective as of the - 27th April 2017). - - End User License Agreement: www.juce.com/juce-5-licence - Privacy Policy: www.juce.com/juce-5-privacy-policy - - Or: You may also use this code under the terms of the GPL v3 (see - www.gnu.org/licenses). - - JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER - EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE - DISCLAIMED. - - ============================================================================== -*/ - -#pragma once - -//============================================================================== -/** - A component that can play back a video file. -*/ -class JUCE_API MovieComponent : public NSViewComponent -{ -public: - MovieComponent(); - ~MovieComponent(); - - bool loadMovie (const File& file); - bool loadMovie (const URL& file); - - void closeMovie(); - bool isMovieOpen() const; - String getCurrentMoviePath() const; - - void play(); - void stop(); - - double getDuration() const; - double getPosition() const; - void setPosition (double seconds); - void setVolume (float newVolume); - float getVolume() const; - - Rectangle getNativeSize() const; - void setBoundsWithCorrectAspectRatio (Rectangle spaceToFitWithin, - RectanglePlacement placement); - -protected: - void resized() override; - -private: - struct Pimpl; - ScopedPointer pimpl; - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MovieComponent) -};