Browse Source

CoreAudio fix.

tags/2021-05-28
Julian Storer 15 years ago
parent
commit
6b0640d2b9
6 changed files with 32 additions and 32 deletions
  1. +8
    -8
      juce_amalgamated.cpp
  2. +8
    -8
      juce_amalgamated.h
  3. +1
    -1
      src/core/juce_StandardHeader.h
  4. +7
    -7
      src/gui/graphics/contexts/juce_EdgeTable.cpp
  5. +7
    -7
      src/gui/graphics/contexts/juce_EdgeTable.h
  6. +1
    -1
      src/native/mac/juce_mac_CoreAudio.cpp

+ 8
- 8
juce_amalgamated.cpp View File

@@ -79102,7 +79102,7 @@ BEGIN_JUCE_NAMESPACE
const int juce_edgeTableDefaultEdgesPerLine = 32;

EdgeTable::EdgeTable (const Rectangle<int>& bounds_,
const Path& path, const AffineTransform& transform) throw()
const Path& path, const AffineTransform& transform)
: bounds (bounds_),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -79176,7 +79176,7 @@ EdgeTable::EdgeTable (const Rectangle<int>& bounds_,
sanitiseLevels (path.isUsingNonZeroWinding());
}

EdgeTable::EdgeTable (const Rectangle<int>& rectangleToAdd) throw()
EdgeTable::EdgeTable (const Rectangle<int>& rectangleToAdd)
: bounds (rectangleToAdd),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -79200,7 +79200,7 @@ EdgeTable::EdgeTable (const Rectangle<int>& rectangleToAdd) throw()
}
}

EdgeTable::EdgeTable (const RectangleList& rectanglesToAdd) throw()
EdgeTable::EdgeTable (const RectangleList& rectanglesToAdd)
: bounds (rectanglesToAdd.getBounds()),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -79234,7 +79234,7 @@ EdgeTable::EdgeTable (const RectangleList& rectanglesToAdd) throw()
sanitiseLevels (true);
}

EdgeTable::EdgeTable (const float x, const float y, const float w, const float h) throw()
EdgeTable::EdgeTable (const float x, const float y, const float w, const float h)
: bounds (Rectangle<int> ((int) floorf (x), roundToInt (y * 256.0f) >> 8, 2 + (int) w, 2 + (int) h)),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -79309,13 +79309,13 @@ EdgeTable::EdgeTable (const float x, const float y, const float w, const float h
}
}

EdgeTable::EdgeTable (const EdgeTable& other) throw()
EdgeTable::EdgeTable (const EdgeTable& other)
: table (0)
{
operator= (other);
}

EdgeTable& EdgeTable::operator= (const EdgeTable& other) throw()
EdgeTable& EdgeTable::operator= (const EdgeTable& other)
{
bounds = other.bounds;
maxEdgesPerLine = other.maxEdgesPerLine;
@@ -79327,7 +79327,7 @@ EdgeTable& EdgeTable::operator= (const EdgeTable& other) throw()
return *this;
}

EdgeTable::~EdgeTable() throw()
EdgeTable::~EdgeTable()
{
}

