diff --git a/GUI/Widgets/Fl_Canvas.C b/GUI/Widgets/Fl_Canvas.C index 9d98767..ceb9a93 100644 --- a/GUI/Widgets/Fl_Canvas.C +++ b/GUI/Widgets/Fl_Canvas.C @@ -20,7 +20,7 @@ #include "Fl_Canvas.h" #include "Fl_DeviceGUI.h" #include -#include "../../SpiralSynthModularInfo.h" +#include "../../SpiralSound/SpiralInfo.h" // no of calls to handle when dragged, before the widget is redrawn // to allow the wire (connection currently being made) to be redrawn diff --git a/GUI/Widgets/Fl_CommentGUI.C b/GUI/Widgets/Fl_CommentGUI.C index 8a69221..1d6c134 100644 --- a/GUI/Widgets/Fl_CommentGUI.C +++ b/GUI/Widgets/Fl_CommentGUI.C @@ -18,7 +18,7 @@ #include "Fl_CommentGUI.h" #include -#include "../../SpiralSynthModularInfo.h" +#include "../../SpiralSound/SpiralInfo.h" #include "../../GUI/Widgets/PawfalInput.h" Fl_CommentGUI::Fl_CommentGUI(const DeviceGUIInfo& Info, SpiralGUIType *PW, Fl_Pixmap *Icon) : @@ -28,14 +28,14 @@ m_Comment("double click to edit.") box(FL_NO_BOX); m_DragBar->box(FL_NO_BOX); m_DragBar->label(m_Comment.c_str()); - m_DragBar->color(SpiralSynthModularInfo::GUICOL_Device); + m_DragBar->color(SpiralInfo::GUICOL_Device); // m_DragBar->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); } int Fl_CommentGUI::handle(int event) { - if (Fl::event_button()==1 && event==FL_PUSH && Fl::event_clicks()==1) - { + if (Fl::event_button()==1 && event==FL_PUSH && Fl::event_clicks()==1) + { char t[1024]; if (Pawfal_Input("and your comment is:", m_Comment.c_str(), t)) { diff --git a/GUI/Widgets/Fl_DeviceGUI.C b/GUI/Widgets/Fl_DeviceGUI.C index c50035e..b0994a7 100644 --- a/GUI/Widgets/Fl_DeviceGUI.C +++ b/GUI/Widgets/Fl_DeviceGUI.C @@ -20,7 +20,7 @@ #include "Fl_Canvas.h" #include "Fl_Canvas.h" #include "PawfalInput.h" -#include "../../SpiralSynthModularInfo.h" +#include "../../SpiralSound/SpiralInfo.h" int Fl_DeviceGUI::Numbers[512]; @@ -66,10 +66,10 @@ m_Minimised(true) for (int n=0; n<512; n++) Numbers[n]=n; type(1); - box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); labeltype(FL_ENGRAVED_LABEL); align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); - color(SpiralSynthModularInfo::GUICOL_Device); + color(SpiralInfo::GUICOL_Device); m_Icon=Icon; m_MiniWidth=w(); @@ -78,7 +78,7 @@ m_Minimised(true) m_DragBar = new Fl_DragBar(Info.XPos, Info.YPos, Info.Width+PortGroupWidth*2, TitleBarHeight, m_Name.c_str()); m_DragBar->labelsize(10); m_DragBar->type(Fl_DragBar::FLDRAG); - m_DragBar->color(SpiralSynthModularInfo::GUICOL_Device); + m_DragBar->color(SpiralInfo::GUICOL_Device); m_Menu = new Fl_Menu_Button(x(),y(),w(),h(),""); m_Menu->type(Fl_Menu_Button::POPUP3); diff --git a/Makefile.in b/Makefile.in index 9cb497b..81684b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,6 @@ SpiralPlugins = $(libdir)/SpiralPlugins ####### Files HEADERS = SpiralSynthModular.h \ - SpiralSynthModularInfo.h \ GraphSort.h \ SettingsWindow.h \ SpiralSynthPluginLocation.h \ @@ -62,7 +61,6 @@ HEADERS = SpiralSynthModular.h \ SpiralSound/Plugins/SpiralPluginGUI.h SOURCES = main.cpp \ SpiralSynthModular.C \ - SpiralSynthModularInfo.C \ GraphSort.C \ SettingsWindow.C \ GUI/Widgets/SpiralGUI.C \ @@ -80,7 +78,6 @@ SOURCES = main.cpp \ SpiralSound/Plugins/SpiralPluginGUI.C OBJECTS = main.o \ SpiralSynthModular.o \ - SpiralSynthModularInfo.o \ GraphSort.o \ SettingsWindow.o \ GUI/Widgets/SpiralGUI.o \ @@ -181,7 +178,6 @@ main.o : main.cpp \ SpiralSynthModular.o: SpiralSynthModular.C \ SpiralSynthModular.h \ - SpiralSynthModularInfo.h \ SpiralSound/SpiralInfo.h \ SettingsWindow.h \ GUI/SSM.xpm \ @@ -199,11 +195,6 @@ SpiralSynthModular.o: SpiralSynthModular.C \ SpiralSound/PluginManager.h \ SpiralSound/Plugins/SpiralPlugin.h -SpiralSynthModularInfo.o: SpiralSynthModularInfo.C \ - SpiralSynthModularInfo.h \ - SpiralSynthPluginLocation.h \ - SpiralSound/SpiralInfo.h - GraphSort.o: GraphSort.C \ GraphSort.h @@ -216,7 +207,6 @@ GUI/Widgets/Fl_DeviceGUI.o: GUI/Widgets/Fl_DeviceGUI.C \ GUI/Widgets/Fl_DragBar.H \ GUI/Widgets/Fl_Canvas.h \ GraphSort.h \ - SpiralSynthModularInfo.h \ SpiralSound/SpiralInfo.h GUI/Widgets/Fl_CommentGUI.o: GUI/Widgets/Fl_CommentGUI.C \ @@ -224,7 +214,6 @@ GUI/Widgets/Fl_CommentGUI.o: GUI/Widgets/Fl_CommentGUI.C \ GUI/Widgets/Fl_CommentGUI.h \ GUI/Widgets/Fl_DeviceGUI.h \ GUI/Widgets/Fl_DragBar.H \ - SpiralSynthModularInfo.h \ SpiralSound/SpiralInfo.h GUI/Widgets/Fl_DragBar.o: GUI/Widgets/Fl_DragBar.cxx \ @@ -236,7 +225,6 @@ GUI/Widgets/Fl_Canvas.o: GUI/Widgets/Fl_Canvas.C \ GUI/Widgets/Fl_DeviceGUI.h \ GUI/Widgets/Fl_DragBar.H \ GraphSort.h \ - SpiralSynthModularInfo.h \ SpiralSound/SpiralInfo.h GUI/Widgets/PawfalInput.o: GUI/Widgets/PawfalInput.C \ @@ -246,6 +234,7 @@ GUI/Widgets/PawfalYesNo.o: GUI/Widgets/PawfalYesNo.C \ GUI/Widgets/PawfalYesNo.h SpiralSound/SpiralInfo.o: SpiralSound/SpiralInfo.C \ + SpiralSynthPluginLocation.h \ SpiralSound/SpiralInfo.h \ SpiralSound/Sample.h @@ -276,12 +265,9 @@ SpiralSound/PluginManager.o: SpiralSound/PluginManager.C \ SettingsWindow.o: SettingsWindow.C \ SettingsWindow.h \ SpiralSynthModular.h \ - SpiralSynthModularInfo.h \ GraphSort.h \ SpiralSound/SpiralInfo.h \ SpiralSound/Sample.h \ - SpiralSound/SpiralInfo.h \ - SpiralSound/Sample.h \ SpiralSound/Plugins/SpiralPlugin.h \ GUI/Widgets/SpiralGUI.H \ GUI/Widgets/Fl_DeviceGUI.h \ diff --git a/SettingsWindow.C b/SettingsWindow.C index 4c18e09..b694afe 100644 --- a/SettingsWindow.C +++ b/SettingsWindow.C @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ +*/ #include #include #include #include "SettingsWindow.h" -#include "SpiralSynthModularInfo.h" +#include "SpiralSound/SpiralInfo.h" #include "GUI/options.xpm" SettingsWindow::SettingsWindow() : Fl_Double_Window(250,275,"SSM Options"), m_App(NULL) { - color(SpiralSynthModularInfo::GUICOL_Tool); + color(SpiralInfo::GUICOL_Tool); box(FL_FLAT_BOX); - + Fl_Pixmap *Icon = new Fl_Pixmap(options_xpm); Fl_Box *IconBox = new Fl_Box(25,30,50,50,""); IconBox->image(Icon); @@ -46,7 +46,7 @@ m_App(NULL) TextBox = new Fl_Box(180,50,50,20,"www.pawfal.org"); TextBox->align(FL_ALIGN_RIGHT | FL_ALIGN_INSIDE); TextBox->labelsize(10); - TextBox = new Fl_Box(180,63,50,20,"We are the music makers"); + TextBox = new Fl_Box(180,63,50,20,"We are the music makers"); TextBox->align(FL_ALIGN_RIGHT | FL_ALIGN_INSIDE); TextBox->labelsize(10); TextBox = new Fl_Box(180,73,50,20,"We are the dreamers of dreams"); @@ -56,51 +56,51 @@ m_App(NULL) Fl_Group *OptionsGrp = new Fl_Group(5,95,240,150,""); OptionsGrp->box(FL_FLAT_BOX); - OptionsGrp->color(SpiralSynthModularInfo::GUICOL_Button); - + OptionsGrp->color(SpiralInfo::GUICOL_Button); + m_Options = new Fl_Pack(5,115,230,100,"Settings"); - m_Options->color(SpiralSynthModularInfo::GUICOL_Button); + m_Options->color(SpiralInfo::GUICOL_Button); OptionsGrp->add(m_Options); - + Fl_Box *Name; Fl_Pack *Line; - + char BufferSize[256]; - sprintf(BufferSize,"%d",SpiralSynthModularInfo::BUFSIZE); + sprintf(BufferSize,"%d",SpiralInfo::BUFSIZE); char FragmentSize[256]; - sprintf(FragmentSize,"%d",SpiralSynthModularInfo::FRAGSIZE); - + sprintf(FragmentSize,"%d",SpiralInfo::FRAGSIZE); + char FragmentCount[256]; - sprintf(FragmentCount,"%d",SpiralSynthModularInfo::FRAGCOUNT); - + sprintf(FragmentCount,"%d",SpiralInfo::FRAGCOUNT); + char Samplerate[256]; - sprintf(Samplerate,"%d",SpiralSynthModularInfo::SAMPLERATE); - + sprintf(Samplerate,"%d",SpiralInfo::SAMPLERATE); + char OutputDevice[256]; - sprintf(OutputDevice,"%s",SpiralSynthModularInfo::OUTPUTFILE.c_str()); - + sprintf(OutputDevice,"%s",SpiralInfo::OUTPUTFILE.c_str()); + char MidiDevice[256]; - sprintf(MidiDevice,"%s",SpiralSynthModularInfo::MIDIFILE.c_str()); - + sprintf(MidiDevice,"%s",SpiralInfo::MIDIFILE.c_str()); + Line = new Fl_Pack(0,0,100,20,""); - Line->type(FL_HORIZONTAL); + Line->type(FL_HORIZONTAL); Name = new Fl_Box(55,0,150,20,"Buffer Size"); Name->labelsize(10); Name->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE); - Line->add(Name); + Line->add(Name); m_BufferSize = new Fl_Int_Input(0,0,80,20,""); m_BufferSize->value(BufferSize); Line->add(m_BufferSize); Line->end(); m_Options->add(Line); - + Line = new Fl_Pack(0,0,100,20,""); Line->type(FL_HORIZONTAL); Name = new Fl_Box(55,0,150,20,"Fragment Size"); Name->labelsize(10); Name->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE); - Line->add(Name); + Line->add(Name); m_FragmentSize = new Fl_Int_Input(0,0,80,20,""); m_FragmentSize->value(FragmentSize); Line->add(m_FragmentSize); @@ -112,63 +112,63 @@ m_App(NULL) Name = new Fl_Box(55,0,150,20,"Fragment Count (-1 = auto)"); Name->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE); Name->labelsize(10); - Line->add(Name); + Line->add(Name); m_FragmentCount = new Fl_Int_Input(0,0,80,20,""); m_FragmentCount->value(FragmentCount); Line->add(m_FragmentCount); Line->end(); m_Options->add(Line); - + Line = new Fl_Pack(0,0,100,20,""); Line->type(FL_HORIZONTAL); Name = new Fl_Box(55,0,150,20,"SampleRate"); Name->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE); Name->labelsize(10); - Line->add(Name); + Line->add(Name); m_Samplerate = new Fl_Int_Input(0,0,80,20,""); m_Samplerate->value(Samplerate); Line->add(m_Samplerate); Line->end(); m_Options->add(Line); - + Line = new Fl_Pack(0,0,100,20,""); Line->type(FL_HORIZONTAL); Name = new Fl_Box(55,0,150,20,"Output Device"); Name->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE); Name->labelsize(10); - Line->add(Name); + Line->add(Name); m_OutputDevice = new Fl_Input(0,0,80,20,""); m_OutputDevice->value(OutputDevice); Line->add(m_OutputDevice); Line->end(); m_Options->add(Line); - + Line = new Fl_Pack(0,0,100,20,""); Line->type(FL_HORIZONTAL); Name = new Fl_Box(55,0,150,20,"Midi Device"); Name->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE); Name->labelsize(10); - Line->add(Name); + Line->add(Name); m_MidiDevice = new Fl_Input(0,0,80,20,""); m_MidiDevice->value(MidiDevice); Line->add(m_MidiDevice); Line->end(); m_Options->add(Line); - + m_Options->end(); - + m_Save = new Fl_Button(140,250,50,20,"Save"); m_Save->labelsize(10); m_Save->tooltip("Save these settings"); m_Save->callback((Fl_Callback*)cb_Save); add(m_Save); - + m_Apply = new Fl_Button(195,250,50,20,"Apply"); m_Apply->labelsize(10); m_Apply->tooltip("Some plugins may request to save data first"); m_Apply->callback((Fl_Callback*)cb_Apply); add(m_Apply); - + end(); } @@ -178,12 +178,12 @@ SettingsWindow::~SettingsWindow() inline void SettingsWindow::cb_Apply_i(Fl_Button* o, void* v) { - SpiralSynthModularInfo::BUFSIZE=(int)atof(m_BufferSize->value()); - SpiralSynthModularInfo::FRAGSIZE=(int)atof(m_FragmentSize->value()); - SpiralSynthModularInfo::FRAGCOUNT=(int)atof(m_FragmentCount->value()); - SpiralSynthModularInfo::SAMPLERATE=(int)atof(m_Samplerate->value()); - SpiralSynthModularInfo::OUTPUTFILE=m_OutputDevice->value(); - SpiralSynthModularInfo::MIDIFILE=m_MidiDevice->value(); + SpiralInfo::BUFSIZE=(int)atof(m_BufferSize->value()); + SpiralInfo::FRAGSIZE=(int)atof(m_FragmentSize->value()); + SpiralInfo::FRAGCOUNT=(int)atof(m_FragmentCount->value()); + SpiralInfo::SAMPLERATE=(int)atof(m_Samplerate->value()); + SpiralInfo::OUTPUTFILE=m_OutputDevice->value(); + SpiralInfo::MIDIFILE=m_MidiDevice->value(); assert(m_App); if (m_App) @@ -193,16 +193,16 @@ inline void SettingsWindow::cb_Apply_i(Fl_Button* o, void* v) } void SettingsWindow::cb_Apply(Fl_Button* o, void* v) { ((SettingsWindow*)(o->parent()))->cb_Apply_i(o,v); } - + inline void SettingsWindow::cb_Save_i(Fl_Button* o, void* v) { - SpiralSynthModularInfo::BUFSIZE=(int)atof(m_BufferSize->value()); - SpiralSynthModularInfo::FRAGSIZE=(int)atof(m_FragmentSize->value()); - SpiralSynthModularInfo::FRAGCOUNT=(int)atof(m_FragmentCount->value()); - SpiralSynthModularInfo::SAMPLERATE=(int)atof(m_Samplerate->value()); - SpiralSynthModularInfo::OUTPUTFILE=m_OutputDevice->value(); - SpiralSynthModularInfo::MIDIFILE=m_MidiDevice->value(); - SpiralSynthModularInfo::Get()->SavePrefs(); + SpiralInfo::BUFSIZE=(int)atof(m_BufferSize->value()); + SpiralInfo::FRAGSIZE=(int)atof(m_FragmentSize->value()); + SpiralInfo::FRAGCOUNT=(int)atof(m_FragmentCount->value()); + SpiralInfo::SAMPLERATE=(int)atof(m_Samplerate->value()); + SpiralInfo::OUTPUTFILE=m_OutputDevice->value(); + SpiralInfo::MIDIFILE=m_MidiDevice->value(); + SpiralInfo::Get()->SavePrefs(); } void SettingsWindow::cb_Save(Fl_Button* o, void* v) { ((SettingsWindow*)(o->parent()))->cb_Save_i(o,v); } diff --git a/SpiralSound/PluginManager.C b/SpiralSound/PluginManager.C index b6b0bc3..81cb3cb 100644 --- a/SpiralSound/PluginManager.C +++ b/SpiralSound/PluginManager.C @@ -14,10 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ +*/ #include #include +#include "SpiralInfo.h" #include "PluginManager.h" PluginManager *PluginManager::m_Singleton = NULL; diff --git a/SpiralSound/Plugins/AmpPlugin/Makefile.in b/SpiralSound/Plugins/AmpPlugin/Makefile.in index e99b658..55db94f 100644 --- a/SpiralSound/Plugins/AmpPlugin/Makefile.in +++ b/SpiralSound/Plugins/AmpPlugin/Makefile.in @@ -39,16 +39,18 @@ mandir = @mandir@ ####### Files HEADERS = AmpPlugin.h \ - AmpPluginGUI.h - ../SpiralPlugin.h \ + AmpPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ - ../../../GUI/Widgets/SpiralGUI.H \ + ../../../GUI/Widgets/SpiralGUI.H SOURCES = AmpPlugin.C \ AmpPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -56,6 +58,7 @@ OBJECTS = AmpPlugin.o \ AmpPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -120,20 +123,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../Sample.h \ + ../../ChannelHandler.h \ ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h AmpPlugin.o: AmpPlugin.C \ AmpPlugin.h \ @@ -149,7 +152,6 @@ AmpPluginGUI.o: AmpPluginGUI.C \ AmpPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in b/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in index 5dc18eb..78dba23 100644 --- a/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = AnotherFilterPlugin.h \ + AnotherFilterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../Widgets/Fl_Knob.H \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - AnotherFilterPlugin.h \ - AnotherFilterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = AnotherFilterPlugin.C \ + AnotherFilterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../Widgets/Fl_Knob.cxx \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ - ../../../GUI/Widgets/SpiralGUI.C \ - AnotherFilterPlugin.C \ - AnotherFilterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = AnotherFilterPlugin.o \ + AnotherFilterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../Widgets/Fl_Knob.o \ - ../../Sample.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - AnotherFilterPlugin.o \ - AnotherFilterPluginGUI.o + ../../Sample.o \ + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../Sample.h - ../../../GUI/Widgets/SpiralGUI.H \ + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,15 +142,13 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h AnotherFilterPlugin.o: AnotherFilterPlugin.C \ AnotherFilterPlugin.h \ AnotherFilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -157,7 +159,6 @@ AnotherFilterPluginGUI.o: AnotherFilterPluginGUI.C \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../Widgets/Fl_Knob.H \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in b/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in index 2315eea..25bf1b3 100644 --- a/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in +++ b/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in @@ -6,14 +6,14 @@ CC = gcc CXX = g++ -CFLAGS = @CFLAGS@ -CXXFLAGS= @CXXFLAGS@ +CFLAGS = @CFLAGS@ +CXXFLAGS= @CXXFLAGS@ INCPATH = -I/usr/X11R6/include LINK = g++ -shared -LFLAGS = +LFLAGS = LIBS = -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11 -ldl MOC = moc -UIC = +UIC = TAR = tar -cf GZIP = gzip -9f @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = BeatMatchPlugin.h \ + BeatMatchPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../Widgets/Fl_Knob.H \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - BeatMatchPlugin.h \ - BeatMatchPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = BeatMatchPlugin.C \ + BeatMatchPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../Widgets/Fl_Knob.cxx \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ - ../../../GUI/Widgets/SpiralGUI.C \ - BeatMatchPlugin.C \ - BeatMatchPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = BeatMatchPlugin.o \ + BeatMatchPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../Widgets/Fl_Knob.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - BeatMatchPlugin.o \ - BeatMatchPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -116,12 +119,13 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../Sample.h \ + ../../ChannelHandler.h \ ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ @@ -131,13 +135,13 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h BeatMatchPlugin.o: BeatMatchPlugin.C \ BeatMatchPlugin.h \ BeatMatchPluginGUI.h \ ../../NoteTable.h \ + ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -147,6 +151,7 @@ BeatMatchPluginGUI.o: BeatMatchPluginGUI.C \ BeatMatchPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../../GUI/Widgets/SpiralGUI.H ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in b/SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in index f467aa3..003a3d5 100644 --- a/SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in +++ b/SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in @@ -10,10 +10,10 @@ CFLAGS = @CFLAGS@ @FLTK_CFLAGS@ CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@ INCPATH = LINK = g++ -shared -LFLAGS = +LFLAGS = LIBS = @FLTK_LIBS@ -ldl MOC = moc -UIC = +UIC = TAR = tar -cf GZIP = gzip -9f @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = ComplexEnvelopePlugin.h \ + ComplexEnvelopePluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ + ../../SpiralInfo.h \ ../../Sample.h \ Bezier.h \ - ComplexEnvelopePlugin.h \ - ComplexEnvelopePluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = ComplexEnvelopePlugin.C \ + ComplexEnvelopePluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ + ../../SpiralInfo.C \ ../../Sample.C \ Bezier.C \ - ComplexEnvelopePlugin.C \ - ComplexEnvelopePluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = ComplexEnvelopePlugin.o \ + ComplexEnvelopePluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ Bezier.o \ - ComplexEnvelopePlugin.o \ - ComplexEnvelopePluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -141,8 +145,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h Bezier.o: Bezier.C \ Bezier.h \ @@ -150,7 +153,6 @@ Bezier.o: Bezier.C \ ComplexEnvelopePlugin.o: ComplexEnvelopePlugin.C \ ComplexEnvelopePlugin.h \ ../SpiralPlugin.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ComplexEnvelopePluginGUI.h \ @@ -163,7 +165,6 @@ ComplexEnvelopePluginGUI.o: ComplexEnvelopePluginGUI.C \ ComplexEnvelopePluginGUI.h \ ComplexEnvelopePlugin.h \ ../SpiralPlugin.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../SpiralPluginGUI.h \ diff --git a/SpiralSound/Plugins/ControllerPlugin/Makefile.in b/SpiralSound/Plugins/ControllerPlugin/Makefile.in index a43629c..bf4bd93 100644 --- a/SpiralSound/Plugins/ControllerPlugin/Makefile.in +++ b/SpiralSound/Plugins/ControllerPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = ControllerPlugin.h \ + ControllerPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - ControllerPlugin.h \ - ControllerPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = ControllerPlugin.C \ + ControllerPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - ControllerPlugin.C \ - ControllerPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = ControllerPlugin.o \ + ControllerPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - ControllerPlugin.o \ - ControllerPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = -SRCMOC = -OBJMOC = -DIST = +SRCMOC = +OBJMOC = +DIST = TARGET = ControllerPlugin.so ####### Implicit rules @@ -91,7 +94,7 @@ TARGET = ControllerPlugin.so all: $(TARGET) -$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) +$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) moc: $(SRCMOC) @@ -106,7 +109,7 @@ dist: clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET) -rm -f *~ core - + install: $(INSTALL) $(TARGET) $(libdir)/SpiralPlugins @@ -120,27 +123,27 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H + ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ControllerPlugin.o: ControllerPlugin.C \ ControllerPlugin.h \ ControllerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -150,7 +153,6 @@ ControllerPluginGUI.o: ControllerPluginGUI.C \ ControllerPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/CounterPlugin/Makefile.in b/SpiralSound/Plugins/CounterPlugin/Makefile.in index e6938f2..f896f84 100644 --- a/SpiralSound/Plugins/CounterPlugin/Makefile.in +++ b/SpiralSound/Plugins/CounterPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = CounterPlugin.h \ + CounterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - CounterPlugin.h \ - CounterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = CounterPlugin.C \ + CounterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - CounterPlugin.C \ - CounterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = CounterPlugin.o \ + CounterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - CounterPlugin.o \ - CounterPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -116,13 +119,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -131,13 +135,13 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h CounterPlugin.o: CounterPlugin.C \ CounterPlugin.h \ CounterPluginGUI.h \ ../../NoteTable.h \ + ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -145,6 +149,7 @@ CounterPlugin.o: CounterPlugin.C \ CounterPluginGUI.o: CounterPluginGUI.C \ CounterPlugin.h \ CounterPluginGUI.h \ + ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/DelayPlugin/Makefile.in b/SpiralSound/Plugins/DelayPlugin/Makefile.in index e272ad4..6280351 100644 --- a/SpiralSound/Plugins/DelayPlugin/Makefile.in +++ b/SpiralSound/Plugins/DelayPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = DelayPlugin.h \ + DelayPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - DelayPlugin.h \ - DelayPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = DelayPlugin.C \ + DelayPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - DelayPlugin.C \ - DelayPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = DelayPlugin.o \ + DelayPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - DelayPlugin.o \ - DelayPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,15 +142,13 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h DelayPlugin.o: DelayPlugin.C \ DelayPlugin.h \ DelayPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -156,7 +158,6 @@ DelayPluginGUI.o: DelayPluginGUI.C \ DelayPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ diff --git a/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in b/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in index 6363261..7eecc63 100644 --- a/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in +++ b/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = DiskWriterPlugin.h \ + DiskWriterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ ../../RiffWav.h \ - DiskWriterPlugin.h \ - DiskWriterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = DiskWriterPlugin.C \ + DiskWriterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ ../../RiffWav.C \ - DiskWriterPlugin.C \ - DiskWriterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = DiskWriterPlugin.o \ + DiskWriterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ ../../RiffWav.o \ - DiskWriterPlugin.o \ - DiskWriterPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,20 +126,21 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H + ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ @@ -147,7 +151,6 @@ DiskWriterPlugin.o: DiskWriterPlugin.C \ DiskWriterPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -159,7 +162,6 @@ DiskWriterPluginGUI.o: DiskWriterPluginGUI.C \ DiskWriterPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/DistributorPlugin/Makefile.in b/SpiralSound/Plugins/DistributorPlugin/Makefile.in index 6f3c02e..ff12dc6 100644 --- a/SpiralSound/Plugins/DistributorPlugin/Makefile.in +++ b/SpiralSound/Plugins/DistributorPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = DistributorPlugin.h \ + DistributorPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - DistributorPlugin.h \ - DistributorPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = DistributorPlugin.C \ + DistributorPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - DistributorPlugin.C \ - DistributorPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = DistributorPlugin.o \ + DistributorPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - DistributorPlugin.o \ - DistributorPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -120,20 +123,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h DistributorPlugin.o: DistributorPlugin.C \ DistributorPlugin.h \ @@ -142,7 +145,6 @@ DistributorPlugin.o: DistributorPlugin.C \ ../SpiralPlugin.h \ ../../SpiralInfo.h \ ../../Sample.h \ - ../../../GUI/Widgets/SpiralGUI.H \ SpiralIcon.xpm DistributorPluginGUI.o: DistributorPluginGUI.C \ diff --git a/SpiralSound/Plugins/EchoPlugin/Makefile.in b/SpiralSound/Plugins/EchoPlugin/Makefile.in index 2f3e5cc..daad1bf 100644 --- a/SpiralSound/Plugins/EchoPlugin/Makefile.in +++ b/SpiralSound/Plugins/EchoPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = EchoPlugin.h \ + EchoPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ + ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../Widgets/Fl_LED_Button.H \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../../Sample.h \ - EchoPlugin.h \ - EchoPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = EchoPlugin.C \ + EchoPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ + ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_LED_Button.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ - ../../Sample.C \ - EchoPlugin.C \ - EchoPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = EchoPlugin.o \ + EchoPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ + ../../Sample.o \ ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../Widgets/Fl_LED_Button.o \ - ../../Sample.o \ - EchoPlugin.o \ - EchoPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,15 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../Widgets/Fl_Knob.H \ - ../Widgets/Fl_LED_Button.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -146,8 +148,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h EchoPlugin.o: EchoPlugin.C \ EchoPlugin.h \ diff --git a/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in b/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in index f35b86a..e96c239 100644 --- a/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in +++ b/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = EnvFollowerPlugin.h \ + EnvFollowerPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - EnvFollowerPlugin.h \ - EnvFollowerPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = EnvFollowerPlugin.C \ + EnvFollowerPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - EnvFollowerPlugin.C \ - EnvFollowerPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = EnvFollowerPlugin.o \ + EnvFollowerPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - EnvFollowerPlugin.o \ - EnvFollowerPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h EnvFollowerPlugin.o: EnvFollowerPlugin.C \ EnvFollowerPlugin.h \ @@ -153,14 +156,14 @@ EnvFollowerPlugin.o: EnvFollowerPlugin.C \ SpiralIcon.xpm EnvFollowerPluginGUI.o: EnvFollowerPluginGUI.C \ - EnvFollowerPluginGUI.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ EnvFollowerPlugin.h \ + EnvFollowerPluginGUI.h \ + ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ ../../SpiralInfo.h \ ../../Sample.h \ - ../SpiralPluginGUI.h + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H ../../ChannelHandler.o: ../../ChannelHandler.C \ ../../ChannelHandler.h diff --git a/SpiralSound/Plugins/EnvelopePlugin/Makefile.in b/SpiralSound/Plugins/EnvelopePlugin/Makefile.in index 7078c43..0551544 100644 --- a/SpiralSound/Plugins/EnvelopePlugin/Makefile.in +++ b/SpiralSound/Plugins/EnvelopePlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = EnvelopePlugin.h \ + EnvelopePluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - EnvelopePlugin.h \ - EnvelopePluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = EnvelopePlugin.C \ + EnvelopePluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - EnvelopePlugin.C \ - EnvelopePluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = EnvelopePlugin.o \ + EnvelopePluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - EnvelopePlugin.o \ - EnvelopePluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h EnvelopePlugin.o: EnvelopePlugin.C \ EnvelopePlugin.h \ diff --git a/SpiralSound/Plugins/FilterPlugin/Makefile.in b/SpiralSound/Plugins/FilterPlugin/Makefile.in index fa9e2c3..7680b25 100644 --- a/SpiralSound/Plugins/FilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/FilterPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = FilterPlugin.h \ + FilterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ iir_filter.h \ - FilterPlugin.h \ - FilterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = FilterPlugin.C \ + FilterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ iir_filter.C \ - FilterPlugin.C \ - FilterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = FilterPlugin.o \ + FilterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ iir_filter.o \ - FilterPlugin.o \ - FilterPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -141,8 +145,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h iir_filter.o: iir_filter.C \ iir_filter.h diff --git a/SpiralSound/Plugins/FlipflopPlugin/Makefile.in b/SpiralSound/Plugins/FlipflopPlugin/Makefile.in index d69218f..edf3b39 100644 --- a/SpiralSound/Plugins/FlipflopPlugin/Makefile.in +++ b/SpiralSound/Plugins/FlipflopPlugin/Makefile.in @@ -7,7 +7,7 @@ CC = gcc CXX = g++ CFLAGS = @CFLAGS@ -CXXFLAGS= @CXXFLAGS@ +CXXFLAGS= @CXXFLAGS@ INCPATH = -I/usr/X11R6/include LINK = g++ -shared LFLAGS = @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = FlipflopPlugin.h \ + FlipflopPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - FlipflopPlugin.h \ - FlipflopPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = FlipflopPlugin.C \ + FlipflopPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - FlipflopPlugin.C \ - FlipflopPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = FlipflopPlugin.o \ + FlipflopPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ + ../../SpiralInfo.o \ ../../Sample.o \ - FlipflopPlugin.o \ - FlipflopPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -116,13 +119,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -131,13 +135,13 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h FlipflopPlugin.o: FlipflopPlugin.C \ FlipflopPlugin.h \ FlipflopPluginGUI.h \ ../../NoteTable.h \ + ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -147,6 +151,7 @@ FlipflopPluginGUI.o: FlipflopPluginGUI.C \ FlipflopPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/FormantFilterPlugin/Makefile.in b/SpiralSound/Plugins/FormantFilterPlugin/Makefile.in index 56b97d4..3b1b991 100644 --- a/SpiralSound/Plugins/FormantFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/FormantFilterPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = FormantFilterPlugin.h \ + FormantFilterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - FormantFilterPlugin.h \ - FormantFilterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = FormantFilterPlugin.C \ + FormantFilterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - FormantFilterPlugin.C \ - FormantFilterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = FormantFilterPlugin.o \ + FormantFilterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - FormantFilterPlugin.o \ - FormantFilterPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h FormantFilterPlugin.o: FormantFilterPlugin.C \ FormantFilterPlugin.h \ diff --git a/SpiralSound/Plugins/JackPlugin/Makefile.in b/SpiralSound/Plugins/JackPlugin/Makefile.in index cfb709e..9da8e6b 100644 --- a/SpiralSound/Plugins/JackPlugin/Makefile.in +++ b/SpiralSound/Plugins/JackPlugin/Makefile.in @@ -40,36 +40,39 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = JackPlugin.h \ + JackPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../Widgets/Fl_LED_Button.H \ ../../Sample.h \ ../../RiffWav.h \ - JackPlugin.h \ - JackPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../Widgets/Fl_LED_Button.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = JackPlugin.C \ + JackPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ - ../Widgets/Fl_LED_Button.cxx \ ../../Sample.C \ ../../RiffWav.C \ - JackPlugin.C \ - JackPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../Widgets/Fl_LED_Button.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = JackPlugin.o \ + JackPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - ../Widgets/Fl_LED_Button.o \ ../../Sample.o \ ../../RiffWav.o \ - JackPlugin.o \ - JackPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../Widgets/Fl_LED_Button.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -131,14 +134,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../Widgets/Fl_LED_Button.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -150,8 +153,7 @@ install: ../Widgets/Fl_LED_Button.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/JoystickPlugin/Makefile.in b/SpiralSound/Plugins/JoystickPlugin/Makefile.in index a851913..b4252a2 100644 --- a/SpiralSound/Plugins/JoystickPlugin/Makefile.in +++ b/SpiralSound/Plugins/JoystickPlugin/Makefile.in @@ -6,14 +6,14 @@ CC = gcc CXX = g++ -CFLAGS = @CFLAGS@ -CXXFLAGS= @CXXFLAGS@ +CFLAGS = @CFLAGS@ +CXXFLAGS= @CXXFLAGS@ INCPATH = -I/usr/X11R6/include LINK = g++ -shared -LFLAGS = +LFLAGS = LIBS = -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11 -ldl MOC = moc -UIC = +UIC = TAR = tar -cf GZIP = gzip -9f @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = JoystickPlugin.h \ + JoystickPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - JoystickPlugin.h \ - JoystickPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = JoystickPlugin.C \ + JoystickPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - JoystickPlugin.C \ - JoystickPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = JoystickPlugin.o \ + JoystickPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - JoystickPlugin.o \ - JoystickPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h JoystickPlugin.o: JoystickPlugin.C \ JoystickPlugin.h \ diff --git a/SpiralSound/Plugins/KeyboardPlugin/Makefile.in b/SpiralSound/Plugins/KeyboardPlugin/Makefile.in index 3a244d8..44228c0 100644 --- a/SpiralSound/Plugins/KeyboardPlugin/Makefile.in +++ b/SpiralSound/Plugins/KeyboardPlugin/Makefile.in @@ -6,14 +6,14 @@ CC = gcc CXX = g++ -CFLAGS = @CFLAGS@ -CXXFLAGS= @CXXFLAGS@ +CFLAGS = @CFLAGS@ +CXXFLAGS= @CXXFLAGS@ INCPATH = -I/usr/X11R6/include LINK = g++ -shared -LFLAGS = +LFLAGS = LIBS = -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11 -ldl -pthread MOC = moc -UIC = +UIC = TAR = tar -cf GZIP = gzip -9f @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = KeyboardPlugin.h \ + KeyboardPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - KeyboardPlugin.h \ - KeyboardPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = KeyboardPlugin.C \ + KeyboardPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - KeyboardPlugin.C \ - KeyboardPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = KeyboardPlugin.o \ + KeyboardPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - KeyboardPlugin.o \ - KeyboardPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -120,20 +123,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h KeyboardPlugin.o: KeyboardPlugin.C \ KeyboardPlugin.h \ diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C index 806ae81..a515d2f 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C @@ -30,7 +30,8 @@ #include "LADSPAPluginGUI.h" #include "LADSPAInfo.h" -#include "../../../SpiralSynthModularInfo.h" + +#include "../../SpiralInfo.h" LADSPAPluginGUI::LADSPAPluginGUI(int w, int h, LADSPAPlugin *o, @@ -64,7 +65,7 @@ SpiralPluginGUI(w,h,o,ch) m_BKnob = new Fl_Button(5,15,50,20,"Knobs"); m_BKnob->labelsize (10); m_BKnob->type(FL_TOGGLE_BUTTON); - m_BKnob->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + m_BKnob->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); m_BKnob->color(Info->GUI_COLOUR); m_BKnob->selection_color(m_GUIColour); m_BKnob->callback((Fl_Callback *)cb_BKnob); @@ -73,7 +74,7 @@ SpiralPluginGUI(w,h,o,ch) m_BSlider = new Fl_Button(60,15,50,20,"Sliders"); m_BSlider->labelsize (10); m_BSlider->type(FL_TOGGLE_BUTTON); - m_BSlider->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + m_BSlider->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); m_BSlider->color(m_GUIColour); m_BSlider->selection_color(m_GUIColour); m_BSlider->callback((Fl_Callback *)cb_BSlider); @@ -82,7 +83,7 @@ SpiralPluginGUI(w,h,o,ch) m_BSetup = new Fl_Button(w - 55,15,50,20,"Setup..."); m_BSetup->labelsize (10); m_BSetup->type(FL_TOGGLE_BUTTON); - m_BSetup->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + m_BSetup->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); m_BSetup->color(m_GUIColour); m_BSetup->selection_color(m_GUIColour); m_BSetup->callback((Fl_Callback *)cb_BSetup); @@ -107,7 +108,7 @@ SpiralPluginGUI(w,h,o,ch) m_SetupGroup->add(m_MakerLabel); m_Browser = new Fl_Choice(50, 90, 440, 22,"Plugin:"); - m_Browser->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + m_Browser->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); m_Browser->labelsize(12); m_Browser->textsize(12); m_Browser->callback((Fl_Callback *)cb_Select); @@ -144,14 +145,14 @@ SpiralPluginGUI(w,h,o,ch) m_SetupGroup->add(m_Browser); m_InputScroll = new Fl_Scroll(10,135,480,145); - m_InputScroll->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); - m_InputScroll->color((Fl_Color)SpiralSynthModularInfo::GUICOL_Device); + m_InputScroll->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); + m_InputScroll->color((Fl_Color)SpiralInfo::GUICOL_Device); m_InputScroll->labelsize(12); m_InputScroll->align(FL_ALIGN_TOP_LEFT); m_InputScroll->type(Fl_Scroll::VERTICAL); m_InputPack = new Fl_Pack(15,140,470,135,""); - m_InputPack->color((Fl_Color)SpiralSynthModularInfo::GUICOL_Device); + m_InputPack->color((Fl_Color)SpiralInfo::GUICOL_Device); m_InputScroll->add(m_InputPack); m_SetupGroup->add(m_InputScroll); @@ -590,7 +591,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Value Fl_Output* NewOutput = new Fl_Output(0,0,60,18,""); - NewOutput->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + NewOutput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); NewOutput->value(0); NewOutput->textsize(10); NewOutput->color(FL_BACKGROUND_COLOR); @@ -600,7 +601,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Fixed Value/Default Fl_Input* NewInput = new Fl_Input(62,0,60,18,""); - NewInput->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_Default); @@ -609,7 +610,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Min NewInput = new Fl_Input(124,0,60,18,""); - NewInput->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_Min); @@ -618,7 +619,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Max NewInput = new Fl_Input(186,0,60,18,""); - NewInput->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_Max); @@ -657,7 +658,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Direct input box for knob NewInput = new Fl_Input(0,0,60,16); - NewInput->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_KnobValue); @@ -685,7 +686,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Slider Fl_Slider* NewSlider = new Fl_Slider(0,0,20,100,""); - NewSlider->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + NewSlider->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); NewSlider->type(FL_VERT_NICE_SLIDER); NewSlider->selection_color(m_GUIColour); NewSlider->callback((Fl_Callback *)cb_Slider); @@ -695,7 +696,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Direct input box for slider NewInput = new Fl_Input(0,0,56,16); - NewInput->box((Fl_Boxtype)SpiralSynthModularInfo::GUIDEVICE_Box); + NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_SliderValue); diff --git a/SpiralSound/Plugins/LADSPAPlugin/Makefile.in b/SpiralSound/Plugins/LADSPAPlugin/Makefile.in index 25ee541..4ae2447 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/Makefile.in +++ b/SpiralSound/Plugins/LADSPAPlugin/Makefile.in @@ -38,39 +38,42 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = LADSPAPlugin.h \ + LADSPAPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ + ../../Sample.h \ + LADSPAInfo.h \ ../Widgets/Fl_Knob.H \ ../Widgets/Fl_LED_Button.H \ ../Widgets/Fl_DragBar.H \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../../Sample.h \ - LADSPAPlugin.h \ - LADSPAPluginGUI.h \ - LADSPAInfo.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = LADSPAPlugin.C \ + LADSPAPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ + ../../Sample.C \ + LADSPAInfo.C \ ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_LED_Button.cxx \ ../Widgets/Fl_DragBar.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ - ../../Sample.C \ - LADSPAPlugin.C \ - LADSPAPluginGUI.C \ - LADSPAInfo.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = LADSPAPlugin.o \ + LADSPAPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ + ../../Sample.o \ + LADSPAInfo.o \ ../Widgets/Fl_Knob.o \ ../Widgets/Fl_LED_Button.o \ ../Widgets/Fl_DragBar.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - ../../Sample.o \ - LADSPAPlugin.o \ - LADSPAPluginGUI.o \ - LADSPAInfo.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -134,16 +137,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ - ../../Sample.h \ - LADSPAInfo.h + ../../ChannelHandler.h \ + ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../Widgets/Fl_DragBar.H \ - ../Widgets/Fl_LED_Button.H \ - ../Widgets/Fl_Knob.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -151,24 +152,19 @@ install: ../Widgets/Fl_LED_Button.o: ../Widgets/Fl_LED_Button.cxx \ ../Widgets/Fl_LED_Button.H -../Widgets/Fl_DragBar.o: ../Widgets/Fl_DragBar.cxx \ - ../Widgets/Fl_DragBar.H +../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ + ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h LADSPAPlugin.o: LADSPAPlugin.C \ LADSPAPlugin.h \ ../SpiralPlugin.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ LADSPAPluginGUI.h \ ../SpiralPluginGUI.h \ - ../Widgets/Fl_Knob.H \ - ../Widgets/Fl_LED_Button.H \ - ../Widgets/Fl_DragBar.H \ LADSPAInfo.h \ SpiralIcon.xpm @@ -177,7 +173,6 @@ LADSPAPluginGUI.o: LADSPAPluginGUI.C \ ../Widgets/Fl_Knob.H \ LADSPAPlugin.h \ ../SpiralPlugin.h \ - ../../Sample.h \ ../../SpiralInfo.h \ ../../Sample.h \ ../SpiralPluginGUI.h \ diff --git a/SpiralSound/Plugins/LFOPlugin/Makefile.in b/SpiralSound/Plugins/LFOPlugin/Makefile.in index 213f5e8..39622b5 100644 --- a/SpiralSound/Plugins/LFOPlugin/Makefile.in +++ b/SpiralSound/Plugins/LFOPlugin/Makefile.in @@ -38,37 +38,40 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = LFOPlugin.h \ + LFOPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ + ../../ChannelHandler.h \ + ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../Widgets/Fl_LED_Button.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../GUI/WS_Sine.h \ ../GUI/WS_Tri.h \ ../GUI/WS_Square.h \ ../GUI/WS_Saw.h \ - ../../Sample.h \ - ../../ChannelHandler.h \ - LFOPlugin.h \ - LFOPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = LFOPlugin.C \ + LFOPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../Widgets/Fl_Knob.cxx \ - ../Widgets/Fl_LED_Button.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ - LFOPlugin.C \ - LFOPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../Widgets/Fl_LED_Button.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = LFOPlugin.o \ + LFOPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../Widgets/Fl_Knob.o \ - ../Widgets/Fl_LED_Button.o \ - ../../../GUI/Widgets/SpiralGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ - LFOPlugin.o \ - LFOPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../Widgets/Fl_LED_Button.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -130,13 +133,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -148,8 +152,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h LFOPlugin.o: LFOPlugin.C \ LFOPlugin.h \ diff --git a/SpiralSound/Plugins/LogicPlugin/Makefile.in b/SpiralSound/Plugins/LogicPlugin/Makefile.in index b27ad12..a8e0432 100644 --- a/SpiralSound/Plugins/LogicPlugin/Makefile.in +++ b/SpiralSound/Plugins/LogicPlugin/Makefile.in @@ -6,14 +6,14 @@ CC = gcc CXX = g++ -CFLAGS = @CFLAGS@ -CXXFLAGS= @CXXFLAGS@ +CFLAGS = @CFLAGS@ +CXXFLAGS= @CXXFLAGS@ INCPATH = -I/usr/X11R6/include LINK = g++ -shared -LFLAGS = +LFLAGS = LIBS = -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11 -ldl MOC = moc -UIC = +UIC = TAR = tar -cf GZIP = gzip -9f @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = LogicPlugin.h \ + LogicPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - LogicPlugin.h \ - LogicPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = LogicPlugin.C \ + LogicPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - LogicPlugin.C \ - LogicPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = LogicPlugin.o \ + LogicPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - LogicPlugin.o \ - LogicPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -113,25 +116,26 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h LogicPlugin.o: LogicPlugin.C \ LogicPlugin.h \ LogicPluginGUI.h \ ../../NoteTable.h \ + ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -141,6 +145,7 @@ LogicPluginGUI.o: LogicPluginGUI.C \ LogicPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../../GUI/Widgets/SpiralGUI.H ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/Plugins/MasherPlugin/Makefile.in b/SpiralSound/Plugins/MasherPlugin/Makefile.in index 62dceaa..e2f68d9 100644 --- a/SpiralSound/Plugins/MasherPlugin/Makefile.in +++ b/SpiralSound/Plugins/MasherPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = MasherPlugin.h \ + MasherPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - MasherPlugin.h \ - MasherPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MasherPlugin.C \ + MasherPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - MasherPlugin.C \ - MasherPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MasherPlugin.o \ + MasherPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - MasherPlugin.o \ - MasherPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h MasherPlugin.o: MasherPlugin.C \ MasherPlugin.h \ diff --git a/SpiralSound/Plugins/MatrixPlugin/Makefile.in b/SpiralSound/Plugins/MatrixPlugin/Makefile.in index daf8d65..f614ecb 100644 --- a/SpiralSound/Plugins/MatrixPlugin/Makefile.in +++ b/SpiralSound/Plugins/MatrixPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = MatrixPlugin.h \ + MatrixPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ + ../../Sample.h \ ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_LED_Button.H \ - ../../Sample.h \ - MatrixPlugin.h \ - MatrixPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MatrixPlugin.C \ + MatrixPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ + ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../Widgets/Fl_LED_Button.cxx \ - ../../Sample.C \ - MatrixPlugin.C \ - MatrixPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MatrixPlugin.o \ + MatrixPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ + ../../Sample.o \ ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../Widgets/Fl_LED_Button.o \ - ../../Sample.o \ - MatrixPlugin.o \ - MatrixPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -144,8 +148,7 @@ install: ../Widgets/Fl_LED_Button.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h MatrixPlugin.o: MatrixPlugin.C \ MatrixPlugin.h \ diff --git a/SpiralSound/Plugins/MeterPlugin/Makefile.in b/SpiralSound/Plugins/MeterPlugin/Makefile.in index 4898415..123cb61 100644 --- a/SpiralSound/Plugins/MeterPlugin/Makefile.in +++ b/SpiralSound/Plugins/MeterPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = MeterPlugin.h \ + MeterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ + ../../Sample.h \ ../Widgets/Fl_SevenSeg.H \ ../Widgets/Fl_VU_Meter.h \ - ../../Sample.h \ - MeterPlugin.h \ - MeterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MeterPlugin.C \ + MeterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ + ../../Sample.C \ ../Widgets/Fl_SevenSeg.cxx \ ../Widgets/Fl_VU_Meter.cxx \ - ../../Sample.C \ - MeterPlugin.C \ - MeterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MeterPlugin.o \ + MeterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ + ../../Sample.o \ ../Widgets/Fl_SevenSeg.o \ ../Widgets/Fl_VU_Meter.o \ - ../../Sample.o \ - MeterPlugin.o \ - MeterPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H @@ -144,8 +148,7 @@ install: ../Widgets/Fl_SevenSeg.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h MeterPlugin.o: MeterPlugin.C \ MeterPlugin.h \ diff --git a/SpiralSound/Plugins/MidiPlugin/Makefile.in b/SpiralSound/Plugins/MidiPlugin/Makefile.in index f36d91c..a7bcaa5 100644 --- a/SpiralSound/Plugins/MidiPlugin/Makefile.in +++ b/SpiralSound/Plugins/MidiPlugin/Makefile.in @@ -6,7 +6,7 @@ CC = gcc CXX = g++ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ CXXFLAGS= @CXXFLAGS@ INCPATH = -I/usr/X11R6/include LINK = g++ -shared @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = MidiPlugin.h \ + MidiPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ ../../Midi.h \ - MidiPlugin.h \ - MidiPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MidiPlugin.C \ + MidiPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ ../../Midi.C \ - MidiPlugin.C \ - MidiPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MidiPlugin.o \ + MidiPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ ../../Midi.o \ - MidiPlugin.o \ - MidiPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -141,8 +145,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../Midi.o: ../../Midi.C \ ../../Midi.h \ diff --git a/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in b/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in index 1460ddd..186fa81 100644 --- a/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in +++ b/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = MixSwitchPlugin.h \ + MixSwitchPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - MixSwitchPlugin.h \ - MixSwitchPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MixSwitchPlugin.C \ + MixSwitchPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - MixSwitchPlugin.C \ - MixSwitchPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MixSwitchPlugin.o \ + MixSwitchPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - MixSwitchPlugin.o \ - MixSwitchPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h MixSwitchPlugin.o: MixSwitchPlugin.C \ MixSwitchPlugin.h \ diff --git a/SpiralSound/Plugins/MixerPlugin/Makefile.in b/SpiralSound/Plugins/MixerPlugin/Makefile.in index 668b620..da9a1cf 100644 --- a/SpiralSound/Plugins/MixerPlugin/Makefile.in +++ b/SpiralSound/Plugins/MixerPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = MixerPlugin.h \ + MixerPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../Sample.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ + ../../Sample.h \ ../Widgets/Fl_LED_Button.H \ - ../../../GUI/Widgets/SpiralGUI.H \ - MixerPlugin.h \ - MixerPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MixerPlugin.C \ + MixerPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../Sample.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ + ../../Sample.C \ ../Widgets/Fl_LED_Button.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ - MixerPlugin.C \ - MixerPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MixerPlugin.o \ + MixerPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../Sample.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ + ../../Sample.o \ ../Widgets/Fl_LED_Button.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - MixerPlugin.o \ - MixerPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,17 +126,17 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../Widgets/Fl_LED_Button.o: ../Widgets/Fl_LED_Button.cxx \ ../Widgets/Fl_LED_Button.H diff --git a/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in b/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in index dc9ae63..9269506 100644 --- a/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = MoogFilterPlugin.h \ + MoogFilterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - MoogFilterPlugin.h \ - MoogFilterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MoogFilterPlugin.C \ + MoogFilterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - MoogFilterPlugin.C \ - MoogFilterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MoogFilterPlugin.o \ + MoogFilterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - MoogFilterPlugin.o \ - MoogFilterPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h MoogFilterPlugin.o: MoogFilterPlugin.C \ MoogFilterPlugin.h \ diff --git a/SpiralSound/Plugins/MousePlugin/Makefile.in b/SpiralSound/Plugins/MousePlugin/Makefile.in index 5c85f12..febd54e 100644 --- a/SpiralSound/Plugins/MousePlugin/Makefile.in +++ b/SpiralSound/Plugins/MousePlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ - ../SpiralPluginGUI.h \ - MousePlugin.h \ +HEADERS = MousePlugin.h \ MousePluginGUI.h \ - ../../Sample.h \ + ../SpiralPlugin.h \ + ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - scratch.h -SOURCES = ../SpiralPlugin.C \ - ../SpiralPluginGUI.C \ - MousePlugin.C \ + ../../Sample.h \ + scratch.h \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = MousePlugin.C \ MousePluginGUI.C \ - ../../Sample.C \ + ../SpiralPlugin.C \ + ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ - scratch.C -OBJECTS = ../SpiralPlugin.o \ - ../SpiralPluginGUI.o \ - MousePlugin.o \ + ../../Sample.C \ + scratch.C \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = MousePlugin.o \ MousePluginGUI.o \ - ../../Sample.o \ + ../SpiralPlugin.o \ + ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - scratch.o + ../../Sample.o \ + scratch.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -119,20 +122,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ - ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../../Sample.h + ../SpiralPlugin.h \ + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h MousePlugin.o: MousePlugin.C \ MousePlugin.h \ diff --git a/SpiralSound/Plugins/NoisePlugin/Makefile.in b/SpiralSound/Plugins/NoisePlugin/Makefile.in index 81e2030..1feed7b 100644 --- a/SpiralSound/Plugins/NoisePlugin/Makefile.in +++ b/SpiralSound/Plugins/NoisePlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = NoisePlugin.h \ + NoisePluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_LED_Button.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - NoisePlugin.h \ - NoisePluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_LED_Button.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = NoisePlugin.C \ + NoisePluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_LED_Button.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - NoisePlugin.C \ - NoisePluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_LED_Button.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = NoisePlugin.o \ + NoisePluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_LED_Button.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - NoisePlugin.o \ - NoisePluginGUI.o + ../Widgets/Fl_LED_Button.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,14 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../Widgets/Fl_LED_Button.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_LED_Button.o: ../Widgets/Fl_LED_Button.cxx \ ../Widgets/Fl_LED_Button.H @@ -139,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h NoisePlugin.o: NoisePlugin.C \ NoisePlugin.h \ diff --git a/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in b/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in index 98e4c90..c9ae2c0 100644 --- a/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in +++ b/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = NoteSnapPlugin.h \ + NoteSnapPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - NoteSnapPlugin.h \ - NoteSnapPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = NoteSnapPlugin.C \ + NoteSnapPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - NoteSnapPlugin.C \ - NoteSnapPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = NoteSnapPlugin.o \ + NoteSnapPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - NoteSnapPlugin.o \ - NoteSnapPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -122,20 +125,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h NoteSnapPlugin.o: NoteSnapPlugin.C \ NoteSnapPlugin.h \ diff --git a/SpiralSound/Plugins/OperatorPlugin/Makefile.in b/SpiralSound/Plugins/OperatorPlugin/Makefile.in index 129e5b9..a4dc8f0 100644 --- a/SpiralSound/Plugins/OperatorPlugin/Makefile.in +++ b/SpiralSound/Plugins/OperatorPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = OperatorPlugin.h \ + OperatorPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - OperatorPlugin.h \ - OperatorPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = OperatorPlugin.C \ + OperatorPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - OperatorPlugin.C \ - OperatorPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = OperatorPlugin.o \ + OperatorPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - OperatorPlugin.o \ - OperatorPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -113,20 +116,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h OperatorPlugin.o: OperatorPlugin.C \ OperatorPlugin.h \ diff --git a/SpiralSound/Plugins/OscillatorPlugin/Makefile.in b/SpiralSound/Plugins/OscillatorPlugin/Makefile.in index 396e57f..01ac0a4 100644 --- a/SpiralSound/Plugins/OscillatorPlugin/Makefile.in +++ b/SpiralSound/Plugins/OscillatorPlugin/Makefile.in @@ -38,36 +38,39 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = OscillatorPlugin.h \ + OscillatorPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../Widgets/Fl_LED_Button.H \ + ../../SpiralInfo.h \ + ../../ChannelHandler.h \ + ../../Sample.h \ ../GUI/WS_Square.h \ ../GUI/WS_Noise.h \ ../GUI/WS_Saw.h \ - ../../Sample.h \ - ../../ChannelHandler.h \ - OscillatorPlugin.h \ - OscillatorPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../Widgets/Fl_LED_Button.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = OscillatorPlugin.C \ + OscillatorPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ + ../../ChannelHandler.C \ + ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_LED_Button.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ - ../../Sample.C \ - ../../ChannelHandler.C \ - OscillatorPlugin.C \ - OscillatorPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = OscillatorPlugin.o \ + OscillatorPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ + ../../ChannelHandler.o \ + ../../Sample.o \ ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../Widgets/Fl_LED_Button.o \ - ../../Sample.o \ - ../../ChannelHandler.o \ - OscillatorPlugin.o \ - OscillatorPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -129,13 +132,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -147,8 +151,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h OscillatorPlugin.o: OscillatorPlugin.C \ OscillatorPlugin.h \ diff --git a/SpiralSound/Plugins/OutputPlugin/Makefile.in b/SpiralSound/Plugins/OutputPlugin/Makefile.in index 02941b4..8989ca1 100644 --- a/SpiralSound/Plugins/OutputPlugin/Makefile.in +++ b/SpiralSound/Plugins/OutputPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = OutputPlugin.h \ + OutputPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ ../../RiffWav.h \ - OutputPlugin.h \ - OutputPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = OutputPlugin.C \ + OutputPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ ../../RiffWav.C \ - OutputPlugin.C \ - OutputPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = OutputPlugin.o \ + OutputPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ ../../RiffWav.o \ - OutputPlugin.o \ - OutputPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -141,8 +145,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in b/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in index 9024703..34a5e15 100644 --- a/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in +++ b/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = PoshSamplerPlugin.h \ + PoshSamplerPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ + ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ - PoshSamplerPlugin.h \ - PoshSamplerPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = PoshSamplerPlugin.C \ + PoshSamplerPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ ../../RiffWav.C \ - PoshSamplerPlugin.C \ - PoshSamplerPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = PoshSamplerPlugin.o \ + PoshSamplerPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ ../../RiffWav.o \ - PoshSamplerPlugin.o \ - PoshSamplerPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -141,8 +145,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/RingModPlugin/Makefile.in b/SpiralSound/Plugins/RingModPlugin/Makefile.in index f0d4ef8..91ad860 100644 --- a/SpiralSound/Plugins/RingModPlugin/Makefile.in +++ b/SpiralSound/Plugins/RingModPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = RingModPlugin.h \ + RingModPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - RingModPlugin.h \ - RingModPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = RingModPlugin.C \ + RingModPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - RingModPlugin.C \ - RingModPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = RingModPlugin.o \ + RingModPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - RingModPlugin.o \ - RingModPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h RingModPlugin.o: RingModPlugin.C \ RingModPlugin.h \ diff --git a/SpiralSound/Plugins/SVFilterPlugin/Makefile.in b/SpiralSound/Plugins/SVFilterPlugin/Makefile.in index bea343c..045fe64 100644 --- a/SpiralSound/Plugins/SVFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/SVFilterPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SVFilterPlugin.h \ + SVFilterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - SVFilterPlugin.h \ - SVFilterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SVFilterPlugin.C \ + SVFilterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - SVFilterPlugin.C \ - SVFilterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SVFilterPlugin.o \ + SVFilterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - SVFilterPlugin.o \ - SVFilterPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SVFilterPlugin.o: SVFilterPlugin.C \ SVFilterPlugin.h \ diff --git a/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in b/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in index 20e92df..315b985 100644 --- a/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in +++ b/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SampleHoldPlugin.h \ + SampleHoldPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - SampleHoldPlugin.h \ - SampleHoldPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SampleHoldPlugin.C \ + SampleHoldPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - SampleHoldPlugin.C \ - SampleHoldPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SampleHoldPlugin.o \ + SampleHoldPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - SampleHoldPlugin.o \ - SampleHoldPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -120,20 +123,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SampleHoldPlugin.o: SampleHoldPlugin.C \ SampleHoldPlugin.h \ diff --git a/SpiralSound/Plugins/SamplerPlugin/Makefile.in b/SpiralSound/Plugins/SamplerPlugin/Makefile.in index 3d10e07..514e5e1 100644 --- a/SpiralSound/Plugins/SamplerPlugin/Makefile.in +++ b/SpiralSound/Plugins/SamplerPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SamplerPlugin.h \ + SamplerPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ ../../RiffWav.h \ - SamplerPlugin.h \ - SamplerPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SamplerPlugin.C \ + SamplerPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ ../../RiffWav.C \ - SamplerPlugin.C \ - SamplerPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SamplerPlugin.o \ + SamplerPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ ../../RiffWav.o \ - SamplerPlugin.o \ - SamplerPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,13 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -141,8 +145,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/ScopePlugin/Makefile.in b/SpiralSound/Plugins/ScopePlugin/Makefile.in index 33f66ee..8b8c110 100644 --- a/SpiralSound/Plugins/ScopePlugin/Makefile.in +++ b/SpiralSound/Plugins/ScopePlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = ScopePlugin.h \ + ScopePluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - ScopePlugin.h \ - ScopePluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = ScopePlugin.C \ + ScopePluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - ScopePlugin.C \ - ScopePluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = ScopePlugin.o \ + ScopePluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - ScopePlugin.o \ - ScopePluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ScopePlugin.o: ScopePlugin.C \ ScopePlugin.h \ diff --git a/SpiralSound/Plugins/SeqPlugin/Makefile.in b/SpiralSound/Plugins/SeqPlugin/Makefile.in index f9b2d05..a8ded8f 100644 --- a/SpiralSound/Plugins/SeqPlugin/Makefile.in +++ b/SpiralSound/Plugins/SeqPlugin/Makefile.in @@ -38,39 +38,42 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SeqPlugin.h \ + SeqPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ + ../../Sample.h \ + ../../RiffWav.h \ ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_EventMap.h \ ../Widgets/Fl_SEvent.h \ - ../../Sample.h \ - ../../RiffWav.h \ - SeqPlugin.h \ - SeqPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SeqPlugin.C \ + SeqPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ + ../../Sample.C \ + ../../RiffWav.C \ ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../Widgets/Fl_EventMap.C \ ../Widgets/Fl_SEvent.C \ - ../../Sample.C \ - ../../RiffWav.C \ - SeqPlugin.C \ - SeqPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SeqPlugin.o \ + SeqPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../ChannelHandler.o \ + ../../SpiralInfo.o \ + ../../ChannelHandler.o \ + ../../Sample.o \ + ../../RiffWav.o \ ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../Widgets/Fl_EventMap.o \ ../Widgets/Fl_SEvent.o \ - ../../Sample.o \ - ../../RiffWav.o \ - SeqPlugin.o \ - SeqPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -132,13 +135,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -155,8 +159,7 @@ install: ../Widgets/Fl_EventMap.h ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in b/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in index 8151122..e340dcf 100644 --- a/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in +++ b/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SeqSelectorPlugin.h \ + SeqSelectorPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ ../Widgets/Fl_LED_Button.H \ - SeqSelectorPlugin.h \ - SeqSelectorPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SeqSelectorPlugin.C \ + SeqSelectorPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ ../Widgets/Fl_LED_Button.cxx \ - SeqSelectorPlugin.C \ - SeqSelectorPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SeqSelectorPlugin.o \ + SeqSelectorPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ ../Widgets/Fl_LED_Button.o \ - SeqSelectorPlugin.o \ - SeqSelectorPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,17 +126,17 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/SequencerPlugin/Makefile.in b/SpiralSound/Plugins/SequencerPlugin/Makefile.in index 398dbc1..529dac2 100644 --- a/SpiralSound/Plugins/SequencerPlugin/Makefile.in +++ b/SpiralSound/Plugins/SequencerPlugin/Makefile.in @@ -38,39 +38,42 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SequencerPlugin.h \ + SequencerPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ + ../../Sample.h \ + ../../RiffWav.h \ ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_EventMap.h \ ../Widgets/Fl_SEvent.h \ - ../../Sample.h \ - ../../RiffWav.h \ - SequencerPlugin.h \ - SequencerPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SequencerPlugin.C \ + SequencerPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ + ../../Sample.C \ + ../../RiffWav.C \ ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../Widgets/Fl_EventMap.C \ ../Widgets/Fl_SEvent.C \ - ../../Sample.C \ - ../../RiffWav.C \ - SequencerPlugin.C \ - SequencerPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SequencerPlugin.o \ + SequencerPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ + ../../Sample.o \ + ../../RiffWav.o \ ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../Widgets/Fl_EventMap.o \ ../Widgets/Fl_SEvent.o \ - ../../Sample.o \ - ../../RiffWav.o \ - SequencerPlugin.o \ - SequencerPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -132,13 +135,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -155,8 +159,7 @@ install: ../Widgets/Fl_EventMap.h ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/SmoothPlugin/Makefile.in b/SpiralSound/Plugins/SmoothPlugin/Makefile.in index ac9744f..5149969 100644 --- a/SpiralSound/Plugins/SmoothPlugin/Makefile.in +++ b/SpiralSound/Plugins/SmoothPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SmoothPlugin.h \ + SmoothPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - SmoothPlugin.h \ - SmoothPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SmoothPlugin.C \ + SmoothPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - SmoothPlugin.C \ - SmoothPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SmoothPlugin.o \ + SmoothPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - SmoothPlugin.o \ - SmoothPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -123,13 +126,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -138,8 +142,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SmoothPlugin.o: SmoothPlugin.C \ SmoothPlugin.h \ diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in b/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in index 1e61ec9..6dfbc66 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in +++ b/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in @@ -38,42 +38,45 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SpiralLoopPlugin.h \ + SpiralLoopPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ Fl_Loop.h \ Fl_Trigger.h \ - SpiralLoopPlugin.h \ - SpiralLoopPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H \ - ../Widgets/Fl_LED_Button.H -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_LED_Button.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SpiralLoopPlugin.C \ + SpiralLoopPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ Fl_Loop.C \ Fl_Trigger.C \ - SpiralLoopPlugin.C \ - SpiralLoopPluginGUI.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../Widgets/Fl_Knob.cxx \ - ../Widgets/Fl_LED_Button.cxx -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_LED_Button.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SpiralLoopPlugin.o \ + SpiralLoopPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ Fl_Loop.o \ Fl_Trigger.o \ - SpiralLoopPlugin.o \ - SpiralLoopPluginGUI.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../Widgets/Fl_Knob.o \ - ../Widgets/Fl_LED_Button.o + ../Widgets/Fl_LED_Button.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -134,20 +137,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/SpiralPlugin.h b/SpiralSound/Plugins/SpiralPlugin.h index 247af37..542208c 100644 --- a/SpiralSound/Plugins/SpiralPlugin.h +++ b/SpiralSound/Plugins/SpiralPlugin.h @@ -32,8 +32,6 @@ static const float MAX_FREQ = 13000; -class ChannelHander; - struct PluginInfo { string Name; @@ -98,9 +96,9 @@ public: string GetName() { return m_PluginInfo.Name; } void UpdatePluginInfoWithHost(); - void SetInPortType(PluginInfo &pinfo, int port, Sample::SampleType type); + void SetInPortType(PluginInfo &pinfo, int port, Sample::SampleType type); void SetOutPortType(PluginInfo &pinfo, int port, Sample::SampleType type); - + // Callbacks to main engine. Should only called by plugin hosts. void SetUpdateInfoCallback(int ID, void(*s)(int, void *)); void SetUpdateCallback(void (*s)(void*,bool m)) { cb_Update=s; } diff --git a/SpiralSound/Plugins/SpiralPluginGUI.C b/SpiralSound/Plugins/SpiralPluginGUI.C index b0f40f4..2e5142a 100644 --- a/SpiralSound/Plugins/SpiralPluginGUI.C +++ b/SpiralSound/Plugins/SpiralPluginGUI.C @@ -18,6 +18,7 @@ #include "SpiralPluginGUI.h" #include "SpiralPlugin.h" +#include "../SpiralInfo.h" #include #include #include diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in b/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in index c0d6b1a..9ed8c0a 100644 --- a/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in +++ b/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SplitSwitchPlugin.h \ + SplitSwitchPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - SplitSwitchPlugin.h \ - SplitSwitchPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SplitSwitchPlugin.C \ + SplitSwitchPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - SplitSwitchPlugin.C \ - SplitSwitchPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SplitSwitchPlugin.o \ + SplitSwitchPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - SplitSwitchPlugin.o \ - SplitSwitchPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -120,20 +123,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SplitSwitchPlugin.o: SplitSwitchPlugin.C \ SplitSwitchPlugin.h \ diff --git a/SpiralSound/Plugins/SplitterPlugin/Makefile.in b/SpiralSound/Plugins/SplitterPlugin/Makefile.in index 41f5c9b..cead4f2 100644 --- a/SpiralSound/Plugins/SplitterPlugin/Makefile.in +++ b/SpiralSound/Plugins/SplitterPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SplitterPlugin.h \ + SplitterPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - SplitterPlugin.h \ - SplitterPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SplitterPlugin.C \ + SplitterPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - SplitterPlugin.C \ - SplitterPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SplitterPlugin.o \ + SplitterPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - SplitterPlugin.o \ - SplitterPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -120,20 +123,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SplitterPlugin.o: SplitterPlugin.C \ SplitterPlugin.h \ diff --git a/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in b/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in index 3a31a08..371720c 100644 --- a/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in +++ b/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in @@ -38,30 +38,33 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = StereoMixerPlugin.h \ + StereoMixerPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - StereoMixerPlugin.h \ - StereoMixerPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = StereoMixerPlugin.C \ + StereoMixerPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - StereoMixerPlugin.C \ - StereoMixerPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = StereoMixerPlugin.o \ + StereoMixerPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - StereoMixerPlugin.o \ - StereoMixerPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -125,13 +128,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -140,8 +144,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h StereoMixerPlugin.o: StereoMixerPlugin.C \ StereoMixerPlugin.h \ diff --git a/SpiralSound/Plugins/StreamPlugin/Makefile.in b/SpiralSound/Plugins/StreamPlugin/Makefile.in index e7f4bf5..54dd6de 100644 --- a/SpiralSound/Plugins/StreamPlugin/Makefile.in +++ b/SpiralSound/Plugins/StreamPlugin/Makefile.in @@ -38,36 +38,39 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = StreamPlugin.h \ + StreamPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../Widgets/Fl_SevenSeg.H \ ../../Sample.h \ ../../RiffWav.h \ - StreamPlugin.h \ - StreamPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../Widgets/Fl_SevenSeg.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = StreamPlugin.C \ + StreamPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ - ../Widgets/Fl_SevenSeg.cxx \ ../../Sample.C \ ../../RiffWav.C \ - StreamPlugin.C \ - StreamPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../Widgets/Fl_Knob.cxx \ + ../Widgets/Fl_SevenSeg.cxx \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = StreamPlugin.o \ + StreamPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - ../Widgets/Fl_SevenSeg.o \ ../../Sample.o \ ../../RiffWav.o \ - StreamPlugin.o \ - StreamPluginGUI.o + ../Widgets/Fl_Knob.o \ + ../Widgets/Fl_SevenSeg.o \ + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -128,13 +131,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -146,8 +150,7 @@ install: ../Widgets/Fl_SevenSeg.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ diff --git a/SpiralSound/Plugins/SwitchPlugin/Makefile.in b/SpiralSound/Plugins/SwitchPlugin/Makefile.in index b1babf0..61e3f81 100644 --- a/SpiralSound/Plugins/SwitchPlugin/Makefile.in +++ b/SpiralSound/Plugins/SwitchPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = SwitchPlugin.h \ + SwitchPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - SwitchPlugin.h \ - SwitchPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = SwitchPlugin.C \ + SwitchPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - SwitchPlugin.C \ - SwitchPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = SwitchPlugin.o \ + SwitchPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - SwitchPlugin.o \ - SwitchPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -113,20 +116,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SwitchPlugin.o: SwitchPlugin.C \ SwitchPlugin.h \ @@ -139,6 +142,7 @@ SwitchPlugin.o: SwitchPlugin.C \ SwitchPluginGUI.o: SwitchPluginGUI.C \ SwitchPlugin.h \ SwitchPluginGUI.h \ + ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/TransposePlugin/Makefile.in b/SpiralSound/Plugins/TransposePlugin/Makefile.in index 746477e..e3ba8ac 100644 --- a/SpiralSound/Plugins/TransposePlugin/Makefile.in +++ b/SpiralSound/Plugins/TransposePlugin/Makefile.in @@ -34,27 +34,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = TransposePlugin.h \ + TransposePluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - TransposePlugin.h \ - TransposePluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = TransposePlugin.C \ + TransposePluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - TransposePlugin.C \ - TransposePluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = TransposePlugin.o \ + TransposePluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - TransposePlugin.o \ - TransposePluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -113,20 +116,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h TransposePlugin.o: TransposePlugin.C \ TransposePlugin.h \ @@ -139,7 +142,8 @@ TransposePlugin.o: TransposePlugin.C \ TransposePluginGUI.o: TransposePluginGUI.C \ TransposePlugin.h \ TransposePluginGUI.h \ - ../SpiralPlugin.h \ + ../../SpiralInfo.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/TrigPlugin/Makefile.in b/SpiralSound/Plugins/TrigPlugin/Makefile.in index 574637b..2b37724 100644 --- a/SpiralSound/Plugins/TrigPlugin/Makefile.in +++ b/SpiralSound/Plugins/TrigPlugin/Makefile.in @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = TrigPlugin.h \ + TrigPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - TrigPlugin.h \ - TrigPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = TrigPlugin.C \ + TrigPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - TrigPlugin.C \ - TrigPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = TrigPlugin.o \ + TrigPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - TrigPlugin.o \ - TrigPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -113,20 +116,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h TrigPlugin.o: TrigPlugin.C \ TrigPlugin.h \ @@ -139,6 +142,7 @@ TrigPlugin.o: TrigPlugin.C \ TrigPluginGUI.o: TrigPluginGUI.C \ TrigPlugin.h \ TrigPluginGUI.h \ + ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/WaveShaperPlugin/Makefile.in b/SpiralSound/Plugins/WaveShaperPlugin/Makefile.in index 1ca9326..000958f 100644 --- a/SpiralSound/Plugins/WaveShaperPlugin/Makefile.in +++ b/SpiralSound/Plugins/WaveShaperPlugin/Makefile.in @@ -38,33 +38,36 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = WaveShaperPlugin.h \ + WaveShaperPluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ + ../../Sample.h \ ../Widgets/Fl_Knob.H \ - ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_LED_Button.H \ - ../../Sample.h \ - WaveShaperPlugin.h \ - WaveShaperPluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = WaveShaperPlugin.C \ + WaveShaperPluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.h \ ../../ChannelHandler.C \ + ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ ../Widgets/Fl_LED_Button.cxx \ - ../../Sample.C \ - WaveShaperPlugin.C \ - WaveShaperPluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = WaveShaperPlugin.o \ + WaveShaperPluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ + ../../Sample.o \ ../Widgets/Fl_Knob.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../Widgets/Fl_LED_Button.o \ - ../../Sample.o \ - WaveShaperPlugin.o \ - WaveShaperPluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -126,15 +129,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ - ../Widgets/Fl_Knob.H \ - ../Widgets/Fl_LED_Button.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -146,8 +148,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h WaveShaperPlugin.o: WaveShaperPlugin.C \ WaveShaperPlugin.h \ diff --git a/SpiralSound/Plugins/WaveTablePlugin/Makefile.in b/SpiralSound/Plugins/WaveTablePlugin/Makefile.in index bfb81de..9441aae 100644 --- a/SpiralSound/Plugins/WaveTablePlugin/Makefile.in +++ b/SpiralSound/Plugins/WaveTablePlugin/Makefile.in @@ -38,11 +38,13 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = WaveTablePlugin.h \ + WaveTablePluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../Widgets/Fl_Knob.H \ - ../Widgets/Fl_LED_Button.H \ - ../../../GUI/Widgets/SpiralGUI.H \ + ../../SpiralInfo.h \ + ../../ChannelHandler.h \ + ../../Sample.h \ ../GUI/WS_Square.h \ ../GUI/WS_Saw.h \ ../GUI/WS_RevSaw.h \ @@ -51,28 +53,29 @@ HEADERS = ../SpiralPlugin.h \ ../GUI/WS_Pulse1.h \ ../GUI/WS_Pulse2.h \ ../GUI/WS_InvSine.h \ - ../../Sample.h \ - ../../ChannelHandler.h \ - WaveTablePlugin.h \ - WaveTablePluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../Widgets/Fl_Knob.H \ + ../Widgets/Fl_LED_Button.H \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = WaveTablePlugin.C \ + WaveTablePluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ + ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_LED_Button.cxx \ - ../../../GUI/Widgets/SpiralGUI.C \ - ../../Sample.C \ - WaveTablePlugin.C \ - WaveTablePluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = WaveTablePlugin.o \ + WaveTablePluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ + ../../Sample.o \ ../Widgets/Fl_Knob.o \ ../Widgets/Fl_LED_Button.o \ - ../../../GUI/Widgets/SpiralGUI.o \ - ../../Sample.o \ - WaveTablePlugin.o \ - WaveTablePluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -134,13 +137,14 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \ ../Widgets/Fl_Knob.H @@ -152,8 +156,7 @@ install: ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h WaveTablePlugin.o: WaveTablePlugin.C \ WaveTablePlugin.h \ diff --git a/SpiralSound/Plugins/XFadePlugin/Makefile.in b/SpiralSound/Plugins/XFadePlugin/Makefile.in index c582627..37737a4 100644 --- a/SpiralSound/Plugins/XFadePlugin/Makefile.in +++ b/SpiralSound/Plugins/XFadePlugin/Makefile.in @@ -13,7 +13,7 @@ LINK = g++ -shared LFLAGS = LIBS = -L/usr/X11R6/lib @FLTK_LIBS@ -lGL -lXext -lX11 -ldl MOC = moc -UIC = +UIC = TAR = tar -cf GZIP = gzip -9f @@ -38,27 +38,30 @@ mandir = @mandir@ ####### Files -HEADERS = ../SpiralPlugin.h \ +HEADERS = XFadePlugin.h \ + XFadePluginGUI.h \ + ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ + ../../SpiralInfo.h \ ../../ChannelHandler.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../../Sample.h \ - XFadePlugin.h \ - XFadePluginGUI.h -SOURCES = ../SpiralPlugin.C \ + ../../../GUI/Widgets/SpiralGUI.H +SOURCES = XFadePlugin.C \ + XFadePluginGUI.C \ + ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ + ../../SpiralInfo.C \ ../../ChannelHandler.C \ - ../../../GUI/Widgets/SpiralGUI.C \ ../../Sample.C \ - XFadePlugin.C \ - XFadePluginGUI.C -OBJECTS = ../SpiralPlugin.o \ + ../../../GUI/Widgets/SpiralGUI.C +OBJECTS = XFadePlugin.o \ + XFadePluginGUI.o \ + ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ + ../../SpiralInfo.o \ ../../ChannelHandler.o \ - ../../../GUI/Widgets/SpiralGUI.o \ ../../Sample.o \ - XFadePlugin.o \ - XFadePluginGUI.o + ../../../GUI/Widgets/SpiralGUI.o INTERFACES = UICDECLS = UICIMPLS = @@ -119,20 +122,20 @@ install: ../SpiralPlugin.o: ../SpiralPlugin.C \ ../SpiralPlugin.h \ + ../../ChannelHandler.h \ ../../Sample.h ../SpiralPluginGUI.o: ../SpiralPluginGUI.C \ ../SpiralPluginGUI.h \ - ../../../GUI/Widgets/SpiralGUI.H \ ../SpiralPlugin.h \ - ../../Sample.h + ../../ChannelHandler.h \ + ../../../GUI/Widgets/SpiralGUI.H ../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \ ../../../GUI/Widgets/SpiralGUI.H ../../Sample.o: ../../Sample.C \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h XFadePlugin.o: XFadePlugin.C \ XFadePlugin.h \ diff --git a/SpiralSound/Sample.h b/SpiralSound/Sample.h index 9fcab8c..ccf4d96 100644 --- a/SpiralSound/Sample.h +++ b/SpiralSound/Sample.h @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ +*/ #ifndef SAMPLE #define SAMPLE @@ -24,14 +24,13 @@ #include #include #include -#include "SpiralInfo.h" //#define DEBUG -inline float Linear(float bot,float top,float pos,float val1,float val2) -{ - float t=(pos-bot)/(top-bot); - return val1*t + val2*(1.0f-t); +inline float Linear(float bot,float top,float pos,float val1,float val2) +{ + float t=(pos-bot)/(top-bot); + return val1*t + val2*(1.0f-t); } inline bool feq(float a, float b, float tol) @@ -43,7 +42,7 @@ class Sample { public: enum SampleType {AUDIO=0, IMAGE, MIDI}; - + Sample(int Len=0); Sample(const Sample &rhs); Sample(const float *S, int Len); @@ -62,15 +61,15 @@ public: void GetRegion(Sample &S, int Start, int End) const; const float *GetBuffer() const {return m_Data;} float *GetNonConstBuffer() {return m_Data;} - int GetLength() const {return m_Length;} - int GetLengthInBytes() const {return m_Length*sizeof(float);} + int GetLength() const {return m_Length;} + int GetLengthInBytes() const {return m_Length*sizeof(float);} void Expand(int Length); void Shrink(int Length); void CropTo(int NewLength); bool IsEmpty() const { return m_IsEmpty; } inline float &Sample::operator[](int i) const - { + { #ifdef DEBUG assert(i>=0 && i=0 && ii=0 && i #include "FL/fl_draw.h" #include "FL/fl_message.h" - #include "SpiralInfo.h" +#include "../SpiralSynthPluginLocation.h" -float RandFloat(float s, float e) -{ - return s+((rand()%10000/10000.0)*(e-s)); +float RandFloat (float s, float e) { + return s+((rand()%10000/10000.0)*(e-s)); } -void SpiralInfo::LoadPrefs() -{ - string rcfn(m_HomeDir+"/"+GetResFileName()); - ifstream i(rcfn.c_str()); - if (!i) - { - cerr<<"Creating "< SpiralInfo::PLUGINVEC; + +string SpiralInfo::PLUGIN_PATH; + + +SpiralInfo* SpiralInfo::m_SpiralInfo=NULL; + +SpiralInfo* SpiralInfo::Get() { + if (!m_SpiralInfo) { + m_SpiralInfo = new SpiralInfo; + } + return m_SpiralInfo; } -void SpiralInfo::SavePrefs() +SpiralInfo::SpiralInfo(): +m_Version(1) { - string rcfn(m_HomeDir+"/"+GetResFileName()); - ofstream o(rcfn.c_str()); + m_ResFileName = getenv("HOME"); + m_ResFileName += "/.spiralmodular"; + PLUGIN_PATH = PLUGIN_PATH_LOCATION; +} - StreamOutPrefs(o); +void SpiralInfo::LoadPrefs() { + ifstream i (m_ResFileName.c_str()); + if (!i) { + cerr << "Creating " << m_ResFileName << endl; + SavePrefs (); + return; + } + StreamInPrefs (i); } -void SpiralInfo::StreamInPrefs (istream &s) -{ - char temp[256]; - s >> temp >> temp >> temp; - s >> temp >> temp >> m_Version; - s >> temp >> temp >> LOCALE; - s >> temp >> temp >> BUFSIZE; - s >> temp >> temp >> FRAGSIZE; - s >> temp >> temp >> FRAGCOUNT; - s >> temp >> temp >> SAMPLERATE; - s >> temp >> temp >> WANTMIDI; - s >> temp >> temp >> FILTERGRAN; - s >> temp >> temp >> OUTPUTFILE; - s >> temp >> temp >> MIDIFILE; - s >> temp >> temp >> USEPLUGINLIST; - s >> temp >> temp >> POLY; - if (m_Version>0) { - s >> temp >> temp >> GUI_COLOUR; - s >> temp >> temp >> SCOPE_BG_COLOUR; - s >> temp >> temp >> SCOPE_FG_COLOUR; - s >> temp >> temp >> SCOPE_SEL_COLOUR; - s >> temp >> temp >> SCOPE_IND_COLOUR; - s >> temp >> temp >> SCOPE_MRK_COLOUR; +void SpiralInfo::SavePrefs() { + ofstream o (m_ResFileName.c_str()); + StreamOutPrefs (o); +} + +void SpiralInfo::StreamInPrefs (istream &s) { + // These lines are from SpiralInfo + char temp[256]; + s >> temp >> temp >> temp; + s >> temp >> temp >> m_Version; + s >> temp >> temp >> LOCALE; + s >> temp >> temp >> BUFSIZE; + s >> temp >> temp >> FRAGSIZE; + s >> temp >> temp >> FRAGCOUNT; + s >> temp >> temp >> SAMPLERATE; + s >> temp >> temp >> WANTMIDI; + s >> temp >> temp >> FILTERGRAN; + s >> temp >> temp >> OUTPUTFILE; + s >> temp >> temp >> MIDIFILE; + s >> temp >> temp >> USEPLUGINLIST; + s >> temp >> temp >> POLY; + if (m_Version>0) { + s >> temp >> temp >> GUI_COLOUR; + s >> temp >> temp >> SCOPE_BG_COLOUR; + s >> temp >> temp >> SCOPE_FG_COLOUR; + s >> temp >> temp >> SCOPE_SEL_COLOUR; + s >> temp >> temp >> SCOPE_IND_COLOUR; + s >> temp >> temp >> SCOPE_MRK_COLOUR; + } + s >> temp >> temp; + s >> temp >> temp >> GUICOL_Tool; + s >> temp >> temp >> GUICOL_Button; + s >> temp >> temp >> GUICOL_Canvas; + s >> temp >> temp >> GUICOL_Device; + s >> temp >> temp >> GUIDEVICE_Box; + s >> temp >> temp >> PLUGIN_PATH; + s >> temp >> temp; + string st; + PLUGINVEC.clear(); + if (USEPLUGINLIST) { + while (st!="end" && !s.eof()) { + s >> st; + if (st!="end") PLUGINVEC.push_back (st); } + } +#if __APPLE__ + // ignore custom paths, plugins are encapsulated in the app anyway + // this prevents the program to fail if the user move the application icon + PLUGIN_PATH = PLUGIN_PATH_LOCATION; +#endif } -void SpiralInfo::StreamOutPrefs(ostream &s) -{ - s << "SpiralSound resource file" << endl << endl; - s << "Version = " << m_Version << endl; - s << "Locale = " << LOCALE << endl; - s << "BufferSize = " << BUFSIZE << endl; - s << "FragmentSize = " << FRAGSIZE << endl; - s << "FragmentCount = " << FRAGCOUNT << endl; - s << "Samplerate = " << SAMPLERATE << endl; - s << "WantMidi = " << WANTMIDI << endl; - s << "FilterGranularity = " << FILTERGRAN << endl; - s << "Output = " << OUTPUTFILE << endl; - s << "Midi = " << MIDIFILE << endl; - s << "UsePluginList = " << USEPLUGINLIST << endl; - s << "Polyphony = " << POLY << endl; - s << "GUIColour = " << GUI_COLOUR << endl; - s << "ScopeBGColour = " << SCOPE_BG_COLOUR << endl; - s << "ScopeFGColour = " << SCOPE_FG_COLOUR << endl; - s << "ScopeSelColour = " << SCOPE_SEL_COLOUR << endl; - s << "ScopeIndColour = " << SCOPE_IND_COLOUR << endl; - s << "ScopeMrkColour = " << SCOPE_MRK_COLOUR << endl; +void SpiralInfo::StreamOutPrefs (ostream &s) { + // These lines are from SpiralInfo + s << "SpiralSound resource file" << endl << endl; + s << "Version = " << m_Version << endl; + s << "Locale = " << LOCALE << endl; + s << "BufferSize = " << BUFSIZE << endl; + s << "FragmentSize = " << FRAGSIZE << endl; + s << "FragmentCount = " << FRAGCOUNT << endl; + s << "Samplerate = " << SAMPLERATE << endl; + s << "WantMidi = " << WANTMIDI << endl; + s << "FilterGranularity = " << FILTERGRAN << endl; + s << "Output = " << OUTPUTFILE << endl; + s << "Midi = " << MIDIFILE << endl; + s << "UsePluginList = " << USEPLUGINLIST << endl; + s << "Polyphony = " << POLY << endl; + s << "GUIColour = " << GUI_COLOUR << endl; + s << "ScopeBGColour = " << SCOPE_BG_COLOUR << endl; + s << "ScopeFGColour = " << SCOPE_FG_COLOUR << endl; + s << "ScopeSelColour = " << SCOPE_SEL_COLOUR << endl; + s << "ScopeIndColour = " << SCOPE_IND_COLOUR << endl; + s << "ScopeMrkColour = " << SCOPE_MRK_COLOUR << endl; + s << endl << "SpiralSynthModular Info:" << endl << endl; + s << "ToolBoxColour = " << GUICOL_Tool << endl; + s << "ButtonColour = " << GUICOL_Button << endl; + s << "CanvasColour = " << GUICOL_Canvas << endl; + s << "DeviceColour = " << GUICOL_Device << endl; + s << "DeviceBoxType = " << GUIDEVICE_Box << endl << endl; + s << "PluginPath = " << PLUGIN_PATH << endl << endl; + s << "PluginList = " << endl; + for (vector::iterator i=PLUGINVEC.begin(); i!=PLUGINVEC.end(); i++) { + s << *i << endl; + } + s << "end" << endl; } -void SpiralInfo::Alert(string Text) -{ - //fl_message(Text.c_str()); - cerr<<"Spiral alert: "< #include +#include #include #include "Sample.h" -#ifndef SpiralINFO -#define SpiralINFO - using namespace std; // todo: better place for these util funcs -float RandFloat(float s=0.0f, float e=1.0f); +float RandFloat (float s=0.0f, float e=1.0f); -// Loads info from the resource file, overload and implement -// as singleton for each app. App specifc info may be added -// after the standard items. +// Loads info from the resource file -class SpiralInfo -{ -public: - - void LoadPrefs(); - void SavePrefs(); - - static void Alert(string Text); - static void Log(string Text); - - static int BUFSIZE; - static int FRAGSIZE; - static int FRAGCOUNT; - static int SAMPLERATE; - static long MAXSAMPLE; - static float VALUECONV; - static bool WANTMIDI; - static int FILTERGRAN; - static string OUTPUTFILE; - static string MIDIFILE; - static bool USEPLUGINLIST; - static int POLY; - static string LOCALE; - static unsigned GUI_COLOUR; - static unsigned SCOPE_BG_COLOUR; - static unsigned SCOPE_FG_COLOUR; - static unsigned SCOPE_SEL_COLOUR; - static unsigned SCOPE_IND_COLOUR; - static unsigned SCOPE_MRK_COLOUR; - - string GetHomeDir() {return m_HomeDir;} - -protected: - SpiralInfo() : m_HomeDir(getenv("HOME")), m_Version(1) {} - virtual ~SpiralInfo() {} - - virtual string GetResFileName() { return "Spiralrc"; } - - virtual void StreamInPrefs(istream &s); - virtual void StreamOutPrefs(ostream &s); - - string m_HomeDir; - int m_Version; +class SpiralInfo { + public: + SpiralInfo(); + ~SpiralInfo() {} + void LoadPrefs(); + void SavePrefs(); + static void Alert (string Text); + static void Log (string Text); + static int BUFSIZE; + static int FRAGSIZE; + static int FRAGCOUNT; + static int SAMPLERATE; + static long MAXSAMPLE; + static float VALUECONV; + static bool WANTMIDI; + static int FILTERGRAN; + static string OUTPUTFILE; + static string MIDIFILE; + static bool USEPLUGINLIST; + static int POLY; + static string LOCALE; + static unsigned GUI_COLOUR; + static unsigned SCOPE_BG_COLOUR; + static unsigned SCOPE_FG_COLOUR; + static unsigned SCOPE_SEL_COLOUR; + static unsigned SCOPE_IND_COLOUR; + static unsigned SCOPE_MRK_COLOUR; + static SpiralInfo* Get(); + void SetColours(); + static string PLUGIN_PATH; + static vector PLUGINVEC; + static int GUICOL_Tool; + static int GUICOL_Button; + static int GUICOL_Canvas; + static int GUICOL_Device; + static int GUIDEVICE_Box; + private: + string m_ResFileName; + int m_Version; + static SpiralInfo *m_SpiralInfo; + void StreamInPrefs (istream &s); + void StreamOutPrefs (ostream &s); }; #endif + diff --git a/SpiralSynthModular.C b/SpiralSynthModular.C index 0411dfa..2c5106c 100644 --- a/SpiralSynthModular.C +++ b/SpiralSynthModular.C @@ -33,6 +33,7 @@ #include "SpiralSynthModular.h" #include "SpiralSound/PluginManager.h" +#include "SpiralSound/SpiralInfo.h" #include "SpiralSound/Plugins/SpiralPluginGUI.h" #include "GUI/SSM.xpm" @@ -75,9 +76,6 @@ DeviceWin::~DeviceWin() SynthModular::SynthModular(): m_NextID(0), -//m_NextPluginButton(1), -//m_NextPluginButtonXPos(5), -//m_NextPluginButtonYPos(20), m_PauseAudio(false) { m_Info.BUFSIZE = SpiralInfo::BUFSIZE; @@ -93,8 +91,7 @@ m_PauseAudio(false) m_Info.SCOPE_SEL_COLOUR = SpiralInfo::SCOPE_SEL_COLOUR; m_Info.SCOPE_IND_COLOUR = SpiralInfo::SCOPE_IND_COLOUR; m_Info.SCOPE_MRK_COLOUR = SpiralInfo::SCOPE_MRK_COLOUR; - - //m_Info.SpiralSynthModularInfo::GUICOL_Button = SpiralInfo::SpiralSynthModularInfo::GUICOL_Button; + //m_Info.SpiralInfo::GUICOL_Button = SpiralInfo::SpiralInfo::GUICOL_Button; for (int n=0; n<512; n++) Numbers[n]=n; @@ -244,19 +241,19 @@ SpiralWindowType *SynthModular::CreateWindow() m_Topbar = new Fl_Pack (0, 0, MAIN_WIDTH, ToolbarHeight, ""); m_Topbar->user_data((void*)(this)); m_Topbar->type(FL_HORIZONTAL); - m_Topbar->color(SpiralSynthModularInfo::GUICOL_Button); + m_Topbar->color(SpiralInfo::GUICOL_Button); m_TopWindow->add(m_Topbar); m_ToolbarPanel = new Fl_Pack (0, 0, but*5, ToolbarHeight, ""); m_ToolbarPanel->user_data((void*)(this)); m_ToolbarPanel->type(FL_VERTICAL); - m_ToolbarPanel->color(SpiralSynthModularInfo::GUICOL_Button); + m_ToolbarPanel->color(SpiralInfo::GUICOL_Button); m_Topbar->add(m_ToolbarPanel); m_Toolbar = new Fl_Pack (0, 0, but*5, but, ""); m_Toolbar->user_data((void*)(this)); m_Toolbar->type(FL_HORIZONTAL); - m_Toolbar->color(SpiralSynthModularInfo::GUICOL_Button); + m_Toolbar->color(SpiralInfo::GUICOL_Button); m_ToolbarPanel->add(m_Toolbar); m_Load = new Fl_Button(0, 0, but, but, ""); @@ -265,8 +262,8 @@ SpiralWindowType *SynthModular::CreateWindow() delete tPix; m_Load->type(0); m_Load->box(FL_PLASTIC_UP_BOX); - m_Load->color(SpiralSynthModularInfo::GUICOL_Button); - m_Load->selection_color(SpiralSynthModularInfo::GUICOL_Tool); + m_Load->color(SpiralInfo::GUICOL_Button); + m_Load->selection_color(SpiralInfo::GUICOL_Tool); m_Load->labelsize (1); m_Load->tooltip("Load a patch file"); m_Load->callback((Fl_Callback*)cb_Load); @@ -278,8 +275,8 @@ SpiralWindowType *SynthModular::CreateWindow() delete tPix; m_Save->type(0); m_Save->box(FL_PLASTIC_UP_BOX); - m_Save->color(SpiralSynthModularInfo::GUICOL_Button); - m_Save->selection_color(SpiralSynthModularInfo::GUICOL_Tool); + m_Save->color(SpiralInfo::GUICOL_Button); + m_Save->selection_color(SpiralInfo::GUICOL_Tool); m_Save->labelsize (1); m_Save->tooltip("Save a patch file"); m_Save->callback((Fl_Callback*)cb_Save); @@ -291,8 +288,8 @@ SpiralWindowType *SynthModular::CreateWindow() delete tPix; m_New->type(0); m_New->box(FL_PLASTIC_UP_BOX); - m_New->color(SpiralSynthModularInfo::GUICOL_Button); - m_New->selection_color(SpiralSynthModularInfo::GUICOL_Tool); + m_New->color(SpiralInfo::GUICOL_Button); + m_New->selection_color(SpiralInfo::GUICOL_Tool); m_New->labelsize (1); m_New->tooltip("New patch"); m_New->callback((Fl_Callback*)cb_New); @@ -304,8 +301,8 @@ SpiralWindowType *SynthModular::CreateWindow() delete tPix; m_Options->type(0); m_Options->box(FL_PLASTIC_UP_BOX); - m_Options->color(SpiralSynthModularInfo::GUICOL_Button); - m_Options->selection_color(SpiralSynthModularInfo::GUICOL_Tool); + m_Options->color(SpiralInfo::GUICOL_Button); + m_Options->selection_color(SpiralInfo::GUICOL_Tool); m_Options->labelsize (1); m_Options->tooltip("Options"); m_Options->callback((Fl_Callback*)cb_Rload); @@ -317,21 +314,21 @@ SpiralWindowType *SynthModular::CreateWindow() delete tPix; m_NewComment->type(0); m_NewComment->box(FL_PLASTIC_UP_BOX); - m_NewComment->color(SpiralSynthModularInfo::GUICOL_Button); - m_NewComment->selection_color(SpiralSynthModularInfo::GUICOL_Tool); + m_NewComment->color(SpiralInfo::GUICOL_Button); + m_NewComment->selection_color(SpiralInfo::GUICOL_Tool); m_NewComment->labelsize (1); m_NewComment->tooltip("New comment"); m_NewComment->callback((Fl_Callback*)cb_NewComment); m_Toolbar->add(m_NewComment); m_GroupFiller = new Fl_Group (0, 0, 0, ToolbarHeight, ""); - m_GroupFiller->color(SpiralSynthModularInfo::GUICOL_Button); + m_GroupFiller->color(SpiralInfo::GUICOL_Button); m_Topbar->add (m_GroupFiller); m_GroupTab = new Fl_Tabs (0, 0, MAIN_WIDTH-m_GroupFiller->w()-but*5, ToolbarHeight, ""); m_GroupTab->user_data ((void*)(this)); m_GroupTab->box(FL_PLASTIC_DOWN_BOX); - m_GroupTab->color(SpiralSynthModularInfo::GUICOL_Button); + m_GroupTab->color(SpiralInfo::GUICOL_Button); m_GroupTab->callback((Fl_Callback*)cb_GroupTab); m_Topbar->add (m_GroupTab); @@ -348,7 +345,7 @@ SpiralWindowType *SynthModular::CreateWindow() m_Canvas->box(FL_FLAT_BOX); m_Canvas->labeltype(FL_ENGRAVED_LABEL); m_Canvas->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); - m_Canvas->color(SpiralSynthModularInfo::GUICOL_Canvas); + m_Canvas->color(SpiralInfo::GUICOL_Canvas); m_Canvas->user_data((void*)(this)); m_Canvas->SetConnectionCallback((Fl_Callback*)cb_Connection); m_Canvas->SetUnconnectCallback((Fl_Callback*)cb_Unconnect); @@ -449,14 +446,14 @@ void SynthModular::LoadPlugins(string pluginPath) vector PluginVector; - if (SpiralSynthModularInfo::USEPLUGINLIST) + if (SpiralInfo::USEPLUGINLIST) { - PluginVector=SpiralSynthModularInfo::PLUGINVEC; + PluginVector=SpiralInfo::PLUGINVEC; } else { if (pluginPath.empty()) - PluginVector=BuildPluginList(SpiralSynthModularInfo::PLUGIN_PATH); + PluginVector=BuildPluginList(SpiralInfo::PLUGIN_PATH); else { string::iterator i = pluginPath.end() - 1; if (*i != '/') pluginPath += '/'; @@ -470,7 +467,7 @@ void SynthModular::LoadPlugins(string pluginPath) string Fullpath; if (pluginPath=="") { - Fullpath=SpiralSynthModularInfo::PLUGIN_PATH+*i; + Fullpath=SpiralInfo::PLUGIN_PATH+*i; } else { @@ -501,7 +498,7 @@ void SynthModular::LoadPlugins(string pluginPath) the_group = new Fl_Pack (m_GroupTab->x(), 16, m_GroupTab->w(), m_GroupTab->h()-15, GroupName.c_str()); the_group->type(FL_HORIZONTAL); the_group->labelsize(8); - the_group->color(SpiralSynthModularInfo::GUICOL_Button); + the_group->color(SpiralInfo::GUICOL_Button); the_group->user_data((void*)(this)); //m_GroupTab->add(the_group); m_GroupTab->value(the_group); @@ -514,8 +511,8 @@ void SynthModular::LoadPlugins(string pluginPath) NewButton->type(0); NewButton->box(FL_NO_BOX); NewButton->down_box(FL_NO_BOX); - //NewButton->color(SpiralSynthModularInfo::GUICOL_Button); - //NewButton->selection_color(SpiralSynthModularInfo::GUICOL_Button); + //NewButton->color(SpiralInfo::GUICOL_Button); + //NewButton->selection_color(SpiralInfo::GUICOL_Button); the_group->add(NewButton); string tooltip=*i; @@ -664,18 +661,18 @@ DeviceWin* SynthModular::NewComment(int n, int x=-1, int y=-1) DeviceWin *nlw = new DeviceWin; if (x==-1) - { - x = m_CanvasScroll->x()+50; - y = m_CanvasScroll->y()+50; + { + x = m_CanvasScroll->x()+50; + y = m_CanvasScroll->y()+50; } - + nlw->m_Device=NULL; nlw->m_PluginID = COMMENT_ID; - - DeviceGUIInfo Info; - - Info.XPos = x; - Info.YPos = y; + + DeviceGUIInfo Info; + + Info.XPos = x; + Info.YPos = y; Info.Width = 50; Info.Height = 20; Info.NumInputs = 0; @@ -683,10 +680,10 @@ DeviceWin* SynthModular::NewComment(int n, int x=-1, int y=-1) Info.Name = ""; nlw->m_DeviceGUI = new Fl_CommentGUI(Info, NULL, NULL); - + m_Canvas->add(nlw->m_DeviceGUI); m_Canvas->redraw(); - + return nlw; } @@ -755,13 +752,13 @@ void SynthModular::cb_Blocking(void* o, bool mode) ////////////////////////////////////////////////////////// istream &operator>>(istream &s, SynthModular &o) -{ +{ o.PauseAudio(); string dummy,dummy2; int ver; s>>dummy>>dummy>>dummy>>ver; - + if (ver>FILE_VERSION) { SpiralInfo::Alert("Bad file, or more recent version."); @@ -772,14 +769,14 @@ istream &operator>>(istream &s, SynthModular &o) { int MainWinX,MainWinY,MainWinW,MainWinH; int EditWinX,EditWinY,EditWinW,EditWinH; - + s>>MainWinX>>MainWinY>>MainWinW>>MainWinH; s>>EditWinX>>EditWinY>>EditWinW>>EditWinH; - + //o.m_MainWindow->resize(MainWinX,MainWinY,MainWinW,MainWinH); //o.m_EditorWindow->resize(EditWinX,EditWinY,EditWinW,EditWinH); } - + int Num, ID, PluginID, x,y,ps,px,py; s>>dummy>>Num; @@ -826,13 +823,13 @@ istream &operator>>(istream &s, SynthModular &o) } if (PluginID==COMMENT_ID) - { + { DeviceWin* temp = o.NewComment(PluginID, x, y); if (temp) { temp->m_DeviceGUI->SetID(ID); o.m_DeviceWinMap[ID]=temp; - ((Fl_CommentGUI*)(o.m_DeviceWinMap[ID]->m_DeviceGUI))->StreamIn(s); // load the plugin + ((Fl_CommentGUI*)(o.m_DeviceWinMap[ID]->m_DeviceGUI))->StreamIn(s); // load the plugin if (o.m_NextID<=ID) o.m_NextID=ID+1; } } @@ -847,15 +844,15 @@ istream &operator>>(istream &s, SynthModular &o) // set the titlebars temp->m_DeviceGUI->SetName(Name); } - - temp->m_Device->SetUpdateInfoCallback(ID,o.cb_UpdatePluginInfo); + + temp->m_Device->SetUpdateInfoCallback(ID,o.cb_UpdatePluginInfo); o.m_DeviceWinMap[ID]=temp; o.m_DeviceWinMap[ID]->m_Device->StreamIn(s); // load the plugin // load external files o.m_DeviceWinMap[ID]->m_Device->LoadExternalFiles(o.m_FilePath+"_files/"); - - if (ver>1 && o.m_DeviceWinMap[ID]->m_DeviceGUI->GetPluginWindow()) - { + + if (ver>1 && o.m_DeviceWinMap[ID]->m_DeviceGUI->GetPluginWindow()) + { // set the GUI up with the loaded values // looks messy, but if we do it here, the plugin and it's gui can remain // totally seperated. @@ -868,8 +865,8 @@ istream &operator>>(istream &s, SynthModular &o) // position the plugin window in the main window //o.m_DeviceWinMap[ID]->m_DeviceGUI->GetPluginWindow()->position(px,py); - - if (ps) + + if (ps) { o.m_DeviceWinMap[ID]->m_DeviceGUI->Maximise(); // reposition after maximise @@ -880,14 +877,14 @@ istream &operator>>(istream &s, SynthModular &o) if (o.m_NextID<=ID) o.m_NextID=ID+1; } - else + else { // can't really recover if the plugin ID doesn't match a plugin, as // we have no idea how much data in the stream belongs to this plugin SpiralInfo::Alert("Error in stream, can't really recover data from here on."); return s; } - } + } } s>>*o.m_Canvas; @@ -908,7 +905,7 @@ ostream &operator<<(ostream &s, SynthModular &o) bool ExternalDirUsed=false; string command("mkdir "+o.m_FilePath+"_files"); system(command.c_str()); - + if (FILE_VERSION>2) { s<x()<<" "<y()<<" "; @@ -916,14 +913,14 @@ ostream &operator<<(ostream &s, SynthModular &o) s<<0<<" "<<0<<" "; s<<0<<" "<<0<::iterator i=o.m_DeviceWinMap.begin(); i!=o.m_DeviceWinMap.end(); i++) - { + { s<first<<" "; // save the id @@ -944,30 +941,30 @@ ostream &operator<<(ostream &s, SynthModular &o) { s<<0<<" "<<0<<" "<<0; } - + s<second->m_PluginID==COMMENT_ID) { // save the comment gui ((Fl_CommentGUI*)(i->second->m_DeviceGUI))->StreamOut(s); } else - { + { // save the plugin - i->second->m_Device->StreamOut(s); + i->second->m_Device->StreamOut(s); } s<second->m_Device && i->second->m_Device->SaveExternalFiles(o.m_FilePath+"_files/")) { ExternalDirUsed=true; } } - + s<0 && !Pawfal_YesNo("Load - Lose changes to current patch?")) { return; - } - + } + char *fn=fl_file_chooser("Load a patch", "*.ssm", NULL); - + if (fn && fn!='\0') { ifstream inf(fn); - + if (inf) - { - m_FilePath=fn; - + { + m_FilePath=fn; + ClearUp(); inf>>*this; - + TITLEBAR=LABEL+" "+fn; m_TopWindow->label(TITLEBAR.c_str()); } @@ -1032,9 +1029,9 @@ void SynthModular::cb_Load(Fl_Button* o, void* v) inline void SynthModular::cb_Save_i(Fl_Button* o, void* v) { char *fn=fl_file_chooser("Save a patch", "*.ssm", NULL); - + if (fn && fn!='\0') - { + { ifstream ifl(fn); if (ifl) { @@ -1043,15 +1040,15 @@ inline void SynthModular::cb_Save_i(Fl_Button* o, void* v) return; } } - + ofstream of(fn); if (of) { m_FilePath=fn; - + of<<*this; - + TITLEBAR=LABEL+" "+fn; m_TopWindow->label(TITLEBAR.c_str()); } @@ -1131,7 +1128,7 @@ inline void SynthModular::cb_Rload_i(Fl_Button* o, void* v) m_ToolPack = new Fl_Pack(5,20,TOOLBOX_WIDTH-10, TOOLBOX_HEIGHT-40,""); m_ToolPack->type(FL_VERTICAL); m_ToolPack->box(FL_NO_BOX); - m_ToolPack->color(SpiralSynthModularInfo::GUICOL_Tool); + m_ToolPack->color(SpiralInfo::GUICOL_Tool); m_ToolPack->user_data((void*)(this)); m_ToolBox->add(m_ToolPack); m_ToolBox->redraw(); diff --git a/SpiralSynthModular.h b/SpiralSynthModular.h index 046d6b0..6719ad7 100644 --- a/SpiralSynthModular.h +++ b/SpiralSynthModular.h @@ -33,7 +33,6 @@ #include #include #include -#include "SpiralSynthModularInfo.h" #include "GUI/Widgets/Fl_DeviceGUI.h" #include "GUI/Widgets/Fl_CommentGUI.h" #include "GUI/Widgets/Fl_Canvas.h" diff --git a/SpiralSynthModular.pro b/SpiralSynthModular.pro index e3f9099..bdde00e 100644 --- a/SpiralSynthModular.pro +++ b/SpiralSynthModular.pro @@ -1,20 +1,18 @@ HEADERS = SpiralSynthModular.h \ - SpiralSynthModularInfo.h \ GraphSort.h \ GUI/Widgets/Fl_DeviceGUI.h \ - GUI/Widgets/Fl_CommentGUI.h \ + GUI/Widgets/Fl_CommentGUI.h \ GUI/Widgets/Fl_DragBar.H \ - GUI/Widgets/Fl_Canvas.h \ + GUI/Widgets/Fl_Canvas.h \ SpiralSound/SpiralInfo.h \ SpiralSound/Sample.h \ SpiralSound/Plugins/SpiralPlugin.h \ SpiralSound/Plugins/SpiralPluginGUI.h \ SpiralSound/PluginManager.h \ SettingsWindow.h \ - SpiralSynthPluginLocation.h - + SpiralSynthPluginLocation.h + SOURCES = SpiralSynthModular.C \ - SpiralSynthModularInfo.C \ GraphSort.C \ GUI/Widgets/Fl_DeviceGUI.C \ GUI/Widgets/Fl_CommentGUI.C \ diff --git a/SpiralSynthModularInfo.C b/SpiralSynthModularInfo.C deleted file mode 100644 index 07ed6bc..0000000 --- a/SpiralSynthModularInfo.C +++ /dev/null @@ -1,130 +0,0 @@ -/* SpiralSynthModular - * Copyleft (C) 2002 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "SpiralSynthModularInfo.h" -#include "SpiralSynthPluginLocation.h" -#include "FL/fl_draw.h" - -string SpiralInfo::LOCALE = "EN"; -int SpiralInfo::BUFSIZE = 512; -int SpiralInfo::FRAGSIZE = 256; -int SpiralInfo::FRAGCOUNT = 8; -int SpiralInfo::SAMPLERATE = 44100; -long SpiralInfo::MAXSAMPLE = 32767; -float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE; -bool SpiralInfo::WANTMIDI = false; -int SpiralInfo::FILTERGRAN = 50; -string SpiralInfo::OUTPUTFILE = "/dev/dsp"; -string SpiralInfo::MIDIFILE = "/dev/midi"; -int SpiralInfo::POLY = 1; -bool SpiralInfo::USEPLUGINLIST = false; -unsigned SpiralInfo::GUI_COLOUR = 179; -unsigned SpiralInfo::SCOPE_BG_COLOUR = fl_rgb_color (20, 60, 20); -unsigned SpiralInfo::SCOPE_FG_COLOUR = fl_rgb_color (100, 200, 100); -unsigned SpiralInfo::SCOPE_SEL_COLOUR = FL_WHITE; -unsigned SpiralInfo::SCOPE_IND_COLOUR = fl_rgb_color (203, 255, 0); -unsigned SpiralInfo::SCOPE_MRK_COLOUR = fl_rgb_color (155, 155, 50); - -/*int SpiralSynthModularInfo::GUICOL_Tool=179; -int SpiralSynthModularInfo::GUICOL_Button=181; -int SpiralSynthModularInfo::GUICOL_Canvas=181; -int SpiralSynthModularInfo::GUICOL_Device=181; -int SpiralSynthModularInfo::GUIDEVICE_Box=30;*/ - -int SpiralSynthModularInfo::GUICOL_Tool=48; -int SpiralSynthModularInfo::GUICOL_Button=42; -int SpiralSynthModularInfo::GUICOL_Canvas=50; -int SpiralSynthModularInfo::GUICOL_Device=52; -int SpiralSynthModularInfo::GUIDEVICE_Box=30; - -vector SpiralSynthModularInfo::PLUGINVEC; -string SpiralSynthModularInfo::PLUGIN_PATH; - -SpiralSynthModularInfo* SpiralSynthModularInfo::m_SpiralSynthModularInfo=NULL; - -SpiralSynthModularInfo* SpiralSynthModularInfo::Get() -{ - if (!m_SpiralSynthModularInfo) - { - m_SpiralSynthModularInfo = new SpiralSynthModularInfo; - } - - return m_SpiralSynthModularInfo; -} - -SpiralSynthModularInfo::SpiralSynthModularInfo() -{ - PLUGIN_PATH = PLUGIN_PATH_LOCATION; -} - -void SpiralSynthModularInfo::StreamInPrefs(istream &s) -{ - // call base class - SpiralInfo::StreamInPrefs(s); - - char temp[256]; - s>>temp>>temp; - s>>temp>>temp>>GUICOL_Tool; - s>>temp>>temp>>GUICOL_Button; - s>>temp>>temp>>GUICOL_Canvas; - s>>temp>>temp>>GUICOL_Device; - s>>temp>>temp>>GUIDEVICE_Box; - s>>temp>>temp>>PLUGIN_PATH; - s>>temp>>temp; - string st; - - PLUGINVEC.clear(); - - if (USEPLUGINLIST) - { - while(st!="end" && !s.eof()) - { - s>>st; - if (st!="end") PLUGINVEC.push_back(st); - } - } -#if __APPLE__ - // ignore custom paths, plugins are encapsulated in the app anyway - // this prevents the program to fail if the user move the application icon - PLUGIN_PATH = PLUGIN_PATH_LOCATION; -#endif -} - -void SpiralSynthModularInfo::StreamOutPrefs(ostream &s) -{ - // call base class - SpiralInfo::StreamOutPrefs(s); - - s< - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef SPIRALSYNTHMODULARINFO -#define SPIRALSYNTHMODULARINFO - -#include "SpiralSound/SpiralInfo.h" -#include - -class SpiralSynthModularInfo : public SpiralInfo -{ -public: - static SpiralSynthModularInfo* Get(); - void SetColours(); - - static string PLUGIN_PATH; - static vector PLUGINVEC; - - static int GUICOL_Tool; - static int GUICOL_Button; - static int GUICOL_Canvas; - static int GUICOL_Device; - static int GUIDEVICE_Box; - -protected: - SpiralSynthModularInfo(); - - virtual string GetResFileName() { return ".spiralmodular"; } - - static SpiralSynthModularInfo *m_SpiralSynthModularInfo; - - virtual void StreamInPrefs(istream &s); - virtual void StreamOutPrefs(ostream &s); -}; - -#endif diff --git a/main.cpp b/main.cpp index 7ebc1b4..84c2db9 100644 --- a/main.cpp +++ b/main.cpp @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ +*/ #ifdef HAVE_CONFIG_H #include @@ -29,6 +29,7 @@ #include #include "SpiralSynthModular.h" +#include "SpiralSound/SpiralInfo.h" pthread_t loopthread,watchdogthread; SynthModular *synth; @@ -53,7 +54,7 @@ void watchdog (void *arg) watchdog_check = 0; gui_watchdog_check = 0; - while (1) + while (1) { usleep (10000000); // gui watchdog goes off with modal dialog boxes @@ -115,7 +116,7 @@ int main(int argc, char **argv) CFURLRef url = main ? CFBundleCopyExecutableURL(main) : NULL; CFStringRef path = url ? CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle) : NULL; char * dst = (char*)CFStringGetCStringPtr(path, 0); - + printf("main %p url %p path %p dst %p", main, url, path, dst); if (dst) { printf("Have a valid name '%s'\n", dst); @@ -125,22 +126,22 @@ int main(int argc, char **argv) printf("No base pathname\n"); #endif srand(time(NULL)); - SpiralSynthModularInfo::Get()->LoadPrefs(); - + SpiralInfo::Get()->LoadPrefs(); + // get args string cmd_filename=""; bool cmd_specd = false; string cmd_pluginPath=""; - + // parse the args - if (argc>1) + if (argc>1) { for (int a=1; a