Compare commits

..

No commits in common. "gui" and "master" have entirely different histories.
gui ... master

11 changed files with 5 additions and 35543 deletions

View File

@ -28,7 +28,6 @@
#define DISTRHO_PLUGIN_IS_RT_SAFE 1 #define DISTRHO_PLUGIN_IS_RT_SAFE 1
#define DISTRHO_PLUGIN_WANT_PROGRAMS 1 #define DISTRHO_PLUGIN_WANT_PROGRAMS 1
#define DISTRHO_PLUGIN_HAS_UI 1
enum Parameters { enum Parameters {
paramProg, paramProg,

View File

@ -15,17 +15,9 @@ FILES_DSP = \
chassis.cpp \ chassis.cpp \
voice.cpp voice.cpp
FILES_UI = \
peacock.cpp \
ui.cpp
UI_TYPE = generic
USE_FILE_BROWSER = false
SKIP_NATIVE_AUDIO_FALLBACK = true
include ../dpf/Makefile.plugins.mk include ../dpf/Makefile.plugins.mk
TARGETS += jack lv2_sep TARGETS += jack lv2
all: $(TARGETS) all: $(TARGETS)

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +0,0 @@
#ifndef _BACK_HPP
#define _BACK_HPP
namespace Artwork {
extern const char *backgroundData;
const unsigned int backgroundDataSize = 677980;
const unsigned int backgroundWidth = 545;
const unsigned int backgroundHeight = 311;
} // namespace Artwork
#endif

View File

@ -159,27 +159,6 @@ void Chassis::run(const float **, float **outputs, uint32_t frames, const MidiEv
s.blockLeft -= sizeThisTime; s.blockLeft -= sizeThisTime;
} }
// highpass filter
float tmp = s.hptmp;
float smp, flt=0;
float cut_tbl[4] = {0.91245, 0.97097, 1, 0.99088};
float cut = cut_tbl[(s.patchRam.switch2 & 0x18) >> 3];
float gain_tbl[4] = {-1, -1, 0, 4};
float gain = gain_tbl[(s.patchRam.switch2 & 0x18) >> 3];
// printf("hp= %02x\n", (s.patchRam.switch2 & 0x18)>>3);
for (uint32_t i = 0; i < frames; i++) {
smp = outputs[0][i];
flt = ((tmp - smp) * cut) + smp;
tmp = flt;
outputs[0][i] = ((flt * gain) + smp);
}
s.hptmp = flt;
// copy left to right // copy left to right
memmove(outputs[1], outputs[0], sizeof(float) * frames); memmove(outputs[1], outputs[0], sizeof(float) * frames);
// outputs[1][1]=1; // outputs[1][1]=1;

View File

@ -149,7 +149,7 @@ void Chassis::initParameter(uint32_t index, Parameter& parameter) {
parameter.name = "HPF"; parameter.name = "HPF";
parameter.symbol = "ch_hpf"; parameter.symbol = "ch_hpf";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 3.9f; parameter.ranges.max = 3.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
parameter.midiCC = 20; parameter.midiCC = 20;
break; break;
@ -397,10 +397,9 @@ void Chassis::setParameterValue(uint32_t index, float value) {
case paramHPF: // bits 3-4 of switch 2 case paramHPF: // bits 3-4 of switch 2
// doesn't look great in Carla because of odd behaviour with small integer knobs // doesn't look great in Carla because of odd behaviour with small integer knobs
printf("setPV %d %f\n", index, value);
if (value > 3) value = 3; if (value > 3) value = 3;
s.patchRam.switch2 &= 0xe7; s.patchRam.switch2 &= 0xf3;
s.patchRam.switch2 |= (3-(int)value )<< 3; s.patchRam.switch2 |= (int)value << 3;
break; break;
case paramModWheel: case paramModWheel:
@ -453,7 +452,7 @@ float Chassis::getParameterValue(uint32_t index) const {
return s.patchRam.noise; return s.patchRam.noise;
break; break;
case paramHPF: case paramHPF:
return 3-((s.patchRam.switch2 & 0x18) >> 3); return (s.patchRam.switch2 & 0x18) >> 3;
break; break;
case paramVCFFreq: case paramVCFFreq:
return s.patchRam.vcfFreq; return s.patchRam.vcfFreq;

File diff suppressed because it is too large Load Diff

View File

@ -1,15 +0,0 @@
#pragma once
namespace Artwork {
/*
extern const char *orangeData;
const uint32_t orangeDataSize = 38*17*3;
const uint32_t orangeWidth = 38;
const uint32_t orangeHeight = 17;
*/
extern const char *backgroundData;
const unsigned int backgroundDataSize = 700*400*3;
const unsigned int backgroundWidth = 700;
const unsigned int backgroundHeight = 400;
} // namespace Artwork

View File

@ -1,32 +0,0 @@
#include "ui.hpp"
#include "chassis.hpp"
START_NAMESPACE_DISTRHO
namespace Art = Artwork;
DistrhoUIchassis::DistrhoUIchassis() : UI(Art::backgroundWidth, Art::backgroundHeight, true),
// UI
fImgBackground(Art::backgroundData, Art::backgroundWidth, Art::backgroundHeight, kImageFormatRGB)
{
}
void DistrhoUIchassis::programLoaded(uint32_t index) {
//printf("in programLoaded %d\n", index);
}
void DistrhoUIchassis::parameterChanged(uint32_t index, float value) {
//printf("in parameterchanged %d %f\n", index, value);
}
void DistrhoUIchassis::onDisplay() {
const GraphicsContext& context(getGraphicsContext());
fImgBackground.draw(context);
};
UI* createUI() {
return new DistrhoUIchassis();
}
END_NAMESPACE_DISTRHO

View File

@ -1,28 +0,0 @@
#ifndef _UI_HPP
#define _UI_HPP
#include "DistrhoUI.hpp"
#include "ImageWidgets.hpp"
#include "peacock.hpp"
START_NAMESPACE_DISTRHO
class DistrhoUIchassis : public UI {
public:
DistrhoUIchassis();
protected:
void parameterChanged(uint32_t index, float value) override;
void programLoaded(uint32_t index) override;
void onDisplay() override;
private:
Image fImgBackground;
DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DistrhoUIchassis)
// ImageAboutWindow fAboutWindow;
};
END_NAMESPACE_DISTRHO
#endif

View File

@ -133,7 +133,6 @@ class Synth {
} patchRam; } patchRam;
float pitchCV[104]; float pitchCV[104];
float hptmp;
void runLFO(); void runLFO();
void lfoDelay(); void lfoDelay();