Version 0.9.0

pull/1/head
asb2m10 10 years ago
parent af17893b6d
commit 947ab53730
  1. BIN
      Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate
  2. 10
      Source/CartManager.cpp
  3. 2
      Source/Dexed.h
  4. 2
      Source/OperatorEditor.cpp

@ -78,6 +78,10 @@ CartManager::CartManager(DexedAudioProcessorEditor *editor) : TopLevelWindow("Ca
addAndMakeVisible(fileMgrButton = new TextButton("SHOW DIR")); addAndMakeVisible(fileMgrButton = new TextButton("SHOW DIR"));
fileMgrButton->setBounds(148, 545, 70, 30); fileMgrButton->setBounds(148, 545, 70, 30);
fileMgrButton->addListener(this); fileMgrButton->addListener(this);
/*
*
* I've removed this since it only works on the DX7 II. TBC.
*
addAndMakeVisible(getDXPgmButton = new TextButton("GET DX7 PGM")); addAndMakeVisible(getDXPgmButton = new TextButton("GET DX7 PGM"));
getDXPgmButton->setBounds(656, 545, 100, 30); getDXPgmButton->setBounds(656, 545, 100, 30);
@ -87,6 +91,7 @@ CartManager::CartManager(DexedAudioProcessorEditor *editor) : TopLevelWindow("Ca
getDXCartButton->setBounds(755, 545, 100, 30); getDXCartButton->setBounds(755, 545, 100, 30);
getDXCartButton->addListener(this); getDXCartButton->addListener(this);
*/
} }
CartManager::~CartManager() { CartManager::~CartManager() {
@ -146,6 +151,7 @@ void CartManager::buttonClicked(juce::Button *buttonThatWasClicked) {
return; return;
} }
// THIS IS NOT USED
if ( buttonThatWasClicked == getDXPgmButton ) { if ( buttonThatWasClicked == getDXPgmButton ) {
if ( mainWindow->processor->sysexComm.isInputActive() && mainWindow->processor->sysexComm.isOutputActive() ) { if ( mainWindow->processor->sysexComm.isInputActive() && mainWindow->processor->sysexComm.isOutputActive() ) {
unsigned char msg[] = { 0xF0, 0x43, 0x20, 0x09, 0xF7 }; unsigned char msg[] = { 0xF0, 0x43, 0x20, 0x09, 0xF7 };
@ -236,10 +242,6 @@ void CartManager::selectionChanged() {
int checksum = sysexChecksum(((char *) &browserSysex), 4096); int checksum = sysexChecksum(((char *) &browserSysex), 4096);
if ( checksum != syx_data[4102] ) { 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; browserCart->readOnly = true;
} else { } else {
browserCart->readOnly = false; browserCart->readOnly = false;

@ -31,7 +31,7 @@ void dexed_trace(const char *source, const char *fmt, ...);
#define TRACE(fmt, ...) dexed_trace(__PRETTY_FUNCTION__,fmt,##__VA_ARGS__) #define TRACE(fmt, ...) dexed_trace(__PRETTY_FUNCTION__,fmt,##__VA_ARGS__)
#endif #endif
#else #else
#define DEXED_VERSION "0.9.0 BETA#2" #define DEXED_VERSION "0.9.0"
#define TRACE(fmt, ...) #define TRACE(fmt, ...)
#endif #endif

@ -461,7 +461,7 @@ void OperatorEditor::updateDisplay() {
txtFreq << "f = " << (freq + (freq * (fine/100))); txtFreq << "f = " << (freq + (freq * (fine/100)));
} else { } else {
freq = pow(10,((int)freq)&3); freq = pow(10,((int)freq)&3);
freq = freq + ((freq*10) * (fine/100)); freq = freq * exp(M_LN10*(fine/100));
txtFreq << freq << " Hz"; txtFreq << freq << " Hz";
} }

Loading…
Cancel
Save