From 858a758aeefdaffb29937337f4f10a268107c591 Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Wed, 10 Mar 2010 13:04:24 +0000 Subject: [PATCH] Fixed a minor AU build error and removed some old macros. --- amalgamation/juce_amalgamated_template.cpp | 1 - build/linux/JUCE.make | 1164 ++++++++--------- build/macosx/Juce.xcodeproj/project.pbxproj | 6 - build/win32/vc8/JUCE.vcproj | 4 - .../wrapper/juce_IncludeCharacteristics.h | 2 +- juce_amalgamated.cpp | 477 ++++--- juce_amalgamated.h | 5 +- .../formats/juce_AudioUnitPluginFormat.mm | 4 +- .../plugins/formats/juce_VSTPluginFormat.cpp | 4 +- .../special/juce_QuickTimeMovieComponent.h | 7 +- src/native/juce_linux_NativeCode.cpp | 7 + src/native/juce_mac_NativeCode.mm | 6 + src/native/juce_win32_NativeCode.cpp | 9 +- src/native/linux/juce_linux_Files.cpp | 9 +- src/native/linux/juce_linux_Fonts.cpp | 23 +- src/native/linux/juce_linux_Messaging.cpp | 46 +- .../mac/juce_mac_QuickTimeMovieComponent.mm | 2 +- .../windows/juce_win32_AudioCDReader.cpp | 110 +- src/native/windows/juce_win32_Files.cpp | 12 +- src/native/windows/juce_win32_Fonts.cpp | 23 +- src/native/windows/juce_win32_Midi.cpp | 103 +- .../juce_win32_QuickTimeMovieComponent.cpp | 129 +- src/native/windows/juce_win32_Windowing.cpp | 18 +- src/threads/juce_InterProcessLock.cpp | 38 - 24 files changed, 1037 insertions(+), 1172 deletions(-) delete mode 100644 src/threads/juce_InterProcessLock.cpp diff --git a/amalgamation/juce_amalgamated_template.cpp b/amalgamation/juce_amalgamated_template.cpp index cf47f13111..7b2ded4aeb 100644 --- a/amalgamation/juce_amalgamated_template.cpp +++ b/amalgamation/juce_amalgamated_template.cpp @@ -138,7 +138,6 @@ #include "../src/text/juce_StringPairArray.cpp" #include "../src/text/juce_XmlDocument.cpp" #include "../src/text/juce_XmlElement.cpp" - #include "../src/threads/juce_InterProcessLock.cpp" #include "../src/threads/juce_ReadWriteLock.cpp" #include "../src/threads/juce_Thread.cpp" #include "../src/threads/juce_ThreadPool.cpp" diff --git a/build/linux/JUCE.make b/build/linux/JUCE.make index 32be57b7ec..1d25e1c850 100644 --- a/build/linux/JUCE.make +++ b/build/linux/JUCE.make @@ -39,275 +39,275 @@ ifeq ($(CONFIG),Release) endif OBJECTS := \ - $(OBJDIR)/juce_FileLogger.o \ - $(OBJDIR)/juce_PerformanceCounter.o \ - $(OBJDIR)/juce_Time.o \ - $(OBJDIR)/juce_Random.o \ - $(OBJDIR)/juce_RelativeTime.o \ - $(OBJDIR)/juce_Uuid.o \ $(OBJDIR)/juce_Logger.o \ + $(OBJDIR)/juce_PerformanceCounter.o \ + $(OBJDIR)/juce_Uuid.o \ + $(OBJDIR)/juce_FileLogger.o \ + $(OBJDIR)/juce_Random.o \ $(OBJDIR)/juce_SystemStats.o \ - $(OBJDIR)/juce_BlowFish.o \ + $(OBJDIR)/juce_Time.o \ + $(OBJDIR)/juce_RelativeTime.o \ $(OBJDIR)/juce_Primes.o \ $(OBJDIR)/juce_RSAKey.o \ $(OBJDIR)/juce_MD5.o \ - $(OBJDIR)/juce_PropertySet.o \ - $(OBJDIR)/juce_NamedValueSet.o \ - $(OBJDIR)/juce_MemoryBlock.o \ - $(OBJDIR)/juce_Value.o \ - $(OBJDIR)/juce_ValueTree.o \ - $(OBJDIR)/juce_BitArray.o \ + $(OBJDIR)/juce_BlowFish.o \ $(OBJDIR)/juce_DynamicObject.o \ + $(OBJDIR)/juce_NamedValueSet.o \ + $(OBJDIR)/juce_BitArray.o \ + $(OBJDIR)/juce_ValueTree.o \ + $(OBJDIR)/juce_Value.o \ + $(OBJDIR)/juce_PropertySet.o \ $(OBJDIR)/juce_Variant.o \ - $(OBJDIR)/juce_FileInputStream.o \ - $(OBJDIR)/juce_File.o \ - $(OBJDIR)/juce_NamedPipe.o \ - $(OBJDIR)/juce_FileOutputStream.o \ - $(OBJDIR)/juce_ZipFile.o \ - $(OBJDIR)/juce_TemporaryFile.o \ + $(OBJDIR)/juce_MemoryBlock.o \ $(OBJDIR)/juce_DirectoryIterator.o \ + $(OBJDIR)/juce_FileInputStream.o \ + $(OBJDIR)/juce_FileOutputStream.o \ + $(OBJDIR)/juce_NamedPipe.o \ + $(OBJDIR)/juce_TemporaryFile.o \ $(OBJDIR)/juce_FileSearchPath.o \ + $(OBJDIR)/juce_File.o \ + $(OBJDIR)/juce_ZipFile.o \ $(OBJDIR)/juce_Socket.o \ $(OBJDIR)/juce_URL.o \ - $(OBJDIR)/juce_MemoryInputStream.o \ - $(OBJDIR)/juce_OutputStream.o \ - $(OBJDIR)/juce_FileInputSource.o \ - $(OBJDIR)/juce_BufferedInputStream.o \ - $(OBJDIR)/juce_SubregionStream.o \ - $(OBJDIR)/juce_GZIPDecompressorInputStream.o \ - $(OBJDIR)/juce_GZIPCompressorOutputStream.o \ $(OBJDIR)/juce_InputStream.o \ + $(OBJDIR)/juce_FileInputSource.o \ + $(OBJDIR)/juce_GZIPCompressorOutputStream.o \ + $(OBJDIR)/juce_GZIPDecompressorInputStream.o \ + $(OBJDIR)/juce_MemoryInputStream.o \ $(OBJDIR)/juce_MemoryOutputStream.o \ - $(OBJDIR)/juce_StringArray.o \ - $(OBJDIR)/juce_StringPairArray.o \ - $(OBJDIR)/juce_LocalisedStrings.o \ - $(OBJDIR)/juce_String.o \ - $(OBJDIR)/juce_XmlElement.o \ + $(OBJDIR)/juce_SubregionStream.o \ + $(OBJDIR)/juce_BufferedInputStream.o \ + $(OBJDIR)/juce_OutputStream.o \ $(OBJDIR)/juce_XmlDocument.o \ + $(OBJDIR)/juce_LocalisedStrings.o \ + $(OBJDIR)/juce_StringPairArray.o \ $(OBJDIR)/juce_CharacterFunctions.o \ - $(OBJDIR)/juce_InterProcessLock.o \ + $(OBJDIR)/juce_StringArray.o \ + $(OBJDIR)/juce_XmlElement.o \ + $(OBJDIR)/juce_String.o \ $(OBJDIR)/juce_ReadWriteLock.o \ $(OBJDIR)/juce_Thread.o \ $(OBJDIR)/juce_TimeSliceThread.o \ $(OBJDIR)/juce_ThreadPool.o \ + $(OBJDIR)/juce_Application.o \ $(OBJDIR)/juce_ApplicationCommandInfo.o \ - $(OBJDIR)/juce_ApplicationProperties.o \ $(OBJDIR)/juce_ApplicationCommandManager.o \ $(OBJDIR)/juce_ApplicationCommandTarget.o \ - $(OBJDIR)/juce_Application.o \ - $(OBJDIR)/juce_IIRFilter.o \ + $(OBJDIR)/juce_ApplicationProperties.o \ $(OBJDIR)/juce_AudioDataConverters.o \ + $(OBJDIR)/juce_IIRFilter.o \ $(OBJDIR)/juce_AudioSampleBuffer.o \ - $(OBJDIR)/juce_MidiKeyboardState.o \ - $(OBJDIR)/juce_MidiMessage.o \ $(OBJDIR)/juce_MidiFile.o \ + $(OBJDIR)/juce_MidiKeyboardState.o \ $(OBJDIR)/juce_MidiMessageCollector.o \ - $(OBJDIR)/juce_MidiBuffer.o \ $(OBJDIR)/juce_MidiMessageSequence.o \ + $(OBJDIR)/juce_MidiMessage.o \ + $(OBJDIR)/juce_MidiBuffer.o \ $(OBJDIR)/juce_AudioProcessorEditor.o \ $(OBJDIR)/juce_AudioProcessorPlayer.o \ - $(OBJDIR)/juce_GenericAudioProcessorEditor.o \ $(OBJDIR)/juce_AudioProcessor.o \ + $(OBJDIR)/juce_GenericAudioProcessorEditor.o \ $(OBJDIR)/juce_AudioProcessorGraph.o \ $(OBJDIR)/juce_AudioPluginFormat.o \ $(OBJDIR)/juce_AudioPluginFormatManager.o \ $(OBJDIR)/juce_AudioPluginInstance.o \ - $(OBJDIR)/juce_PluginDescription.o \ + $(OBJDIR)/juce_KnownPluginList.o \ $(OBJDIR)/juce_PluginDirectoryScanner.o \ $(OBJDIR)/juce_PluginListComponent.o \ - $(OBJDIR)/juce_KnownPluginList.o \ + $(OBJDIR)/juce_PluginDescription.o \ $(OBJDIR)/juce_VSTPluginFormat.o \ - $(OBJDIR)/juce_AudioSubsectionReader.o \ - $(OBJDIR)/juce_AudioThumbnailCache.o \ $(OBJDIR)/juce_AudioCDReader.o \ - $(OBJDIR)/juce_AudioFormatManager.o \ - $(OBJDIR)/juce_OggVorbisAudioFormat.o \ - $(OBJDIR)/juce_AiffAudioFormat.o \ - $(OBJDIR)/juce_AudioThumbnail.o \ - $(OBJDIR)/juce_FlacAudioFormat.o \ - $(OBJDIR)/juce_WavAudioFormat.o \ - $(OBJDIR)/juce_QuickTimeAudioFormat.o \ $(OBJDIR)/juce_AudioFormat.o \ + $(OBJDIR)/juce_AudioFormatManager.o \ + $(OBJDIR)/juce_AudioSubsectionReader.o \ + $(OBJDIR)/juce_AudioThumbnail.o \ + $(OBJDIR)/juce_AudioThumbnailCache.o \ + $(OBJDIR)/juce_FlacAudioFormat.o \ + $(OBJDIR)/juce_QuickTimeAudioFormat.o \ + $(OBJDIR)/juce_OggVorbisAudioFormat.o \ + $(OBJDIR)/juce_WavAudioFormat.o \ + $(OBJDIR)/juce_AiffAudioFormat.o \ $(OBJDIR)/juce_AudioFormatReaderSource.o \ $(OBJDIR)/juce_AudioSourcePlayer.o \ - $(OBJDIR)/juce_AudioTransportSource.o \ $(OBJDIR)/juce_ChannelRemappingAudioSource.o \ $(OBJDIR)/juce_IIRFilterAudioSource.o \ $(OBJDIR)/juce_MixerAudioSource.o \ - $(OBJDIR)/juce_ToneGeneratorAudioSource.o \ - $(OBJDIR)/juce_BufferingAudioSource.o \ $(OBJDIR)/juce_ResamplingAudioSource.o \ + $(OBJDIR)/juce_ToneGeneratorAudioSource.o \ + $(OBJDIR)/juce_AudioTransportSource.o \ + $(OBJDIR)/juce_BufferingAudioSource.o \ + $(OBJDIR)/juce_AudioDeviceManager.o \ $(OBJDIR)/juce_AudioIODevice.o \ $(OBJDIR)/juce_AudioIODeviceType.o \ $(OBJDIR)/juce_MidiOutput.o \ - $(OBJDIR)/juce_AudioDeviceManager.o \ - $(OBJDIR)/juce_Synthesiser.o \ $(OBJDIR)/juce_Sampler.o \ + $(OBJDIR)/juce_Synthesiser.o \ $(OBJDIR)/juce_ActionBroadcaster.o \ - $(OBJDIR)/juce_ActionListenerList.o \ $(OBJDIR)/juce_AsyncUpdater.o \ $(OBJDIR)/juce_ChangeBroadcaster.o \ $(OBJDIR)/juce_ChangeListenerList.o \ + $(OBJDIR)/juce_InterprocessConnection.o \ + $(OBJDIR)/juce_InterprocessConnectionServer.o \ $(OBJDIR)/juce_Message.o \ $(OBJDIR)/juce_MessageListener.o \ $(OBJDIR)/juce_Timer.o \ - $(OBJDIR)/juce_InterprocessConnectionServer.o \ - $(OBJDIR)/juce_InterprocessConnection.o \ - $(OBJDIR)/juce_MultiTimer.o \ $(OBJDIR)/juce_MessageManager.o \ - $(OBJDIR)/juce_FileBasedDocument.o \ - $(OBJDIR)/juce_RecentlyOpenedFilesList.o \ - $(OBJDIR)/juce_PropertiesFile.o \ + $(OBJDIR)/juce_MultiTimer.o \ + $(OBJDIR)/juce_ActionListenerList.o \ $(OBJDIR)/juce_DeletedAtShutdown.o \ + $(OBJDIR)/juce_FileBasedDocument.o \ + $(OBJDIR)/juce_PropertiesFile.o \ + $(OBJDIR)/juce_RecentlyOpenedFilesList.o \ $(OBJDIR)/juce_UndoManager.o \ + $(OBJDIR)/juce_ColourGradient.o \ $(OBJDIR)/juce_Colours.o \ $(OBJDIR)/juce_Colour.o \ - $(OBJDIR)/juce_ColourGradient.o \ + $(OBJDIR)/juce_Graphics.o \ + $(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o \ $(OBJDIR)/juce_Justification.o \ $(OBJDIR)/juce_RectanglePlacement.o \ - $(OBJDIR)/juce_EdgeTable.o \ $(OBJDIR)/juce_FillType.o \ - $(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o \ + $(OBJDIR)/juce_EdgeTable.o \ $(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o \ - $(OBJDIR)/juce_Graphics.o \ - $(OBJDIR)/juce_DrawableComposite.o \ - $(OBJDIR)/juce_SVGParser.o \ - $(OBJDIR)/juce_DrawableText.o \ + $(OBJDIR)/juce_Drawable.o \ $(OBJDIR)/juce_DrawableImage.o \ $(OBJDIR)/juce_DrawablePath.o \ - $(OBJDIR)/juce_Drawable.o \ - $(OBJDIR)/juce_ReduceOpacityEffect.o \ - $(OBJDIR)/juce_GlowEffect.o \ + $(OBJDIR)/juce_DrawableText.o \ + $(OBJDIR)/juce_SVGParser.o \ + $(OBJDIR)/juce_DrawableComposite.o \ $(OBJDIR)/juce_DropShadowEffect.o \ - $(OBJDIR)/juce_TextLayout.o \ - $(OBJDIR)/juce_GlyphArrangement.o \ - $(OBJDIR)/juce_Typeface.o \ + $(OBJDIR)/juce_GlowEffect.o \ + $(OBJDIR)/juce_ReduceOpacityEffect.o \ $(OBJDIR)/juce_Font.o \ - $(OBJDIR)/juce_Path.o \ + $(OBJDIR)/juce_Typeface.o \ + $(OBJDIR)/juce_GlyphArrangement.o \ + $(OBJDIR)/juce_TextLayout.o \ $(OBJDIR)/juce_BorderSize.o \ - $(OBJDIR)/juce_Line.o \ - $(OBJDIR)/juce_AffineTransform.o \ $(OBJDIR)/juce_PathIterator.o \ - $(OBJDIR)/juce_PathStrokeType.o \ $(OBJDIR)/juce_RectangleList.o \ $(OBJDIR)/juce_PositionedRectangle.o \ - $(OBJDIR)/juce_ImageFileFormat.o \ + $(OBJDIR)/juce_PathStrokeType.o \ + $(OBJDIR)/juce_Path.o \ + $(OBJDIR)/juce_Line.o \ + $(OBJDIR)/juce_AffineTransform.o \ $(OBJDIR)/juce_ImageCache.o \ + $(OBJDIR)/juce_ImageFileFormat.o \ $(OBJDIR)/juce_ImageConvolutionKernel.o \ $(OBJDIR)/juce_Image.o \ + $(OBJDIR)/juce_GIFLoader.o \ $(OBJDIR)/juce_JPEGLoader.o \ $(OBJDIR)/juce_PNGLoader.o \ - $(OBJDIR)/juce_GIFLoader.o \ $(OBJDIR)/juce_ComponentListener.o \ - $(OBJDIR)/juce_Component.o \ $(OBJDIR)/juce_Desktop.o \ + $(OBJDIR)/juce_Component.o \ $(OBJDIR)/juce_ArrowButton.o \ - $(OBJDIR)/juce_HyperlinkButton.o \ - $(OBJDIR)/juce_TextButton.o \ - $(OBJDIR)/juce_ToggleButton.o \ - $(OBJDIR)/juce_ImageButton.o \ $(OBJDIR)/juce_DrawableButton.o \ - $(OBJDIR)/juce_Button.o \ - $(OBJDIR)/juce_ToolbarButton.o \ + $(OBJDIR)/juce_HyperlinkButton.o \ + $(OBJDIR)/juce_ImageButton.o \ $(OBJDIR)/juce_ShapeButton.o \ - $(OBJDIR)/juce_ListBox.o \ - $(OBJDIR)/juce_Label.o \ - $(OBJDIR)/juce_ToolbarItemPalette.o \ - $(OBJDIR)/juce_Slider.o \ + $(OBJDIR)/juce_TextButton.o \ + $(OBJDIR)/juce_ToolbarButton.o \ + $(OBJDIR)/juce_ToggleButton.o \ + $(OBJDIR)/juce_Button.o \ $(OBJDIR)/juce_ProgressBar.o \ $(OBJDIR)/juce_ComboBox.o \ - $(OBJDIR)/juce_TableHeaderComponent.o \ - $(OBJDIR)/juce_TableListBox.o \ - $(OBJDIR)/juce_TextEditor.o \ - $(OBJDIR)/juce_Toolbar.o \ + $(OBJDIR)/juce_ToolbarItemPalette.o \ $(OBJDIR)/juce_ToolbarItemComponent.o \ + $(OBJDIR)/juce_Toolbar.o \ $(OBJDIR)/juce_TreeView.o \ + $(OBJDIR)/juce_TableListBox.o \ + $(OBJDIR)/juce_TableHeaderComponent.o \ + $(OBJDIR)/juce_ListBox.o \ + $(OBJDIR)/juce_TextEditor.o \ + $(OBJDIR)/juce_Label.o \ + $(OBJDIR)/juce_Slider.o \ $(OBJDIR)/juce_CPlusPlusCodeTokeniser.o \ - $(OBJDIR)/juce_CodeDocument.o \ $(OBJDIR)/juce_CodeEditorComponent.o \ + $(OBJDIR)/juce_CodeDocument.o \ + $(OBJDIR)/juce_DirectoryContentsList.o \ $(OBJDIR)/juce_FileChooserDialogBox.o \ $(OBJDIR)/juce_FileFilter.o \ - $(OBJDIR)/juce_FileBrowserComponent.o \ $(OBJDIR)/juce_FileListComponent.o \ - $(OBJDIR)/juce_FilenameComponent.o \ - $(OBJDIR)/juce_FileTreeComponent.o \ $(OBJDIR)/juce_FileSearchPathListComponent.o \ + $(OBJDIR)/juce_FileTreeComponent.o \ + $(OBJDIR)/juce_ImagePreviewComponent.o \ $(OBJDIR)/juce_WildcardFileFilter.o \ $(OBJDIR)/juce_FileChooser.o \ - $(OBJDIR)/juce_ImagePreviewComponent.o \ - $(OBJDIR)/juce_DirectoryContentsList.o \ $(OBJDIR)/juce_DirectoryContentsDisplayComponent.o \ + $(OBJDIR)/juce_FileBrowserComponent.o \ + $(OBJDIR)/juce_FilenameComponent.o \ $(OBJDIR)/juce_KeyListener.o \ - $(OBJDIR)/juce_KeyPress.o \ - $(OBJDIR)/juce_KeyPressMappingSet.o \ - $(OBJDIR)/juce_KeyMappingEditorComponent.o \ - $(OBJDIR)/juce_KeyboardFocusTraverser.o \ $(OBJDIR)/juce_ModifierKeys.o \ - $(OBJDIR)/juce_ScrollBar.o \ - $(OBJDIR)/juce_GroupComponent.o \ - $(OBJDIR)/juce_ResizableBorderComponent.o \ - $(OBJDIR)/juce_ResizableCornerComponent.o \ - $(OBJDIR)/juce_TabbedComponent.o \ - $(OBJDIR)/juce_StretchableLayoutResizerBar.o \ - $(OBJDIR)/juce_ComponentAnimator.o \ - $(OBJDIR)/juce_ComponentMovementWatcher.o \ + $(OBJDIR)/juce_KeyPressMappingSet.o \ + $(OBJDIR)/juce_KeyboardFocusTraverser.o \ + $(OBJDIR)/juce_KeyPress.o \ + $(OBJDIR)/juce_KeyMappingEditorComponent.o \ $(OBJDIR)/juce_Viewport.o \ - $(OBJDIR)/juce_TabbedButtonBar.o \ - $(OBJDIR)/juce_StretchableLayoutManager.o \ - $(OBJDIR)/juce_StretchableObjectResizer.o \ + $(OBJDIR)/juce_ComponentMovementWatcher.o \ + $(OBJDIR)/juce_GroupComponent.o \ $(OBJDIR)/juce_MultiDocumentPanel.o \ + $(OBJDIR)/juce_ResizableBorderComponent.o \ + $(OBJDIR)/juce_StretchableLayoutManager.o \ + $(OBJDIR)/juce_StretchableLayoutResizerBar.o \ + $(OBJDIR)/juce_StretchableObjectResizer.o \ + $(OBJDIR)/juce_ComponentAnimator.o \ + $(OBJDIR)/juce_TabbedButtonBar.o \ + $(OBJDIR)/juce_TabbedComponent.o \ $(OBJDIR)/juce_ComponentBoundsConstrainer.o \ - $(OBJDIR)/juce_LookAndFeel.o \ + $(OBJDIR)/juce_ResizableCornerComponent.o \ + $(OBJDIR)/juce_ScrollBar.o \ $(OBJDIR)/juce_OldSchoolLookAndFeel.o \ - $(OBJDIR)/juce_MenuBarModel.o \ + $(OBJDIR)/juce_LookAndFeel.o \ $(OBJDIR)/juce_MenuBarComponent.o \ + $(OBJDIR)/juce_MenuBarModel.o \ $(OBJDIR)/juce_PopupMenu.o \ - $(OBJDIR)/juce_ComponentDragger.o \ - $(OBJDIR)/juce_MouseEvent.o \ - $(OBJDIR)/juce_MouseHoverDetector.o \ - $(OBJDIR)/juce_MouseListener.o \ $(OBJDIR)/juce_MouseCursor.o \ + $(OBJDIR)/juce_MouseListener.o \ + $(OBJDIR)/juce_MouseHoverDetector.o \ + $(OBJDIR)/juce_ComponentDragger.o \ $(OBJDIR)/juce_DragAndDropContainer.o \ + $(OBJDIR)/juce_MouseEvent.o \ + $(OBJDIR)/juce_MouseInputSource.o \ + $(OBJDIR)/juce_BooleanPropertyComponent.o \ $(OBJDIR)/juce_ButtonPropertyComponent.o \ - $(OBJDIR)/juce_PropertyPanel.o \ + $(OBJDIR)/juce_ChoicePropertyComponent.o \ $(OBJDIR)/juce_PropertyComponent.o \ + $(OBJDIR)/juce_PropertyPanel.o \ $(OBJDIR)/juce_SliderPropertyComponent.o \ $(OBJDIR)/juce_TextPropertyComponent.o \ - $(OBJDIR)/juce_ChoicePropertyComponent.o \ - $(OBJDIR)/juce_BooleanPropertyComponent.o \ $(OBJDIR)/juce_BubbleMessageComponent.o \ + $(OBJDIR)/juce_ColourSelector.o \ + $(OBJDIR)/juce_BubbleComponent.o \ + $(OBJDIR)/juce_OpenGLComponent.o \ $(OBJDIR)/juce_SystemTrayIconComponent.o \ $(OBJDIR)/juce_PreferencesPanel.o \ - $(OBJDIR)/juce_AudioDeviceSelectorComponent.o \ - $(OBJDIR)/juce_DropShadower.o \ $(OBJDIR)/juce_MidiKeyboardComponent.o \ - $(OBJDIR)/juce_OpenGLComponent.o \ - $(OBJDIR)/juce_BubbleComponent.o \ - $(OBJDIR)/juce_ColourSelector.o \ + $(OBJDIR)/juce_DropShadower.o \ + $(OBJDIR)/juce_AudioDeviceSelectorComponent.o \ $(OBJDIR)/juce_MagnifierComponent.o \ - $(OBJDIR)/juce_SplashScreen.o \ - $(OBJDIR)/juce_DialogWindow.o \ + $(OBJDIR)/juce_AlertWindow.o \ $(OBJDIR)/juce_TooltipWindow.o \ $(OBJDIR)/juce_ThreadWithProgressWindow.o \ - $(OBJDIR)/juce_AlertWindow.o \ $(OBJDIR)/juce_ComponentPeer.o \ + $(OBJDIR)/juce_DialogWindow.o \ $(OBJDIR)/juce_DocumentWindow.o \ $(OBJDIR)/juce_ResizableWindow.o \ + $(OBJDIR)/juce_SplashScreen.o \ $(OBJDIR)/juce_TopLevelWindow.o \ - $(OBJDIR)/juce_linux_Midi.o \ - $(OBJDIR)/juce_linux_Fonts.o \ - $(OBJDIR)/juce_linux_Audio.o \ - $(OBJDIR)/juce_linux_WebBrowserComponent.o \ - $(OBJDIR)/juce_linux_JackAudio.o \ $(OBJDIR)/juce_linux_AudioCDReader.o \ - $(OBJDIR)/juce_linux_Clipboard.o \ - $(OBJDIR)/juce_linux_Files.o \ $(OBJDIR)/juce_linux_Threads.o \ + $(OBJDIR)/juce_linux_Files.o \ + $(OBJDIR)/juce_linux_Midi.o \ + $(OBJDIR)/juce_linux_Messaging.o \ $(OBJDIR)/juce_linux_SystemStats.o \ $(OBJDIR)/juce_linux_FileChooser.o \ + $(OBJDIR)/juce_linux_WebBrowserComponent.o \ $(OBJDIR)/juce_linux_Network.o \ + $(OBJDIR)/juce_linux_Clipboard.o \ + $(OBJDIR)/juce_linux_JackAudio.o \ + $(OBJDIR)/juce_linux_Audio.o \ $(OBJDIR)/juce_linux_Windowing.o \ - $(OBJDIR)/juce_linux_Messaging.o \ + $(OBJDIR)/juce_linux_Fonts.o \ $(OBJDIR)/juce_linux_NativeCode.o \ MKDIR_TYPE := msdos @@ -350,7 +350,7 @@ else -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) endif -$(OBJDIR)/juce_FileLogger.o: ../../src/core/juce_FileLogger.cpp +$(OBJDIR)/juce_Logger.o: ../../src/core/juce_Logger.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -360,7 +360,12 @@ $(OBJDIR)/juce_PerformanceCounter.o: ../../src/core/juce_PerformanceCounter.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Time.o: ../../src/core/juce_Time.cpp +$(OBJDIR)/juce_Uuid.o: ../../src/core/juce_Uuid.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileLogger.o: ../../src/core/juce_FileLogger.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -370,27 +375,17 @@ $(OBJDIR)/juce_Random.o: ../../src/core/juce_Random.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_RelativeTime.o: ../../src/core/juce_RelativeTime.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Uuid.o: ../../src/core/juce_Uuid.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Logger.o: ../../src/core/juce_Logger.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_SystemStats.o: ../../src/core/juce_SystemStats.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BlowFish.o: ../../src/cryptography/juce_BlowFish.cpp +$(OBJDIR)/juce_Time.o: ../../src/core/juce_Time.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_RelativeTime.o: ../../src/core/juce_RelativeTime.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -410,32 +405,7 @@ $(OBJDIR)/juce_MD5.o: ../../src/cryptography/juce_MD5.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PropertySet.o: ../../src/containers/juce_PropertySet.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_NamedValueSet.o: ../../src/containers/juce_NamedValueSet.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MemoryBlock.o: ../../src/containers/juce_MemoryBlock.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Value.o: ../../src/containers/juce_Value.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ValueTree.o: ../../src/containers/juce_ValueTree.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_BitArray.o: ../../src/containers/juce_BitArray.cpp +$(OBJDIR)/juce_BlowFish.o: ../../src/cryptography/juce_BlowFish.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -445,37 +415,37 @@ $(OBJDIR)/juce_DynamicObject.o: ../../src/containers/juce_DynamicObject.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_NamedValueSet.o: ../../src/containers/juce_NamedValueSet.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_BitArray.o: ../../src/containers/juce_BitArray.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ValueTree.o: ../../src/containers/juce_ValueTree.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Value.o: ../../src/containers/juce_Value.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PropertySet.o: ../../src/containers/juce_PropertySet.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_Variant.o: ../../src/containers/juce_Variant.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FileInputStream.o: ../../src/io/files/juce_FileInputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_File.o: ../../src/io/files/juce_File.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_NamedPipe.o: ../../src/io/files/juce_NamedPipe.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileOutputStream.o: ../../src/io/files/juce_FileOutputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ZipFile.o: ../../src/io/files/juce_ZipFile.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_TemporaryFile.o: ../../src/io/files/juce_TemporaryFile.cpp +$(OBJDIR)/juce_MemoryBlock.o: ../../src/containers/juce_MemoryBlock.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -485,11 +455,41 @@ $(OBJDIR)/juce_DirectoryIterator.o: ../../src/io/files/juce_DirectoryIterator.cp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_FileInputStream.o: ../../src/io/files/juce_FileInputStream.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FileOutputStream.o: ../../src/io/files/juce_FileOutputStream.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_NamedPipe.o: ../../src/io/files/juce_NamedPipe.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TemporaryFile.o: ../../src/io/files/juce_TemporaryFile.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_FileSearchPath.o: ../../src/io/files/juce_FileSearchPath.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_File.o: ../../src/io/files/juce_File.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ZipFile.o: ../../src/io/files/juce_ZipFile.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_Socket.o: ../../src/io/network/juce_Socket.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -500,12 +500,7 @@ $(OBJDIR)/juce_URL.o: ../../src/io/network/juce_URL.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MemoryInputStream.o: ../../src/io/streams/juce_MemoryInputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_OutputStream.o: ../../src/io/streams/juce_OutputStream.cpp +$(OBJDIR)/juce_InputStream.o: ../../src/io/streams/juce_InputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -515,12 +510,7 @@ $(OBJDIR)/juce_FileInputSource.o: ../../src/io/streams/juce_FileInputSource.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_BufferedInputStream.o: ../../src/io/streams/juce_BufferedInputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_SubregionStream.o: ../../src/io/streams/juce_SubregionStream.cpp +$(OBJDIR)/juce_GZIPCompressorOutputStream.o: ../../src/io/streams/juce_GZIPCompressorOutputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -530,12 +520,7 @@ $(OBJDIR)/juce_GZIPDecompressorInputStream.o: ../../src/io/streams/juce_GZIPDeco @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_GZIPCompressorOutputStream.o: ../../src/io/streams/juce_GZIPCompressorOutputStream.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_InputStream.o: ../../src/io/streams/juce_InputStream.cpp +$(OBJDIR)/juce_MemoryInputStream.o: ../../src/io/streams/juce_MemoryInputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -545,27 +530,17 @@ $(OBJDIR)/juce_MemoryOutputStream.o: ../../src/io/streams/juce_MemoryOutputStrea @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_StringArray.o: ../../src/text/juce_StringArray.cpp +$(OBJDIR)/juce_SubregionStream.o: ../../src/io/streams/juce_SubregionStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_StringPairArray.o: ../../src/text/juce_StringPairArray.cpp +$(OBJDIR)/juce_BufferedInputStream.o: ../../src/io/streams/juce_BufferedInputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_LocalisedStrings.o: ../../src/text/juce_LocalisedStrings.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_String.o: ../../src/text/juce_String.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_XmlElement.o: ../../src/text/juce_XmlElement.cpp +$(OBJDIR)/juce_OutputStream.o: ../../src/io/streams/juce_OutputStream.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -575,12 +550,32 @@ $(OBJDIR)/juce_XmlDocument.o: ../../src/text/juce_XmlDocument.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_LocalisedStrings.o: ../../src/text/juce_LocalisedStrings.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_StringPairArray.o: ../../src/text/juce_StringPairArray.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_CharacterFunctions.o: ../../src/text/juce_CharacterFunctions.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_InterProcessLock.o: ../../src/threads/juce_InterProcessLock.cpp +$(OBJDIR)/juce_StringArray.o: ../../src/text/juce_StringArray.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_XmlElement.o: ../../src/text/juce_XmlElement.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_String.o: ../../src/text/juce_String.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -605,12 +600,12 @@ $(OBJDIR)/juce_ThreadPool.o: ../../src/threads/juce_ThreadPool.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ApplicationCommandInfo.o: ../../src/application/juce_ApplicationCommandInfo.cpp +$(OBJDIR)/juce_Application.o: ../../src/application/juce_Application.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ApplicationProperties.o: ../../src/application/juce_ApplicationProperties.cpp +$(OBJDIR)/juce_ApplicationCommandInfo.o: ../../src/application/juce_ApplicationCommandInfo.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -625,12 +620,7 @@ $(OBJDIR)/juce_ApplicationCommandTarget.o: ../../src/application/juce_Applicatio @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Application.o: ../../src/application/juce_Application.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_IIRFilter.o: ../../src/audio/dsp/juce_IIRFilter.cpp +$(OBJDIR)/juce_ApplicationProperties.o: ../../src/application/juce_ApplicationProperties.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -640,37 +630,42 @@ $(OBJDIR)/juce_AudioDataConverters.o: ../../src/audio/dsp/juce_AudioDataConverte @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_IIRFilter.o: ../../src/audio/dsp/juce_IIRFilter.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_AudioSampleBuffer.o: ../../src/audio/dsp/juce_AudioSampleBuffer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MidiKeyboardState.o: ../../src/audio/midi/juce_MidiKeyboardState.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MidiMessage.o: ../../src/audio/midi/juce_MidiMessage.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_MidiFile.o: ../../src/audio/midi/juce_MidiFile.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_MidiKeyboardState.o: ../../src/audio/midi/juce_MidiKeyboardState.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_MidiMessageCollector.o: ../../src/audio/midi/juce_MidiMessageCollector.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MidiBuffer.o: ../../src/audio/midi/juce_MidiBuffer.cpp +$(OBJDIR)/juce_MidiMessageSequence.o: ../../src/audio/midi/juce_MidiMessageSequence.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MidiMessageSequence.o: ../../src/audio/midi/juce_MidiMessageSequence.cpp +$(OBJDIR)/juce_MidiMessage.o: ../../src/audio/midi/juce_MidiMessage.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MidiBuffer.o: ../../src/audio/midi/juce_MidiBuffer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -685,12 +680,12 @@ $(OBJDIR)/juce_AudioProcessorPlayer.o: ../../src/audio/processors/juce_AudioProc @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_GenericAudioProcessorEditor.o: ../../src/audio/processors/juce_GenericAudioProcessorEditor.cpp +$(OBJDIR)/juce_AudioProcessor.o: ../../src/audio/processors/juce_AudioProcessor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioProcessor.o: ../../src/audio/processors/juce_AudioProcessor.cpp +$(OBJDIR)/juce_GenericAudioProcessorEditor.o: ../../src/audio/processors/juce_GenericAudioProcessorEditor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -715,7 +710,7 @@ $(OBJDIR)/juce_AudioPluginInstance.o: ../../src/audio/plugins/juce_AudioPluginIn @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PluginDescription.o: ../../src/audio/plugins/juce_PluginDescription.cpp +$(OBJDIR)/juce_KnownPluginList.o: ../../src/audio/plugins/juce_KnownPluginList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -730,7 +725,7 @@ $(OBJDIR)/juce_PluginListComponent.o: ../../src/audio/plugins/juce_PluginListCom @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_KnownPluginList.o: ../../src/audio/plugins/juce_KnownPluginList.cpp +$(OBJDIR)/juce_PluginDescription.o: ../../src/audio/plugins/juce_PluginDescription.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -740,32 +735,22 @@ $(OBJDIR)/juce_VSTPluginFormat.o: ../../src/audio/plugins/formats/juce_VSTPlugin @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioSubsectionReader.o: ../../src/audio/audio_file_formats/juce_AudioSubsectionReader.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AudioThumbnailCache.o: ../../src/audio/audio_file_formats/juce_AudioThumbnailCache.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_AudioCDReader.o: ../../src/audio/audio_file_formats/juce_AudioCDReader.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_AudioFormat.o: ../../src/audio/audio_file_formats/juce_AudioFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_AudioFormatManager.o: ../../src/audio/audio_file_formats/juce_AudioFormatManager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_OggVorbisAudioFormat.o: ../../src/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AiffAudioFormat.o: ../../src/audio/audio_file_formats/juce_AiffAudioFormat.cpp +$(OBJDIR)/juce_AudioSubsectionReader.o: ../../src/audio/audio_file_formats/juce_AudioSubsectionReader.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -775,12 +760,12 @@ $(OBJDIR)/juce_AudioThumbnail.o: ../../src/audio/audio_file_formats/juce_AudioTh @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FlacAudioFormat.o: ../../src/audio/audio_file_formats/juce_FlacAudioFormat.cpp +$(OBJDIR)/juce_AudioThumbnailCache.o: ../../src/audio/audio_file_formats/juce_AudioThumbnailCache.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_WavAudioFormat.o: ../../src/audio/audio_file_formats/juce_WavAudioFormat.cpp +$(OBJDIR)/juce_FlacAudioFormat.o: ../../src/audio/audio_file_formats/juce_FlacAudioFormat.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -790,7 +775,17 @@ $(OBJDIR)/juce_QuickTimeAudioFormat.o: ../../src/audio/audio_file_formats/juce_Q @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioFormat.o: ../../src/audio/audio_file_formats/juce_AudioFormat.cpp +$(OBJDIR)/juce_OggVorbisAudioFormat.o: ../../src/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_WavAudioFormat.o: ../../src/audio/audio_file_formats/juce_WavAudioFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AiffAudioFormat.o: ../../src/audio/audio_file_formats/juce_AiffAudioFormat.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -805,11 +800,6 @@ $(OBJDIR)/juce_AudioSourcePlayer.o: ../../src/audio/audio_sources/juce_AudioSour @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioTransportSource.o: ../../src/audio/audio_sources/juce_AudioTransportSource.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ChannelRemappingAudioSource.o: ../../src/audio/audio_sources/juce_ChannelRemappingAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -825,17 +815,27 @@ $(OBJDIR)/juce_MixerAudioSource.o: ../../src/audio/audio_sources/juce_MixerAudio @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_ResamplingAudioSource.o: ../../src/audio/audio_sources/juce_ResamplingAudioSource.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ToneGeneratorAudioSource.o: ../../src/audio/audio_sources/juce_ToneGeneratorAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_AudioTransportSource.o: ../../src/audio/audio_sources/juce_AudioTransportSource.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_BufferingAudioSource.o: ../../src/audio/audio_sources/juce_BufferingAudioSource.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ResamplingAudioSource.o: ../../src/audio/audio_sources/juce_ResamplingAudioSource.cpp +$(OBJDIR)/juce_AudioDeviceManager.o: ../../src/audio/devices/juce_AudioDeviceManager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -855,7 +855,7 @@ $(OBJDIR)/juce_MidiOutput.o: ../../src/audio/devices/juce_MidiOutput.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioDeviceManager.o: ../../src/audio/devices/juce_AudioDeviceManager.cpp +$(OBJDIR)/juce_Sampler.o: ../../src/audio/synthesisers/juce_Sampler.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -865,21 +865,11 @@ $(OBJDIR)/juce_Synthesiser.o: ../../src/audio/synthesisers/juce_Synthesiser.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Sampler.o: ../../src/audio/synthesisers/juce_Sampler.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ActionBroadcaster.o: ../../src/events/juce_ActionBroadcaster.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ActionListenerList.o: ../../src/events/juce_ActionListenerList.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_AsyncUpdater.o: ../../src/events/juce_AsyncUpdater.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -895,6 +885,16 @@ $(OBJDIR)/juce_ChangeListenerList.o: ../../src/events/juce_ChangeListenerList.cp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_InterprocessConnection.o: ../../src/events/juce_InterprocessConnection.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_InterprocessConnectionServer.o: ../../src/events/juce_InterprocessConnectionServer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_Message.o: ../../src/events/juce_Message.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -910,12 +910,7 @@ $(OBJDIR)/juce_Timer.o: ../../src/events/juce_Timer.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_InterprocessConnectionServer.o: ../../src/events/juce_InterprocessConnectionServer.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_InterprocessConnection.o: ../../src/events/juce_InterprocessConnection.cpp +$(OBJDIR)/juce_MessageManager.o: ../../src/events/juce_MessageManager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -925,22 +920,7 @@ $(OBJDIR)/juce_MultiTimer.o: ../../src/events/juce_MultiTimer.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MessageManager.o: ../../src/events/juce_MessageManager.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_FileBasedDocument.o: ../../src/utilities/juce_FileBasedDocument.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_RecentlyOpenedFilesList.o: ../../src/utilities/juce_RecentlyOpenedFilesList.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_PropertiesFile.o: ../../src/utilities/juce_PropertiesFile.cpp +$(OBJDIR)/juce_ActionListenerList.o: ../../src/events/juce_ActionListenerList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -950,11 +930,31 @@ $(OBJDIR)/juce_DeletedAtShutdown.o: ../../src/utilities/juce_DeletedAtShutdown.c @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_FileBasedDocument.o: ../../src/utilities/juce_FileBasedDocument.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_PropertiesFile.o: ../../src/utilities/juce_PropertiesFile.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_RecentlyOpenedFilesList.o: ../../src/utilities/juce_RecentlyOpenedFilesList.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_UndoManager.o: ../../src/utilities/juce_UndoManager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_ColourGradient.o: ../../src/gui/graphics/colour/juce_ColourGradient.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_Colours.o: ../../src/gui/graphics/colour/juce_Colours.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -965,7 +965,12 @@ $(OBJDIR)/juce_Colour.o: ../../src/gui/graphics/colour/juce_Colour.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ColourGradient.o: ../../src/gui/graphics/colour/juce_ColourGradient.cpp +$(OBJDIR)/juce_Graphics.o: ../../src/gui/graphics/contexts/juce_Graphics.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o: ../../src/gui/graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -980,17 +985,12 @@ $(OBJDIR)/juce_RectanglePlacement.o: ../../src/gui/graphics/contexts/juce_Rectan @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_EdgeTable.o: ../../src/gui/graphics/contexts/juce_EdgeTable.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_FillType.o: ../../src/gui/graphics/contexts/juce_FillType.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_LowLevelGraphicsPostScriptRenderer.o: ../../src/gui/graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp +$(OBJDIR)/juce_EdgeTable.o: ../../src/gui/graphics/contexts/juce_EdgeTable.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1000,22 +1000,7 @@ $(OBJDIR)/juce_LowLevelGraphicsSoftwareRenderer.o: ../../src/gui/graphics/contex @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Graphics.o: ../../src/gui/graphics/contexts/juce_Graphics.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DrawableComposite.o: ../../src/gui/graphics/drawables/juce_DrawableComposite.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_SVGParser.o: ../../src/gui/graphics/drawables/juce_SVGParser.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DrawableText.o: ../../src/gui/graphics/drawables/juce_DrawableText.cpp +$(OBJDIR)/juce_Drawable.o: ../../src/gui/graphics/drawables/juce_Drawable.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1030,17 +1015,17 @@ $(OBJDIR)/juce_DrawablePath.o: ../../src/gui/graphics/drawables/juce_DrawablePat @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Drawable.o: ../../src/gui/graphics/drawables/juce_Drawable.cpp +$(OBJDIR)/juce_DrawableText.o: ../../src/gui/graphics/drawables/juce_DrawableText.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ReduceOpacityEffect.o: ../../src/gui/graphics/effects/juce_ReduceOpacityEffect.cpp +$(OBJDIR)/juce_SVGParser.o: ../../src/gui/graphics/drawables/juce_SVGParser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_GlowEffect.o: ../../src/gui/graphics/effects/juce_GlowEffect.cpp +$(OBJDIR)/juce_DrawableComposite.o: ../../src/gui/graphics/drawables/juce_DrawableComposite.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1050,17 +1035,12 @@ $(OBJDIR)/juce_DropShadowEffect.o: ../../src/gui/graphics/effects/juce_DropShado @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_TextLayout.o: ../../src/gui/graphics/fonts/juce_TextLayout.cpp +$(OBJDIR)/juce_GlowEffect.o: ../../src/gui/graphics/effects/juce_GlowEffect.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_GlyphArrangement.o: ../../src/gui/graphics/fonts/juce_GlyphArrangement.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Typeface.o: ../../src/gui/graphics/fonts/juce_Typeface.cpp +$(OBJDIR)/juce_ReduceOpacityEffect.o: ../../src/gui/graphics/effects/juce_ReduceOpacityEffect.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1070,7 +1050,17 @@ $(OBJDIR)/juce_Font.o: ../../src/gui/graphics/fonts/juce_Font.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Path.o: ../../src/gui/graphics/geometry/juce_Path.cpp +$(OBJDIR)/juce_Typeface.o: ../../src/gui/graphics/fonts/juce_Typeface.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_GlyphArrangement.o: ../../src/gui/graphics/fonts/juce_GlyphArrangement.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TextLayout.o: ../../src/gui/graphics/fonts/juce_TextLayout.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1080,26 +1070,11 @@ $(OBJDIR)/juce_BorderSize.o: ../../src/gui/graphics/geometry/juce_BorderSize.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Line.o: ../../src/gui/graphics/geometry/juce_Line.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_AffineTransform.o: ../../src/gui/graphics/geometry/juce_AffineTransform.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_PathIterator.o: ../../src/gui/graphics/geometry/juce_PathIterator.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PathStrokeType.o: ../../src/gui/graphics/geometry/juce_PathStrokeType.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_RectangleList.o: ../../src/gui/graphics/geometry/juce_RectangleList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1110,7 +1085,22 @@ $(OBJDIR)/juce_PositionedRectangle.o: ../../src/gui/graphics/geometry/juce_Posit @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ImageFileFormat.o: ../../src/gui/graphics/imaging/juce_ImageFileFormat.cpp +$(OBJDIR)/juce_PathStrokeType.o: ../../src/gui/graphics/geometry/juce_PathStrokeType.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Path.o: ../../src/gui/graphics/geometry/juce_Path.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Line.o: ../../src/gui/graphics/geometry/juce_Line.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_AffineTransform.o: ../../src/gui/graphics/geometry/juce_AffineTransform.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1120,6 +1110,11 @@ $(OBJDIR)/juce_ImageCache.o: ../../src/gui/graphics/imaging/juce_ImageCache.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_ImageFileFormat.o: ../../src/gui/graphics/imaging/juce_ImageFileFormat.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ImageConvolutionKernel.o: ../../src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1130,6 +1125,11 @@ $(OBJDIR)/juce_Image.o: ../../src/gui/graphics/imaging/juce_Image.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_GIFLoader.o: ../../src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_JPEGLoader.o: ../../src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1140,62 +1140,37 @@ $(OBJDIR)/juce_PNGLoader.o: ../../src/gui/graphics/imaging/image_file_formats/ju @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_GIFLoader.o: ../../src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_ComponentListener.o: ../../src/gui/components/juce_ComponentListener.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Component.o: ../../src/gui/components/juce_Component.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_Desktop.o: ../../src/gui/components/juce_Desktop.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_Component.o: ../../src/gui/components/juce_Component.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ArrowButton.o: ../../src/gui/components/buttons/juce_ArrowButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_HyperlinkButton.o: ../../src/gui/components/buttons/juce_HyperlinkButton.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_TextButton.o: ../../src/gui/components/buttons/juce_TextButton.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ToggleButton.o: ../../src/gui/components/buttons/juce_ToggleButton.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ImageButton.o: ../../src/gui/components/buttons/juce_ImageButton.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_DrawableButton.o: ../../src/gui/components/buttons/juce_DrawableButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Button.o: ../../src/gui/components/buttons/juce_Button.cpp +$(OBJDIR)/juce_HyperlinkButton.o: ../../src/gui/components/buttons/juce_HyperlinkButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ToolbarButton.o: ../../src/gui/components/buttons/juce_ToolbarButton.cpp +$(OBJDIR)/juce_ImageButton.o: ../../src/gui/components/buttons/juce_ImageButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1205,22 +1180,22 @@ $(OBJDIR)/juce_ShapeButton.o: ../../src/gui/components/buttons/juce_ShapeButton. @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ListBox.o: ../../src/gui/components/controls/juce_ListBox.cpp +$(OBJDIR)/juce_TextButton.o: ../../src/gui/components/buttons/juce_TextButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Label.o: ../../src/gui/components/controls/juce_Label.cpp +$(OBJDIR)/juce_ToolbarButton.o: ../../src/gui/components/buttons/juce_ToolbarButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ToolbarItemPalette.o: ../../src/gui/components/controls/juce_ToolbarItemPalette.cpp +$(OBJDIR)/juce_ToggleButton.o: ../../src/gui/components/buttons/juce_ToggleButton.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_Slider.o: ../../src/gui/components/controls/juce_Slider.cpp +$(OBJDIR)/juce_Button.o: ../../src/gui/components/buttons/juce_Button.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1235,22 +1210,7 @@ $(OBJDIR)/juce_ComboBox.o: ../../src/gui/components/controls/juce_ComboBox.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_TableHeaderComponent.o: ../../src/gui/components/controls/juce_TableHeaderComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_TableListBox.o: ../../src/gui/components/controls/juce_TableListBox.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_TextEditor.o: ../../src/gui/components/controls/juce_TextEditor.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_Toolbar.o: ../../src/gui/components/controls/juce_Toolbar.cpp +$(OBJDIR)/juce_ToolbarItemPalette.o: ../../src/gui/components/controls/juce_ToolbarItemPalette.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1260,22 +1220,62 @@ $(OBJDIR)/juce_ToolbarItemComponent.o: ../../src/gui/components/controls/juce_To @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_Toolbar.o: ../../src/gui/components/controls/juce_Toolbar.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_TreeView.o: ../../src/gui/components/controls/juce_TreeView.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_TableListBox.o: ../../src/gui/components/controls/juce_TableListBox.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TableHeaderComponent.o: ../../src/gui/components/controls/juce_TableHeaderComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ListBox.o: ../../src/gui/components/controls/juce_ListBox.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TextEditor.o: ../../src/gui/components/controls/juce_TextEditor.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Label.o: ../../src/gui/components/controls/juce_Label.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_Slider.o: ../../src/gui/components/controls/juce_Slider.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_CPlusPlusCodeTokeniser.o: ../../src/gui/components/code_editor/juce_CPlusPlusCodeTokeniser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_CodeEditorComponent.o: ../../src/gui/components/code_editor/juce_CodeEditorComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_CodeDocument.o: ../../src/gui/components/code_editor/juce_CodeDocument.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_CodeEditorComponent.o: ../../src/gui/components/code_editor/juce_CodeEditorComponent.cpp +$(OBJDIR)/juce_DirectoryContentsList.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsList.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1290,17 +1290,12 @@ $(OBJDIR)/juce_FileFilter.o: ../../src/gui/components/filebrowser/juce_FileFilte @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FileBrowserComponent.o: ../../src/gui/components/filebrowser/juce_FileBrowserComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_FileListComponent.o: ../../src/gui/components/filebrowser/juce_FileListComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FilenameComponent.o: ../../src/gui/components/filebrowser/juce_FilenameComponent.cpp +$(OBJDIR)/juce_FileSearchPathListComponent.o: ../../src/gui/components/filebrowser/juce_FileSearchPathListComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1310,7 +1305,7 @@ $(OBJDIR)/juce_FileTreeComponent.o: ../../src/gui/components/filebrowser/juce_Fi @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_FileSearchPathListComponent.o: ../../src/gui/components/filebrowser/juce_FileSearchPathListComponent.cpp +$(OBJDIR)/juce_ImagePreviewComponent.o: ../../src/gui/components/filebrowser/juce_ImagePreviewComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1325,27 +1320,27 @@ $(OBJDIR)/juce_FileChooser.o: ../../src/gui/components/filebrowser/juce_FileChoo @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ImagePreviewComponent.o: ../../src/gui/components/filebrowser/juce_ImagePreviewComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DirectoryContentsList.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsList.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_DirectoryContentsDisplayComponent.o: ../../src/gui/components/filebrowser/juce_DirectoryContentsDisplayComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_FileBrowserComponent.o: ../../src/gui/components/filebrowser/juce_FileBrowserComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_FilenameComponent.o: ../../src/gui/components/filebrowser/juce_FilenameComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_KeyListener.o: ../../src/gui/components/keyboard/juce_KeyListener.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_KeyPress.o: ../../src/gui/components/keyboard/juce_KeyPress.cpp +$(OBJDIR)/juce_ModifierKeys.o: ../../src/gui/components/keyboard/juce_ModifierKeys.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1355,57 +1350,17 @@ $(OBJDIR)/juce_KeyPressMappingSet.o: ../../src/gui/components/keyboard/juce_KeyP @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_KeyMappingEditorComponent.o: ../../src/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_KeyboardFocusTraverser.o: ../../src/gui/components/keyboard/juce_KeyboardFocusTraverser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ModifierKeys.o: ../../src/gui/components/keyboard/juce_ModifierKeys.cpp +$(OBJDIR)/juce_KeyPress.o: ../../src/gui/components/keyboard/juce_KeyPress.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ScrollBar.o: ../../src/gui/components/layout/juce_ScrollBar.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_GroupComponent.o: ../../src/gui/components/layout/juce_GroupComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ResizableBorderComponent.o: ../../src/gui/components/layout/juce_ResizableBorderComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ResizableCornerComponent.o: ../../src/gui/components/layout/juce_ResizableCornerComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_TabbedComponent.o: ../../src/gui/components/layout/juce_TabbedComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_StretchableLayoutResizerBar.o: ../../src/gui/components/layout/juce_StretchableLayoutResizerBar.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ComponentAnimator.o: ../../src/gui/components/layout/juce_ComponentAnimator.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ComponentMovementWatcher.o: ../../src/gui/components/layout/juce_ComponentMovementWatcher.cpp +$(OBJDIR)/juce_KeyMappingEditorComponent.o: ../../src/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1415,17 +1370,12 @@ $(OBJDIR)/juce_Viewport.o: ../../src/gui/components/layout/juce_Viewport.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_TabbedButtonBar.o: ../../src/gui/components/layout/juce_TabbedButtonBar.cpp +$(OBJDIR)/juce_ComponentMovementWatcher.o: ../../src/gui/components/layout/juce_ComponentMovementWatcher.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_StretchableLayoutManager.o: ../../src/gui/components/layout/juce_StretchableLayoutManager.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_StretchableObjectResizer.o: ../../src/gui/components/layout/juce_StretchableObjectResizer.cpp +$(OBJDIR)/juce_GroupComponent.o: ../../src/gui/components/layout/juce_GroupComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1435,12 +1385,52 @@ $(OBJDIR)/juce_MultiDocumentPanel.o: ../../src/gui/components/layout/juce_MultiD @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_ResizableBorderComponent.o: ../../src/gui/components/layout/juce_ResizableBorderComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_StretchableLayoutManager.o: ../../src/gui/components/layout/juce_StretchableLayoutManager.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_StretchableLayoutResizerBar.o: ../../src/gui/components/layout/juce_StretchableLayoutResizerBar.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_StretchableObjectResizer.o: ../../src/gui/components/layout/juce_StretchableObjectResizer.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ComponentAnimator.o: ../../src/gui/components/layout/juce_ComponentAnimator.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TabbedButtonBar.o: ../../src/gui/components/layout/juce_TabbedButtonBar.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_TabbedComponent.o: ../../src/gui/components/layout/juce_TabbedComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ComponentBoundsConstrainer.o: ../../src/gui/components/layout/juce_ComponentBoundsConstrainer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_LookAndFeel.o: ../../src/gui/components/lookandfeel/juce_LookAndFeel.cpp +$(OBJDIR)/juce_ResizableCornerComponent.o: ../../src/gui/components/layout/juce_ResizableCornerComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ScrollBar.o: ../../src/gui/components/layout/juce_ScrollBar.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1450,7 +1440,7 @@ $(OBJDIR)/juce_OldSchoolLookAndFeel.o: ../../src/gui/components/lookandfeel/juce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MenuBarModel.o: ../../src/gui/components/menus/juce_MenuBarModel.cpp +$(OBJDIR)/juce_LookAndFeel.o: ../../src/gui/components/lookandfeel/juce_LookAndFeel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1460,47 +1450,62 @@ $(OBJDIR)/juce_MenuBarComponent.o: ../../src/gui/components/menus/juce_MenuBarCo @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_MenuBarModel.o: ../../src/gui/components/menus/juce_MenuBarModel.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_PopupMenu.o: ../../src/gui/components/menus/juce_PopupMenu.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ComponentDragger.o: ../../src/gui/components/mouse/juce_ComponentDragger.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MouseEvent.o: ../../src/gui/components/mouse/juce_MouseEvent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MouseHoverDetector.o: ../../src/gui/components/mouse/juce_MouseHoverDetector.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_MouseListener.o: ../../src/gui/components/mouse/juce_MouseListener.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_MouseCursor.o: ../../src/gui/components/mouse/juce_MouseCursor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_MouseListener.o: ../../src/gui/components/mouse/juce_MouseListener.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MouseHoverDetector.o: ../../src/gui/components/mouse/juce_MouseHoverDetector.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_ComponentDragger.o: ../../src/gui/components/mouse/juce_ComponentDragger.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_DragAndDropContainer.o: ../../src/gui/components/mouse/juce_DragAndDropContainer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_MouseEvent.o: ../../src/gui/components/mouse/juce_MouseEvent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_MouseInputSource.o: ../../src/gui/components/mouse/juce_MouseInputSource.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_BooleanPropertyComponent.o: ../../src/gui/components/properties/juce_BooleanPropertyComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_ButtonPropertyComponent.o: ../../src/gui/components/properties/juce_ButtonPropertyComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PropertyPanel.o: ../../src/gui/components/properties/juce_PropertyPanel.cpp +$(OBJDIR)/juce_ChoicePropertyComponent.o: ../../src/gui/components/properties/juce_ChoicePropertyComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1510,6 +1515,11 @@ $(OBJDIR)/juce_PropertyComponent.o: ../../src/gui/components/properties/juce_Pro @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_PropertyPanel.o: ../../src/gui/components/properties/juce_PropertyPanel.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_SliderPropertyComponent.o: ../../src/gui/components/properties/juce_SliderPropertyComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1520,21 +1530,26 @@ $(OBJDIR)/juce_TextPropertyComponent.o: ../../src/gui/components/properties/juce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ChoicePropertyComponent.o: ../../src/gui/components/properties/juce_ChoicePropertyComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_BooleanPropertyComponent.o: ../../src/gui/components/properties/juce_BooleanPropertyComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_BubbleMessageComponent.o: ../../src/gui/components/special/juce_BubbleMessageComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_ColourSelector.o: ../../src/gui/components/special/juce_ColourSelector.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_BubbleComponent.o: ../../src/gui/components/special/juce_BubbleComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_OpenGLComponent.o: ../../src/gui/components/special/juce_OpenGLComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_SystemTrayIconComponent.o: ../../src/gui/components/special/juce_SystemTrayIconComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @@ -1545,7 +1560,7 @@ $(OBJDIR)/juce_PreferencesPanel.o: ../../src/gui/components/special/juce_Prefere @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioDeviceSelectorComponent.o: ../../src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp +$(OBJDIR)/juce_MidiKeyboardComponent.o: ../../src/gui/components/special/juce_MidiKeyboardComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1555,22 +1570,7 @@ $(OBJDIR)/juce_DropShadower.o: ../../src/gui/components/special/juce_DropShadowe @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_MidiKeyboardComponent.o: ../../src/gui/components/special/juce_MidiKeyboardComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_OpenGLComponent.o: ../../src/gui/components/special/juce_OpenGLComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_BubbleComponent.o: ../../src/gui/components/special/juce_BubbleComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_ColourSelector.o: ../../src/gui/components/special/juce_ColourSelector.cpp +$(OBJDIR)/juce_AudioDeviceSelectorComponent.o: ../../src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1580,12 +1580,7 @@ $(OBJDIR)/juce_MagnifierComponent.o: ../../src/gui/components/special/juce_Magni @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_SplashScreen.o: ../../src/gui/components/windows/juce_SplashScreen.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_DialogWindow.o: ../../src/gui/components/windows/juce_DialogWindow.cpp +$(OBJDIR)/juce_AlertWindow.o: ../../src/gui/components/windows/juce_AlertWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1600,12 +1595,12 @@ $(OBJDIR)/juce_ThreadWithProgressWindow.o: ../../src/gui/components/windows/juce @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AlertWindow.o: ../../src/gui/components/windows/juce_AlertWindow.cpp +$(OBJDIR)/juce_ComponentPeer.o: ../../src/gui/components/windows/juce_ComponentPeer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_ComponentPeer.o: ../../src/gui/components/windows/juce_ComponentPeer.cpp +$(OBJDIR)/juce_DialogWindow.o: ../../src/gui/components/windows/juce_DialogWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1620,42 +1615,22 @@ $(OBJDIR)/juce_ResizableWindow.o: ../../src/gui/components/windows/juce_Resizabl @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_SplashScreen.o: ../../src/gui/components/windows/juce_SplashScreen.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_TopLevelWindow.o: ../../src/gui/components/windows/juce_TopLevelWindow.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Midi.o: ../../src/native/linux/juce_linux_Midi.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_Fonts.o: ../../src/native/linux/juce_linux_Fonts.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_Audio.o: ../../src/native/linux/juce_linux_Audio.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_WebBrowserComponent.o: ../../src/native/linux/juce_linux_WebBrowserComponent.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_linux_JackAudio.o: ../../src/native/linux/juce_linux_JackAudio.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_linux_AudioCDReader.o: ../../src/native/linux/juce_linux_AudioCDReader.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Clipboard.o: ../../src/native/linux/juce_linux_Clipboard.cpp +$(OBJDIR)/juce_linux_Threads.o: ../../src/native/linux/juce_linux_Threads.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1665,7 +1640,12 @@ $(OBJDIR)/juce_linux_Files.o: ../../src/native/linux/juce_linux_Files.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Threads.o: ../../src/native/linux/juce_linux_Threads.cpp +$(OBJDIR)/juce_linux_Midi.o: ../../src/native/linux/juce_linux_Midi.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_Messaging.o: ../../src/native/linux/juce_linux_Messaging.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -1680,17 +1660,37 @@ $(OBJDIR)/juce_linux_FileChooser.o: ../../src/native/linux/juce_linux_FileChoose @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_linux_WebBrowserComponent.o: ../../src/native/linux/juce_linux_WebBrowserComponent.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_linux_Network.o: ../../src/native/linux/juce_linux_Network.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/juce_linux_Clipboard.o: ../../src/native/linux/juce_linux_Clipboard.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_JackAudio.o: ../../src/native/linux/juce_linux_JackAudio.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/juce_linux_Audio.o: ../../src/native/linux/juce_linux_Audio.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/juce_linux_Windowing.o: ../../src/native/linux/juce_linux_Windowing.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_linux_Messaging.o: ../../src/native/linux/juce_linux_Messaging.cpp +$(OBJDIR)/juce_linux_Fonts.o: ../../src/native/linux/juce_linux_Fonts.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff --git a/build/macosx/Juce.xcodeproj/project.pbxproj b/build/macosx/Juce.xcodeproj/project.pbxproj index 22147b37e0..1c42a08d16 100644 --- a/build/macosx/Juce.xcodeproj/project.pbxproj +++ b/build/macosx/Juce.xcodeproj/project.pbxproj @@ -465,7 +465,6 @@ 8481700C10809E00008FEC33 /* juce_InputStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E9C5104036D6006A1807 /* juce_InputStream.cpp */; }; 8481700D10809E00008FEC33 /* juce_InterprocessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E957104036B3006A1807 /* juce_InterprocessConnection.cpp */; }; 8481700E10809E00008FEC33 /* juce_InterprocessConnectionServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E959104036B3006A1807 /* juce_InterprocessConnectionServer.cpp */; }; - 8481700F10809E00008FEC33 /* juce_InterProcessLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E9DA104036D6006A1807 /* juce_InterProcessLock.cpp */; }; 8481701010809E00008FEC33 /* juce_iphone_Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84816E5110809D07008FEC33 /* juce_iphone_Audio.cpp */; }; 8481701210809E00008FEC33 /* juce_iphone_MessageManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84816E5310809D07008FEC33 /* juce_iphone_MessageManager.mm */; }; 8481701310809E00008FEC33 /* juce_iphone_MiscUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84816E5410809D07008FEC33 /* juce_iphone_MiscUtilities.mm */; }; @@ -939,7 +938,6 @@ 84F1EA31104036D6006A1807 /* juce_XmlElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E9D6104036D6006A1807 /* juce_XmlElement.cpp */; }; 84F1EA32104036D6006A1807 /* juce_XmlElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1E9D7104036D6006A1807 /* juce_XmlElement.h */; }; 84F1EA33104036D6006A1807 /* juce_CriticalSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1E9D9104036D6006A1807 /* juce_CriticalSection.h */; }; - 84F1EA34104036D6006A1807 /* juce_InterProcessLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E9DA104036D6006A1807 /* juce_InterProcessLock.cpp */; }; 84F1EA35104036D6006A1807 /* juce_InterProcessLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1E9DB104036D6006A1807 /* juce_InterProcessLock.h */; }; 84F1EA36104036D6006A1807 /* juce_Process.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F1E9DC104036D6006A1807 /* juce_Process.h */; }; 84F1EA37104036D6006A1807 /* juce_ReadWriteLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1E9DD104036D6006A1807 /* juce_ReadWriteLock.cpp */; }; @@ -1558,7 +1556,6 @@ 84F1E9D6104036D6006A1807 /* juce_XmlElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_XmlElement.cpp; path = ../../src/text/juce_XmlElement.cpp; sourceTree = SOURCE_ROOT; }; 84F1E9D7104036D6006A1807 /* juce_XmlElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_XmlElement.h; path = ../../src/text/juce_XmlElement.h; sourceTree = SOURCE_ROOT; }; 84F1E9D9104036D6006A1807 /* juce_CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_CriticalSection.h; path = ../../src/threads/juce_CriticalSection.h; sourceTree = SOURCE_ROOT; }; - 84F1E9DA104036D6006A1807 /* juce_InterProcessLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_InterProcessLock.cpp; path = ../../src/threads/juce_InterProcessLock.cpp; sourceTree = SOURCE_ROOT; }; 84F1E9DB104036D6006A1807 /* juce_InterProcessLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_InterProcessLock.h; path = ../../src/threads/juce_InterProcessLock.h; sourceTree = SOURCE_ROOT; }; 84F1E9DC104036D6006A1807 /* juce_Process.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_Process.h; path = ../../src/threads/juce_Process.h; sourceTree = SOURCE_ROOT; }; 84F1E9DD104036D6006A1807 /* juce_ReadWriteLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_ReadWriteLock.cpp; path = ../../src/threads/juce_ReadWriteLock.cpp; sourceTree = SOURCE_ROOT; }; @@ -2428,7 +2425,6 @@ isa = PBXGroup; children = ( 84F1E9D9104036D6006A1807 /* juce_CriticalSection.h */, - 84F1E9DA104036D6006A1807 /* juce_InterProcessLock.cpp */, 84F1E9DB104036D6006A1807 /* juce_InterProcessLock.h */, 84F1E9DC104036D6006A1807 /* juce_Process.h */, 84F1E9DD104036D6006A1807 /* juce_ReadWriteLock.cpp */, @@ -3771,7 +3767,6 @@ 8481700C10809E00008FEC33 /* juce_InputStream.cpp in Sources */, 8481700D10809E00008FEC33 /* juce_InterprocessConnection.cpp in Sources */, 8481700E10809E00008FEC33 /* juce_InterprocessConnectionServer.cpp in Sources */, - 8481700F10809E00008FEC33 /* juce_InterProcessLock.cpp in Sources */, 8481701010809E00008FEC33 /* juce_iphone_Audio.cpp in Sources */, 8481701210809E00008FEC33 /* juce_iphone_MessageManager.mm in Sources */, 8481701310809E00008FEC33 /* juce_iphone_MiscUtilities.mm in Sources */, @@ -4086,7 +4081,6 @@ 84F1EA2D104036D6006A1807 /* juce_StringPairArray.cpp in Sources */, 84F1EA2F104036D6006A1807 /* juce_XmlDocument.cpp in Sources */, 84F1EA31104036D6006A1807 /* juce_XmlElement.cpp in Sources */, - 84F1EA34104036D6006A1807 /* juce_InterProcessLock.cpp in Sources */, 84F1EA37104036D6006A1807 /* juce_ReadWriteLock.cpp in Sources */, 84F1EA3D104036D6006A1807 /* juce_Thread.cpp in Sources */, 84F1EA3F104036D6006A1807 /* juce_ThreadPool.cpp in Sources */, diff --git a/build/win32/vc8/JUCE.vcproj b/build/win32/vc8/JUCE.vcproj index d117e3097e..c82bd151c6 100644 --- a/build/win32/vc8/JUCE.vcproj +++ b/build/win32/vc8/JUCE.vcproj @@ -2813,10 +2813,6 @@ RelativePath="..\..\..\src\threads\juce_CriticalSection.h" > - - diff --git a/extras/audio plugins/wrapper/juce_IncludeCharacteristics.h b/extras/audio plugins/wrapper/juce_IncludeCharacteristics.h index 7fa7fc311d..4cb52ea009 100644 --- a/extras/audio plugins/wrapper/juce_IncludeCharacteristics.h +++ b/extras/audio plugins/wrapper/juce_IncludeCharacteristics.h @@ -107,7 +107,7 @@ #endif #if (defined(__APPLE_CPP__) || defined(__APPLE_CC__)) && ! defined (JUCE_ObjCExtraSuffix) - #error "To avoid objective-C name clashes with other plugins, you need to define the JUCE_ObjCExtraSuffix value in your JucePluginCharacteristics.h file!" + #error "To avoid objective-C name clashes with other plugins, you need to define the JUCE_ObjCExtraSuffix value as a global definition for your project!" #endif #endif // __JUCE_INCLUDECHARACTERISTICS_JUCEHEADER__ diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 9644f212eb..842547e4a0 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -15151,15 +15151,6 @@ END_JUCE_NAMESPACE /*** End of inlined file: juce_XmlElement.cpp ***/ -/*** Start of inlined file: juce_InterProcessLock.cpp ***/ -BEGIN_JUCE_NAMESPACE - -// (implemented in the platform-specific code files) - -END_JUCE_NAMESPACE -/*** End of inlined file: juce_InterProcessLock.cpp ***/ - - /*** Start of inlined file: juce_ReadWriteLock.cpp ***/ BEGIN_JUCE_NAMESPACE @@ -30995,7 +30986,7 @@ AudioProcessorEditor* AudioUnitPluginInstance::createEditor() { ScopedPointer w (new AudioUnitPluginWindowCocoa (*this, false)); - if (! ((AudioUnitPluginWindowCocoa*) w)->isValid()) + if (! static_cast (static_cast (w))->isValid()) w = 0; #if JUCE_SUPPORT_CARBON @@ -31003,7 +30994,7 @@ AudioProcessorEditor* AudioUnitPluginInstance::createEditor() { w = new AudioUnitPluginWindowCarbon (*this); - if (! ((AudioUnitPluginWindowCarbon*) w)->isValid()) + if (! static_cast (static_cast (w))->isValid()) w = 0; } #endif @@ -31641,8 +31632,8 @@ private: /*** End of inlined file: juce_VSTMidiEventList.h ***/ #if ! JUCE_WIN32 - #define _fpreset() - #define _clearfp() + static void _fpreset() {} + static void _clearfp() {} #endif extern void juce_callAnyTimersSynchronously(); @@ -211345,6 +211336,8 @@ END_JUCE_NAMESPACE #if JUCE_WINDOWS /*** Start of inlined file: juce_win32_NativeCode.cpp ***/ +#if JUCE_WINDOWS + BEGIN_JUCE_NAMESPACE #define JUCE_INCLUDED_FILE 1 @@ -212547,11 +212540,9 @@ bool File::isOnRemovableDrive() const || n == DRIVE_RAMDISK; } -#define MAX_PATH_CHARS (MAX_PATH + 256) - static const File juce_getSpecialFolderPath (int type) { - WCHAR path [MAX_PATH_CHARS]; + WCHAR path [MAX_PATH + 256]; if (SHGetSpecialFolderPath (0, path, type, 0)) return File (String (path)); @@ -212611,9 +212602,9 @@ const File JUCE_CALLTYPE File::getSpecialLocation (const SpecialLocationType typ { HINSTANCE moduleHandle = (HINSTANCE) PlatformUtilities::getCurrentModuleInstanceHandle(); - WCHAR dest [MAX_PATH_CHARS]; + WCHAR dest [MAX_PATH + 256]; dest[0] = 0; - GetModuleFileName (moduleHandle, dest, MAX_PATH_CHARS); + GetModuleFileName (moduleHandle, dest, numElementsInArray (dest)); return File (String (dest)); } break; @@ -212628,9 +212619,9 @@ const File JUCE_CALLTYPE File::getSpecialLocation (const SpecialLocationType typ const File File::getCurrentWorkingDirectory() { - WCHAR dest [MAX_PATH_CHARS]; + WCHAR dest [MAX_PATH + 256]; dest[0] = 0; - GetCurrentDirectory (MAX_PATH_CHARS, dest); + GetCurrentDirectory (numElementsInArray (dest), dest); return File (String (dest)); } @@ -213996,8 +213987,6 @@ extern bool juce_IsRunningInWine(); #define AC_SRC_ALPHA 0x01 #endif -#define DEBUG_REPAINT_TIMES 0 - static HPALETTE palette = 0; static bool createPaletteIfNeeded = true; static bool shouldDeactivateTitleBar = true; @@ -214024,9 +214013,6 @@ bool Desktop::canUseSemiTransparentWindows() throw() return updateLayeredWindow != 0; } -#undef DefWindowProc -#define DefWindowProc DefWindowProcW - const int extendedKeyModifier = 0x10000; const int KeyPress::spaceKey = VK_SPACE; @@ -215014,9 +215000,6 @@ private: void handlePaintMessage() { -#if DEBUG_REPAINT_TIMES - const double paintStart = Time::getMillisecondCounterHiRes(); -#endif HRGN rgn = CreateRectRgn (0, 0, 0, 0); const int regionType = GetUpdateRgn (hwnd, rgn, false); @@ -215153,11 +215136,6 @@ private: #endif lastPaintTime = Time::getMillisecondCounter(); - -#if DEBUG_REPAINT_TIMES - const double elapsed = Time::getMillisecondCounterHiRes() - paintStart; - Logger::outputDebugString (T("repaint time: ") + String (elapsed, 2)); -#endif } void doMouseEvent (const Point& position) @@ -215590,7 +215568,7 @@ public: if (peer != 0) return peer->peerWindowProc (h, message, wParam, lParam); - return DefWindowProc (h, message, wParam, lParam); + return DefWindowProcW (h, message, wParam, lParam); } private: @@ -216012,7 +215990,7 @@ private: } } - return DefWindowProc (h, message, wParam, lParam); + return DefWindowProcW (h, message, wParam, lParam); } bool sendInputAttemptWhenModalMessage() @@ -217171,11 +217149,8 @@ public: while ((char*) pheader < data + bufSize) { - #define remapX(v) (scaleX * (v).x.value) - #define remapY(v) (scaleY * (v).y.value) - - float x = remapX (pheader->pfxStart); - float y = remapY (pheader->pfxStart); + float x = scaleX * pheader->pfxStart.x.value; + float y = scaleY * pheader->pfxStart.y.value; glyphPath.startNewSubPath (x, y); @@ -217188,8 +217163,8 @@ public: { for (int i = 0; i < curve->cpfx; ++i) { - x = remapX (curve->apfx [i]); - y = remapY (curve->apfx [i]); + x = scaleX * curve->apfx[i].x.value; + y = scaleY * curve->apfx[i].y.value; glyphPath.lineTo (x, y); } @@ -217198,19 +217173,19 @@ public: { for (int i = 0; i < curve->cpfx - 1; ++i) { - const float x2 = remapX (curve->apfx [i]); - const float y2 = remapY (curve->apfx [i]); + const float x2 = scaleX * curve->apfx[i].x.value; + const float y2 = scaleY * curve->apfx[i].y.value; float x3, y3; if (i < curve->cpfx - 2) { - x3 = 0.5f * (x2 + remapX (curve->apfx [i + 1])); - y3 = 0.5f * (y2 + remapY (curve->apfx [i + 1])); + x3 = 0.5f * (x2 + scaleX * curve->apfx[i + 1].x.value); + y3 = 0.5f * (y2 + scaleY * curve->apfx[i + 1].y.value); } else { - x3 = remapX (curve->apfx [i + 1]); - y3 = remapY (curve->apfx [i + 1]); + x3 = scaleX * curve->apfx[i + 1].x.value; + y3 = scaleY * curve->apfx[i + 1].y.value; } glyphPath.quadraticTo (x2, y2, x3, y3); @@ -218148,23 +218123,18 @@ bool juce_OpenQuickTimeMovieFromStream (InputStream* input, Movie& movie, Handle static bool isQTAvailable = false; -struct QTMovieCompInternal +class QuickTimeMovieComponent::Pimpl { - QTMovieCompInternal() - : dataHandle (0) +public: + Pimpl() : dataHandle (0) { } - ~QTMovieCompInternal() + ~Pimpl() { clearHandle(); } - IQTControlPtr qtControlInternal; - IQTMoviePtr qtMovieInternal; - - Handle dataHandle; - void clearHandle() { if (dataHandle != 0) @@ -218173,37 +218143,32 @@ struct QTMovieCompInternal dataHandle = 0; } } -}; -#define qtControl (((QTMovieCompInternal*) internal)->qtControlInternal) -#define qtMovie (((QTMovieCompInternal*) internal)->qtMovieInternal) + IQTControlPtr qtControl; + IQTMoviePtr qtMovie; + Handle dataHandle; +}; QuickTimeMovieComponent::QuickTimeMovieComponent() : movieLoaded (false), controllerVisible (true) { - internal = new QTMovieCompInternal(); + pimpl = new Pimpl(); setMouseEventsAllowed (false); } QuickTimeMovieComponent::~QuickTimeMovieComponent() { closeMovie(); - qtControl = 0; - + pimpl->qtControl = 0; deleteControl(); - - delete internal; - internal = 0; + pimpl = 0; } bool QuickTimeMovieComponent::isQuickTimeAvailable() throw() { if (! isQTAvailable) - { - isQTAvailable = (InitializeQTML (0) == noErr) - && (EnterMovies() == noErr); - } + isQTAvailable = (InitializeQTML (0) == noErr) && (EnterMovies() == noErr); return isQTAvailable; } @@ -218217,14 +218182,14 @@ void QuickTimeMovieComponent::createControlIfNeeded() if (createControl (&qtIID)) { const IID qtInterfaceIID = __uuidof (IQTControl); - qtControl = (IQTControl*) queryInterface (&qtInterfaceIID); + pimpl->qtControl = (IQTControl*) queryInterface (&qtInterfaceIID); - if (qtControl != 0) + if (pimpl->qtControl != 0) { - qtControl->Release(); // it has one ref too many at this point + pimpl->qtControl->Release(); // it has one ref too many at this point - qtControl->QuickTimeInitialize(); - qtControl->PutSizing (qtMovieFitsControl); + pimpl->qtControl->QuickTimeInitialize(); + pimpl->qtControl->PutSizing (qtMovieFitsControl); if (movieFile != File::nonexistent) loadMovie (movieFile, controllerVisible); @@ -218241,36 +218206,38 @@ bool QuickTimeMovieComponent::isControlCreated() const bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream, const bool isControllerVisible) { + const ScopedPointer movieStreamDeleter (movieStream); + movieFile = File::nonexistent; movieLoaded = false; - qtMovie = 0; + pimpl->qtMovie = 0; controllerVisible = isControllerVisible; createControlIfNeeded(); if (isControlCreated()) { - if (qtControl != 0) + if (pimpl->qtControl != 0) { - qtControl->Put_MovieHandle (0); - ((QTMovieCompInternal*) internal)->clearHandle(); + pimpl->qtControl->Put_MovieHandle (0); + pimpl->clearHandle(); Movie movie; - if (juce_OpenQuickTimeMovieFromStream (movieStream, movie, ((QTMovieCompInternal*) internal)->dataHandle)) + if (juce_OpenQuickTimeMovieFromStream (movieStream, movie, pimpl->dataHandle)) { - qtControl->Put_MovieHandle ((long) (pointer_sized_int) movie); + pimpl->qtControl->Put_MovieHandle ((long) (pointer_sized_int) movie); - qtMovie = qtControl->GetMovie(); + pimpl->qtMovie = pimpl->qtControl->GetMovie(); - if (qtMovie != 0) - qtMovie->PutMovieControllerType (isControllerVisible ? qtMovieControllerTypeStandard - : qtMovieControllerTypeNone); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutMovieControllerType (isControllerVisible ? qtMovieControllerTypeStandard + : qtMovieControllerTypeNone); } if (movie == 0) - ((QTMovieCompInternal*) internal)->clearHandle(); + pimpl->clearHandle(); } - movieLoaded = (qtMovie != 0); + movieLoaded = (pimpl->qtMovie != 0); } else { @@ -218279,7 +218246,6 @@ bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream, jassertfalse } - delete movieStream; return movieLoaded; } @@ -218288,12 +218254,12 @@ void QuickTimeMovieComponent::closeMovie() stop(); movieFile = File::nonexistent; movieLoaded = false; - qtMovie = 0; + pimpl->qtMovie = 0; - if (qtControl != 0) - qtControl->Put_MovieHandle (0); + if (pimpl->qtControl != 0) + pimpl->qtControl->Put_MovieHandle (0); - ((QTMovieCompInternal*) internal)->clearHandle(); + pimpl->clearHandle(); } const File QuickTimeMovieComponent::getCurrentMovieFile() const @@ -218308,17 +218274,17 @@ bool QuickTimeMovieComponent::isMovieOpen() const double QuickTimeMovieComponent::getMovieDuration() const { - if (qtMovie != 0) - return qtMovie->GetDuration() / (double) qtMovie->GetTimeScale(); + if (pimpl->qtMovie != 0) + return pimpl->qtMovie->GetDuration() / (double) pimpl->qtMovie->GetTimeScale(); return 0.0; } void QuickTimeMovieComponent::getMovieNormalSize (int& width, int& height) const { - if (qtMovie != 0) + if (pimpl->qtMovie != 0) { - struct QTRECT r = qtMovie->GetNaturalRect(); + struct QTRECT r = pimpl->qtMovie->GetNaturalRect(); width = r.right - r.left; height = r.bottom - r.top; @@ -218331,67 +218297,67 @@ void QuickTimeMovieComponent::getMovieNormalSize (int& width, int& height) const void QuickTimeMovieComponent::play() { - if (qtMovie != 0) - qtMovie->Play(); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->Play(); } void QuickTimeMovieComponent::stop() { - if (qtMovie != 0) - qtMovie->Stop(); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->Stop(); } bool QuickTimeMovieComponent::isPlaying() const { - return qtMovie != 0 && qtMovie->GetRate() != 0.0f; + return pimpl->qtMovie != 0 && pimpl->qtMovie->GetRate() != 0.0f; } void QuickTimeMovieComponent::setPosition (const double seconds) { - if (qtMovie != 0) - qtMovie->PutTime ((long) (seconds * qtMovie->GetTimeScale())); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutTime ((long) (seconds * pimpl->qtMovie->GetTimeScale())); } double QuickTimeMovieComponent::getPosition() const { - if (qtMovie != 0) - return qtMovie->GetTime() / (double) qtMovie->GetTimeScale(); + if (pimpl->qtMovie != 0) + return pimpl->qtMovie->GetTime() / (double) pimpl->qtMovie->GetTimeScale(); return 0.0; } void QuickTimeMovieComponent::setSpeed (const float newSpeed) { - if (qtMovie != 0) - qtMovie->PutRate (newSpeed); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutRate (newSpeed); } void QuickTimeMovieComponent::setMovieVolume (const float newVolume) { - if (qtMovie != 0) + if (pimpl->qtMovie != 0) { - qtMovie->PutAudioVolume (newVolume); - qtMovie->PutAudioMute (newVolume <= 0); + pimpl->qtMovie->PutAudioVolume (newVolume); + pimpl->qtMovie->PutAudioMute (newVolume <= 0); } } float QuickTimeMovieComponent::getMovieVolume() const { - if (qtMovie != 0) - return qtMovie->GetAudioVolume(); + if (pimpl->qtMovie != 0) + return pimpl->qtMovie->GetAudioVolume(); return 0.0f; } void QuickTimeMovieComponent::setLooping (const bool shouldLoop) { - if (qtMovie != 0) - qtMovie->PutLoop (shouldLoop); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutLoop (shouldLoop); } bool QuickTimeMovieComponent::isLooping() const { - return qtMovie != 0 && qtMovie->GetLoop(); + return pimpl->qtMovie != 0 && pimpl->qtMovie->GetLoop(); } bool QuickTimeMovieComponent::isControllerVisible() const @@ -218559,7 +218525,7 @@ bool juce_OpenQuickTimeMovieFromStream (InputStream* input, Movie& movie, Handle bool QuickTimeMovieComponent::loadMovie (const File& movieFile_, const bool isControllerVisible) { - const bool ok = loadMovie ((InputStream*) movieFile_.createInputStream(), isControllerVisible); + const bool ok = loadMovie (static_cast (movieFile_.createInputStream()), isControllerVisible); movieFile = movieFile_; return ok; } @@ -218567,7 +218533,7 @@ bool QuickTimeMovieComponent::loadMovie (const File& movieFile_, bool QuickTimeMovieComponent::loadMovie (const URL& movieURL, const bool isControllerVisible) { - return loadMovie ((InputStream*) movieURL.createInputStream (false), isControllerVisible); + return loadMovie (static_cast (movieURL.createInputStream (false)), isControllerVisible); } void QuickTimeMovieComponent::goToStart() @@ -219452,6 +219418,9 @@ void OpenGLPixelFormat::getAvailablePixelFormats (Component* component, #if JUCE_USE_CDREADER +namespace CDReaderHelpers +{ + //*************************************************************************** // %%% TARGET STATUS VALUES %%% //*************************************************************************** @@ -219939,12 +219908,12 @@ public: wantsIndex (false) { bufferSize = 2352 * numberOfFrames; - buffer = (BYTE*) malloc (bufferSize); + buffer = (BYTE*) juce_malloc (bufferSize); } ~CDReadBuffer() { - free (buffer); + juce_free (buffer); } bool isZero() const @@ -220034,7 +220003,7 @@ public: if (controller != 0) { controller->shutDown(); - delete controller; + controller = 0; } if (scsiHandle != 0) @@ -220050,7 +220019,7 @@ public: BYTE readType; private: - CDController* controller; + ScopedPointer controller; bool testController (const int readType, CDController* const newController, @@ -220115,14 +220084,7 @@ static void DeinitialiseCDRipper() static HANDLE CreateSCSIDeviceHandle (char driveLetter) { - TCHAR devicePath[8]; - devicePath[0] = '\\'; - devicePath[1] = '\\'; - devicePath[2] = '.'; - devicePath[3] = '\\'; - devicePath[4] = driveLetter; - devicePath[5] = ':'; - devicePath[6] = 0; + TCHAR devicePath[] = { '\\', '\\', '.', '\\', driveLetter, ':', 0, 0 }; OSVERSIONINFO info; info.dwOSVersionInfoSize = sizeof (info); @@ -220674,7 +220636,6 @@ void CDDeviceHandle::openDrawer (bool shouldBeOpen) if (controller != 0) { controller->shutDown(); - delete controller; controller = 0; } @@ -220756,7 +220717,6 @@ bool CDDeviceHandle::testController (const int type, if (! passed) { controller->shutDown(); - delete controller; controller = 0; } @@ -220981,8 +220941,8 @@ static void decUserCount() struct CDDeviceWrapper { - CDDeviceHandle* cdH; - CDReadBuffer* overlapBuffer; + ScopedPointer cdH; + ScopedPointer overlapBuffer; bool jitter; }; @@ -221000,36 +220960,6 @@ static int getMSFAddressOf (const TOCTRACK* const t) static const int samplesPerFrame = 44100 / 75; static const int bytesPerFrame = samplesPerFrame * 4; -const StringArray AudioCDReader::getAvailableCDNames() -{ - StringArray results; - incUserCount(); - - if (initialisedOk) - { - CDDeviceInfo list[8]; - const int num = FindCDDevices (list, 8); - - decUserCount(); - - for (int i = 0; i < num; ++i) - { - String s; - - if (list[i].scsiDriveLetter > 0) - s << String::charToString (list[i].scsiDriveLetter).toUpperCase() << T(": "); - - s << String (list[i].vendor).trim() - << T(" ") << String (list[i].productId).trim() - << T(" ") << String (list[i].rev).trim(); - - results.add (s); - } - } - - return results; -} - static CDDeviceHandle* openHandle (const CDDeviceInfo* const device) { SRB_GDEVBlock s; @@ -221063,8 +220993,42 @@ static CDDeviceHandle* openHandle (const CDDeviceInfo* const device) return 0; } +} + +const StringArray AudioCDReader::getAvailableCDNames() +{ + using namespace CDReaderHelpers; + StringArray results; + incUserCount(); + + if (initialisedOk) + { + CDDeviceInfo list[8]; + const int num = FindCDDevices (list, 8); + + decUserCount(); + + for (int i = 0; i < num; ++i) + { + String s; + + if (list[i].scsiDriveLetter > 0) + s << String::charToString (list[i].scsiDriveLetter).toUpperCase() << T(": "); + + s << String (list[i].vendor).trim() + << T(" ") << String (list[i].productId).trim() + << T(" ") << String (list[i].rev).trim(); + + results.add (s); + } + } + + return results; +} + AudioCDReader* AudioCDReader::createReaderForCD (const int deviceIndex) { + using namespace CDReaderHelpers; incUserCount(); if (initialisedOk) @@ -221099,6 +221063,7 @@ AudioCDReader::AudioCDReader (void* handle_) firstFrameInBuffer (0), samplesInBuffer (0) { + using namespace CDReaderHelpers; jassert (handle_ != 0); refreshTrackLengths(); @@ -221114,10 +221079,8 @@ AudioCDReader::AudioCDReader (void* handle_) AudioCDReader::~AudioCDReader() { - CDDeviceWrapper* const device = (CDDeviceWrapper*)handle; - - delete device->cdH; - delete device->overlapBuffer; + using namespace CDReaderHelpers; + CDDeviceWrapper* const device = (CDDeviceWrapper*) handle; delete device; decUserCount(); @@ -221126,6 +221089,7 @@ AudioCDReader::~AudioCDReader() bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer, int64 startSampleInFile, int numSamples) { + using namespace CDReaderHelpers; CDDeviceWrapper* const device = (CDDeviceWrapper*) handle; bool ok = true; @@ -221223,10 +221187,11 @@ bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int sta bool AudioCDReader::isCDStillPresent() const { + using namespace CDReaderHelpers; TOC toc; zerostruct (toc); - return ((CDDeviceWrapper*)handle)->cdH->readTOC (&toc, false); + return ((CDDeviceWrapper*) handle)->cdH->readTOC (&toc, false); } int AudioCDReader::getNumTracks() const @@ -221236,12 +221201,14 @@ int AudioCDReader::getNumTracks() const int AudioCDReader::getPositionOfTrackStart (int trackNum) const { + using namespace CDReaderHelpers; return (trackNum >= 0 && trackNum <= numTracks) ? trackStarts [trackNum] * samplesPerFrame : 0; } void AudioCDReader::refreshTrackLengths() { + using namespace CDReaderHelpers; zeromem (trackStarts, sizeof (trackStarts)); zeromem (audioTracks, sizeof (audioTracks)); @@ -221284,6 +221251,7 @@ const int framesPerIndexRead = 4; int AudioCDReader::getIndexAt (int samplePos) { + using namespace CDReaderHelpers; CDDeviceWrapper* const device = (CDDeviceWrapper*) handle; const int frameNeeded = samplePos / samplesPerFrame; @@ -221317,6 +221285,7 @@ int AudioCDReader::getIndexAt (int samplePos) const Array AudioCDReader::findIndexesInTrack (const int trackNumber) { + using namespace CDReaderHelpers; Array indexes; const int trackStart = getPositionOfTrackStart (trackNumber); @@ -221413,6 +221382,7 @@ const Array AudioCDReader::findIndexesInTrack (const int trackNumber) int AudioCDReader::getCDDBId() { + using namespace CDReaderHelpers; refreshTrackLengths(); if (numTracks > 0) @@ -221450,6 +221420,7 @@ int AudioCDReader::getCDDBId() void AudioCDReader::ejectDisk() { + using namespace CDReaderHelpers; ((CDDeviceWrapper*) handle)->cdH->openDrawer (true); } @@ -221871,13 +221842,15 @@ bool AudioCDBurner::addAudioTrack (AudioSource* audioSource, int numSamples) // compiled on its own). #if JUCE_INCLUDED_FILE -static const int midiBufferSize = 1024 * 10; -static const int numInHeaders = 32; -static const int inBufferSize = 256; -static Array activeMidiThreads; - using ::free; +namespace MidiConstants +{ + static const int midiBufferSize = 1024 * 10; + static const int numInHeaders = 32; + static const int inBufferSize = 256; +} + class MidiInThread : public Thread { public: @@ -221892,11 +221865,11 @@ public: startTime (0), pendingLength(0) { - for (int i = numInHeaders; --i >= 0;) + for (int i = MidiConstants::numInHeaders; --i >= 0;) { zeromem (&hdr[i], sizeof (MIDIHDR)); hdr[i].lpData = inData[i]; - hdr[i].dwBufferLength = inBufferSize; + hdr[i].dwBufferLength = MidiConstants::inBufferSize; } }; @@ -221929,7 +221902,7 @@ public: { const ScopedLock sl (lock); - if (pendingLength < midiBufferSize - 12) + if (pendingLength < MidiConstants::midiBufferSize - 12) { char* const p = pending + pendingLength; *(double*) p = time; @@ -221957,7 +221930,7 @@ public: { const ScopedLock sl (lock); - if (pendingLength < midiBufferSize - (8 + num)) + if (pendingLength < MidiConstants::midiBufferSize - (8 + num)) { char* const p = pending + pendingLength; *(double*) p = time; @@ -221990,7 +221963,7 @@ public: while (! threadShouldExit()) { - for (int i = 0; i < numInHeaders; ++i) + for (int i = 0; i < MidiConstants::numInHeaders; ++i) { if ((hdr[i].dwFlags & WHDR_DONE) != 0) { @@ -222052,7 +222025,7 @@ public: activeMidiThreads.addIfNotAlreadyThere (this); int i; - for (i = 0; i < numInHeaders; ++i) + for (i = 0; i < MidiConstants::numInHeaders; ++i) writeBlock (i); startTime = Time::getMillisecondCounter(); @@ -222082,7 +222055,7 @@ public: { const ScopedLock sl (lock); } - for (int i = numInHeaders; --i >= 0;) + for (int i = MidiConstants::numInHeaders; --i >= 0;) { if ((hdr[i].dwFlags & WHDR_DONE) != 0) { @@ -222099,22 +222072,37 @@ public: } } + static void CALLBACK midiInCallback (HMIDIIN, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR midiMessage, DWORD_PTR timeStamp) + { + MidiInThread* const thread = reinterpret_cast (dwInstance); + + if (thread != 0 && activeMidiThreads.contains (thread)) + { + if (uMsg == MIM_DATA) + thread->handle ((uint32) midiMessage, (uint32) timeStamp); + else if (uMsg == MIM_LONGDATA) + thread->handleSysEx ((MIDIHDR*) midiMessage, (uint32) timeStamp); + } + } + juce_UseDebuggingNewOperator HMIDIIN hIn; private: + static Array activeMidiThreads; + MidiInput* input; MidiInputCallback* callback; bool isStarted; uint32 startTime; CriticalSection lock; - MIDIHDR hdr [numInHeaders]; - char inData [numInHeaders] [inBufferSize]; + MIDIHDR hdr [MidiConstants::numInHeaders]; + char inData [MidiConstants::numInHeaders] [MidiConstants::inBufferSize]; int pendingLength; - char pending [midiBufferSize]; + char pending [MidiConstants::midiBufferSize]; double timeStampToTime (uint32 timeStamp) throw() { @@ -222136,22 +222124,7 @@ private: MidiInThread& operator= (const MidiInThread&); }; -static void CALLBACK midiInCallback (HMIDIIN, - UINT uMsg, - DWORD_PTR dwInstance, - DWORD_PTR midiMessage, - DWORD_PTR timeStamp) -{ - MidiInThread* const thread = (MidiInThread*) dwInstance; - - if (thread != 0 && activeMidiThreads.contains (thread)) - { - if (uMsg == MIM_DATA) - thread->handle ((uint32) midiMessage, (uint32) timeStamp); - else if (uMsg == MIM_LONGDATA) - thread->handleSysEx ((MIDIHDR*) midiMessage, (uint32) timeStamp); - } -} +Array MidiInThread::activeMidiThreads; const StringArray MidiInput::getDevices() { @@ -222209,7 +222182,7 @@ MidiInput* MidiInput::openDevice (const int index, MidiInputCallback* const call HMIDIIN h; HRESULT err = midiInOpen (&h, deviceId, - (DWORD_PTR) &midiInCallback, + (DWORD_PTR) &MidiInThread::midiInCallback, (DWORD_PTR) (MidiInThread*) thread, CALLBACK_FUNCTION); @@ -222231,21 +222204,17 @@ MidiInput::MidiInput (const String& name_) MidiInput::~MidiInput() { - if (internal != 0) - { - MidiInThread* const thread = (MidiInThread*) internal; - delete thread; - } + delete static_cast (internal); } void MidiInput::start() { - ((MidiInThread*) internal)->start(); + static_cast (internal)->start(); } void MidiInput::stop() { - ((MidiInThread*) internal)->stop(); + static_cast (internal)->stop(); } struct MidiOutHandle @@ -222254,10 +222223,12 @@ struct MidiOutHandle UINT deviceId; HMIDIOUT handle; + static Array activeHandles; + juce_UseDebuggingNewOperator }; -static Array midiOutputHandles; +Array MidiOutHandle::activeHandles; const StringArray MidiOutput::getDevices() { @@ -222326,9 +222297,9 @@ MidiOutput* MidiOutput::openDevice (int index) } } - for (i = midiOutputHandles.size(); --i >= 0;) + for (i = MidiOutHandle::activeHandles.size(); --i >= 0;) { - MidiOutHandle* const han = midiOutputHandles.getUnchecked(i); + MidiOutHandle* const han = MidiOutHandle::activeHandles.getUnchecked(i); if (han != 0 && han->deviceId == deviceId) { @@ -222351,7 +222322,7 @@ MidiOutput* MidiOutput::openDevice (int index) han->deviceId = deviceId; han->refCount = 1; han->handle = h; - midiOutputHandles.add (han); + MidiOutHandle::activeHandles.add (han); MidiOutput* const out = new MidiOutput(); out->internal = (void*) han; @@ -222372,26 +222343,26 @@ MidiOutput* MidiOutput::openDevice (int index) MidiOutput::~MidiOutput() { - MidiOutHandle* const h = (MidiOutHandle*) internal; + MidiOutHandle* const h = static_cast (internal); - if (midiOutputHandles.contains (h) && --(h->refCount) == 0) + if (MidiOutHandle::activeHandles.contains (h) && --(h->refCount) == 0) { midiOutClose (h->handle); - midiOutputHandles.removeValue (h); + MidiOutHandle::activeHandles.removeValue (h); delete h; } } void MidiOutput::reset() { - const MidiOutHandle* const h = (MidiOutHandle*) internal; + const MidiOutHandle* const h = static_cast (internal); midiOutReset (h->handle); } bool MidiOutput::getVolume (float& leftVol, float& rightVol) { - const MidiOutHandle* const handle = (const MidiOutHandle*) internal; + const MidiOutHandle* const handle = static_cast (internal); DWORD n; if (midiOutGetVolume (handle->handle, &n) == MMSYSERR_NOERROR) @@ -222411,18 +222382,18 @@ bool MidiOutput::getVolume (float& leftVol, void MidiOutput::setVolume (float leftVol, float rightVol) { - const MidiOutHandle* const handle = (MidiOutHandle*) internal; + const MidiOutHandle* const handle = static_cast (internal); DWORD n; unsigned short* const nn = (unsigned short*) &n; - nn[0] = (unsigned short) jlimit (0, 0xffff, (int)(rightVol * 0xffff)); - nn[1] = (unsigned short) jlimit (0, 0xffff, (int)(leftVol * 0xffff)); + nn[0] = (unsigned short) jlimit (0, 0xffff, (int) (rightVol * 0xffff)); + nn[1] = (unsigned short) jlimit (0, 0xffff, (int) (leftVol * 0xffff)); midiOutSetVolume (handle->handle, n); } void MidiOutput::sendMessageNow (const MidiMessage& message) { - const MidiOutHandle* const handle = (const MidiOutHandle*) internal; + const MidiOutHandle* const handle = static_cast (internal); if (message.getRawDataSize() > 3 || message.isSysEx()) @@ -227932,6 +227903,8 @@ CameraDevice* CameraDevice::openDevice (int index, #endif END_JUCE_NAMESPACE + +#endif /*** End of inlined file: juce_win32_NativeCode.cpp ***/ @@ -227940,6 +227913,8 @@ END_JUCE_NAMESPACE #if JUCE_LINUX /*** Start of inlined file: juce_linux_NativeCode.cpp ***/ +#if JUCE_LINUX + BEGIN_JUCE_NAMESPACE #if defined (CPU_ISSET) && ! defined (SUPPORT_AFFINITIES) @@ -228439,10 +228414,10 @@ void InterProcessLock::exit() // compiled on its own). #if JUCE_INCLUDED_FILE -#define U_ISOFS_SUPER_MAGIC (short) 0x9660 // linux/iso_fs.h -#define U_MSDOS_SUPER_MAGIC (short) 0x4d44 // linux/msdos_fs.h -#define U_NFS_SUPER_MAGIC (short) 0x6969 // linux/nfs_fs.h -#define U_SMB_SUPER_MAGIC (short) 0x517B // linux/smb_fs.h +static const short U_ISOFS_SUPER_MAGIC = 0x9660; // linux/iso_fs.h +static const short U_MSDOS_SUPER_MAGIC = 0x4d44; // linux/msdos_fs.h +static const short U_NFS_SUPER_MAGIC = 0x6969; // linux/nfs_fs.h +static const short U_SMB_SUPER_MAGIC = 0x517B; // linux/smb_fs.h void juce_getFileTimes (const String& fileName, int64& modificationTime, @@ -230161,22 +230136,10 @@ const String SystemClipboard::getTextFromClipboard() throw() Display* display = 0; // This is also referenced from WindowDriver.cpp Window juce_messageWindowHandle = None; -#define SpecialAtom "JUCESpecialAtom" -#define BroadcastAtom "JUCEBroadcastAtom" -#define SpecialCallbackAtom "JUCESpecialCallbackAtom" +XContext improbableNumber; // This is referenced from Windowing.cpp -static Atom specialId; -static Atom broadcastId; -static Atom specialCallbackId; - -// This is referenced from Windowing.cpp -XContext improbableNumber; - -// Defined in Windowing.cpp -extern void juce_windowMessageReceive (XEvent* event); - -// Defined in Clipboard.cpp -extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt); +extern void juce_windowMessageReceive (XEvent* event); // Defined in Windowing.cpp +extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt); // Defined in Clipboard.cpp ScopedXLock::ScopedXLock() { XLockDisplay (display); } ScopedXLock::~ScopedXLock() { XUnlockDisplay (display); } @@ -230411,11 +230374,6 @@ void MessageManager::doPlatformSpecificInitialisation() Window root = RootWindow (display, screen); Visual* visual = DefaultVisual (display, screen); - // Create atoms for our ClientMessages (these cannot be deleted) - specialId = XInternAtom (display, SpecialAtom, false); - broadcastId = XInternAtom (display, BroadcastAtom, false); - specialCallbackId = XInternAtom (display, SpecialCallbackAtom, false); - // Create a context to store user data associated with Windows we // create in WindowDriver improbableNumber = XUniqueContext(); @@ -230899,9 +230857,6 @@ public: const float scaleY = -1.0f / height; Path destShape; - #define CONVERTX(val) (scaleX * (val).x) - #define CONVERTY(val) (scaleY * (val).y) - if (FT_Load_Glyph (face, glyphIndex, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP | FT_LOAD_IGNORE_TRANSFORM) != 0 || face->glyph->format != ft_glyph_format_outline) { @@ -230920,15 +230875,15 @@ public: for (int p = startPoint; p <= endPoint; p++) { - const float x = CONVERTX (points[p]); - const float y = CONVERTY (points[p]); + const float x = scaleX * points[p].x; + const float y = scaleY * points[p].y; if (p == startPoint) { if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic) { - float x2 = CONVERTX (points [endPoint]); - float y2 = CONVERTY (points [endPoint]); + float x2 = scaleX * points [endPoint].x; + float y2 = scaleY * points [endPoint].y; if (FT_CURVE_TAG (tags[endPoint]) != FT_Curve_Tag_On) { @@ -230952,8 +230907,8 @@ public: else if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic) { const int nextIndex = (p == endPoint) ? startPoint : p + 1; - float x2 = CONVERTX (points [nextIndex]); - float y2 = CONVERTY (points [nextIndex]); + float x2 = scaleX * points [nextIndex].x; + float y2 = scaleY * points [nextIndex].y; if (FT_CURVE_TAG (tags [nextIndex]) == FT_Curve_Tag_Conic) { @@ -230975,10 +230930,10 @@ public: const int next1 = p + 1; const int next2 = (p == (endPoint - 1)) ? startPoint : p + 2; - const float x2 = CONVERTX (points [next1]); - const float y2 = CONVERTY (points [next1]); - const float x3 = CONVERTX (points [next2]); - const float y3 = CONVERTY (points [next2]); + const float x2 = scaleX * points [next1].x; + const float y2 = scaleY * points [next1].y; + const float x3 = scaleX * points [next2].x; + const float y3 = scaleY * points [next2].y; if (FT_CURVE_TAG (tags[next1]) != FT_Curve_Tag_Cubic || FT_CURVE_TAG (tags[next2]) != FT_Curve_Tag_On) @@ -236822,6 +236777,8 @@ bool WebBrowserComponent::pageAboutToLoad (const String& url) #endif END_JUCE_NAMESPACE + +#endif /*** End of inlined file: juce_linux_NativeCode.cpp ***/ @@ -236830,6 +236787,8 @@ END_JUCE_NAMESPACE #if JUCE_MAC || JUCE_IPHONE /*** Start of inlined file: juce_mac_NativeCode.mm ***/ +#if JUCE_MAC || JUCE_IPHONE + BEGIN_JUCE_NAMESPACE #undef Point @@ -248183,7 +248142,7 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -#define theMovie ((QTMovie*) movie) +#define theMovie (static_cast (movie)) QuickTimeMovieComponent::QuickTimeMovieComponent() : movie (0) @@ -252147,6 +252106,8 @@ CameraDevice* CameraDevice::openDevice (int index, #endif END_JUCE_NAMESPACE + +#endif /*** End of inlined file: juce_mac_NativeCode.mm ***/ diff --git a/juce_amalgamated.h b/juce_amalgamated.h index 213f4ead1a..73e3589ba9 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -26894,7 +26894,10 @@ private: void createControlIfNeeded(); bool isControlCreated() const; - void* internal; + + class Pimpl; + friend class ScopedPointer ; + ScopedPointer pimpl; #else void* movie; #endif diff --git a/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm b/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm index 20c9f44911..7a5b2516f1 100644 --- a/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm +++ b/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm @@ -1095,7 +1095,7 @@ AudioProcessorEditor* AudioUnitPluginInstance::createEditor() { ScopedPointer w (new AudioUnitPluginWindowCocoa (*this, false)); - if (! ((AudioUnitPluginWindowCocoa*) w)->isValid()) + if (! static_cast (static_cast (w))->isValid()) w = 0; #if JUCE_SUPPORT_CARBON @@ -1103,7 +1103,7 @@ AudioProcessorEditor* AudioUnitPluginInstance::createEditor() { w = new AudioUnitPluginWindowCarbon (*this); - if (! ((AudioUnitPluginWindowCarbon*) w)->isValid()) + if (! static_cast (static_cast (w))->isValid()) w = 0; } #endif diff --git a/src/audio/plugins/formats/juce_VSTPluginFormat.cpp b/src/audio/plugins/formats/juce_VSTPluginFormat.cpp index b958a3173b..5c58c7352c 100644 --- a/src/audio/plugins/formats/juce_VSTPluginFormat.cpp +++ b/src/audio/plugins/formats/juce_VSTPluginFormat.cpp @@ -112,8 +112,8 @@ BEGIN_JUCE_NAMESPACE #include "juce_VSTMidiEventList.h" #if ! JUCE_WIN32 - #define _fpreset() - #define _clearfp() + static void _fpreset() {} + static void _clearfp() {} #endif extern void juce_callAnyTimersSynchronously(); diff --git a/src/gui/components/special/juce_QuickTimeMovieComponent.h b/src/gui/components/special/juce_QuickTimeMovieComponent.h index 598e03f79c..ffa4bf8d34 100644 --- a/src/gui/components/special/juce_QuickTimeMovieComponent.h +++ b/src/gui/components/special/juce_QuickTimeMovieComponent.h @@ -209,14 +209,15 @@ private: bool movieLoaded, controllerVisible, looping; #if JUCE_WINDOWS - /** @internal */ void parentHierarchyChanged(); - /** @internal */ void visibilityChanged(); void createControlIfNeeded(); bool isControlCreated() const; - void* internal; + + class Pimpl; + friend class ScopedPointer ; + ScopedPointer pimpl; #else void* movie; #endif diff --git a/src/native/juce_linux_NativeCode.cpp b/src/native/juce_linux_NativeCode.cpp index ec309ad59e..5cc825efca 100644 --- a/src/native/juce_linux_NativeCode.cpp +++ b/src/native/juce_linux_NativeCode.cpp @@ -30,10 +30,15 @@ the rest of the codebase. */ +#include "../core/juce_TargetPlatform.h" + +#if JUCE_LINUX + #include "linux/juce_linux_NativeIncludes.h" BEGIN_JUCE_NAMESPACE +//============================================================================== #include "../io/files/juce_FileInputStream.h" #include "../io/files/juce_FileOutputStream.h" #include "../core/juce_SystemStats.h" @@ -115,3 +120,5 @@ BEGIN_JUCE_NAMESPACE #endif END_JUCE_NAMESPACE + +#endif diff --git a/src/native/juce_mac_NativeCode.mm b/src/native/juce_mac_NativeCode.mm index a38c45caab..d3feb51823 100644 --- a/src/native/juce_mac_NativeCode.mm +++ b/src/native/juce_mac_NativeCode.mm @@ -30,6 +30,10 @@ the rest of the codebase. */ +#include "../core/juce_TargetPlatform.h" + +#if JUCE_MAC || JUCE_IPHONE + #include "mac/juce_mac_NativeIncludes.h" BEGIN_JUCE_NAMESPACE @@ -131,3 +135,5 @@ BEGIN_JUCE_NAMESPACE #endif END_JUCE_NAMESPACE + +#endif diff --git a/src/native/juce_win32_NativeCode.cpp b/src/native/juce_win32_NativeCode.cpp index 25bab50654..3c016c16e4 100644 --- a/src/native/juce_win32_NativeCode.cpp +++ b/src/native/juce_win32_NativeCode.cpp @@ -23,7 +23,6 @@ ============================================================================== */ -//============================================================================== /* This file wraps together all the win32-specific code, so that we can include all the native headers just once, and compile all our @@ -31,9 +30,11 @@ the rest of the codebase. */ -//============================================================================== -#include "windows/juce_win32_NativeIncludes.h" +#include "../core/juce_TargetPlatform.h" +#if JUCE_WINDOWS + +#include "windows/juce_win32_NativeIncludes.h" #include "../core/juce_StandardHeader.h" BEGIN_JUCE_NAMESPACE @@ -118,3 +119,5 @@ BEGIN_JUCE_NAMESPACE #endif END_JUCE_NAMESPACE + +#endif diff --git a/src/native/linux/juce_linux_Files.cpp b/src/native/linux/juce_linux_Files.cpp index 480fa9135f..b175c99b6d 100644 --- a/src/native/linux/juce_linux_Files.cpp +++ b/src/native/linux/juce_linux_Files.cpp @@ -27,11 +27,10 @@ // compiled on its own). #if JUCE_INCLUDED_FILE -#define U_ISOFS_SUPER_MAGIC (short) 0x9660 // linux/iso_fs.h -#define U_MSDOS_SUPER_MAGIC (short) 0x4d44 // linux/msdos_fs.h -#define U_NFS_SUPER_MAGIC (short) 0x6969 // linux/nfs_fs.h -#define U_SMB_SUPER_MAGIC (short) 0x517B // linux/smb_fs.h - +static const short U_ISOFS_SUPER_MAGIC = 0x9660; // linux/iso_fs.h +static const short U_MSDOS_SUPER_MAGIC = 0x4d44; // linux/msdos_fs.h +static const short U_NFS_SUPER_MAGIC = 0x6969; // linux/nfs_fs.h +static const short U_SMB_SUPER_MAGIC = 0x517B; // linux/smb_fs.h //============================================================================== void juce_getFileTimes (const String& fileName, diff --git a/src/native/linux/juce_linux_Fonts.cpp b/src/native/linux/juce_linux_Fonts.cpp index cc5dcebc98..0691d4bfb1 100644 --- a/src/native/linux/juce_linux_Fonts.cpp +++ b/src/native/linux/juce_linux_Fonts.cpp @@ -296,9 +296,6 @@ public: const float scaleY = -1.0f / height; Path destShape; - #define CONVERTX(val) (scaleX * (val).x) - #define CONVERTY(val) (scaleY * (val).y) - if (FT_Load_Glyph (face, glyphIndex, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP | FT_LOAD_IGNORE_TRANSFORM) != 0 || face->glyph->format != ft_glyph_format_outline) { @@ -317,15 +314,15 @@ public: for (int p = startPoint; p <= endPoint; p++) { - const float x = CONVERTX (points[p]); - const float y = CONVERTY (points[p]); + const float x = scaleX * points[p].x; + const float y = scaleY * points[p].y; if (p == startPoint) { if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic) { - float x2 = CONVERTX (points [endPoint]); - float y2 = CONVERTY (points [endPoint]); + float x2 = scaleX * points [endPoint].x; + float y2 = scaleY * points [endPoint].y; if (FT_CURVE_TAG (tags[endPoint]) != FT_Curve_Tag_On) { @@ -349,8 +346,8 @@ public: else if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic) { const int nextIndex = (p == endPoint) ? startPoint : p + 1; - float x2 = CONVERTX (points [nextIndex]); - float y2 = CONVERTY (points [nextIndex]); + float x2 = scaleX * points [nextIndex].x; + float y2 = scaleY * points [nextIndex].y; if (FT_CURVE_TAG (tags [nextIndex]) == FT_Curve_Tag_Conic) { @@ -372,10 +369,10 @@ public: const int next1 = p + 1; const int next2 = (p == (endPoint - 1)) ? startPoint : p + 2; - const float x2 = CONVERTX (points [next1]); - const float y2 = CONVERTY (points [next1]); - const float x3 = CONVERTX (points [next2]); - const float y3 = CONVERTY (points [next2]); + const float x2 = scaleX * points [next1].x; + const float y2 = scaleY * points [next1].y; + const float x3 = scaleX * points [next2].x; + const float y3 = scaleY * points [next2].y; if (FT_CURVE_TAG (tags[next1]) != FT_Curve_Tag_Cubic || FT_CURVE_TAG (tags[next2]) != FT_Curve_Tag_On) diff --git a/src/native/linux/juce_linux_Messaging.cpp b/src/native/linux/juce_linux_Messaging.cpp index c17288b98e..9e8961d4ba 100644 --- a/src/native/linux/juce_linux_Messaging.cpp +++ b/src/native/linux/juce_linux_Messaging.cpp @@ -35,22 +35,10 @@ Display* display = 0; // This is also referenced from WindowDriver.cpp Window juce_messageWindowHandle = None; -#define SpecialAtom "JUCESpecialAtom" -#define BroadcastAtom "JUCEBroadcastAtom" -#define SpecialCallbackAtom "JUCESpecialCallbackAtom" +XContext improbableNumber; // This is referenced from Windowing.cpp -static Atom specialId; -static Atom broadcastId; -static Atom specialCallbackId; - -// This is referenced from Windowing.cpp -XContext improbableNumber; - -// Defined in Windowing.cpp -extern void juce_windowMessageReceive (XEvent* event); - -// Defined in Clipboard.cpp -extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt); +extern void juce_windowMessageReceive (XEvent* event); // Defined in Windowing.cpp +extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt); // Defined in Clipboard.cpp //============================================================================== ScopedXLock::ScopedXLock() { XLockDisplay (display); } @@ -290,11 +278,6 @@ void MessageManager::doPlatformSpecificInitialisation() Window root = RootWindow (display, screen); Visual* visual = DefaultVisual (display, screen); - // Create atoms for our ClientMessages (these cannot be deleted) - specialId = XInternAtom (display, SpecialAtom, false); - broadcastId = XInternAtom (display, BroadcastAtom, false); - specialCallbackId = XInternAtom (display, SpecialCallbackAtom, false); - // Create a context to store user data associated with Windows we // create in WindowDriver improbableNumber = XUniqueContext(); @@ -340,29 +323,6 @@ bool juce_postMessageToSystemQueue (void* message) return true; } -/*bool juce_postMessageToX11Queue (void *message) -{ - XClientMessageEvent clientMsg; - clientMsg.display = display; - clientMsg.window = juce_messageWindowHandle; - clientMsg.type = ClientMessage; - clientMsg.format = 32; - clientMsg.message_type = specialId; -#if JUCE_64BIT - clientMsg.data.l[0] = (long) (0x00000000ffffffff & (((uint64) message) >> 32)); - clientMsg.data.l[1] = (long) (0x00000000ffffffff & (long) message); -#else - clientMsg.data.l[0] = (long) message; -#endif - - XSendEvent (display, juce_messageWindowHandle, false, - NoEventMask, (XEvent*) &clientMsg); - - XFlush (display); // This is necessary to ensure the event is delivered - - return true; -}*/ - void MessageManager::broadcastMessage (const String& value) throw() { /* TODO */ diff --git a/src/native/mac/juce_mac_QuickTimeMovieComponent.mm b/src/native/mac/juce_mac_QuickTimeMovieComponent.mm index a6087bd2eb..f7faa32c1f 100644 --- a/src/native/mac/juce_mac_QuickTimeMovieComponent.mm +++ b/src/native/mac/juce_mac_QuickTimeMovieComponent.mm @@ -71,7 +71,7 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE //============================================================================== -#define theMovie ((QTMovie*) movie) +#define theMovie (static_cast (movie)) //============================================================================== QuickTimeMovieComponent::QuickTimeMovieComponent() diff --git a/src/native/windows/juce_win32_AudioCDReader.cpp b/src/native/windows/juce_win32_AudioCDReader.cpp index 145807567c..4bc3038368 100644 --- a/src/native/windows/juce_win32_AudioCDReader.cpp +++ b/src/native/windows/juce_win32_AudioCDReader.cpp @@ -29,6 +29,9 @@ #if JUCE_USE_CDREADER +namespace CDReaderHelpers +{ + //*************************************************************************** // %%% TARGET STATUS VALUES %%% //*************************************************************************** @@ -528,12 +531,12 @@ public: wantsIndex (false) { bufferSize = 2352 * numberOfFrames; - buffer = (BYTE*) malloc (bufferSize); + buffer = (BYTE*) juce_malloc (bufferSize); } ~CDReadBuffer() { - free (buffer); + juce_free (buffer); } bool isZero() const @@ -627,7 +630,7 @@ public: if (controller != 0) { controller->shutDown(); - delete controller; + controller = 0; } if (scsiHandle != 0) @@ -643,7 +646,7 @@ public: BYTE readType; private: - CDController* controller; + ScopedPointer controller; bool testController (const int readType, CDController* const newController, @@ -713,14 +716,7 @@ static void DeinitialiseCDRipper() //============================================================================== static HANDLE CreateSCSIDeviceHandle (char driveLetter) { - TCHAR devicePath[8]; - devicePath[0] = '\\'; - devicePath[1] = '\\'; - devicePath[2] = '.'; - devicePath[3] = '\\'; - devicePath[4] = driveLetter; - devicePath[5] = ':'; - devicePath[6] = 0; + TCHAR devicePath[] = { '\\', '\\', '.', '\\', driveLetter, ':', 0, 0 }; OSVERSIONINFO info; info.dwOSVersionInfoSize = sizeof (info); @@ -1283,7 +1279,6 @@ void CDDeviceHandle::openDrawer (bool shouldBeOpen) if (controller != 0) { controller->shutDown(); - delete controller; controller = 0; } @@ -1365,7 +1360,6 @@ bool CDDeviceHandle::testController (const int type, if (! passed) { controller->shutDown(); - delete controller; controller = 0; } @@ -1595,8 +1589,8 @@ static void decUserCount() //============================================================================== struct CDDeviceWrapper { - CDDeviceHandle* cdH; - CDReadBuffer* overlapBuffer; + ScopedPointer cdH; + ScopedPointer overlapBuffer; bool jitter; }; @@ -1615,38 +1609,6 @@ static int getMSFAddressOf (const TOCTRACK* const t) static const int samplesPerFrame = 44100 / 75; static const int bytesPerFrame = samplesPerFrame * 4; - -//============================================================================== -const StringArray AudioCDReader::getAvailableCDNames() -{ - StringArray results; - incUserCount(); - - if (initialisedOk) - { - CDDeviceInfo list[8]; - const int num = FindCDDevices (list, 8); - - decUserCount(); - - for (int i = 0; i < num; ++i) - { - String s; - - if (list[i].scsiDriveLetter > 0) - s << String::charToString (list[i].scsiDriveLetter).toUpperCase() << T(": "); - - s << String (list[i].vendor).trim() - << T(" ") << String (list[i].productId).trim() - << T(" ") << String (list[i].rev).trim(); - - results.add (s); - } - } - - return results; -} - static CDDeviceHandle* openHandle (const CDDeviceInfo* const device) { SRB_GDEVBlock s; @@ -1680,8 +1642,43 @@ static CDDeviceHandle* openHandle (const CDDeviceInfo* const device) return 0; } +} + +//============================================================================== +const StringArray AudioCDReader::getAvailableCDNames() +{ + using namespace CDReaderHelpers; + StringArray results; + incUserCount(); + + if (initialisedOk) + { + CDDeviceInfo list[8]; + const int num = FindCDDevices (list, 8); + + decUserCount(); + + for (int i = 0; i < num; ++i) + { + String s; + + if (list[i].scsiDriveLetter > 0) + s << String::charToString (list[i].scsiDriveLetter).toUpperCase() << T(": "); + + s << String (list[i].vendor).trim() + << T(" ") << String (list[i].productId).trim() + << T(" ") << String (list[i].rev).trim(); + + results.add (s); + } + } + + return results; +} + AudioCDReader* AudioCDReader::createReaderForCD (const int deviceIndex) { + using namespace CDReaderHelpers; incUserCount(); if (initialisedOk) @@ -1716,6 +1713,7 @@ AudioCDReader::AudioCDReader (void* handle_) firstFrameInBuffer (0), samplesInBuffer (0) { + using namespace CDReaderHelpers; jassert (handle_ != 0); refreshTrackLengths(); @@ -1731,10 +1729,8 @@ AudioCDReader::AudioCDReader (void* handle_) AudioCDReader::~AudioCDReader() { - CDDeviceWrapper* const device = (CDDeviceWrapper*)handle; - - delete device->cdH; - delete device->overlapBuffer; + using namespace CDReaderHelpers; + CDDeviceWrapper* const device = (CDDeviceWrapper*) handle; delete device; decUserCount(); @@ -1743,6 +1739,7 @@ AudioCDReader::~AudioCDReader() bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer, int64 startSampleInFile, int numSamples) { + using namespace CDReaderHelpers; CDDeviceWrapper* const device = (CDDeviceWrapper*) handle; bool ok = true; @@ -1840,10 +1837,11 @@ bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int sta bool AudioCDReader::isCDStillPresent() const { + using namespace CDReaderHelpers; TOC toc; zerostruct (toc); - return ((CDDeviceWrapper*)handle)->cdH->readTOC (&toc, false); + return ((CDDeviceWrapper*) handle)->cdH->readTOC (&toc, false); } int AudioCDReader::getNumTracks() const @@ -1853,12 +1851,14 @@ int AudioCDReader::getNumTracks() const int AudioCDReader::getPositionOfTrackStart (int trackNum) const { + using namespace CDReaderHelpers; return (trackNum >= 0 && trackNum <= numTracks) ? trackStarts [trackNum] * samplesPerFrame : 0; } void AudioCDReader::refreshTrackLengths() { + using namespace CDReaderHelpers; zeromem (trackStarts, sizeof (trackStarts)); zeromem (audioTracks, sizeof (audioTracks)); @@ -1901,6 +1901,7 @@ const int framesPerIndexRead = 4; int AudioCDReader::getIndexAt (int samplePos) { + using namespace CDReaderHelpers; CDDeviceWrapper* const device = (CDDeviceWrapper*) handle; const int frameNeeded = samplePos / samplesPerFrame; @@ -1934,6 +1935,7 @@ int AudioCDReader::getIndexAt (int samplePos) const Array AudioCDReader::findIndexesInTrack (const int trackNumber) { + using namespace CDReaderHelpers; Array indexes; const int trackStart = getPositionOfTrackStart (trackNumber); @@ -2030,6 +2032,7 @@ const Array AudioCDReader::findIndexesInTrack (const int trackNumber) int AudioCDReader::getCDDBId() { + using namespace CDReaderHelpers; refreshTrackLengths(); if (numTracks > 0) @@ -2067,6 +2070,7 @@ int AudioCDReader::getCDDBId() void AudioCDReader::ejectDisk() { + using namespace CDReaderHelpers; ((CDDeviceWrapper*) handle)->cdH->openDrawer (true); } diff --git a/src/native/windows/juce_win32_Files.cpp b/src/native/windows/juce_win32_Files.cpp index 923a55626d..62f88be2b4 100644 --- a/src/native/windows/juce_win32_Files.cpp +++ b/src/native/windows/juce_win32_Files.cpp @@ -429,11 +429,9 @@ bool File::isOnRemovableDrive() const } //============================================================================== -#define MAX_PATH_CHARS (MAX_PATH + 256) - static const File juce_getSpecialFolderPath (int type) { - WCHAR path [MAX_PATH_CHARS]; + WCHAR path [MAX_PATH + 256]; if (SHGetSpecialFolderPath (0, path, type, 0)) return File (String (path)); @@ -493,9 +491,9 @@ const File JUCE_CALLTYPE File::getSpecialLocation (const SpecialLocationType typ { HINSTANCE moduleHandle = (HINSTANCE) PlatformUtilities::getCurrentModuleInstanceHandle(); - WCHAR dest [MAX_PATH_CHARS]; + WCHAR dest [MAX_PATH + 256]; dest[0] = 0; - GetModuleFileName (moduleHandle, dest, MAX_PATH_CHARS); + GetModuleFileName (moduleHandle, dest, numElementsInArray (dest)); return File (String (dest)); } break; @@ -511,9 +509,9 @@ const File JUCE_CALLTYPE File::getSpecialLocation (const SpecialLocationType typ //============================================================================== const File File::getCurrentWorkingDirectory() { - WCHAR dest [MAX_PATH_CHARS]; + WCHAR dest [MAX_PATH + 256]; dest[0] = 0; - GetCurrentDirectory (MAX_PATH_CHARS, dest); + GetCurrentDirectory (numElementsInArray (dest), dest); return File (String (dest)); } diff --git a/src/native/windows/juce_win32_Fonts.cpp b/src/native/windows/juce_win32_Fonts.cpp index b656c1b10f..c1a6212174 100644 --- a/src/native/windows/juce_win32_Fonts.cpp +++ b/src/native/windows/juce_win32_Fonts.cpp @@ -314,11 +314,8 @@ public: while ((char*) pheader < data + bufSize) { - #define remapX(v) (scaleX * (v).x.value) - #define remapY(v) (scaleY * (v).y.value) - - float x = remapX (pheader->pfxStart); - float y = remapY (pheader->pfxStart); + float x = scaleX * pheader->pfxStart.x.value; + float y = scaleY * pheader->pfxStart.y.value; glyphPath.startNewSubPath (x, y); @@ -331,8 +328,8 @@ public: { for (int i = 0; i < curve->cpfx; ++i) { - x = remapX (curve->apfx [i]); - y = remapY (curve->apfx [i]); + x = scaleX * curve->apfx[i].x.value; + y = scaleY * curve->apfx[i].y.value; glyphPath.lineTo (x, y); } @@ -341,19 +338,19 @@ public: { for (int i = 0; i < curve->cpfx - 1; ++i) { - const float x2 = remapX (curve->apfx [i]); - const float y2 = remapY (curve->apfx [i]); + const float x2 = scaleX * curve->apfx[i].x.value; + const float y2 = scaleY * curve->apfx[i].y.value; float x3, y3; if (i < curve->cpfx - 2) { - x3 = 0.5f * (x2 + remapX (curve->apfx [i + 1])); - y3 = 0.5f * (y2 + remapY (curve->apfx [i + 1])); + x3 = 0.5f * (x2 + scaleX * curve->apfx[i + 1].x.value); + y3 = 0.5f * (y2 + scaleY * curve->apfx[i + 1].y.value); } else { - x3 = remapX (curve->apfx [i + 1]); - y3 = remapY (curve->apfx [i + 1]); + x3 = scaleX * curve->apfx[i + 1].x.value; + y3 = scaleY * curve->apfx[i + 1].y.value; } glyphPath.quadraticTo (x2, y2, x3, y3); diff --git a/src/native/windows/juce_win32_Midi.cpp b/src/native/windows/juce_win32_Midi.cpp index 959e859e88..ead21b5a43 100644 --- a/src/native/windows/juce_win32_Midi.cpp +++ b/src/native/windows/juce_win32_Midi.cpp @@ -28,13 +28,15 @@ #if JUCE_INCLUDED_FILE //============================================================================== -static const int midiBufferSize = 1024 * 10; -static const int numInHeaders = 32; -static const int inBufferSize = 256; -static Array activeMidiThreads; - using ::free; +namespace MidiConstants +{ + static const int midiBufferSize = 1024 * 10; + static const int numInHeaders = 32; + static const int inBufferSize = 256; +} + class MidiInThread : public Thread { public: @@ -49,11 +51,11 @@ public: startTime (0), pendingLength(0) { - for (int i = numInHeaders; --i >= 0;) + for (int i = MidiConstants::numInHeaders; --i >= 0;) { zeromem (&hdr[i], sizeof (MIDIHDR)); hdr[i].lpData = inData[i]; - hdr[i].dwBufferLength = inBufferSize; + hdr[i].dwBufferLength = MidiConstants::inBufferSize; } }; @@ -87,7 +89,7 @@ public: { const ScopedLock sl (lock); - if (pendingLength < midiBufferSize - 12) + if (pendingLength < MidiConstants::midiBufferSize - 12) { char* const p = pending + pendingLength; *(double*) p = time; @@ -115,7 +117,7 @@ public: { const ScopedLock sl (lock); - if (pendingLength < midiBufferSize - (8 + num)) + if (pendingLength < MidiConstants::midiBufferSize - (8 + num)) { char* const p = pending + pendingLength; *(double*) p = time; @@ -148,7 +150,7 @@ public: while (! threadShouldExit()) { - for (int i = 0; i < numInHeaders; ++i) + for (int i = 0; i < MidiConstants::numInHeaders; ++i) { if ((hdr[i].dwFlags & WHDR_DONE) != 0) { @@ -210,7 +212,7 @@ public: activeMidiThreads.addIfNotAlreadyThere (this); int i; - for (i = 0; i < numInHeaders; ++i) + for (i = 0; i < MidiConstants::numInHeaders; ++i) writeBlock (i); startTime = Time::getMillisecondCounter(); @@ -240,7 +242,7 @@ public: { const ScopedLock sl (lock); } - for (int i = numInHeaders; --i >= 0;) + for (int i = MidiConstants::numInHeaders; --i >= 0;) { if ((hdr[i].dwFlags & WHDR_DONE) != 0) { @@ -257,22 +259,37 @@ public: } } + static void CALLBACK midiInCallback (HMIDIIN, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR midiMessage, DWORD_PTR timeStamp) + { + MidiInThread* const thread = reinterpret_cast (dwInstance); + + if (thread != 0 && activeMidiThreads.contains (thread)) + { + if (uMsg == MIM_DATA) + thread->handle ((uint32) midiMessage, (uint32) timeStamp); + else if (uMsg == MIM_LONGDATA) + thread->handleSysEx ((MIDIHDR*) midiMessage, (uint32) timeStamp); + } + } + juce_UseDebuggingNewOperator HMIDIIN hIn; private: + static Array activeMidiThreads; + MidiInput* input; MidiInputCallback* callback; bool isStarted; uint32 startTime; CriticalSection lock; - MIDIHDR hdr [numInHeaders]; - char inData [numInHeaders] [inBufferSize]; + MIDIHDR hdr [MidiConstants::numInHeaders]; + char inData [MidiConstants::numInHeaders] [MidiConstants::inBufferSize]; int pendingLength; - char pending [midiBufferSize]; + char pending [MidiConstants::midiBufferSize]; double timeStampToTime (uint32 timeStamp) throw() { @@ -294,22 +311,8 @@ private: MidiInThread& operator= (const MidiInThread&); }; -static void CALLBACK midiInCallback (HMIDIIN, - UINT uMsg, - DWORD_PTR dwInstance, - DWORD_PTR midiMessage, - DWORD_PTR timeStamp) -{ - MidiInThread* const thread = (MidiInThread*) dwInstance; +Array MidiInThread::activeMidiThreads; - if (thread != 0 && activeMidiThreads.contains (thread)) - { - if (uMsg == MIM_DATA) - thread->handle ((uint32) midiMessage, (uint32) timeStamp); - else if (uMsg == MIM_LONGDATA) - thread->handleSysEx ((MIDIHDR*) midiMessage, (uint32) timeStamp); - } -} //============================================================================== const StringArray MidiInput::getDevices() @@ -368,7 +371,7 @@ MidiInput* MidiInput::openDevice (const int index, MidiInputCallback* const call HMIDIIN h; HRESULT err = midiInOpen (&h, deviceId, - (DWORD_PTR) &midiInCallback, + (DWORD_PTR) &MidiInThread::midiInCallback, (DWORD_PTR) (MidiInThread*) thread, CALLBACK_FUNCTION); @@ -390,21 +393,17 @@ MidiInput::MidiInput (const String& name_) MidiInput::~MidiInput() { - if (internal != 0) - { - MidiInThread* const thread = (MidiInThread*) internal; - delete thread; - } + delete static_cast (internal); } void MidiInput::start() { - ((MidiInThread*) internal)->start(); + static_cast (internal)->start(); } void MidiInput::stop() { - ((MidiInThread*) internal)->stop(); + static_cast (internal)->stop(); } @@ -415,10 +414,12 @@ struct MidiOutHandle UINT deviceId; HMIDIOUT handle; + static Array activeHandles; + juce_UseDebuggingNewOperator }; -static Array midiOutputHandles; +Array MidiOutHandle::activeHandles; //============================================================================== const StringArray MidiOutput::getDevices() @@ -488,9 +489,9 @@ MidiOutput* MidiOutput::openDevice (int index) } } - for (i = midiOutputHandles.size(); --i >= 0;) + for (i = MidiOutHandle::activeHandles.size(); --i >= 0;) { - MidiOutHandle* const han = midiOutputHandles.getUnchecked(i); + MidiOutHandle* const han = MidiOutHandle::activeHandles.getUnchecked(i); if (han != 0 && han->deviceId == deviceId) { @@ -513,7 +514,7 @@ MidiOutput* MidiOutput::openDevice (int index) han->deviceId = deviceId; han->refCount = 1; han->handle = h; - midiOutputHandles.add (han); + MidiOutHandle::activeHandles.add (han); MidiOutput* const out = new MidiOutput(); out->internal = (void*) han; @@ -534,26 +535,26 @@ MidiOutput* MidiOutput::openDevice (int index) MidiOutput::~MidiOutput() { - MidiOutHandle* const h = (MidiOutHandle*) internal; + MidiOutHandle* const h = static_cast (internal); - if (midiOutputHandles.contains (h) && --(h->refCount) == 0) + if (MidiOutHandle::activeHandles.contains (h) && --(h->refCount) == 0) { midiOutClose (h->handle); - midiOutputHandles.removeValue (h); + MidiOutHandle::activeHandles.removeValue (h); delete h; } } void MidiOutput::reset() { - const MidiOutHandle* const h = (MidiOutHandle*) internal; + const MidiOutHandle* const h = static_cast (internal); midiOutReset (h->handle); } bool MidiOutput::getVolume (float& leftVol, float& rightVol) { - const MidiOutHandle* const handle = (const MidiOutHandle*) internal; + const MidiOutHandle* const handle = static_cast (internal); DWORD n; if (midiOutGetVolume (handle->handle, &n) == MMSYSERR_NOERROR) @@ -573,18 +574,18 @@ bool MidiOutput::getVolume (float& leftVol, void MidiOutput::setVolume (float leftVol, float rightVol) { - const MidiOutHandle* const handle = (MidiOutHandle*) internal; + const MidiOutHandle* const handle = static_cast (internal); DWORD n; unsigned short* const nn = (unsigned short*) &n; - nn[0] = (unsigned short) jlimit (0, 0xffff, (int)(rightVol * 0xffff)); - nn[1] = (unsigned short) jlimit (0, 0xffff, (int)(leftVol * 0xffff)); + nn[0] = (unsigned short) jlimit (0, 0xffff, (int) (rightVol * 0xffff)); + nn[1] = (unsigned short) jlimit (0, 0xffff, (int) (leftVol * 0xffff)); midiOutSetVolume (handle->handle, n); } void MidiOutput::sendMessageNow (const MidiMessage& message) { - const MidiOutHandle* const handle = (const MidiOutHandle*) internal; + const MidiOutHandle* const handle = static_cast (internal); if (message.getRawDataSize() > 3 || message.isSysEx()) diff --git a/src/native/windows/juce_win32_QuickTimeMovieComponent.cpp b/src/native/windows/juce_win32_QuickTimeMovieComponent.cpp index 8f20ac623d..5735ecda48 100644 --- a/src/native/windows/juce_win32_QuickTimeMovieComponent.cpp +++ b/src/native/windows/juce_win32_QuickTimeMovieComponent.cpp @@ -36,23 +36,18 @@ static bool isQTAvailable = false; //============================================================================== -struct QTMovieCompInternal +class QuickTimeMovieComponent::Pimpl { - QTMovieCompInternal() - : dataHandle (0) +public: + Pimpl() : dataHandle (0) { } - ~QTMovieCompInternal() + ~Pimpl() { clearHandle(); } - IQTControlPtr qtControlInternal; - IQTMoviePtr qtMovieInternal; - - Handle dataHandle; - void clearHandle() { if (dataHandle != 0) @@ -61,38 +56,33 @@ struct QTMovieCompInternal dataHandle = 0; } } -}; -#define qtControl (((QTMovieCompInternal*) internal)->qtControlInternal) -#define qtMovie (((QTMovieCompInternal*) internal)->qtMovieInternal) + IQTControlPtr qtControl; + IQTMoviePtr qtMovie; + Handle dataHandle; +}; //============================================================================== QuickTimeMovieComponent::QuickTimeMovieComponent() : movieLoaded (false), controllerVisible (true) { - internal = new QTMovieCompInternal(); + pimpl = new Pimpl(); setMouseEventsAllowed (false); } QuickTimeMovieComponent::~QuickTimeMovieComponent() { closeMovie(); - qtControl = 0; - + pimpl->qtControl = 0; deleteControl(); - - delete internal; - internal = 0; + pimpl = 0; } bool QuickTimeMovieComponent::isQuickTimeAvailable() throw() { if (! isQTAvailable) - { - isQTAvailable = (InitializeQTML (0) == noErr) - && (EnterMovies() == noErr); - } + isQTAvailable = (InitializeQTML (0) == noErr) && (EnterMovies() == noErr); return isQTAvailable; } @@ -107,14 +97,14 @@ void QuickTimeMovieComponent::createControlIfNeeded() if (createControl (&qtIID)) { const IID qtInterfaceIID = __uuidof (IQTControl); - qtControl = (IQTControl*) queryInterface (&qtInterfaceIID); + pimpl->qtControl = (IQTControl*) queryInterface (&qtInterfaceIID); - if (qtControl != 0) + if (pimpl->qtControl != 0) { - qtControl->Release(); // it has one ref too many at this point + pimpl->qtControl->Release(); // it has one ref too many at this point - qtControl->QuickTimeInitialize(); - qtControl->PutSizing (qtMovieFitsControl); + pimpl->qtControl->QuickTimeInitialize(); + pimpl->qtControl->PutSizing (qtMovieFitsControl); if (movieFile != File::nonexistent) loadMovie (movieFile, controllerVisible); @@ -131,36 +121,38 @@ bool QuickTimeMovieComponent::isControlCreated() const bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream, const bool isControllerVisible) { + const ScopedPointer movieStreamDeleter (movieStream); + movieFile = File::nonexistent; movieLoaded = false; - qtMovie = 0; + pimpl->qtMovie = 0; controllerVisible = isControllerVisible; createControlIfNeeded(); if (isControlCreated()) { - if (qtControl != 0) + if (pimpl->qtControl != 0) { - qtControl->Put_MovieHandle (0); - ((QTMovieCompInternal*) internal)->clearHandle(); + pimpl->qtControl->Put_MovieHandle (0); + pimpl->clearHandle(); Movie movie; - if (juce_OpenQuickTimeMovieFromStream (movieStream, movie, ((QTMovieCompInternal*) internal)->dataHandle)) + if (juce_OpenQuickTimeMovieFromStream (movieStream, movie, pimpl->dataHandle)) { - qtControl->Put_MovieHandle ((long) (pointer_sized_int) movie); + pimpl->qtControl->Put_MovieHandle ((long) (pointer_sized_int) movie); - qtMovie = qtControl->GetMovie(); + pimpl->qtMovie = pimpl->qtControl->GetMovie(); - if (qtMovie != 0) - qtMovie->PutMovieControllerType (isControllerVisible ? qtMovieControllerTypeStandard - : qtMovieControllerTypeNone); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutMovieControllerType (isControllerVisible ? qtMovieControllerTypeStandard + : qtMovieControllerTypeNone); } if (movie == 0) - ((QTMovieCompInternal*) internal)->clearHandle(); + pimpl->clearHandle(); } - movieLoaded = (qtMovie != 0); + movieLoaded = (pimpl->qtMovie != 0); } else { @@ -169,7 +161,6 @@ bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream, jassertfalse } - delete movieStream; return movieLoaded; } @@ -178,12 +169,12 @@ void QuickTimeMovieComponent::closeMovie() stop(); movieFile = File::nonexistent; movieLoaded = false; - qtMovie = 0; + pimpl->qtMovie = 0; - if (qtControl != 0) - qtControl->Put_MovieHandle (0); + if (pimpl->qtControl != 0) + pimpl->qtControl->Put_MovieHandle (0); - ((QTMovieCompInternal*) internal)->clearHandle(); + pimpl->clearHandle(); } const File QuickTimeMovieComponent::getCurrentMovieFile() const @@ -198,17 +189,17 @@ bool QuickTimeMovieComponent::isMovieOpen() const double QuickTimeMovieComponent::getMovieDuration() const { - if (qtMovie != 0) - return qtMovie->GetDuration() / (double) qtMovie->GetTimeScale(); + if (pimpl->qtMovie != 0) + return pimpl->qtMovie->GetDuration() / (double) pimpl->qtMovie->GetTimeScale(); return 0.0; } void QuickTimeMovieComponent::getMovieNormalSize (int& width, int& height) const { - if (qtMovie != 0) + if (pimpl->qtMovie != 0) { - struct QTRECT r = qtMovie->GetNaturalRect(); + struct QTRECT r = pimpl->qtMovie->GetNaturalRect(); width = r.right - r.left; height = r.bottom - r.top; @@ -221,67 +212,67 @@ void QuickTimeMovieComponent::getMovieNormalSize (int& width, int& height) const void QuickTimeMovieComponent::play() { - if (qtMovie != 0) - qtMovie->Play(); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->Play(); } void QuickTimeMovieComponent::stop() { - if (qtMovie != 0) - qtMovie->Stop(); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->Stop(); } bool QuickTimeMovieComponent::isPlaying() const { - return qtMovie != 0 && qtMovie->GetRate() != 0.0f; + return pimpl->qtMovie != 0 && pimpl->qtMovie->GetRate() != 0.0f; } void QuickTimeMovieComponent::setPosition (const double seconds) { - if (qtMovie != 0) - qtMovie->PutTime ((long) (seconds * qtMovie->GetTimeScale())); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutTime ((long) (seconds * pimpl->qtMovie->GetTimeScale())); } double QuickTimeMovieComponent::getPosition() const { - if (qtMovie != 0) - return qtMovie->GetTime() / (double) qtMovie->GetTimeScale(); + if (pimpl->qtMovie != 0) + return pimpl->qtMovie->GetTime() / (double) pimpl->qtMovie->GetTimeScale(); return 0.0; } void QuickTimeMovieComponent::setSpeed (const float newSpeed) { - if (qtMovie != 0) - qtMovie->PutRate (newSpeed); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutRate (newSpeed); } void QuickTimeMovieComponent::setMovieVolume (const float newVolume) { - if (qtMovie != 0) + if (pimpl->qtMovie != 0) { - qtMovie->PutAudioVolume (newVolume); - qtMovie->PutAudioMute (newVolume <= 0); + pimpl->qtMovie->PutAudioVolume (newVolume); + pimpl->qtMovie->PutAudioMute (newVolume <= 0); } } float QuickTimeMovieComponent::getMovieVolume() const { - if (qtMovie != 0) - return qtMovie->GetAudioVolume(); + if (pimpl->qtMovie != 0) + return pimpl->qtMovie->GetAudioVolume(); return 0.0f; } void QuickTimeMovieComponent::setLooping (const bool shouldLoop) { - if (qtMovie != 0) - qtMovie->PutLoop (shouldLoop); + if (pimpl->qtMovie != 0) + pimpl->qtMovie->PutLoop (shouldLoop); } bool QuickTimeMovieComponent::isLooping() const { - return qtMovie != 0 && qtMovie->GetLoop(); + return pimpl->qtMovie != 0 && pimpl->qtMovie->GetLoop(); } bool QuickTimeMovieComponent::isControllerVisible() const @@ -465,7 +456,7 @@ bool juce_OpenQuickTimeMovieFromStream (InputStream* input, Movie& movie, Handle bool QuickTimeMovieComponent::loadMovie (const File& movieFile_, const bool isControllerVisible) { - const bool ok = loadMovie ((InputStream*) movieFile_.createInputStream(), isControllerVisible); + const bool ok = loadMovie (static_cast (movieFile_.createInputStream()), isControllerVisible); movieFile = movieFile_; return ok; } @@ -473,7 +464,7 @@ bool QuickTimeMovieComponent::loadMovie (const File& movieFile_, bool QuickTimeMovieComponent::loadMovie (const URL& movieURL, const bool isControllerVisible) { - return loadMovie ((InputStream*) movieURL.createInputStream (false), isControllerVisible); + return loadMovie (static_cast (movieURL.createInputStream (false)), isControllerVisible); } void QuickTimeMovieComponent::goToStart() diff --git a/src/native/windows/juce_win32_Windowing.cpp b/src/native/windows/juce_win32_Windowing.cpp index 60e1a04264..ee14f6e2f7 100644 --- a/src/native/windows/juce_win32_Windowing.cpp +++ b/src/native/windows/juce_win32_Windowing.cpp @@ -54,8 +54,6 @@ extern bool juce_IsRunningInWine(); #define AC_SRC_ALPHA 0x01 #endif -#define DEBUG_REPAINT_TIMES 0 - static HPALETTE palette = 0; static bool createPaletteIfNeeded = true; static bool shouldDeactivateTitleBar = true; @@ -83,10 +81,6 @@ bool Desktop::canUseSemiTransparentWindows() throw() return updateLayeredWindow != 0; } -//============================================================================== -#undef DefWindowProc -#define DefWindowProc DefWindowProcW - //============================================================================== const int extendedKeyModifier = 0x10000; @@ -1094,9 +1088,6 @@ private: //============================================================================== void handlePaintMessage() { -#if DEBUG_REPAINT_TIMES - const double paintStart = Time::getMillisecondCounterHiRes(); -#endif HRGN rgn = CreateRectRgn (0, 0, 0, 0); const int regionType = GetUpdateRgn (hwnd, rgn, false); @@ -1233,11 +1224,6 @@ private: #endif lastPaintTime = Time::getMillisecondCounter(); - -#if DEBUG_REPAINT_TIMES - const double elapsed = Time::getMillisecondCounterHiRes() - paintStart; - Logger::outputDebugString (T("repaint time: ") + String (elapsed, 2)); -#endif } //============================================================================== @@ -1674,7 +1660,7 @@ public: if (peer != 0) return peer->peerWindowProc (h, message, wParam, lParam); - return DefWindowProc (h, message, wParam, lParam); + return DefWindowProcW (h, message, wParam, lParam); } private: @@ -2103,7 +2089,7 @@ private: } } - return DefWindowProc (h, message, wParam, lParam); + return DefWindowProcW (h, message, wParam, lParam); } bool sendInputAttemptWhenModalMessage() diff --git a/src/threads/juce_InterProcessLock.cpp b/src/threads/juce_InterProcessLock.cpp deleted file mode 100644 index fe6203ddff..0000000000 --- a/src/threads/juce_InterProcessLock.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-9 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#include "../core/juce_StandardHeader.h" - -BEGIN_JUCE_NAMESPACE - - -#include "juce_InterProcessLock.h" - - -//============================================================================== -// (implemented in the platform-specific code files) - - -END_JUCE_NAMESPACE