jens/JaySynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed leakage

Browse Source 
- fixed assertion failure
- fixed warnings
- fixed version number

git-svn-id: http://moon:8086/svn/software/trunk/projects/JaySynth@238 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2015-02-22 10:05:57 +00:00
parent dadf05a851
commit d060c00828
9 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JuceLibraryCode/AppConfig.h
+8 -8
View File
@@ -194,22 +194,22 @@
#define JucePlugin_Name "JaySynth" #define JucePlugin_Name "JaySynth"
#endif #endif
#ifndef JucePlugin_Desc #ifndef JucePlugin_Desc
#define JucePlugin_Desc "JaySynth" #define JucePlugin_Desc "JaySynth Software Synthesizer"
#endif #endif
#ifndef JucePlugin_Manufacturer #ifndef JucePlugin_Manufacturer
#define JucePlugin_Manufacturer "Jay Digital Illusions" #define JucePlugin_Manufacturer "Jay Digital Illusions"
#endif #endif
#ifndef JucePlugin_ManufacturerWebsite #ifndef JucePlugin_ManufacturerWebsite
#define JucePlugin_ManufacturerWebsite "" #define JucePlugin_ManufacturerWebsite "www.jayfield.org"
#endif #endif
#ifndef JucePlugin_ManufacturerEmail #ifndef JucePlugin_ManufacturerEmail
#define JucePlugin_ManufacturerEmail "" #define JucePlugin_ManufacturerEmail "synth@jayfield.org"
#endif #endif
#ifndef JucePlugin_ManufacturerCode #ifndef JucePlugin_ManufacturerCode
#define JucePlugin_ManufacturerCode 'Manu' #define JucePlugin_ManufacturerCode '3110'
#endif #endif
#ifndef JucePlugin_PluginCode #ifndef JucePlugin_PluginCode
#define JucePlugin_PluginCode 'Plug' #define JucePlugin_PluginCode '1970'
#endif #endif
#ifndef JucePlugin_MaxNumInputChannels #ifndef JucePlugin_MaxNumInputChannels
#define JucePlugin_MaxNumInputChannels 2 #define JucePlugin_MaxNumInputChannels 2
@@ -236,13 +236,13 @@
#define JucePlugin_EditorRequiresKeyboardFocus 0 #define JucePlugin_EditorRequiresKeyboardFocus 0
#endif #endif
#ifndef JucePlugin_Version #ifndef JucePlugin_Version
#define JucePlugin_Version 1.0.0 #define JucePlugin_Version 0.5.6
#endif #endif
#ifndef JucePlugin_VersionCode #ifndef JucePlugin_VersionCode
#define JucePlugin_VersionCode 0x10000 #define JucePlugin_VersionCode 0x000506
#endif #endif
#ifndef JucePlugin_VersionString #ifndef JucePlugin_VersionString
#define JucePlugin_VersionString "1.0.0" #define JucePlugin_VersionString "0.5.6"
#endif #endif
#ifndef JucePlugin_VSTUniqueID #ifndef JucePlugin_VSTUniqueID
#define JucePlugin_VSTUniqueID JucePlugin_PluginCode #define JucePlugin_VSTUniqueID JucePlugin_PluginCode
JuceLibraryCode/JuceHeader.h
+3 -3
View File
@@ -34,9 +34,9 @@
namespace ProjectInfo namespace ProjectInfo
{ {
const char* const projectName = "JaySynth"; const char* const projectName = JucePlugin_Name;
const char* const versionString = "1.0.0"; const char* const versionString = JucePlugin_VersionString;
const int versionNumber = 0x10000; const int versionNumber = JucePlugin_VersionCode;
} }
#endif // __APPHEADERFILE_FGWBAQ__ #endif // __APPHEADERFILE_FGWBAQ__
Source/JaySynth.cpp
+4 -3
View File
@@ -882,7 +882,8 @@ void JaySynth::renderNextBlock (AudioSampleBuffer& outputBuffer,
float *buf1, *buf2; float *buf1, *buf2;
// must set the sample rate before using this! // must set the sample rate before using this!
jassert (sampleRate != 0); float sr = Synthesiser::getSampleRate();
jassert (sr != 0);
const ScopedLock sl (lock); const ScopedLock sl (lock);
@@ -1375,8 +1376,8 @@ void JaySynthThread::run(void)
m_buffer->clear (0, 0, m_sample_len); m_buffer->clear (0, 0, m_sample_len);
m_buffer->clear (1, 0, m_sample_len); m_buffer->clear (1, 0, m_sample_len);
buf1 = m_buffer->getSampleData (0, 0); buf1 = m_buffer->getWritePointer (0, 0);
buf2 = m_buffer->getSampleData (1, 0); buf2 = m_buffer->getWritePointer (1, 0);
for (int i = m_voice_offset; i < m_num_voices; i += m_voice_step) for (int i = m_voice_offset; i < m_num_voices; i += m_voice_step)
{ {
Source/JaySynth.h
+1 -2
View File
@@ -208,7 +208,6 @@ public:
private: private:
int m_num_audiothreads; int m_num_audiothreads;
float sampleRate;
BigInteger sustainPedalsDown; BigInteger sustainPedalsDown;
int paramID_changed, next_possible_voice, oldest_voice; int paramID_changed, next_possible_voice, oldest_voice;
JaySynthMidiCC *pMidCC_editBuffer; JaySynthMidiCC *pMidCC_editBuffer;
@@ -244,7 +243,7 @@ private:
midi_note_info_t last_midi_note_info; midi_note_info_t last_midi_note_info;
voice_t *m_pVoices; voice_t *m_pVoices;
JaySynthThread **m_ppAudioThread; JaySynthThread **m_ppAudioThread;
WaitableEvent *m_pEventAudioThreadRdy; ScopedPointer <WaitableEvent> m_pEventAudioThreadRdy;
JaySynthMonophonicMGR m_monoMGR; JaySynthMonophonicMGR m_monoMGR;
}; };
Source/JaySynthAudioProcessorEditor.cpp
+9 -9
View File
@@ -5370,32 +5370,32 @@ void JaySynthAudioProcessorEditor::paramUpdate(int paramID, bool doHostUpdate)
switch(paramID) switch(paramID)
{ {
case SYNTH_PARAM_OSC_0_FM_SRC_1: case SYNTH_PARAM_OSC_0_FM_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_0_FM_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_0_FM_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
case SYNTH_PARAM_OSC_1_FM_SRC_1: case SYNTH_PARAM_OSC_1_FM_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_1_FM_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_1_FM_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
case SYNTH_PARAM_OSC_0_AM_SRC_1: case SYNTH_PARAM_OSC_0_AM_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_0_AM_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_0_AM_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
case SYNTH_PARAM_OSC_1_AM_SRC_1: case SYNTH_PARAM_OSC_1_AM_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_1_AM_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_1_AM_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
case SYNTH_PARAM_OSC_0_PWM_SRC_1: case SYNTH_PARAM_OSC_0_PWM_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_0_PWM_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_0_PWM_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
case SYNTH_PARAM_OSC_1_PWM_SRC_1: case SYNTH_PARAM_OSC_1_PWM_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_1_PWM_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_OSC_1_PWM_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
case SYNTH_PARAM_VCF_F_SRC_1: case SYNTH_PARAM_VCF_F_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_VCF_F_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_VCF_F_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
case SYNTH_PARAM_VCF_Q_SRC_1: case SYNTH_PARAM_VCF_Q_SRC_1:
pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_VCF_Q_SRC_OP)), juce::NotificationType::sendNotification); pComboBox->setSelectedId(ModSrc1_CB_getIndex((int)getProcessor()->getParam(paramID), (int)getProcessor()->getParam(SYNTH_PARAM_VCF_Q_SRC_OP)), juce::NotificationType::dontSendNotification);
break; break;
default: default:
pComboBox->setSelectedId(1 + (int)getProcessor()->getParam(paramID), juce::NotificationType::sendNotification); pComboBox->setSelectedId(1 + (int)getProcessor()->getParam(paramID), juce::NotificationType::dontSendNotification);
break; break;
} }
pComboBox->setColour (ComboBox:: backgroundColourId, combobox_colour); pComboBox->setColour (ComboBox:: backgroundColourId, combobox_colour);
Source/VelKey_PopUp.cpp
+1 -1
View File
@@ -561,7 +561,7 @@ VelKey_PopUp::VelKey_PopUp (JaySynthMidiCC *pMidiCC, int paramID, synth_float_t
m_velKey_constraints.pcenter = -1E18; m_velKey_constraints.pcenter = -1E18;
label_parameter_name->setText(name, juce::NotificationType::dontSendNotification); label_parameter_name->setText(name, juce::NotificationType::dontSendNotification);
comboBoxOPSel->setSelectedId(1 + pMidiCC->getVelKeyCombineOP(pMidiCC_container), juce::NotificationType::sendNotification); comboBoxOPSel->setSelectedId(1 + pMidiCC->getVelKeyCombineOP(pMidiCC_container), juce::NotificationType::dontSendNotification);
slider_vel_kexp->setValue(toSlider(&m_shape_xform, pMidiCC->getVelCurve(pMidiCC_container)->kexp), juce::NotificationType::dontSendNotification); slider_vel_kexp->setValue(toSlider(&m_shape_xform, pMidiCC->getVelCurve(pMidiCC_container)->kexp), juce::NotificationType::dontSendNotification);
slider_vel_scenter->setValue(toSlider(&m_skew_xform, pMidiCC->getVelCurve(pMidiCC_container)->scenter), juce::NotificationType::dontSendNotification); slider_vel_scenter->setValue(toSlider(&m_skew_xform, pMidiCC->getVelCurve(pMidiCC_container)->scenter), juce::NotificationType::dontSendNotification);
Source/synth/param_scale.c
+2 -2
View File
@@ -799,7 +799,7 @@ if ((pcenter < pmin) || (pcenter > pmax))
} }
void paramInfoInit(param_info_t *pObj, UINT32 id, char *pName) void paramInfoInit(param_info_t *pObj, UINT32 id, const char *pName)
{ {
pObj->id = id; pObj->id = id;
@@ -855,7 +855,7 @@ void paramInfoSet(param_info_t *pObj,
pObj->pinterval = pinterval; pObj->pinterval = pinterval;
} }
void paramInfoCopy(param_info_t *pDst, param_info_t *pSrc) void paramInfoCopy(param_info_t *pDst, param_info_t const *pSrc)
{ {
pDst->base = pSrc->base; pDst->base = pSrc->base;
pDst->kexp = pSrc->kexp; pDst->kexp = pSrc->kexp;
Source/synth/param_scale.h
+2 -2
View File
@@ -161,7 +161,7 @@ extern "C" {
// -------------------------------------------------------------- // --------------------------------------------------------------
// Exported functions // Exported functions
// -------------------------------------------------------------- // --------------------------------------------------------------
void paramInfoInit(param_info_t *pObj, UINT32 id, char *pName); void paramInfoInit(param_info_t *pObj, UINT32 id, const char *pName);
void paramInfoFree(param_info_t *pObj); void paramInfoFree(param_info_t *pObj);
void paramInfoSetPMIN(param_info_t *pObj, synth_float_t value); void paramInfoSetPMIN(param_info_t *pObj, synth_float_t value);
void paramInfoSetPMAX(param_info_t *pObj, synth_float_t value); void paramInfoSetPMAX(param_info_t *pObj, synth_float_t value);
@@ -174,7 +174,7 @@ void paramInfoSet(param_info_t *pObj,
synth_float_t pmax, synth_float_t pmax,
synth_float_t pinterval); synth_float_t pinterval);
void paramInfoCopy(param_info_t *pDst, param_info_t *pSrc); void paramInfoCopy(param_info_t *pDst, param_info_t const *pSrc);
synth_float_t clampParam(param_info_t *pObj, synth_float_t p); synth_float_t clampParam(param_info_t *pObj, synth_float_t p);
synth_float_t toParam(param_info_t *pObj, synth_float_t s); synth_float_t toParam(param_info_t *pObj, synth_float_t s);
synth_float_t toSlider(param_info_t *pObj, synth_float_t p); synth_float_t toSlider(param_info_t *pObj, synth_float_t p);
Source/synth/synth_defs.h
+1 -1
View File
@@ -52,7 +52,7 @@
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
void SynthDebug(char *fmtstr, ...); void SynthDebug(const char *fmtstr, ...);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif