extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.h

@@ -61,9 +61,9 @@ public:
 
     //==============================================================================
     void audioDeviceIOCallback (const float** inputChannelData,
-                                int totalNumInputChannels,
+                                int numInputChannels,
                                 float** outputChannelData,
-                                int totalNumOutputChannels,
+                                int numOutputChannels,
                                 int numSamples);
 
     void audioDeviceAboutToStart (AudioIODevice* device);

extras/the jucer/build/vc8/jucer.sln

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "The Jucer", "jucer.vcproj", "{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JUCE", "..\..\..\..\build\win32\vc8\JUCE.vcproj", "{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -19,6 +21,14 @@ Global
 		{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.DLL Release|Win32.Build.0 = Release|Win32
 		{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.Release|Win32.ActiveCfg = Release|Win32
 		{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.Release|Win32.Build.0 = Release|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.Build.0 = Debug|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.ActiveCfg = Release|Win32
+		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/juce_appframework/gui/components/controls/juce_Slider.h

@@ -167,6 +167,8 @@ public:
                                 to be treated as a movement
         @param offset           values greater than 0.0 increase the minimum speed that will be used when
                                 the threshold is reached
+        @param userCanPressKeyToSwapMode    if true, then the user can hold down the ctrl or command
+                                key to toggle velocity-sensitive mode
     */
     void setVelocityModeParameters (const double sensitivity = 1.0,
                                     const int threshold = 1.0,

src/juce_appframework/gui/components/mouse/juce_DragAndDropTarget.h

@@ -59,6 +59,7 @@ public:
         dragged.
 
         @param sourceDescription    the description string passed into DragAndDropContainer::startDragging()
+        @param sourceComponent      the component that was passed into DragAndDropContainer::startDragging()
         @returns                    true if this component wants to receive the other callbacks regarging this
                                     type of object; if it returns false, no other callbacks will be made.
     */
@@ -74,7 +75,7 @@ public:
         user feedback about whether the item can be dropped here or not.
 
         @param sourceDescription    the description string passed into DragAndDropContainer::startDragging()
-        @param sourceComponent      the component passed into DragAndDropContainer::startDragging()
+        @param sourceComponent      the component that was passed into DragAndDropContainer::startDragging()
         @param x                    the mouse x position, relative to this component
         @param y                    the mouse y position, relative to this component
         @see itemDragExit
@@ -91,7 +92,7 @@ public:
         this lets you know what happens in-between.
 
         @param sourceDescription    the description string passed into DragAndDropContainer::startDragging()
-        @param sourceComponent      the component passed into DragAndDropContainer::startDragging()
+        @param sourceComponent      the component that was passed into DragAndDropContainer::startDragging()
         @param x                    the mouse x position, relative to this component
         @param y                    the mouse y position, relative to this component
     */
@@ -109,7 +110,7 @@ public:
         as a signal to repaint it in its normal state.
 
         @param sourceDescription    the description string passed into DragAndDropContainer::startDragging()
-        @param sourceComponent      the component passed into DragAndDropContainer::startDragging()
+        @param sourceComponent      the component that was passed into DragAndDropContainer::startDragging()
         @see itemDragEnter
     */
     virtual void itemDragExit (const String& sourceDescription,
@@ -124,7 +125,7 @@ public:
         clean up in here if there's anything you need to do when the drag finishes.
 
         @param sourceDescription    the description string passed into DragAndDropContainer::startDragging()
-        @param sourceComponent      the component passed into DragAndDropContainer::startDragging()
+        @param sourceComponent      the component that was passed into DragAndDropContainer::startDragging()
         @param x                    the mouse x position, relative to this component
         @param y                    the mouse y position, relative to this component
     */

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

@@ -110,6 +110,8 @@ public:
         @param timeOutMsWhenCancelling  when 'cancel' is pressed, this is how long to wait for
                                         the thread to stop before killing it forcibly (see
                                         Thread::stopThread() )
+        @param cancelButtonText         the text that should be shown in the cancel button
+                                        (if it has one)
     */
     ThreadWithProgressWindow (const String& windowTitle,
                               const bool hasProgressBar,

src/juce_core/io/network/juce_URL.h

@@ -159,6 +159,9 @@ public:
                                 for lengthy POST operations, so that you can provide user feedback.
         @param progressCallbackContext  if a callback is specified, this value will be passed to
                                 the function
+        @param extraHeaders     if not empty, this string is appended onto the headers that
+                                are used for the request. It must therefore be a valid set of HTML
+                                header directives, separated by newlines.
     */
     InputStream* createInputStream (const bool usePostCommand,
                                     OpenStreamProgressCallback* const progressCallback = 0,