From 0216f469b018182ce44017c5f156ef55c11d9926 Mon Sep 17 00:00:00 2001 From: edgeeffect Date: Sat, 5 Apr 2003 07:57:14 +0000 Subject: [PATCH] General Small Bug Fixes --- .../KeyboardPlugin/KeyboardPluginGUI.C | 70 +++++++++---------- .../NoteSnapPlugin/NoteSnapPluginGUI.h | 6 +- .../Plugins/SmoothPlugin/SmoothPluginGUI.h | 4 +- SpiralSound/Plugins/SpiralPlugin.h | 2 +- SpiralSynthModular.C | 8 +-- configure.in | 15 ++-- 6 files changed, 53 insertions(+), 52 deletions(-) diff --git a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C index 256efa8..5e0765e 100644 --- a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C +++ b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C @@ -38,7 +38,7 @@ KeyboardPluginGUI::KeyboardPluginGUI(int w, int h,KeyboardPlugin *o,ChannelHandl SpiralPluginGUI(w,h,o,ch), m_Last(-1), m_Oct(4) -{ +{ Fl_Scroll *Scroll = new Fl_Scroll(2,20,w-4,h-20); Fl_Group *Group = new Fl_Group(0,20,500,h-40); Group->box(FL_FLAT_BOX); @@ -50,18 +50,18 @@ m_Oct(4) for (int n=0; nbox(FL_THIN_UP_BOX); m_Key[n]->labelsize(10); m_Key[n]->when(FL_WHEN_CHANGED); - if (Note==0) + if (Note==0) { int Num=n/12; sprintf(m_Label[n],"%d",Num); @@ -72,14 +72,14 @@ m_Oct(4) m_Key[n]->selection_color(FL_WHITE); m_Key[n]->callback((Fl_Callback*)cb_Key, &m_Num[n]); Group->add(m_Key[n]); - } + } } - + Count=0; for (int n=0; nbox(FL_THIN_UP_BOX); @@ -92,40 +92,40 @@ m_Oct(4) } else { - Count++; Pos=Count*KeyWidth; + Count++; } } Group->position(-100,20); Group->end(); Scroll->end(); } - + void KeyboardPluginGUI::Update() -{ +{ int Volume=0,Note=0,EventDevice=0; - if (Fl::event_key(FL_F+1)) m_Oct=0; - if (Fl::event_key(FL_F+2)) m_Oct=1; - if (Fl::event_key(FL_F+3)) m_Oct=2; - if (Fl::event_key(FL_F+4)) m_Oct=3; - if (Fl::event_key(FL_F+5)) m_Oct=4; - if (Fl::event_key(FL_F+6)) m_Oct=5; - if (Fl::event_key(FL_F+7)) m_Oct=6; - if (Fl::event_key(FL_F+8)) m_Oct=7; - if (Fl::event_key(FL_F+9)) m_Oct=8; - if (Fl::event_key(FL_F+10)) m_Oct=9; - if (Fl::event_key(FL_F+11)) m_Oct=10; + if (Fl::event_key(FL_F+1)) m_Oct=0; + if (Fl::event_key(FL_F+2)) m_Oct=1; + if (Fl::event_key(FL_F+3)) m_Oct=2; + if (Fl::event_key(FL_F+4)) m_Oct=3; + if (Fl::event_key(FL_F+5)) m_Oct=4; + if (Fl::event_key(FL_F+6)) m_Oct=5; + if (Fl::event_key(FL_F+7)) m_Oct=6; + if (Fl::event_key(FL_F+8)) m_Oct=7; + if (Fl::event_key(FL_F+9)) m_Oct=8; + if (Fl::event_key(FL_F+10)) m_Oct=9; + if (Fl::event_key(FL_F+11)) m_Oct=10; int note=0; char KeyChar=0; bool KeyPressed=false; for (int key=0; keyvalue(0); m_Key[m_Last]->parent()->redraw(); - m_GUICH->SetCommand(KeyboardPlugin::NOTE_OFF); + m_GUICH->SetCommand(KeyboardPlugin::NOTE_OFF); m_GUICH->Wait(); } - + m_Last = Note; m_GUICH->Set("Note",Note); - m_GUICH->SetCommand(KeyboardPlugin::NOTE_ON); + m_GUICH->SetCommand(KeyboardPlugin::NOTE_ON); m_Key[Note]->value(1); m_Key[m_Last]->parent()->redraw(); } } - else // it's not pressed down + else // it's not pressed down { - //see if the note was pressed down last time + //see if the note was pressed down last time Note=(m_Oct*12)+note; - + if (m_Last==Note) { m_Key[m_Last]->value(0); m_Key[m_Last]->parent()->redraw(); - m_GUICH->SetCommand(KeyboardPlugin::NOTE_OFF); + m_GUICH->SetCommand(KeyboardPlugin::NOTE_OFF); m_Last=-1; - } + } } note++; } diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h index 581aff0..7a2806d 100644 --- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h +++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h @@ -21,13 +21,13 @@ #include #include -#include "../Widgets/Fl_Knob.H" +//#include "../Widgets/Fl_Knob.H" #include "../Widgets/Fl_DragBar.H" #include "NoteSnapPlugin.h" #include "../SpiralPluginGUI.h" -#ifndef SplitterGUI -#define SplitterGUI +#ifndef NoteSnapGUI +#define NoteSnapGUI static const int NUM_KEYS = 12; class NoteSnapPluginGUI : public SpiralPluginGUI diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h index 112a3e9..736ecab 100644 --- a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h +++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h @@ -26,8 +26,8 @@ #include "SmoothPlugin.h" #include "../SpiralPluginGUI.h" -#ifndef SplitterGUI -#define SplitterGUI +#ifndef SmoothGUI +#define SmoothGUI class SmoothPluginGUI : public SpiralPluginGUI diff --git a/SpiralSound/Plugins/SpiralPlugin.h b/SpiralSound/Plugins/SpiralPlugin.h index 5a2ec4c..bfe4a11 100644 --- a/SpiralSound/Plugins/SpiralPlugin.h +++ b/SpiralSound/Plugins/SpiralPlugin.h @@ -122,7 +122,7 @@ protected: void SetOutputPitch(int n,int p, float s) { if (m_Output[n]) m_Output[n]->Set(p,(s/MAX_FREQ*2)-1.0f); } - float GetInputPitch(int n,int p) + float GetInputPitch(int n,int p) { if (m_Input[n]) return ((*m_Input[n])[p]+1.0f)*MAX_FREQ/2; else return 0.0; } void MixOutput(int n,int p, float s) diff --git a/SpiralSynthModular.C b/SpiralSynthModular.C index 50ab80a..261293c 100644 --- a/SpiralSynthModular.C +++ b/SpiralSynthModular.C @@ -335,10 +335,10 @@ SpiralWindowType *SynthModular::CreateWindow() m_TopWindow->resizable(m_CanvasScroll); m_Canvas = new Fl_Canvas(-5000, -5000, 10000, 10000, ""); - m_Canvas->type(1); + m_Canvas->type(1); m_Canvas->box(FL_FLAT_BOX); - m_Canvas->labeltype(FL_ENGRAVED_LABEL); - m_Canvas->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); + m_Canvas->labeltype(FL_ENGRAVED_LABEL); + m_Canvas->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); m_Canvas->color(SpiralSynthModularInfo::GUICOL_Canvas); m_Canvas->user_data((void*)(this)); m_Canvas->SetConnectionCallback((Fl_Callback*)cb_Connection); @@ -472,7 +472,7 @@ void SynthModular::LoadPlugins(string pluginPath) if (ID!=PluginError) { #ifdef DEBUG_PLUGINS - cerr<<"Plugin ["<<*i<<"] = "< SpiralSound/PluginList.txt @@ -126,10 +126,10 @@ AC_SUBST(PLUGINLIST) dnl Modify the output files. AC_OUTPUT( -SpiralSound/Plugins/AmpPlugin/Makefile -SpiralSound/Plugins/AnotherFilterPlugin/Makefile -SpiralSound/Plugins/ControllerPlugin/Makefile -SpiralSound/Plugins/DelayPlugin/Makefile +SpiralSound/Plugins/AmpPlugin/Makefile +SpiralSound/Plugins/AnotherFilterPlugin/Makefile +SpiralSound/Plugins/ControllerPlugin/Makefile +SpiralSound/Plugins/DelayPlugin/Makefile SpiralSound/Plugins/DiskWriterPlugin/Makefile SpiralSound/Plugins/DistributorPlugin/Makefile SpiralSound/Plugins/EchoPlugin/Makefile @@ -174,6 +174,7 @@ SpiralSound/Plugins/MixSwitchPlugin/Makefile SpiralSound/Plugins/TrigPlugin/Makefile SpiralSound/Plugins/SpiralLoopPlugin/Makefile SpiralSound/Plugins/MasherPlugin/Makefile +SpiralSound/Plugins/TransposePlugin/Makefile SpiralSynthPluginLocation.h Makefile )