mirrors
/
OPL
2
0
Fork 0
Code

Attempt to fix XCode build issues reported by nrezmerski.

This commit is contained in:
bruce 2013-12-10 22:27:16 +08:00
parent e1eac777bb
commit de9f8732a7
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/EnumFloatParameter.h
View File

@ -8,7 +8,7 @@ public:
~EnumFloatParameter(void); ~EnumFloatParameter(void);
String getParameterText(void); String getParameterText(void);
int getParameterIndex(void); int getParameterIndex(void);
void EnumFloatParameter::setParameterIndex(int); void setParameterIndex(int);
private: private:
StringArray values; StringArray values;
}; };

26
Source/PluginGui.cpp
View File

@ -67,17 +67,17 @@ void PluginGui::updateFromParameters()
frequencyComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Frequency Multiplier"), true); frequencyComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Frequency Multiplier"), true);
frequencyComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Frequency Multiplier"), true); frequencyComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Frequency Multiplier"), true);
attenuationSlider->setValue(processor->getEnumParameter("Modulator Attenuation") * -0.75, NotificationType::dontSendNotification); attenuationSlider->setValue(processor->getEnumParameter("Modulator Attenuation") * -0.75, juce::NotificationType::dontSendNotification);
attenuationSlider2->setValue(processor->getEnumParameter("Carrier Attenuation") * -0.75, NotificationType::dontSendNotification); attenuationSlider2->setValue(processor->getEnumParameter("Carrier Attenuation") * -0.75, juce::NotificationType::dontSendNotification);
aSlider->setValue(processor->getIntParameter("Modulator Attack"), NotificationType::dontSendNotification); aSlider->setValue(processor->getIntParameter("Modulator Attack"), juce::NotificationType::dontSendNotification);
dSlider->setValue(processor->getIntParameter("Modulator Decay"), NotificationType::dontSendNotification); dSlider->setValue(processor->getIntParameter("Modulator Decay"), juce::NotificationType::dontSendNotification);
sSlider->setValue(processor->getIntParameter("Modulator Sustain Level"), NotificationType::dontSendNotification); sSlider->setValue(processor->getIntParameter("Modulator Sustain Level"), juce::NotificationType::dontSendNotification);
rSlider->setValue(processor->getIntParameter("Modulator Release"), NotificationType::dontSendNotification); rSlider->setValue(processor->getIntParameter("Modulator Release"), juce::NotificationType::dontSendNotification);
aSlider2->setValue(processor->getIntParameter("Carrier Attack"), NotificationType::dontSendNotification); aSlider2->setValue(processor->getIntParameter("Carrier Attack"), juce::NotificationType::dontSendNotification);
dSlider2->setValue(processor->getIntParameter("Carrier Decay"), NotificationType::dontSendNotification); dSlider2->setValue(processor->getIntParameter("Carrier Decay"), juce::NotificationType::dontSendNotification);
sSlider2->setValue(processor->getIntParameter("Carrier Sustain Level"), NotificationType::dontSendNotification); sSlider2->setValue(processor->getIntParameter("Carrier Sustain Level"), juce::NotificationType::dontSendNotification);
rSlider2->setValue(processor->getIntParameter("Carrier Release"), NotificationType::dontSendNotification); rSlider2->setValue(processor->getIntParameter("Carrier Release"), juce::NotificationType::dontSendNotification);
keyscaleAttenuationComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Keyscale Level"), true); keyscaleAttenuationComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Keyscale Level"), true);
keyscaleAttenuationComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Keyscale Level"), true); keyscaleAttenuationComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Keyscale Level"), true);
@ -93,9 +93,9 @@ void PluginGui::updateFromParameters()
if (processor->getEnumParameter("Carrier Sustain")) sustainButton2->setToggleState(true, false); if (processor->getEnumParameter("Carrier Sustain")) sustainButton2->setToggleState(true, false);
if (processor->getEnumParameter("Carrier Keyscale Rate")) keyscaleEnvButton2->setToggleState(true, false); if (processor->getEnumParameter("Carrier Keyscale Rate")) keyscaleEnvButton2->setToggleState(true, false);
vibratoSlider->setValue(processor->getEnumParameter("Vibrato Depth") * 7.0 + 7.0, NotificationType::dontSendNotification); vibratoSlider->setValue(processor->getEnumParameter("Vibrato Depth") * 7.0 + 7.0, juce::NotificationType::dontSendNotification);
tremoloSlider->setValue(processor->getEnumParameter("Tremolo Depth") * 3.8 + 1.0, NotificationType::dontSendNotification); tremoloSlider->setValue(processor->getEnumParameter("Tremolo Depth") * 3.8 + 1.0, juce::NotificationType::dontSendNotification);
feedbackSlider->setValue(processor->getIntParameter("Modulator Feedback"), NotificationType::dontSendNotification); feedbackSlider->setValue(processor->getIntParameter("Modulator Feedback"), juce::NotificationType::dontSendNotification);
velocityComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Velocity Sensitivity"), true); velocityComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Velocity Sensitivity"), true);
velocityComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Velocity Sensitivity"), true); velocityComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Velocity Sensitivity"), true);

2
Source/SbiLoader.h
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "c:\code\juceoplvsti\source\instrumentloader.h" #include "InstrumentLoader.h"
class SbiLoader : class SbiLoader :
public InstrumentLoader public InstrumentLoader
{ {

4
Source/config.h
View File

@ -63,6 +63,10 @@
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#endif #endif
#ifndef WIN32
typedef long long __int64;
#endif
typedef double Real64; typedef double Real64;
/* The internal types */ /* The internal types */
typedef unsigned char Bit8u; typedef unsigned char Bit8u;