Browse Source

tags/2021-05-28
jules 17 years ago
parent
commit
48d8be021a
4 changed files with 3605 additions and 3562 deletions
  1. +3545
    -3545
      build/macosx/platform_specific_code/juce_mac_Windowing.cpp
  2. +48
    -8
      build/win32/vc6/JUCE.dsp
  3. +5
    -1
      extras/audio plugin host/build/mac/PluginHost.xcodeproj/project.pbxproj
  4. +7
    -8
      src/juce_appframework/audio/dsp/juce_AudioSampleBuffer.cpp

+ 3545
- 3545
build/macosx/platform_specific_code/juce_mac_Windowing.cpp
File diff suppressed because it is too large
View File


+ 48
- 8
build/win32/vc6/JUCE.dsp View File

@@ -619,6 +619,42 @@ SOURCE=..\..\..\src\juce_appframework\audio\dsp\juce_IIRFilter.cpp
SOURCE=..\..\..\src\juce_appframework\audio\dsp\juce_IIRFilter.h
# End Source File
# End Group
# Begin Group "processors"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioPlayHead.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessor.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorEditor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorEditor.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorListener.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_GenericAudioProcessorEditor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_GenericAudioProcessorEditor.h
# End Source File
# End Group
# End Group
# Begin Group "events"
@@ -1245,10 +1281,6 @@ SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pn
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pnggccrd.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngget.c
# End Source File
# Begin Source File
@@ -1285,10 +1317,6 @@ SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pn
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngvcrd.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwio.c
# End Source File
# Begin Source File
@@ -1866,6 +1894,10 @@ SOURCE=..\..\..\src\juce_appframework\gui\components\mouse\juce_DragAndDropTarge
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\mouse\juce_FileDragAndDropTarget.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\mouse\juce_LassoComponent.h
# End Source File
# Begin Source File
@@ -2154,6 +2186,14 @@ SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FilePrevie
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileSearchPathListComponent.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileSearchPathListComponent.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileTreeComponent.cpp
# End Source File
# Begin Source File


+ 5
- 1
extras/audio plugin host/build/mac/PluginHost.xcodeproj/project.pbxproj View File

@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
8411682E0CBBEE0500232E45 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8411682D0CBBEE0500232E45 /* OpenGL.framework */; };
84FFAEAC0C6C8A6F009F6E72 /* FilterGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84FFAE920C6C8A6F009F6E72 /* FilterGraph.cpp */; };
84FFAEAD0C6C8A6F009F6E72 /* GraphEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84FFAE940C6C8A6F009F6E72 /* GraphEditorPanel.cpp */; };
84FFAEAE0C6C8A6F009F6E72 /* InternalFilters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84FFAE960C6C8A6F009F6E72 /* InternalFilters.cpp */; };
@@ -42,7 +43,8 @@
20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
508344B209E5C41E0093A071 /* Juce Plugin Host.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "Juce Plugin Host.app"; sourceTree = BUILT_PRODUCTS_DIR; };
508344B209E5C41E0093A071 /* Juce Plugin Host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Juce Plugin Host.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8411682D0CBBEE0500232E45 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
84FFAE920C6C8A6F009F6E72 /* FilterGraph.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = FilterGraph.cpp; path = ../../src/host/FilterGraph.cpp; sourceTree = SOURCE_ROOT; };
84FFAE930C6C8A6F009F6E72 /* FilterGraph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FilterGraph.h; path = ../../src/host/FilterGraph.h; sourceTree = SOURCE_ROOT; };
84FFAE940C6C8A6F009F6E72 /* GraphEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = GraphEditorPanel.cpp; path = ../../src/host/GraphEditorPanel.cpp; sourceTree = SOURCE_ROOT; };
@@ -88,6 +90,7 @@
84FFAF060C6C8ED5009F6E72 /* IOKit.framework in Frameworks */,
84FFAF080C6C8ED5009F6E72 /* QuickTime.framework in Frameworks */,
84FFAF150C6C8EE8009F6E72 /* AGL.framework in Frameworks */,
8411682E0CBBEE0500232E45 /* OpenGL.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -134,6 +137,7 @@
20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
isa = PBXGroup;
children = (
8411682D0CBBEE0500232E45 /* OpenGL.framework */,
84FFAF140C6C8EE8009F6E72 /* AGL.framework */,
84FFAEFF0C6C8ED5009F6E72 /* CoreAudio.framework */,
84FFAF000C6C8ED5009F6E72 /* CoreMIDI.framework */,


+ 7
- 8
src/juce_appframework/audio/dsp/juce_AudioSampleBuffer.cpp View File

@@ -117,8 +117,10 @@ const AudioSampleBuffer& AudioSampleBuffer::operator= (const AudioSampleBuffer&
{
setSize (other.getNumChannels(), other.getNumSamples(), false, false, false);
const int totalBytes = numChannels * size * sizeof (float);
memcpy (allocatedData, other.allocatedData, totalBytes);
const int numBytes = size * sizeof (float);
for (int i = 0; i < numChannels; ++i)
memcpy (channels[i], other.channels[i], numBytes);
}
return *this;
@@ -126,8 +128,7 @@ const AudioSampleBuffer& AudioSampleBuffer::operator= (const AudioSampleBuffer&
AudioSampleBuffer::~AudioSampleBuffer() throw()
{
if (allocatedData != 0)
juce_free (allocatedData);
juce_free (allocatedData);
}
float* AudioSampleBuffer::getSampleData (const int channelNumber,
@@ -165,8 +166,7 @@ void AudioSampleBuffer::setSize (const int newNumChannels,
sizeToCopy);
}
if (allocatedData != 0)
juce_free (allocatedData);
juce_free (allocatedData);
allocatedData = newData;
allocatedBytes = newTotalBytes;
@@ -180,8 +180,7 @@ void AudioSampleBuffer::setSize (const int newNumChannels,
}
else
{
if (allocatedData != 0)
juce_free (allocatedData);
juce_free (allocatedData);
allocatedData = (clearExtraSpace) ? (float*) juce_calloc (newTotalBytes)
: (float*) juce_malloc (newTotalBytes);


Loading…
Cancel
Save