Quicktime fix.

juce-framework · Aug 9, 2011 · 1a21c89 · 1a21c89
1 parent 8d71948
commit 1a21c89
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 19 deletions.
diff --git a/extras/Introjucer/Source/Project/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project/jucer_ProjectSaver.h
@@ -51,9 +51,6 @@ class ProjectSaver
 
         writeMainProjectFile();
 
-        if (! project.getGeneratedCodeFolder().createDirectory())
-            errors.add ("Couldn't create folder: " + project.getGeneratedCodeFolder().getFullPathName());
-
         if (errors.size() == 0)
             writeAppConfigFile();
 
@@ -74,6 +71,12 @@ class ProjectSaver
 
     bool saveGeneratedFile (const String& filePath, const MemoryOutputStream& newData)
     {
+        if (! project.getGeneratedCodeFolder().createDirectory())
+        {
+            errors.add ("Couldn't create folder: " + project.getGeneratedCodeFolder().getFullPathName());
+            return false;
+        }
+
         const File file (project.getGeneratedCodeFolder().getChildFile (filePath));
 
         if (replaceFileIfDifferent (file, newData))

diff --git a/extras/Introjucer/Source/Project/jucer_ProjectType.cpp b/extras/Introjucer/Source/Project/jucer_ProjectType.cpp
@@ -80,8 +80,40 @@ class JuceModule
     }
 
     String getID() const        { return moduleInfo ["id"]; }
+
     bool isValid() const        { return getID().isNotEmpty(); }
 
+    File getInclude() const
+    {
+        return getFileFromPath (moduleInfo ["include"]);
+    }
+
+    Array<File> getCompiledFiles() const
+    {
+        Array<File> result;
+        const Array<var>* const files = moduleInfo ["compile"].getArray();
+
+        if (files != nullptr)
+        {
+            for (int i = 0; i < files->size(); ++i)
+            {
+                const var& file = files->getReference(i);
+
+                String filename (file ["file"].toString());
+
+                if (filename.isNotEmpty())
+                    result.add (getFileFromPath (filename));
+            }
+        }
+
+        return result;
+    }
+
+    File getFileFromPath (const String& path) const
+    {
+        return moduleFolder.getChildFile (path);
+    }
+
     void getDependencies (OwnedArray<JuceModule>& dependencies) const
     {
         const Array<var>* const deps = moduleInfo ["dependencies"].getArray();
@@ -119,7 +151,8 @@ class JuceModule
 
     static File getModulesFolder()
     {
-        return StoredSettings::getInstance()->getLastKnownJuceFolder().getChildFile ("modules");
+        return File ("/Volumes/CODE/code/juce2/modules");
+        //return StoredSettings::getInstance()->getLastKnownJuceFolder().getChildFile ("modules");
     }
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceModule);
@@ -828,6 +861,8 @@ ProjectType::ProjectType (const String& type_, const String& desc_)
 
 ProjectType::~ProjectType()
 {
+    JuceModule::findAllModuleIDs();
+
     getAllTypes().removeValue (this);
 }
 
@@ -849,18 +884,6 @@ const ProjectType* ProjectType::findType (const String& typeCode)
     return nullptr;
 }
 
-void ProjectType::setMissingProjectProperties (Project&) const
-{
-}
-
-void ProjectType::createPropertyEditors (const Project& project, Array <PropertyComponent*>& props) const
-{
-}
-
-void ProjectType::prepareExporter (ProjectExporter& exporter) const
-{
-}
-
 void ProjectType::createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const
 {
     modules.add (new JuceLibraryModule());

diff --git a/extras/Introjucer/Source/Project/jucer_ProjectType.h b/extras/Introjucer/Source/Project/jucer_ProjectType.h
@@ -71,9 +71,9 @@ class ProjectType
     static const char* getConsoleAppTypeName();
     static const char* getAudioPluginTypeName();
 
-    virtual void setMissingProjectProperties (Project&) const;
-    virtual void createPropertyEditors (const Project&, Array <PropertyComponent*>&) const;
-    virtual void prepareExporter (ProjectExporter&) const;
+    virtual void setMissingProjectProperties (Project&) const = 0;
+    virtual void createPropertyEditors (const Project&, Array <PropertyComponent*>&) const = 0;
+    virtual void prepareExporter (ProjectExporter&) const = 0;
     virtual void createRequiredModules (Project&, OwnedArray<LibraryModule>& modules) const;
 
 protected:

diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
@@ -285102,6 +285102,7 @@ QuickTimeMovieComponent::QuickTimeMovieComponent()
 
 	QTMovieView* view = [[NonInterceptingQTMovieView alloc] initWithFrame: NSMakeRect (0, 0, 100.0f, 100.0f)];
 	setView (view);
+	[view setWantsLayer: YES]; // prevents the view failing to redraw correctly when paused.
 	[view release];
 }
 

diff --git a/src/native/mac/juce_mac_QuickTimeMovieComponent.mm b/src/native/mac/juce_mac_QuickTimeMovieComponent.mm
@@ -82,6 +82,7 @@ - (BOOL) acceptsFirstMouse: (NSEvent*) theEvent
 
     QTMovieView* view = [[NonInterceptingQTMovieView alloc] initWithFrame: NSMakeRect (0, 0, 100.0f, 100.0f)];
     setView (view);
+    [view setWantsLayer: YES]; // prevents the view failing to redraw correctly when paused.
     [view release];
 }