diff --git a/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate b/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate index 4fb08c0..e121e52 100644 Binary files a/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate and b/Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Source/CartManager.cpp b/Source/CartManager.cpp index 37aa075..0fb85ca 100644 --- a/Source/CartManager.cpp +++ b/Source/CartManager.cpp @@ -78,7 +78,11 @@ CartManager::CartManager(DexedAudioProcessorEditor *editor) : TopLevelWindow("Ca addAndMakeVisible(fileMgrButton = new TextButton("SHOW DIR")); fileMgrButton->setBounds(148, 545, 70, 30); fileMgrButton->addListener(this); - +/* + * + * I've removed this since it only works on the DX7 II. TBC. + * + addAndMakeVisible(getDXPgmButton = new TextButton("GET DX7 PGM")); getDXPgmButton->setBounds(656, 545, 100, 30); getDXPgmButton->addListener(this); @@ -86,7 +90,8 @@ CartManager::CartManager(DexedAudioProcessorEditor *editor) : TopLevelWindow("Ca addAndMakeVisible(getDXCartButton = new TextButton("GET DX7 CART")); getDXCartButton->setBounds(755, 545, 100, 30); getDXCartButton->addListener(this); - + +*/ } CartManager::~CartManager() { @@ -146,6 +151,7 @@ void CartManager::buttonClicked(juce::Button *buttonThatWasClicked) { return; } + // THIS IS NOT USED if ( buttonThatWasClicked == getDXPgmButton ) { if ( mainWindow->processor->sysexComm.isInputActive() && mainWindow->processor->sysexComm.isOutputActive() ) { unsigned char msg[] = { 0xF0, 0x43, 0x20, 0x09, 0xF7 }; @@ -236,10 +242,6 @@ void CartManager::selectionChanged() { int checksum = sysexChecksum(((char *) &browserSysex), 4096); if ( checksum != syx_data[4102] ) { - /*String message = "Sysex import checksum doesnt match "; - message << ((int)checksum) << " != " << ((int)syx_data[4102]); - - AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon, "Warning", message);*/ browserCart->readOnly = true; } else { browserCart->readOnly = false; diff --git a/Source/Dexed.h b/Source/Dexed.h index 1a19610..ab2930c 100644 --- a/Source/Dexed.h +++ b/Source/Dexed.h @@ -31,7 +31,7 @@ void dexed_trace(const char *source, const char *fmt, ...); #define TRACE(fmt, ...) dexed_trace(__PRETTY_FUNCTION__,fmt,##__VA_ARGS__) #endif #else - #define DEXED_VERSION "0.9.0 BETA#2" + #define DEXED_VERSION "0.9.0" #define TRACE(fmt, ...) #endif diff --git a/Source/OperatorEditor.cpp b/Source/OperatorEditor.cpp index f9a03ec..0d40958 100644 --- a/Source/OperatorEditor.cpp +++ b/Source/OperatorEditor.cpp @@ -461,7 +461,7 @@ void OperatorEditor::updateDisplay() { txtFreq << "f = " << (freq + (freq * (fine/100))); } else { freq = pow(10,((int)freq)&3); - freq = freq + ((freq*10) * (fine/100)); + freq = freq * exp(M_LN10*(fine/100)); txtFreq << freq << " Hz"; }