| @@ -237,7 +237,7 @@ public: | |||||
| if (module != nullptr) | if (module != nullptr) | ||||
| { | { | ||||
| props.add (new ModuleInfoComponent (project, moduleList, moduleID)); | |||||
| props.add (new ModuleInfoComponent (moduleList, moduleID)); | |||||
| if (project.isModuleEnabled (moduleID)) | if (project.isModuleEnabled (moduleID)) | ||||
| { | { | ||||
| @@ -293,8 +293,8 @@ public: | |||||
| class ModuleInfoComponent : public PropertyComponent | class ModuleInfoComponent : public PropertyComponent | ||||
| { | { | ||||
| public: | public: | ||||
| ModuleInfoComponent (Project& p, ModuleList& list, const String& modID) | |||||
| : PropertyComponent ("Module", 100), project (p), moduleList (list), moduleID (modID) | |||||
| ModuleInfoComponent (ModuleList& list, const String& modID) | |||||
| : PropertyComponent ("Module", 100), moduleList (list), moduleID (modID) | |||||
| { | { | ||||
| } | } | ||||
| @@ -322,7 +322,6 @@ public: | |||||
| } | } | ||||
| private: | private: | ||||
| Project& project; | |||||
| ModuleList& moduleList; | ModuleList& moduleList; | ||||
| String moduleID; | String moduleID; | ||||
| @@ -105,7 +105,7 @@ public: | |||||
| } | } | ||||
| private: | private: | ||||
| float x, y, size, dx, dy, w, h, parentWidth, parentHeight; | |||||
| float x, y, size, dx, dy, parentWidth, parentHeight; | |||||
| float innerX, innerY; | float innerX, innerY; | ||||
| Colour colour; | Colour colour; | ||||
| Thread::ThreadID threadId; | Thread::ThreadID threadId; | ||||
| @@ -69,15 +69,11 @@ class AudioDeviceSelectorComponent::MidiInputSelectorComponentListBox : public | |||||
| private ListBoxModel | private ListBoxModel | ||||
| { | { | ||||
| public: | public: | ||||
| MidiInputSelectorComponentListBox (AudioDeviceManager& deviceManager_, | |||||
| const String& noItemsMessage_, | |||||
| const int minNumber_, | |||||
| const int maxNumber_) | |||||
| MidiInputSelectorComponentListBox (AudioDeviceManager& dm, | |||||
| const String& noItemsMessage_) | |||||
| : ListBox (String::empty, nullptr), | : ListBox (String::empty, nullptr), | ||||
| deviceManager (deviceManager_), | |||||
| noItemsMessage (noItemsMessage_), | |||||
| minNumber (minNumber_), | |||||
| maxNumber (maxNumber_) | |||||
| deviceManager (dm), | |||||
| noItemsMessage (noItemsMessage_) | |||||
| { | { | ||||
| items = MidiInput::getDevices(); | items = MidiInput::getDevices(); | ||||
| @@ -162,7 +158,6 @@ private: | |||||
| AudioDeviceManager& deviceManager; | AudioDeviceManager& deviceManager; | ||||
| const String noItemsMessage; | const String noItemsMessage; | ||||
| StringArray items; | StringArray items; | ||||
| int minNumber, maxNumber; | |||||
| void flipEnablement (const int row) | void flipEnablement (const int row) | ||||
| { | { | ||||
| @@ -917,7 +912,7 @@ private: | |||||
| //============================================================================== | //============================================================================== | ||||
| AudioDeviceSelectorComponent::AudioDeviceSelectorComponent (AudioDeviceManager& deviceManager_, | |||||
| AudioDeviceSelectorComponent::AudioDeviceSelectorComponent (AudioDeviceManager& dm, | |||||
| const int minInputChannels_, | const int minInputChannels_, | ||||
| const int maxInputChannels_, | const int maxInputChannels_, | ||||
| const int minOutputChannels_, | const int minOutputChannels_, | ||||
| @@ -926,7 +921,7 @@ AudioDeviceSelectorComponent::AudioDeviceSelectorComponent (AudioDeviceManager& | |||||
| const bool showMidiOutputSelector, | const bool showMidiOutputSelector, | ||||
| const bool showChannelsAsStereoPairs_, | const bool showChannelsAsStereoPairs_, | ||||
| const bool hideAdvancedOptionsWithButton_) | const bool hideAdvancedOptionsWithButton_) | ||||
| : deviceManager (deviceManager_), | |||||
| : deviceManager (dm), | |||||
| minOutputChannels (minOutputChannels_), | minOutputChannels (minOutputChannels_), | ||||
| maxOutputChannels (maxOutputChannels_), | maxOutputChannels (maxOutputChannels_), | ||||
| minInputChannels (minInputChannels_), | minInputChannels (minInputChannels_), | ||||
| @@ -937,7 +932,7 @@ AudioDeviceSelectorComponent::AudioDeviceSelectorComponent (AudioDeviceManager& | |||||
| jassert (minOutputChannels >= 0 && minOutputChannels <= maxOutputChannels); | jassert (minOutputChannels >= 0 && minOutputChannels <= maxOutputChannels); | ||||
| jassert (minInputChannels >= 0 && minInputChannels <= maxInputChannels); | jassert (minInputChannels >= 0 && minInputChannels <= maxInputChannels); | ||||
| const OwnedArray<AudioIODeviceType>& types = deviceManager_.getAvailableDeviceTypes(); | |||||
| const OwnedArray<AudioIODeviceType>& types = deviceManager.getAvailableDeviceTypes(); | |||||
| if (types.size() > 1) | if (types.size() > 1) | ||||
| { | { | ||||
| @@ -958,8 +953,7 @@ AudioDeviceSelectorComponent::AudioDeviceSelectorComponent (AudioDeviceManager& | |||||
| { | { | ||||
| addAndMakeVisible (midiInputsList | addAndMakeVisible (midiInputsList | ||||
| = new MidiInputSelectorComponentListBox (deviceManager, | = new MidiInputSelectorComponentListBox (deviceManager, | ||||
| "(" + TRANS("No MIDI inputs available") + ")", | |||||
| 0, 0)); | |||||
| "(" + TRANS("No MIDI inputs available") + ")")); | |||||
| midiInputsLabel = new Label (String::empty, TRANS ("Active MIDI inputs:")); | midiInputsLabel = new Label (String::empty, TRANS ("Active MIDI inputs:")); | ||||
| midiInputsLabel->setJustificationType (Justification::topRight); | midiInputsLabel->setJustificationType (Justification::topRight); | ||||
| @@ -985,7 +979,7 @@ AudioDeviceSelectorComponent::AudioDeviceSelectorComponent (AudioDeviceManager& | |||||
| midiOutputLabel = nullptr; | midiOutputLabel = nullptr; | ||||
| } | } | ||||
| deviceManager_.addChangeListener (this); | |||||
| deviceManager.addChangeListener (this); | |||||
| updateAllControls(); | updateAllControls(); | ||||
| } | } | ||||
| @@ -417,7 +417,7 @@ void EdgeTable::intersectWithEdgeTableLine (const int y, const int* otherLine) | |||||
| if (dest[0] == 0) | if (dest[0] == 0) | ||||
| return; | return; | ||||
| int otherNumPoints = *otherLine; | |||||
| const int otherNumPoints = *otherLine; | |||||
| if (otherNumPoints == 0) | if (otherNumPoints == 0) | ||||
| { | { | ||||
| *dest = 0; | *dest = 0; | ||||
| @@ -522,17 +522,6 @@ void EdgeTable::intersectWithEdgeTableLine (const int y, const int* otherLine) | |||||
| } | } | ||||
| dest[0] = destTotal; | dest[0] = destTotal; | ||||
| #if JUCE_DEBUG | |||||
| int last = std::numeric_limits<int>::min(); | |||||
| for (int i = 0; i < dest[0]; ++i) | |||||
| { | |||||
| jassert (dest[i * 2 + 1] > last); | |||||
| last = dest[i * 2 + 1]; | |||||
| } | |||||
| jassert (dest [dest[0] * 2] == 0); | |||||
| #endif | |||||
| } | } | ||||
| void EdgeTable::clipEdgeTableLineToRange (int* dest, const int x1, const int x2) noexcept | void EdgeTable::clipEdgeTableLineToRange (int* dest, const int x1, const int x2) noexcept | ||||
| @@ -656,13 +645,12 @@ void EdgeTable::clipToEdgeTable (const EdgeTable& other) | |||||
| if (clipped.getRight() < bounds.getRight()) | if (clipped.getRight() < bounds.getRight()) | ||||
| bounds.setRight (clipped.getRight()); | bounds.setRight (clipped.getRight()); | ||||
| int i = 0; | |||||
| for (i = top; --i >= 0;) | |||||
| for (int i = 0; i < top; ++i) | |||||
| table [lineStrideElements * i] = 0; | table [lineStrideElements * i] = 0; | ||||
| const int* otherLine = other.table + other.lineStrideElements * (clipped.getY() - other.bounds.getY()); | const int* otherLine = other.table + other.lineStrideElements * (clipped.getY() - other.bounds.getY()); | ||||
| for (i = top; i < bottom; ++i) | |||||
| for (int i = top; i < bottom; ++i) | |||||
| { | { | ||||
| intersectWithEdgeTableLine (i, otherLine); | intersectWithEdgeTableLine (i, otherLine); | ||||
| otherLine += other.lineStrideElements; | otherLine += other.lineStrideElements; | ||||
| @@ -396,7 +396,7 @@ private: | |||||
| OwnedArray <ItemInfo> items; | OwnedArray <ItemInfo> items; | ||||
| Value currentId; | Value currentId; | ||||
| int lastCurrentId; | int lastCurrentId; | ||||
| bool isButtonDown, separatorPending, menuActive, textIsCustom; | |||||
| bool isButtonDown, separatorPending, menuActive; | |||||
| ListenerList <Listener> listeners; | ListenerList <Listener> listeners; | ||||
| ScopedPointer<Label> label; | ScopedPointer<Label> label; | ||||
| String textWhenNothingSelected, noChoicesMessage; | String textWhenNothingSelected, noChoicesMessage; | ||||
| @@ -28,8 +28,7 @@ TooltipWindow::TooltipWindow (Component* const parentComp, const int delayMs) | |||||
| mouseClicks (0), | mouseClicks (0), | ||||
| mouseWheelMoves (0), | mouseWheelMoves (0), | ||||
| lastHideTime (0), | lastHideTime (0), | ||||
| lastComponentUnderMouse (nullptr), | |||||
| changedCompsSinceShown (true) | |||||
| lastComponentUnderMouse (nullptr) | |||||
| { | { | ||||
| if (Desktop::getInstance().getMainMouseSource().canHover()) | if (Desktop::getInstance().getMainMouseSource().canHover()) | ||||
| startTimer (123); | startTimer (123); | ||||
| @@ -101,7 +101,6 @@ private: | |||||
| int mouseClicks, mouseWheelMoves; | int mouseClicks, mouseWheelMoves; | ||||
| unsigned int lastCompChangeTime, lastHideTime; | unsigned int lastCompChangeTime, lastHideTime; | ||||
| Component* lastComponentUnderMouse; | Component* lastComponentUnderMouse; | ||||
| bool changedCompsSinceShown; | |||||
| String tipShowing, lastTipUnderMouse; | String tipShowing, lastTipUnderMouse; | ||||
| void paint (Graphics&) override; | void paint (Graphics&) override; | ||||