diff --git a/build/macosx/Juce.xcodeproj/project.pbxproj b/build/macosx/Juce.xcodeproj/project.pbxproj index baf02d49b8..8455df8c9a 100644 --- a/build/macosx/Juce.xcodeproj/project.pbxproj +++ b/build/macosx/Juce.xcodeproj/project.pbxproj @@ -15,6 +15,11 @@ 840F1DA610AD674F002A03A6 /* juce_CPlusPlusCodeTokeniser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84AB91F910A078190048FC39 /* juce_CPlusPlusCodeTokeniser.cpp */; }; 840F1DA710AD6750002A03A6 /* juce_CPlusPlusCodeTokeniser.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AB91FA10A078190048FC39 /* juce_CPlusPlusCodeTokeniser.h */; }; 840F80BC092B399D005E7B4E /* juce.h in Headers */ = {isa = PBXBuildFile; fileRef = 840F80BB092B399D005E7B4E /* juce.h */; }; + 844BB95B10C5578800DF5536 /* juce_TargetPlatform.h in Headers */ = {isa = PBXBuildFile; fileRef = 8481730E10832513008FEC33 /* juce_TargetPlatform.h */; }; + 844BB95C10C5579A00DF5536 /* juce_FillType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F29A9D10C2EFA5005014DF /* juce_FillType.cpp */; }; + 844BB95D10C5579B00DF5536 /* juce_FillType.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F29A9E10C2EFA5005014DF /* juce_FillType.h */; }; + 844BB95E10C557A600DF5536 /* juce_mac_CoreGraphicsContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D0F00B109B1546007F73A3 /* juce_mac_CoreGraphicsContext.mm */; }; + 844BB95F10C557A800DF5536 /* juce_Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 8456EC6508A2A6C80087C412 /* juce_Config.h */; }; 84816E5710809D07008FEC33 /* juce_iphone_Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84816E5110809D07008FEC33 /* juce_iphone_Audio.cpp */; }; 84816E5910809D07008FEC33 /* juce_iphone_MessageManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84816E5310809D07008FEC33 /* juce_iphone_MessageManager.mm */; }; 84816E5A10809D07008FEC33 /* juce_iphone_MiscUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84816E5410809D07008FEC33 /* juce_iphone_MiscUtilities.mm */; }; @@ -3189,6 +3194,9 @@ 840F1DA410AD674E002A03A6 /* juce_CodeEditorComponent.h in Headers */, 840F1DA510AD674F002A03A6 /* juce_CodeTokeniser.h in Headers */, 840F1DA710AD6750002A03A6 /* juce_CPlusPlusCodeTokeniser.h in Headers */, + 844BB95B10C5578800DF5536 /* juce_TargetPlatform.h in Headers */, + 844BB95D10C5579B00DF5536 /* juce_FillType.h in Headers */, + 844BB95F10C557A800DF5536 /* juce_Config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3856,6 +3864,8 @@ 840F1DA110AD674C002A03A6 /* juce_CodeDocument.cpp in Sources */, 840F1DA310AD674D002A03A6 /* juce_CodeEditorComponent.cpp in Sources */, 840F1DA610AD674F002A03A6 /* juce_CPlusPlusCodeTokeniser.cpp in Sources */, + 844BB95C10C5579A00DF5536 /* juce_FillType.cpp in Sources */, + 844BB95E10C557A600DF5536 /* juce_mac_CoreGraphicsContext.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index ff4bcf304c..06efc1ff6e 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -257109,7 +257109,7 @@ public: jassert (deviceName.isNotEmpty()); jack_status_t status; - client = juce::jack_client_open (JUCE_JACK_CLIENT_NAME, JackNoStartServer, &status); + client = JUCE_NAMESPACE::jack_client_open (JUCE_JACK_CLIENT_NAME, JackNoStartServer, &status); if (client == 0) { @@ -257117,7 +257117,7 @@ public: } else { - juce::jack_set_error_function (errorCallback); + JUCE_NAMESPACE::jack_set_error_function (errorCallback); // open input ports const StringArray inputChannels (getInputChannelNames()); @@ -257126,8 +257126,8 @@ public: String inputName; inputName << "in_" << (++totalNumberOfInputChannels); - inputPorts.add (juce::jack_port_register (client, (const char*) inputName, - JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0)); + inputPorts.add (JUCE_NAMESPACE::jack_port_register (client, (const char*) inputName, + JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0)); } // open output ports @@ -257137,8 +257137,8 @@ public: String outputName; outputName << "out_" << (++totalNumberOfOutputChannels); - outputPorts.add (juce::jack_port_register (client, (const char*) outputName, - JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)); + outputPorts.add (JUCE_NAMESPACE::jack_port_register (client, (const char*) outputName, + JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)); } inChans = (float**) juce_calloc (sizeof (float*) * (totalNumberOfInputChannels + 2)); @@ -257151,7 +257151,7 @@ public: close(); if (client != 0) { - juce::jack_client_close (client); + JUCE_NAMESPACE::jack_client_close (client); client = 0; } @@ -257162,8 +257162,8 @@ public: const StringArray getChannelNames (bool forInput) const { StringArray names; - const char** const ports = juce::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ - forInput ? JackPortIsInput : JackPortIsOutput); + const char** const ports = JUCE_NAMESPACE::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ + forInput ? JackPortIsInput : JackPortIsOutput); if (ports != 0) { @@ -257185,10 +257185,10 @@ public: const StringArray getOutputChannelNames() { return getChannelNames (false); } const StringArray getInputChannelNames() { return getChannelNames (true); } int getNumSampleRates() { return client != 0 ? 1 : 0; } - double getSampleRate (int index) { return client != 0 ? juce::jack_get_sample_rate (client) : 0; } + double getSampleRate (int index) { return client != 0 ? JUCE_NAMESPACE::jack_get_sample_rate (client) : 0; } int getNumBufferSizesAvailable() { return client != 0 ? 1 : 0; } int getBufferSizeSamples (int index) { return getDefaultBufferSize(); } - int getDefaultBufferSize() { return client != 0 ? juce::jack_get_buffer_size (client) : 0; } + int getDefaultBufferSize() { return client != 0 ? JUCE_NAMESPACE::jack_get_buffer_size (client) : 0; } const String open (const BitArray& inputChannels, const BitArray& outputChannels, double sampleRate, int bufferSizeSamples) @@ -257202,14 +257202,14 @@ public: lastError = String::empty; close(); - juce::jack_set_process_callback (client, processCallback, this); - juce::jack_on_shutdown (client, shutdownCallback, this); - juce::jack_activate (client); + JUCE_NAMESPACE::jack_set_process_callback (client, processCallback, this); + JUCE_NAMESPACE::jack_on_shutdown (client, shutdownCallback, this); + JUCE_NAMESPACE::jack_activate (client); isOpen_ = true; if (! inputChannels.isEmpty()) { - const char** const ports = juce::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsOutput); + const char** const ports = JUCE_NAMESPACE::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsOutput); if (ports != 0) { @@ -257221,7 +257221,7 @@ public: if (inputChannels[i] && portName.upToFirstOccurrenceOf (T(":"), false, false) == getName()) { - int error = juce::jack_connect (client, ports[i], juce::jack_port_name ((jack_port_t*) inputPorts[i])); + int error = JUCE_NAMESPACE::jack_connect (client, ports[i], JUCE_NAMESPACE::jack_port_name ((jack_port_t*) inputPorts[i])); if (error != 0) jack_Log ("Cannot connect input port " + String (i) + " (" + String (ports[i]) + "), error " + String (error)); } @@ -257233,7 +257233,7 @@ public: if (! outputChannels.isEmpty()) { - const char** const ports = juce::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsInput); + const char** const ports = JUCE_NAMESPACE::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsInput); if (ports != 0) { @@ -257245,7 +257245,7 @@ public: if (outputChannels[i] && portName.upToFirstOccurrenceOf (T(":"), false, false) == getName()) { - int error = juce::jack_connect (client, juce::jack_port_name ((jack_port_t*) outputPorts[i]), ports[i]); + int error = JUCE_NAMESPACE::jack_connect (client, JUCE_NAMESPACE::jack_port_name ((jack_port_t*) outputPorts[i]), ports[i]); if (error != 0) jack_Log ("Cannot connect output port " + String (i) + " (" + String (ports[i]) + "), error " + String (error)); } @@ -257264,9 +257264,9 @@ public: if (client != 0) { - juce::jack_deactivate (client); - juce::jack_set_process_callback (client, processCallback, 0); - juce::jack_on_shutdown (client, shutdownCallback, 0); + JUCE_NAMESPACE::jack_deactivate (client); + JUCE_NAMESPACE::jack_set_process_callback (client, processCallback, 0); + JUCE_NAMESPACE::jack_on_shutdown (client, shutdownCallback, 0); } isOpen_ = false; @@ -257308,7 +257308,7 @@ public: BitArray outputBits; for (int i = 0; i < outputPorts.size(); i++) - if (juce::jack_port_connected ((jack_port_t*) outputPorts [i])) + if (JUCE_NAMESPACE::jack_port_connected ((jack_port_t*) outputPorts [i])) outputBits.setBit (i); return outputBits; @@ -257319,7 +257319,7 @@ public: BitArray inputBits; for (int i = 0; i < inputPorts.size(); i++) - if (juce::jack_port_connected ((jack_port_t*) inputPorts [i])) + if (JUCE_NAMESPACE::jack_port_connected ((jack_port_t*) inputPorts [i])) inputBits.setBit (i); return inputBits; @@ -257330,7 +257330,7 @@ public: int latency = 0; for (int i = 0; i < outputPorts.size(); i++) - latency = jmax (latency, (int) juce::jack_port_get_total_latency (client, (jack_port_t*) outputPorts [i])); + latency = jmax (latency, (int) JUCE_NAMESPACE::jack_port_get_total_latency (client, (jack_port_t*) outputPorts [i])); return latency; } @@ -257340,7 +257340,7 @@ public: int latency = 0; for (int i = 0; i < inputPorts.size(); i++) - latency = jmax (latency, (int) juce::jack_port_get_total_latency (client, (jack_port_t*) inputPorts [i])); + latency = jmax (latency, (int) JUCE_NAMESPACE::jack_port_get_total_latency (client, (jack_port_t*) inputPorts [i])); return latency; } @@ -257355,7 +257355,7 @@ private: for (i = 0; i < totalNumberOfInputChannels; ++i) { jack_default_audio_sample_t* in - = (jack_default_audio_sample_t*) juce::jack_port_get_buffer ((jack_port_t*) inputPorts.getUnchecked(i), numSamples); + = (jack_default_audio_sample_t*) JUCE_NAMESPACE::jack_port_get_buffer ((jack_port_t*) inputPorts.getUnchecked(i), numSamples); if (in != 0) inChans [numActiveInChans++] = (float*) in; @@ -257364,7 +257364,7 @@ private: for (i = 0; i < totalNumberOfOutputChannels; ++i) { jack_default_audio_sample_t* out - = (jack_default_audio_sample_t*) juce::jack_port_get_buffer ((jack_port_t*) outputPorts.getUnchecked(i), numSamples); + = (jack_default_audio_sample_t*) JUCE_NAMESPACE::jack_port_get_buffer ((jack_port_t*) outputPorts.getUnchecked(i), numSamples); if (out != 0) outChans [numActiveOutChans++] = (float*) out; @@ -257460,7 +257460,7 @@ public: // open a dummy client jack_status_t status; - jack_client_t* client = juce::jack_client_open ("JuceJackDummy", JackNoStartServer, &status); + jack_client_t* client = JUCE_NAMESPACE::jack_client_open ("JuceJackDummy", JackNoStartServer, &status); if (client == 0) { @@ -257469,7 +257469,7 @@ public: else { // scan for output devices - const char** ports = juce::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsOutput); + const char** ports = JUCE_NAMESPACE::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsOutput); if (ports != 0) { @@ -257493,7 +257493,7 @@ public: } // scan for input devices - ports = juce::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsInput); + ports = JUCE_NAMESPACE::jack_get_ports (client, 0, 0, /* JackPortIsPhysical | */ JackPortIsInput); if (ports != 0) { @@ -257516,7 +257516,7 @@ public: free (ports); } - juce::jack_client_close (client); + JUCE_NAMESPACE::jack_client_close (client); } } @@ -261360,6 +261360,7 @@ public: } } +#if JUCE_MAC static NSImage* createNSImage (const Image& image) { const ScopedAutoReleasePool pool; @@ -261380,6 +261381,7 @@ public: return im; } +#endif CGContextRef context; @@ -261556,6 +261558,7 @@ public: void setOpacity (float opacity) { state->fillType.colour = state->fillType.colour.withAlpha (opacity); + setFill (state->fillType); } void setInterpolationQuality (Graphics::ResamplingQuality quality) @@ -262689,7 +262692,7 @@ void UIViewComponentPeer::drawRect (CGRect r) bool UIViewComponentPeer::canBecomeKeyWindow() { - return (getStyleFlags() & juce::ComponentPeer::windowIgnoresKeyPresses) == 0; + return (getStyleFlags() & JUCE_NAMESPACE::ComponentPeer::windowIgnoresKeyPresses) == 0; } bool UIViewComponentPeer::windowShouldClose() @@ -265805,6 +265808,7 @@ public: } } +#if JUCE_MAC static NSImage* createNSImage (const Image& image) { const ScopedAutoReleasePool pool; @@ -265825,6 +265829,7 @@ public: return im; } +#endif CGContextRef context; @@ -266001,6 +266006,7 @@ public: void setOpacity (float opacity) { state->fillType.colour = state->fillType.colour.withAlpha (opacity); + setFill (state->fillType); } void setInterpolationQuality (Graphics::ResamplingQuality quality) @@ -266942,10 +266948,10 @@ END_JUCE_NAMESPACE - (void) windowWillMove: (NSNotification*) notification { - if (juce::Component::getCurrentlyModalComponent() != 0 + if (JUCE_NAMESPACE::Component::getCurrentlyModalComponent() != 0 && owner->getComponent()->isCurrentlyBlockedByAnotherModalComponent() - && (owner->getStyleFlags() & juce::ComponentPeer::windowHasTitleBar) != 0) - juce::Component::getCurrentlyModalComponent()->inputAttemptWhenModal(); + && (owner->getStyleFlags() & JUCE_NAMESPACE::ComponentPeer::windowHasTitleBar) != 0) + JUCE_NAMESPACE::Component::getCurrentlyModalComponent()->inputAttemptWhenModal(); } @end @@ -267760,7 +267766,7 @@ void NSViewComponentPeer::drawRect (NSRect r) bool NSViewComponentPeer::canBecomeKeyWindow() { - return (getStyleFlags() & juce::ComponentPeer::windowIgnoresKeyPresses) == 0; + return (getStyleFlags() & JUCE_NAMESPACE::ComponentPeer::windowIgnoresKeyPresses) == 0; } bool NSViewComponentPeer::windowShouldClose() diff --git a/src/native/mac/juce_mac_CoreGraphicsContext.mm b/src/native/mac/juce_mac_CoreGraphicsContext.mm index 555b202d87..ccdac62164 100644 --- a/src/native/mac/juce_mac_CoreGraphicsContext.mm +++ b/src/native/mac/juce_mac_CoreGraphicsContext.mm @@ -79,6 +79,7 @@ public: } } +#if JUCE_MAC static NSImage* createNSImage (const Image& image) { const ScopedAutoReleasePool pool; @@ -99,6 +100,7 @@ public: return im; } +#endif //============================================================================== CGContextRef context; @@ -280,6 +282,7 @@ public: void setOpacity (float opacity) { state->fillType.colour = state->fillType.colour.withAlpha (opacity); + setFill (state->fillType); } void setInterpolationQuality (Graphics::ResamplingQuality quality)