build/linux/platform_specific_code/juce_linux_Network.cpp

@@ -37,7 +37,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <linux/if.h> 
+#include <linux/if.h>
 
 #include "../../../src/juce_core/basics/juce_StandardHeader.h"
 

build/macosx/platform_specific_code/juce_mac_Network.cpp

@@ -181,6 +181,7 @@ bool PlatformUtilities::launchEmailWithAttachments (const String& targetEmailAdd
     OSAError err = OSACompileExecute (comp, &source,
                                       kOSANullScript, kOSAModeNull,
                                       &resultID);
+    (void) err;
     AEDisposeDesc (&source);
     CloseComponent (comp);
 

build/macosx/platform_specific_code/juce_posix_SharedCode.cpp

@@ -29,8 +29,7 @@
   ==============================================================================
 */
 
-
+/*
-/* 
     This file contains posix routines that are common to both the Linux and Mac builds.
 
     It gets included directly in the cpp files for these platforms.
@@ -432,7 +431,7 @@ bool InterProcessLock::enter (const int timeOutMillisecs) throw()
 
         if (errno != EINTR)
         {
-            if (timeOutMillisecs == 0 
+            if (timeOutMillisecs == 0
                  || (timeOutMillisecs > 0 && Time::currentTimeMillis() >= endTime))
                 break;
 
@@ -463,4 +462,3 @@ void InterProcessLock::exit() throw()
         }
     }
 }
-

build/win32/platform_specific_code/juce_win32_SystemStats.cpp

@@ -53,6 +53,10 @@
     #pragma comment(lib, "OpenGL32.Lib")
     #pragma comment(lib, "GlU32.Lib")
   #endif
+
+  #if JUCE_QUICKTIME_AUDIOFORMAT
+    #pragma comment(lib, "QTMLClient.lib")
+  #endif
 #endif
 
 

docs/JUCE changelist.txt

@@ -25,6 +25,7 @@ Changelist for version 1.46
 - new classes: InputSource and FileInputSource. These encapsulate some kind of resource, and also replace the XmlInputSource class.
 - moved some of the posix code that was the same in the mac and linux builds into a single, shared file
 - fixed InterprocessLock on mac/linux so that it can't get stuck when an app quits unexpectedly
+- added an option to splash screens to close themselves when the mouse is clicked
 
 ==============================================================================
 Changelist for version 1.45

src/juce_appframework/audio/devices/juce_MidiOutput.cpp

@@ -79,10 +79,10 @@ void MidiOutput::sendBlockOfMessages (const MidiBuffer& buffer,
 
         const ScopedLock sl (lock);
 
-        if (firstMessage == 0)
+        if (firstMessage == 0 || firstMessage->message.getTimeStamp() > eventTime)
         {
+            m->next = firstMessage;
             firstMessage = m;
-            m->next = 0;
         }
         else
         {

src/juce_appframework/gui/components/special/juce_AudioDeviceSelectorComponent.cpp

@@ -428,8 +428,8 @@ void AudioDeviceSelectorComponent::comboBoxChanged (ComboBox* comboBoxThatHasCha
                 if (deviceManager.getInputChannels().countNumberOfSetBits() > 0
                       && deviceManager.getOutputChannels().countNumberOfSetBits() > 0)
                 {
-                    // in DSound, some machines lose their primary input device when a mic 
+                    // in DSound, some machines lose their primary input device when a mic
-                    // is removed, and this also buggers up our attempt at opening an output 
+                    // is removed, and this also buggers up our attempt at opening an output
                     // device, so this is a workaround that doesn't fail in that case.
                     BitArray noInputs;
                     error = deviceManager.setAudioDevice (audioDeviceDropDown->getText(),

src/juce_appframework/gui/components/windows/juce_SplashScreen.cpp

@@ -36,6 +36,7 @@ BEGIN_JUCE_NAMESPACE
 #include "juce_SplashScreen.h"
 #include "../../../events/juce_MessageManager.h"
 #include "../../graphics/imaging/juce_ImageCache.h"
+#include "../juce_Desktop.h"
 
 
 //==============================================================================
@@ -58,7 +59,8 @@ SplashScreen::~SplashScreen()
 void SplashScreen::show (const String& title,
                          Image* const backgroundImage_,
                          const int minimumTimeToDisplayFor,
-                         const bool useDropShadow)
+                         const bool useDropShadow,
+                         const bool removeOnMouseClick)
 {
     backgroundImage = backgroundImage_;
 
@@ -74,7 +76,8 @@ void SplashScreen::show (const String& title,
               backgroundImage_->getWidth(),
               backgroundImage_->getHeight(),
               minimumTimeToDisplayFor,
-              useDropShadow);
+              useDropShadow,
+              removeOnMouseClick);
     }
 }
 
@@ -82,7 +85,8 @@ void SplashScreen::show (const String& title,
                          const int width,
                          const int height,
                          const int minimumTimeToDisplayFor,
-                         const bool useDropShadow)
+                         const bool useDropShadow,
+                         const bool removeOnMouseClick)
 {
     setName (title);
     setAlwaysOnTop (true);
@@ -97,8 +101,13 @@ void SplashScreen::show (const String& title,
 
     repaint();
 
+    originalClickCounter = removeOnMouseClick
+                                ? Desktop::getMouseButtonClickCounter()
+                                : INT_MAX;
+
     earliestTimeToDelete = Time::getCurrentTime() + RelativeTime::milliseconds (minimumTimeToDisplayFor);
-    startTimer (200);
+
+    startTimer (50);
 }
 
 //==============================================================================
@@ -116,7 +125,8 @@ void SplashScreen::paint (Graphics& g)
 
 void SplashScreen::timerCallback()
 {
-    if (Time::getCurrentTime() > earliestTimeToDelete)
+    if (Time::getCurrentTime() > earliestTimeToDelete
+         || Desktop::getMouseButtonClickCounter() > originalClickCounter)
     {
         delete this;
     }

src/juce_appframework/gui/components/windows/juce_SplashScreen.h

@@ -99,11 +99,14 @@ public:
                                 disappearing, but if initialisation is very quick, this lets
                                 you make sure that people get a good look at your splash.
         @param useDropShadow    if true, the window will have a drop shadow
+        @param removeOnMouseClick   if true, the window will go away as soon as the user clicks
+                                the mouse (anywhere)
     */
     void show (const String& title,
                Image* const backgroundImage,
                const int minimumTimeToDisplayFor,
-               const bool useDropShadow);
+               const bool useDropShadow,
+               const bool removeOnMouseClick = true);
 
     /** Creates a SplashScreen object with a specified size.
 
@@ -124,12 +127,15 @@ public:
                                 disappearing, but if initialisation is very quick, this lets
                                 you make sure that people get a good look at your splash.
         @param useDropShadow    if true, the window will have a drop shadow
+        @param removeOnMouseClick   if true, the window will go away as soon as the user clicks
+                                the mouse (anywhere)
     */
     void show (const String& title,
                const int width,
                const int height,
                const int minimumTimeToDisplayFor,
-               const bool useDropShadow);
+               const bool useDropShadow,
+               const bool removeOnMouseClick = true);
 
     //==============================================================================
     /** @internal */
@@ -143,6 +149,7 @@ public:
 private:
     Image* backgroundImage;
     Time earliestTimeToDelete;
+    int originalClickCounter;
     bool isImageInCache;
 
     SplashScreen (const SplashScreen&);