@@ -250197,7 +250197,7 @@ public:
{
if (inputDevice == 0)
{
callback->audioDeviceIOCallback (const_cast<const float**> (inputDevice->tempInputBuffers.getData()),
callback->audioDeviceIOCallback (const_cast<const float**> (tempInputBuffers.getData()),
numInputChans,
tempOutputBuffers,
numOutputChans,


+ 8
- 8
juce_amalgamated.h View File

@@ -43,7 +43,7 @@

#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 51
#define JUCE_BUILDNUMBER 7
#define JUCE_BUILDNUMBER 8

#define JUCE_VERSION ((JUCE_MAJOR_VERSION << 16) + (JUCE_MINOR_VERSION << 8) + JUCE_BUILDNUMBER)

@@ -10185,20 +10185,20 @@ public:

EdgeTable (const Rectangle<int>& clipLimits,
const Path& pathToAdd,
const AffineTransform& transform) throw();
const AffineTransform& transform);

EdgeTable (const Rectangle<int>& rectangleToAdd) throw();
EdgeTable (const Rectangle<int>& rectangleToAdd);

EdgeTable (const RectangleList& rectanglesToAdd) throw();
EdgeTable (const RectangleList& rectanglesToAdd);

EdgeTable (const float x, const float y,
const float w, const float h) throw();
const float w, const float h);

EdgeTable (const EdgeTable& other) throw();
EdgeTable (const EdgeTable& other);

EdgeTable& operator= (const EdgeTable& other) throw();
EdgeTable& operator= (const EdgeTable& other);

~EdgeTable() throw();
~EdgeTable();

void clipToRectangle (const Rectangle<int>& r) throw();
void excludeRectangle (const Rectangle<int>& r) throw();


+ 1
- 1
src/core/juce_StandardHeader.h View File

@@ -33,7 +33,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 51
#define JUCE_BUILDNUMBER 7
#define JUCE_BUILDNUMBER 8
/** Current Juce version number.


+ 7
- 7
src/gui/graphics/contexts/juce_EdgeTable.cpp View File

@@ -36,7 +36,7 @@ const int juce_edgeTableDefaultEdgesPerLine = 32;
//==============================================================================
EdgeTable::EdgeTable (const Rectangle<int>& bounds_,
const Path& path, const AffineTransform& transform) throw()
const Path& path, const AffineTransform& transform)
: bounds (bounds_),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -110,7 +110,7 @@ EdgeTable::EdgeTable (const Rectangle<int>& bounds_,
sanitiseLevels (path.isUsingNonZeroWinding());
}
EdgeTable::EdgeTable (const Rectangle<int>& rectangleToAdd) throw()
EdgeTable::EdgeTable (const Rectangle<int>& rectangleToAdd)
: bounds (rectangleToAdd),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -134,7 +134,7 @@ EdgeTable::EdgeTable (const Rectangle<int>& rectangleToAdd) throw()
}
}
EdgeTable::EdgeTable (const RectangleList& rectanglesToAdd) throw()
EdgeTable::EdgeTable (const RectangleList& rectanglesToAdd)
: bounds (rectanglesToAdd.getBounds()),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -168,7 +168,7 @@ EdgeTable::EdgeTable (const RectangleList& rectanglesToAdd) throw()
sanitiseLevels (true);
}
EdgeTable::EdgeTable (const float x, const float y, const float w, const float h) throw()
EdgeTable::EdgeTable (const float x, const float y, const float w, const float h)
: bounds (Rectangle<int> ((int) floorf (x), roundToInt (y * 256.0f) >> 8, 2 + (int) w, 2 + (int) h)),
maxEdgesPerLine (juce_edgeTableDefaultEdgesPerLine),
lineStrideElements ((juce_edgeTableDefaultEdgesPerLine << 1) + 1),
@@ -243,13 +243,13 @@ EdgeTable::EdgeTable (const float x, const float y, const float w, const float h
}
}
EdgeTable::EdgeTable (const EdgeTable& other) throw()
EdgeTable::EdgeTable (const EdgeTable& other)
: table (0)
{
operator= (other);
}
EdgeTable& EdgeTable::operator= (const EdgeTable& other) throw()
EdgeTable& EdgeTable::operator= (const EdgeTable& other)
{
bounds = other.bounds;
maxEdgesPerLine = other.maxEdgesPerLine;
@@ -261,7 +261,7 @@ EdgeTable& EdgeTable::operator= (const EdgeTable& other) throw()
return *this;
}
EdgeTable::~EdgeTable() throw()
EdgeTable::~EdgeTable()
{
}


+ 7
- 7
src/gui/graphics/contexts/juce_EdgeTable.h View File

@@ -55,29 +55,29 @@ public:
*/
EdgeTable (const Rectangle<int>& clipLimits,
const Path& pathToAdd,
const AffineTransform& transform) throw();
const AffineTransform& transform);
/** Creates an edge table containing a rectangle.
*/
EdgeTable (const Rectangle<int>& rectangleToAdd) throw();
EdgeTable (const Rectangle<int>& rectangleToAdd);
/** Creates an edge table containing a rectangle list.
*/
EdgeTable (const RectangleList& rectanglesToAdd) throw();
EdgeTable (const RectangleList& rectanglesToAdd);
/** Creates an edge table containing a rectangle.
*/
EdgeTable (const float x, const float y,
const float w, const float h) throw();
const float w, const float h);
/** Creates a copy of another edge table. */
EdgeTable (const EdgeTable& other) throw();
EdgeTable (const EdgeTable& other);
/** Copies from another edge table. */
EdgeTable& operator= (const EdgeTable& other) throw();
EdgeTable& operator= (const EdgeTable& other);
/** Destructor. */
~EdgeTable() throw();
~EdgeTable();
//==============================================================================
void clipToRectangle (const Rectangle<int>& r) throw();


+ 1
- 1
src/native/mac/juce_mac_CoreAudio.cpp View File

@@ -628,7 +628,7 @@ public:
{
if (inputDevice == 0)
{
callback->audioDeviceIOCallback (const_cast<const float**> (inputDevice->tempInputBuffers.getData()),
callback->audioDeviceIOCallback (const_cast<const float**> (tempInputBuffers.getData()),
numInputChans,
tempOutputBuffers,
numOutputChans,


Loading…
Cancel
Save