Threaded build nominally working

This commit is contained in:
hirsch 2016-07-29 15:40:45 -04:00
parent 96152fd3ed
commit f9527898df
26 changed files with 1237 additions and 1090 deletions

100
delay.h
View file

@ -14,8 +14,8 @@ protected:
unsigned char model[2];
unsigned char slot;
int continuous_control( int parm5, int parm6, int parm7, int value );
int discrete_control( int parm5, int parm6, int parm7, int value );
int continuous_control( int parm5, int parm6, int parm7, int value, unsigned char *cmd );
int discrete_control( int parm5, int parm6, int parm7, int value, unsigned char *cmd );
public:
DelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) :
@ -25,20 +25,20 @@ public:
memcpy( this->model, model, 2 );
}
int dispatch( int cc, int value );
int dispatch( int cc, int value, unsigned char *cmd );
const unsigned char *getModel( void ) { return model;}
const unsigned char getSlot( void ) { return slot;}
private:
// Level
virtual int cc49( int value ) { return continuous_control( 0x00, 0x00, 0x01, value );}
virtual int cc49( int value, unsigned char *cmd ) { return continuous_control( 0x00, 0x00, 0x01, value, cmd );}
// Delay Time
virtual int cc50( int value ) { return continuous_control( 0x01, 0x01, 0x06, value );}
virtual int cc50( int value, unsigned char *cmd ) { return continuous_control( 0x01, 0x01, 0x06, value, cmd );}
virtual int cc51( int value ) = 0;
virtual int cc52( int value ) = 0;
virtual int cc53( int value ) = 0;
virtual int cc54( int value ) = 0;
virtual int cc51( int value, unsigned char *cmd ) = 0;
virtual int cc52( int value, unsigned char *cmd ) = 0;
virtual int cc53( int value, unsigned char *cmd ) = 0;
virtual int cc54( int value, unsigned char *cmd ) = 0;
};
@ -47,13 +47,13 @@ public:
MonoDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// Feedback
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// Brightness
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Attenuation
virtual int cc53( int value ) { return continuous_control( 0x04, 0x04, 0x01, value );}
virtual int cc53( int value, unsigned char *cmd ) { return continuous_control( 0x04, 0x04, 0x01, value, cmd );}
// no-op
virtual int cc54( int value ) { return 0;}
virtual int cc54( int value, unsigned char *cmd ) { return -1;}
};
@ -62,13 +62,13 @@ public:
EchoFilterCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// Feedback
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// Frequency
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Resonance
virtual int cc53( int value ) { return continuous_control( 0x04, 0x04, 0x01, value );}
virtual int cc53( int value, unsigned char *cmd ) { return continuous_control( 0x04, 0x04, 0x01, value, cmd );}
// Input Level
virtual int cc54( int value ) { return continuous_control( 0x05, 0x05, 0x01, value );}
virtual int cc54( int value, unsigned char *cmd ) { return continuous_control( 0x05, 0x05, 0x01, value, cmd );}
};
@ -77,18 +77,18 @@ public:
MultitapDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// Delay Time
virtual int cc50( int value ) { return continuous_control( 0x01, 0x01, 0x08, value );}
virtual int cc50( int value, unsigned char *cmd ) { return continuous_control( 0x01, 0x01, 0x08, value, cmd );}
// Feedback
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// Brightness
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Mode
virtual int cc53( int value ) {
if ( value > 3 ) return 0;
else return discrete_control( 0x04, 0x04, 0x8b, value );
virtual int cc53( int value, unsigned char *cmd ) {
if ( value > 3 ) return -1;
else return discrete_control( 0x04, 0x04, 0x8b, value, cmd );
}
// no-op
virtual int cc54( int value ) { return 0;}
virtual int cc54( int value, unsigned char *cmd ) { return -1;}
};
@ -97,13 +97,13 @@ public:
PingPongDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// Feedback
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// Brightness
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Stereo
virtual int cc53( int value ) { return continuous_control( 0x04, 0x04, 0x01, value );}
virtual int cc53( int value, unsigned char *cmd ) { return continuous_control( 0x04, 0x04, 0x01, value, cmd );}
// no-op
virtual int cc54( int value ) { return 0;}
virtual int cc54( int value, unsigned char *cmd ) { return -1;}
};
@ -112,13 +112,13 @@ public:
DuckingDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// Feedback
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// Release
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Threshold
virtual int cc53( int value ) { return continuous_control( 0x04, 0x04, 0x01, value );}
virtual int cc53( int value, unsigned char *cmd ) { return continuous_control( 0x04, 0x04, 0x01, value, cmd );}
// no-op
virtual int cc54( int value ) { return 0;}
virtual int cc54( int value, unsigned char *cmd ) { return -1;}
};
@ -127,13 +127,13 @@ public:
ReverseDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// FFdbk
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// RFdbk
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Tone
virtual int cc53( int value ) { return continuous_control( 0x04, 0x04, 0x01, value );}
virtual int cc53( int value, unsigned char *cmd ) { return continuous_control( 0x04, 0x04, 0x01, value, cmd );}
// no-op
virtual int cc54( int value ) { return 0;}
virtual int cc54( int value, unsigned char *cmd ) { return -1;}
};
@ -142,13 +142,13 @@ public:
TapeDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// Feedback
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// Flutter
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Brightness
virtual int cc53( int value ) { return continuous_control( 0x04, 0x04, 0x01, value );}
virtual int cc53( int value, unsigned char *cmd ) { return continuous_control( 0x04, 0x04, 0x01, value, cmd );}
// Stereo
virtual int cc54( int value ) { return continuous_control( 0x05, 0x05, 0x01, value );}
virtual int cc54( int value, unsigned char *cmd ) { return continuous_control( 0x05, 0x05, 0x01, value, cmd );}
};
@ -157,13 +157,13 @@ public:
StereoTapeDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
// Feedback
virtual int cc51( int value ) { return continuous_control( 0x02, 0x02, 0x01, value );}
virtual int cc51( int value, unsigned char *cmd ) { return continuous_control( 0x02, 0x02, 0x01, value, cmd );}
// Flutter
virtual int cc52( int value ) { return continuous_control( 0x03, 0x03, 0x01, value );}
virtual int cc52( int value, unsigned char *cmd ) { return continuous_control( 0x03, 0x03, 0x01, value, cmd );}
// Separation
virtual int cc53( int value ) { return continuous_control( 0x04, 0x05, 0x01, value );}
virtual int cc53( int value, unsigned char *cmd ) { return continuous_control( 0x04, 0x05, 0x01, value, cmd );}
// Brightness
virtual int cc54( int value ) { return continuous_control( 0x05, 0x04, 0x01, value );}
virtual int cc54( int value, unsigned char *cmd ) { return continuous_control( 0x05, 0x04, 0x01, value, cmd );}
};
@ -171,12 +171,12 @@ class NullDelayCC : public DelayCC {
public:
NullDelayCC( Mustang * theAmp, const unsigned char *model, const unsigned char theSlot ) : DelayCC(theAmp,model,theSlot) {}
private:
virtual int cc49( int value ) { return 0;}
virtual int cc50( int value ) { return 0;}
virtual int cc51( int value ) { return 0;}
virtual int cc52( int value ) { return 0;}
virtual int cc53( int value ) { return 0;}
virtual int cc54( int value ) { return 0;}
virtual int cc49( int value, unsigned char *cmd ) { return -1;}
virtual int cc50( int value, unsigned char *cmd ) { return -1;}
virtual int cc51( int value, unsigned char *cmd ) { return -1;}
virtual int cc52( int value, unsigned char *cmd ) { return -1;}
virtual int cc53( int value, unsigned char *cmd ) { return -1;}
virtual int cc54( int value, unsigned char *cmd ) { return -1;}
};