diff --git a/SpiralSound/Plugins/AmpPlugin/Makefile.in b/SpiralSound/Plugins/AmpPlugin/Makefile.in index 55db94f..441e476 100644 --- a/SpiralSound/Plugins/AmpPlugin/Makefile.in +++ b/SpiralSound/Plugins/AmpPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = AmpPlugin.h \ AmpPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = AmpPlugin.C \ AmpPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = AmpPlugin.o \ AmpPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -143,7 +140,6 @@ AmpPlugin.o: AmpPlugin.C \ AmpPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -152,7 +148,6 @@ AmpPluginGUI.o: AmpPluginGUI.C \ AmpPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in b/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in index 78dba23..6825ac3 100644 --- a/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = AnotherFilterPlugin.h \ AnotherFilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = AnotherFilterPlugin.C \ AnotherFilterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = AnotherFilterPlugin.o \ AnotherFilterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ AnotherFilterPlugin.o: AnotherFilterPlugin.C \ AnotherFilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -159,7 +155,6 @@ AnotherFilterPluginGUI.o: AnotherFilterPluginGUI.C \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../Widgets/Fl_Knob.H \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in b/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in index 25bf1b3..2beaf0c 100644 --- a/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in +++ b/SpiralSound/Plugins/BeatMatchPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = BeatMatchPlugin.h \ BeatMatchPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = BeatMatchPlugin.C \ BeatMatchPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = BeatMatchPlugin.o \ BeatMatchPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -141,7 +138,6 @@ BeatMatchPlugin.o: BeatMatchPlugin.C \ BeatMatchPlugin.h \ BeatMatchPluginGUI.h \ ../../NoteTable.h \ - ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -151,7 +147,6 @@ 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 003a3d5..7b9df08 100644 --- a/SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in +++ b/SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in @@ -43,7 +43,6 @@ HEADERS = ComplexEnvelopePlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../ChannelHandler.h \ - ../../SpiralInfo.h \ ../../Sample.h \ Bezier.h \ ../Widgets/Fl_Knob.H \ @@ -53,7 +52,6 @@ SOURCES = ComplexEnvelopePlugin.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ ../../ChannelHandler.C \ - ../../SpiralInfo.C \ ../../Sample.C \ Bezier.C \ ../Widgets/Fl_Knob.cxx \ @@ -62,7 +60,6 @@ OBJECTS = ComplexEnvelopePlugin.o \ ComplexEnvelopePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ Bezier.o \ @@ -153,7 +150,6 @@ Bezier.o: Bezier.C \ ComplexEnvelopePlugin.o: ComplexEnvelopePlugin.C \ ComplexEnvelopePlugin.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ComplexEnvelopePluginGUI.h \ ../SpiralPluginGUI.h \ @@ -165,7 +161,6 @@ ComplexEnvelopePluginGUI.o: ComplexEnvelopePluginGUI.C \ ComplexEnvelopePluginGUI.h \ ComplexEnvelopePlugin.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../SpiralPluginGUI.h \ Bezier.h \ diff --git a/SpiralSound/Plugins/ControllerPlugin/Makefile.in b/SpiralSound/Plugins/ControllerPlugin/Makefile.in index bf4bd93..259c6cc 100644 --- a/SpiralSound/Plugins/ControllerPlugin/Makefile.in +++ b/SpiralSound/Plugins/ControllerPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = ControllerPlugin.h \ ControllerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = ControllerPlugin.C \ ControllerPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = ControllerPlugin.o \ ControllerPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -144,7 +141,6 @@ ControllerPlugin.o: ControllerPlugin.C \ ControllerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -153,7 +149,6 @@ ControllerPluginGUI.o: ControllerPluginGUI.C \ ControllerPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/CounterPlugin/Makefile.in b/SpiralSound/Plugins/CounterPlugin/Makefile.in index f896f84..9e6a153 100644 --- a/SpiralSound/Plugins/CounterPlugin/Makefile.in +++ b/SpiralSound/Plugins/CounterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = CounterPlugin.h \ CounterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = CounterPlugin.C \ CounterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = CounterPlugin.o \ CounterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -141,7 +138,6 @@ CounterPlugin.o: CounterPlugin.C \ CounterPlugin.h \ CounterPluginGUI.h \ ../../NoteTable.h \ - ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -149,7 +145,6 @@ 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 6280351..d3d4c8a 100644 --- a/SpiralSound/Plugins/DelayPlugin/Makefile.in +++ b/SpiralSound/Plugins/DelayPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = DelayPlugin.h \ DelayPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = DelayPlugin.C \ DelayPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = DelayPlugin.o \ DelayPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ DelayPlugin.o: DelayPlugin.C \ DelayPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ DelayPluginGUI.o: DelayPluginGUI.C \ DelayPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in b/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in index 7eecc63..2a9cfc2 100644 --- a/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in +++ b/SpiralSound/Plugins/DiskWriterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = DiskWriterPlugin.h \ DiskWriterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -51,7 +50,6 @@ SOURCES = DiskWriterPlugin.C \ DiskWriterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -60,7 +58,6 @@ OBJECTS = DiskWriterPlugin.o \ DiskWriterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -144,14 +141,12 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h DiskWriterPlugin.o: DiskWriterPlugin.C \ DiskWriterPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ DiskWriterPluginGUI.h \ @@ -162,7 +157,6 @@ DiskWriterPluginGUI.o: DiskWriterPluginGUI.C \ DiskWriterPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/DistributorPlugin/Makefile.in b/SpiralSound/Plugins/DistributorPlugin/Makefile.in index ff12dc6..a9c5f71 100644 --- a/SpiralSound/Plugins/DistributorPlugin/Makefile.in +++ b/SpiralSound/Plugins/DistributorPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = DistributorPlugin.h \ DistributorPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = DistributorPlugin.C \ DistributorPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = DistributorPlugin.o \ DistributorPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -143,7 +140,6 @@ DistributorPlugin.o: DistributorPlugin.C \ DistributorPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -153,7 +149,6 @@ DistributorPluginGUI.o: DistributorPluginGUI.C \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../../../GUI/Widgets/SpiralGUI.H ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/Plugins/EchoPlugin/Makefile.in b/SpiralSound/Plugins/EchoPlugin/Makefile.in index daad1bf..cd49862 100644 --- a/SpiralSound/Plugins/EchoPlugin/Makefile.in +++ b/SpiralSound/Plugins/EchoPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = EchoPlugin.h \ EchoPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -52,7 +51,6 @@ SOURCES = EchoPlugin.C \ EchoPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -62,7 +60,6 @@ OBJECTS = EchoPlugin.o \ EchoPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -155,7 +152,6 @@ EchoPlugin.o: EchoPlugin.C \ EchoPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_LED_Button.H \ @@ -167,7 +163,6 @@ EchoPluginGUI.o: EchoPluginGUI.C \ EchoPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_LED_Button.H \ diff --git a/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in b/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in index e96c239..6879cf3 100644 --- a/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in +++ b/SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = EnvFollowerPlugin.h \ EnvFollowerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = EnvFollowerPlugin.C \ EnvFollowerPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = EnvFollowerPlugin.o \ EnvFollowerPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -150,7 +147,6 @@ EnvFollowerPlugin.o: EnvFollowerPlugin.C \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H \ SpiralIcon.xpm @@ -160,7 +156,6 @@ EnvFollowerPluginGUI.o: EnvFollowerPluginGUI.C \ EnvFollowerPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/EnvelopePlugin/Makefile.in b/SpiralSound/Plugins/EnvelopePlugin/Makefile.in index 0551544..d36b462 100644 --- a/SpiralSound/Plugins/EnvelopePlugin/Makefile.in +++ b/SpiralSound/Plugins/EnvelopePlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = EnvelopePlugin.h \ EnvelopePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = EnvelopePlugin.C \ EnvelopePluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = EnvelopePlugin.o \ EnvelopePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ EnvelopePlugin.o: EnvelopePlugin.C \ EnvelopePluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ EnvelopePluginGUI.o: EnvelopePluginGUI.C \ EnvelopePlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/FilterPlugin/Makefile.in b/SpiralSound/Plugins/FilterPlugin/Makefile.in index 7680b25..3ea6538 100644 --- a/SpiralSound/Plugins/FilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/FilterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = FilterPlugin.h \ FilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ iir_filter.h \ @@ -52,7 +51,6 @@ SOURCES = FilterPlugin.C \ FilterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ iir_filter.C \ @@ -62,7 +60,6 @@ OBJECTS = FilterPlugin.o \ FilterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ iir_filter.o \ @@ -156,7 +153,6 @@ FilterPlugin.o: FilterPlugin.C \ iir_filter.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -166,7 +162,6 @@ FilterPluginGUI.o: FilterPluginGUI.C \ iir_filter.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/FlipflopPlugin/Makefile.in b/SpiralSound/Plugins/FlipflopPlugin/Makefile.in index edf3b39..770c50a 100644 --- a/SpiralSound/Plugins/FlipflopPlugin/Makefile.in +++ b/SpiralSound/Plugins/FlipflopPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = FlipflopPlugin.h \ FlipflopPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = FlipflopPlugin.C \ FlipflopPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -61,7 +59,6 @@ OBJECTS = FlipflopPlugin.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ ../../ChannelHandler.o \ - ../../SpiralInfo.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -141,7 +138,6 @@ FlipflopPlugin.o: FlipflopPlugin.C \ FlipflopPlugin.h \ FlipflopPluginGUI.h \ ../../NoteTable.h \ - ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -151,7 +147,6 @@ 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 3b1b991..1026ed8 100644 --- a/SpiralSound/Plugins/FormantFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/FormantFilterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = FormantFilterPlugin.h \ FormantFilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = FormantFilterPlugin.C \ FormantFilterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = FormantFilterPlugin.o \ FormantFilterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ FormantFilterPlugin.o: FormantFilterPlugin.C \ FormantFilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ FormantFilterPluginGUI.o: FormantFilterPluginGUI.C \ FormantFilterPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/JackPlugin/Makefile.in b/SpiralSound/Plugins/JackPlugin/Makefile.in index 9da8e6b..0ba49db 100644 --- a/SpiralSound/Plugins/JackPlugin/Makefile.in +++ b/SpiralSound/Plugins/JackPlugin/Makefile.in @@ -44,7 +44,6 @@ HEADERS = JackPlugin.h \ JackPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -55,7 +54,6 @@ SOURCES = JackPlugin.C \ JackPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -66,7 +64,6 @@ OBJECTS = JackPlugin.o \ JackPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -157,15 +154,13 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h JackPlugin.o: JackPlugin.C \ JackPlugin.h \ JackPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ SpiralIcon.xpm @@ -175,7 +170,6 @@ JackPluginGUI.o: JackPluginGUI.C \ JackPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ ../Widgets/Fl_Knob.H \ diff --git a/SpiralSound/Plugins/JoystickPlugin/Makefile.in b/SpiralSound/Plugins/JoystickPlugin/Makefile.in index b4252a2..2c4824d 100644 --- a/SpiralSound/Plugins/JoystickPlugin/Makefile.in +++ b/SpiralSound/Plugins/JoystickPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = JoystickPlugin.h \ JoystickPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = JoystickPlugin.C \ JoystickPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = JoystickPlugin.o \ JoystickPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ JoystickPlugin.o: JoystickPlugin.C \ JoystickPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,8 +154,6 @@ JoystickPluginGUI.o: JoystickPluginGUI.C \ JoystickPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ - ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/KeyboardPlugin/Makefile.in b/SpiralSound/Plugins/KeyboardPlugin/Makefile.in index 44228c0..c3fc679 100644 --- a/SpiralSound/Plugins/KeyboardPlugin/Makefile.in +++ b/SpiralSound/Plugins/KeyboardPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = KeyboardPlugin.h \ KeyboardPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = KeyboardPlugin.C \ KeyboardPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = KeyboardPlugin.o \ KeyboardPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -143,7 +140,6 @@ KeyboardPlugin.o: KeyboardPlugin.C \ KeyboardPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../NoteTable.h \ SpiralIcon.xpm @@ -153,7 +149,6 @@ KeyboardPluginGUI.o: KeyboardPluginGUI.C \ KeyboardPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C index a515d2f..d79ec1d 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C @@ -31,8 +31,6 @@ #include "LADSPAPluginGUI.h" #include "LADSPAInfo.h" -#include "../../SpiralInfo.h" - LADSPAPluginGUI::LADSPAPluginGUI(int w, int h, LADSPAPlugin *o, ChannelHandler *ch, @@ -41,6 +39,7 @@ LADSPAPluginGUI::LADSPAPluginGUI(int w, int h, SpiralPluginGUI(w,h,o,ch) { m_GUIColour = (Fl_Color)Info->GUI_COLOUR; + m_GUIBox = (Fl_Boxtype)Info->GUIDEVICE_Box; m_PluginList = PVec; // Get maximum input port count @@ -65,7 +64,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)SpiralInfo::GUIDEVICE_Box); + m_BKnob->box(m_GUIBox); m_BKnob->color(Info->GUI_COLOUR); m_BKnob->selection_color(m_GUIColour); m_BKnob->callback((Fl_Callback *)cb_BKnob); @@ -74,7 +73,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)SpiralInfo::GUIDEVICE_Box); + m_BSlider->box(m_GUIBox); m_BSlider->color(m_GUIColour); m_BSlider->selection_color(m_GUIColour); m_BSlider->callback((Fl_Callback *)cb_BSlider); @@ -83,7 +82,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)SpiralInfo::GUIDEVICE_Box); + m_BSetup->box(m_GUIBox); m_BSetup->color(m_GUIColour); m_BSetup->selection_color(m_GUIColour); m_BSetup->callback((Fl_Callback *)cb_BSetup); @@ -108,7 +107,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)SpiralInfo::GUIDEVICE_Box); + m_Browser->box(m_GUIBox); m_Browser->labelsize(12); m_Browser->textsize(12); m_Browser->callback((Fl_Callback *)cb_Select); @@ -145,14 +144,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)SpiralInfo::GUIDEVICE_Box); - m_InputScroll->color((Fl_Color)SpiralInfo::GUICOL_Device); + m_InputScroll->box(m_GUIBox); + m_InputScroll->color((Fl_Color)Info->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)SpiralInfo::GUICOL_Device); + m_InputPack->color((Fl_Color)Info->GUICOL_Device); m_InputScroll->add(m_InputPack); m_SetupGroup->add(m_InputScroll); @@ -591,8 +590,8 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Value Fl_Output* NewOutput = new Fl_Output(0,0,60,18,""); - NewOutput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); - NewOutput->value(0); + NewOutput->box(m_GUIBox); + NewOutput->value(0); NewOutput->textsize(10); NewOutput->color(FL_BACKGROUND_COLOR); NewOutput->readonly(1); @@ -601,7 +600,8 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Fixed Value/Default Fl_Input* NewInput = new Fl_Input(62,0,60,18,""); - NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); + NewInput->box(fl_down(m_GUIBox)); + //NewInput->color(m_GUIColour); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_Default); @@ -610,7 +610,8 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Min NewInput = new Fl_Input(124,0,60,18,""); - NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); + NewInput->box(fl_down(m_GUIBox)); + //NewInput->color(m_GUIColour); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_Min); @@ -619,7 +620,8 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Max NewInput = new Fl_Input(186,0,60,18,""); - NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); + NewInput->box(fl_down(m_GUIBox)); + //NewInput->color(m_GUIColour); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_Max); @@ -658,7 +660,8 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Direct input box for knob NewInput = new Fl_Input(0,0,60,16); - NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); + NewInput->box(fl_down(m_GUIBox)); + //NewInput->color(m_GUIColour); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_KnobValue); @@ -686,7 +689,7 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Slider Fl_Slider* NewSlider = new Fl_Slider(0,0,20,100,""); - NewSlider->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); + NewSlider->box(fl_down(m_GUIBox)); NewSlider->type(FL_VERT_NICE_SLIDER); NewSlider->selection_color(m_GUIColour); NewSlider->callback((Fl_Callback *)cb_Slider); @@ -696,7 +699,8 @@ void LADSPAPluginGUI::AddPortInfo(unsigned long p) // Direct input box for slider NewInput = new Fl_Input(0,0,56,16); - NewInput->box((Fl_Boxtype)SpiralInfo::GUIDEVICE_Box); + NewInput->box(fl_down(m_GUIBox)); + //NewInput->color(m_GUIColour); NewInput->value(0); NewInput->textsize(10); NewInput->callback((Fl_Callback *)cb_SliderValue); diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h index 5b3a7ae..a8b2218 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h @@ -91,6 +91,7 @@ private: float ConvertControlValue(unsigned long p, float value); Fl_Color m_GUIColour; + Fl_Boxtype m_GUIBox; // Buttons Fl_Button *m_BKnob; diff --git a/SpiralSound/Plugins/LADSPAPlugin/Makefile.in b/SpiralSound/Plugins/LADSPAPlugin/Makefile.in index 4ae2447..88a8455 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/Makefile.in +++ b/SpiralSound/Plugins/LADSPAPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = LADSPAPlugin.h \ LADSPAPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ LADSPAInfo.h \ @@ -54,7 +53,6 @@ SOURCES = LADSPAPlugin.C \ LADSPAPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ LADSPAInfo.C \ @@ -66,7 +64,6 @@ OBJECTS = LADSPAPlugin.o \ LADSPAPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ LADSPAInfo.o \ @@ -161,7 +158,6 @@ install: LADSPAPlugin.o: LADSPAPlugin.C \ LADSPAPlugin.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ LADSPAPluginGUI.h \ ../SpiralPluginGUI.h \ @@ -173,7 +169,6 @@ LADSPAPluginGUI.o: LADSPAPluginGUI.C \ ../Widgets/Fl_Knob.H \ LADSPAPlugin.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../SpiralPluginGUI.h \ ../Widgets/Fl_Knob.H \ diff --git a/SpiralSound/Plugins/LFOPlugin/Makefile.in b/SpiralSound/Plugins/LFOPlugin/Makefile.in index 39622b5..0e1da2d 100644 --- a/SpiralSound/Plugins/LFOPlugin/Makefile.in +++ b/SpiralSound/Plugins/LFOPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = LFOPlugin.h \ LFOPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -56,7 +55,6 @@ SOURCES = LFOPlugin.C \ LFOPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -66,7 +64,6 @@ OBJECTS = LFOPlugin.o \ LFOPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -159,7 +156,6 @@ LFOPlugin.o: LFOPlugin.C \ LFOPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -175,7 +171,6 @@ LFOPluginGUI.o: LFOPluginGUI.C \ ../GUI/WS_Tri.h \ ../GUI/WS_Square.h \ ../GUI/WS_Saw.h \ - ../../SpiralInfo.h \ ../../Sample.h ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/Plugins/LogicPlugin/Makefile.in b/SpiralSound/Plugins/LogicPlugin/Makefile.in index a8e0432..63cfa79 100644 --- a/SpiralSound/Plugins/LogicPlugin/Makefile.in +++ b/SpiralSound/Plugins/LogicPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = LogicPlugin.h \ LogicPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = LogicPlugin.C \ LogicPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = LogicPlugin.o \ LogicPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -135,7 +132,6 @@ LogicPlugin.o: LogicPlugin.C \ LogicPlugin.h \ LogicPluginGUI.h \ ../../NoteTable.h \ - ../../SpiralInfo.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ SpiralIcon.xpm @@ -145,7 +141,6 @@ 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 e2f68d9..240b718 100644 --- a/SpiralSound/Plugins/MasherPlugin/Makefile.in +++ b/SpiralSound/Plugins/MasherPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MasherPlugin.h \ MasherPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = MasherPlugin.C \ MasherPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = MasherPlugin.o \ MasherPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ MasherPlugin.o: MasherPlugin.C \ MasherPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ MasherPluginGUI.o: MasherPluginGUI.C \ MasherPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/MatrixPlugin/Makefile.in b/SpiralSound/Plugins/MatrixPlugin/Makefile.in index f614ecb..be5f58e 100644 --- a/SpiralSound/Plugins/MatrixPlugin/Makefile.in +++ b/SpiralSound/Plugins/MatrixPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MatrixPlugin.h \ MatrixPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -52,7 +51,6 @@ SOURCES = MatrixPlugin.C \ MatrixPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -62,7 +60,6 @@ OBJECTS = MatrixPlugin.o \ MatrixPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -155,7 +152,6 @@ MatrixPlugin.o: MatrixPlugin.C \ MatrixPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm \ ../../RiffWav.h \ @@ -166,7 +162,6 @@ MatrixPluginGUI.o: MatrixPluginGUI.C \ MatrixPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H \ diff --git a/SpiralSound/Plugins/MeterPlugin/Makefile.in b/SpiralSound/Plugins/MeterPlugin/Makefile.in index 123cb61..6b789bc 100644 --- a/SpiralSound/Plugins/MeterPlugin/Makefile.in +++ b/SpiralSound/Plugins/MeterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MeterPlugin.h \ MeterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_SevenSeg.H \ @@ -52,7 +51,6 @@ SOURCES = MeterPlugin.C \ MeterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_SevenSeg.cxx \ @@ -62,7 +60,6 @@ OBJECTS = MeterPlugin.o \ MeterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_SevenSeg.o \ @@ -155,7 +152,6 @@ MeterPlugin.o: MeterPlugin.C \ MeterPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -167,7 +163,6 @@ MeterPluginGUI.o: MeterPluginGUI.C \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_VU_Meter.h \ ../Widgets/Fl_SevenSeg.H \ - ../../SpiralInfo.h \ ../../Sample.h ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/Plugins/MidiPlugin/Makefile.in b/SpiralSound/Plugins/MidiPlugin/Makefile.in index a7bcaa5..efc5a55 100644 --- a/SpiralSound/Plugins/MidiPlugin/Makefile.in +++ b/SpiralSound/Plugins/MidiPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MidiPlugin.h \ MidiPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../Midi.h \ @@ -52,7 +51,6 @@ SOURCES = MidiPlugin.C \ MidiPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../Midi.C \ @@ -62,7 +60,6 @@ OBJECTS = MidiPlugin.o \ MidiPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../Midi.o \ @@ -156,7 +153,6 @@ MidiPlugin.o: MidiPlugin.C \ MidiPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../NoteTable.h \ ../../Midi.h \ @@ -167,7 +163,6 @@ MidiPluginGUI.o: MidiPluginGUI.C \ MidiPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in b/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in index 186fa81..75d1b56 100644 --- a/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in +++ b/SpiralSound/Plugins/MixSwitchPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MixSwitchPlugin.h \ MixSwitchPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = MixSwitchPlugin.C \ MixSwitchPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = MixSwitchPlugin.o \ MixSwitchPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ MixSwitchPlugin.o: MixSwitchPlugin.C \ MixSwitchPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ MixSwitchPluginGUI.o: MixSwitchPluginGUI.C \ MixSwitchPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/MixerPlugin/Makefile.in b/SpiralSound/Plugins/MixerPlugin/Makefile.in index da9a1cf..a4da3ce 100644 --- a/SpiralSound/Plugins/MixerPlugin/Makefile.in +++ b/SpiralSound/Plugins/MixerPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MixerPlugin.h \ MixerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_LED_Button.H \ @@ -51,7 +50,6 @@ SOURCES = MixerPlugin.C \ MixerPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_LED_Button.cxx \ @@ -60,7 +58,6 @@ OBJECTS = MixerPlugin.o \ MixerPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_LED_Button.o \ @@ -149,7 +146,6 @@ MixerPlugin.o: MixerPlugin.C \ MixerPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ MixerPluginGUI.o: MixerPluginGUI.C \ MixerPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_LED_Button.H diff --git a/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in b/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in index 9269506..865b05d 100644 --- a/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/MoogFilterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MoogFilterPlugin.h \ MoogFilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = MoogFilterPlugin.C \ MoogFilterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = MoogFilterPlugin.o \ MoogFilterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ MoogFilterPlugin.o: MoogFilterPlugin.C \ MoogFilterPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ MoogFilterPluginGUI.o: MoogFilterPluginGUI.C \ MoogFilterPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/MousePlugin/Makefile.in b/SpiralSound/Plugins/MousePlugin/Makefile.in index febd54e..79cc2de 100644 --- a/SpiralSound/Plugins/MousePlugin/Makefile.in +++ b/SpiralSound/Plugins/MousePlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = MousePlugin.h \ MousePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ scratch.h \ @@ -51,7 +50,6 @@ SOURCES = MousePlugin.C \ MousePluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ scratch.C \ @@ -60,7 +58,6 @@ OBJECTS = MousePlugin.o \ MousePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ scratch.o \ @@ -142,7 +139,6 @@ MousePlugin.o: MousePlugin.C \ MousePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ scratch.h \ SpiralIcon.xpm @@ -153,7 +149,6 @@ MousePluginGUI.o: MousePluginGUI.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ ../../../GUI/Widgets/SpiralGUI.H \ - ../../SpiralInfo.h \ ../../Sample.h \ scratch.h diff --git a/SpiralSound/Plugins/NoisePlugin/Makefile.in b/SpiralSound/Plugins/NoisePlugin/Makefile.in index 1feed7b..547cefa 100644 --- a/SpiralSound/Plugins/NoisePlugin/Makefile.in +++ b/SpiralSound/Plugins/NoisePlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = NoisePlugin.h \ NoisePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_LED_Button.H \ @@ -51,7 +50,6 @@ SOURCES = NoisePlugin.C \ NoisePluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_LED_Button.cxx \ @@ -60,7 +58,6 @@ OBJECTS = NoisePlugin.o \ NoisePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_LED_Button.o \ @@ -149,7 +146,6 @@ NoisePlugin.o: NoisePlugin.C \ NoisePluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -160,7 +156,6 @@ NoisePluginGUI.o: NoisePluginGUI.C \ ../SpiralPluginGUI.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_LED_Button.H \ - ../../SpiralInfo.h \ ../../Sample.h ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in b/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in index c9ae2c0..bab702b 100644 --- a/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in +++ b/SpiralSound/Plugins/NoteSnapPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = NoteSnapPlugin.h \ NoteSnapPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = NoteSnapPlugin.C \ NoteSnapPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = NoteSnapPlugin.o \ NoteSnapPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o diff --git a/SpiralSound/Plugins/OperatorPlugin/Makefile.in b/SpiralSound/Plugins/OperatorPlugin/Makefile.in index a4dc8f0..131108d 100644 --- a/SpiralSound/Plugins/OperatorPlugin/Makefile.in +++ b/SpiralSound/Plugins/OperatorPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = OperatorPlugin.h \ OperatorPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = OperatorPlugin.C \ OperatorPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = OperatorPlugin.o \ OperatorPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o diff --git a/SpiralSound/Plugins/OscillatorPlugin/Makefile.in b/SpiralSound/Plugins/OscillatorPlugin/Makefile.in index 01ac0a4..25065dc 100644 --- a/SpiralSound/Plugins/OscillatorPlugin/Makefile.in +++ b/SpiralSound/Plugins/OscillatorPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = OscillatorPlugin.h \ OscillatorPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../GUI/WS_Square.h \ @@ -55,7 +54,6 @@ SOURCES = OscillatorPlugin.C \ OscillatorPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -65,7 +63,6 @@ OBJECTS = OscillatorPlugin.o \ OscillatorPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -158,7 +155,6 @@ OscillatorPlugin.o: OscillatorPlugin.C \ OscillatorPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -173,7 +169,6 @@ OscillatorPluginGUI.o: OscillatorPluginGUI.C \ ../GUI/WS_Saw.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/Plugins/OutputPlugin/Makefile.in b/SpiralSound/Plugins/OutputPlugin/Makefile.in index 8989ca1..995a11f 100644 --- a/SpiralSound/Plugins/OutputPlugin/Makefile.in +++ b/SpiralSound/Plugins/OutputPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = OutputPlugin.h \ OutputPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -52,7 +51,6 @@ SOURCES = OutputPlugin.C \ OutputPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -62,7 +60,6 @@ OBJECTS = OutputPlugin.o \ OutputPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -149,15 +146,13 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h OutputPlugin.o: OutputPlugin.C \ OutputPlugin.h \ OutputPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ SpiralIcon.xpm @@ -167,7 +162,6 @@ OutputPluginGUI.o: OutputPluginGUI.C \ OutputPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ ../Widgets/Fl_Knob.H \ diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in b/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in index 34a5e15..ce7a667 100644 --- a/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in +++ b/SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in @@ -43,7 +43,6 @@ HEADERS = PoshSamplerPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../ChannelHandler.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ ../Widgets/Fl_Knob.H \ @@ -52,7 +51,6 @@ SOURCES = PoshSamplerPlugin.C \ PoshSamplerPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -62,7 +60,6 @@ OBJECTS = PoshSamplerPlugin.o \ PoshSamplerPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -149,15 +146,13 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h PoshSamplerPlugin.o: PoshSamplerPlugin.C \ PoshSamplerPlugin.h \ PoshSamplerPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm \ ../../RiffWav.h \ @@ -168,7 +163,6 @@ PoshSamplerPluginGUI.o: PoshSamplerPluginGUI.C \ PoshSamplerPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/RingModPlugin/Makefile.in b/SpiralSound/Plugins/RingModPlugin/Makefile.in index 91ad860..091a8ed 100644 --- a/SpiralSound/Plugins/RingModPlugin/Makefile.in +++ b/SpiralSound/Plugins/RingModPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = RingModPlugin.h \ RingModPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = RingModPlugin.C \ RingModPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = RingModPlugin.o \ RingModPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ RingModPlugin.o: RingModPlugin.C \ RingModPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ RingModPluginGUI.o: RingModPluginGUI.C \ RingModPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/SVFilterPlugin/Makefile.in b/SpiralSound/Plugins/SVFilterPlugin/Makefile.in index 045fe64..0a9b677 100644 --- a/SpiralSound/Plugins/SVFilterPlugin/Makefile.in +++ b/SpiralSound/Plugins/SVFilterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SVFilterPlugin.h \ SVFilterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = SVFilterPlugin.C \ SVFilterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = SVFilterPlugin.o \ SVFilterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -150,7 +147,6 @@ SVFilterPlugin.o: SVFilterPlugin.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ SpiralIcon.xpm SVFilterPluginGUI.o: SVFilterPluginGUI.C \ @@ -159,7 +155,6 @@ SVFilterPluginGUI.o: SVFilterPluginGUI.C \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in b/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in index 315b985..e2d8ef0 100644 --- a/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in +++ b/SpiralSound/Plugins/SampleHoldPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SampleHoldPlugin.h \ SampleHoldPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = SampleHoldPlugin.C \ SampleHoldPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = SampleHoldPlugin.o \ SampleHoldPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -144,7 +141,6 @@ SampleHoldPlugin.o: SampleHoldPlugin.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ SpiralIcon.xpm SampleHoldPluginGUI.o: SampleHoldPluginGUI.C \ @@ -152,7 +148,6 @@ SampleHoldPluginGUI.o: SampleHoldPluginGUI.C \ SampleHoldPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/SamplerPlugin/Makefile.in b/SpiralSound/Plugins/SamplerPlugin/Makefile.in index 514e5e1..86b4da7 100644 --- a/SpiralSound/Plugins/SamplerPlugin/Makefile.in +++ b/SpiralSound/Plugins/SamplerPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SamplerPlugin.h \ SamplerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -52,7 +51,6 @@ SOURCES = SamplerPlugin.C \ SamplerPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -62,7 +60,6 @@ OBJECTS = SamplerPlugin.o \ SamplerPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -149,14 +146,12 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SamplerPlugin.o: SamplerPlugin.C \ SamplerPlugin.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SamplerPluginGUI.h \ ../SpiralPluginGUI.h \ @@ -169,7 +164,6 @@ SamplerPluginGUI.o: SamplerPluginGUI.C \ SamplerPlugin.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../SpiralPluginGUI.h \ ../../../GUI/Widgets/SpiralGUI.H \ diff --git a/SpiralSound/Plugins/ScopePlugin/Makefile.in b/SpiralSound/Plugins/ScopePlugin/Makefile.in index 8b8c110..6c39871 100644 --- a/SpiralSound/Plugins/ScopePlugin/Makefile.in +++ b/SpiralSound/Plugins/ScopePlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = ScopePlugin.h \ ScopePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = ScopePlugin.C \ ScopePluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = ScopePlugin.o \ ScopePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ ScopePlugin.o: ScopePlugin.C \ ScopePluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -158,7 +154,6 @@ ScopePluginGUI.o: ScopePluginGUI.C \ ScopePlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/SeqPlugin/Makefile.in b/SpiralSound/Plugins/SeqPlugin/Makefile.in index a8ded8f..53e6df9 100644 --- a/SpiralSound/Plugins/SeqPlugin/Makefile.in +++ b/SpiralSound/Plugins/SeqPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SeqPlugin.h \ SeqPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -54,7 +53,6 @@ SOURCES = SeqPlugin.C \ SeqPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -66,7 +64,6 @@ OBJECTS = SeqPlugin.o \ SeqPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -163,8 +160,7 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SeqPlugin.o: SeqPlugin.C \ SeqPlugin.h \ @@ -172,7 +168,6 @@ SeqPlugin.o: SeqPlugin.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ SpiralIcon.xpm \ ../../RiffWav.h \ ../../NoteTable.h @@ -182,7 +177,6 @@ SeqPluginGUI.o: SeqPluginGUI.C \ SeqPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_EventMap.h \ ../Widgets/Fl_SEvent.h \ diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in b/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in index e340dcf..407dea5 100644 --- a/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in +++ b/SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SeqSelectorPlugin.h \ SeqSelectorPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_LED_Button.H \ @@ -51,7 +50,6 @@ SOURCES = SeqSelectorPlugin.C \ SeqSelectorPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_LED_Button.cxx \ @@ -60,7 +58,6 @@ OBJECTS = SeqSelectorPlugin.o \ SeqSelectorPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_LED_Button.o \ @@ -149,7 +146,6 @@ SeqSelectorPlugin.o: SeqSelectorPlugin.C \ SeqSelectorPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../NoteTable.h \ ../../Sample.h \ SpiralIcon.xpm @@ -159,7 +155,6 @@ SeqSelectorPluginGUI.o: SeqSelectorPluginGUI.C \ SeqSelectorPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_LED_Button.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/SequencerPlugin/Makefile.in b/SpiralSound/Plugins/SequencerPlugin/Makefile.in index 529dac2..920c9e9 100644 --- a/SpiralSound/Plugins/SequencerPlugin/Makefile.in +++ b/SpiralSound/Plugins/SequencerPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SequencerPlugin.h \ SequencerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -54,7 +53,6 @@ SOURCES = SequencerPlugin.C \ SequencerPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -66,7 +64,6 @@ OBJECTS = SequencerPlugin.o \ SequencerPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -163,15 +160,13 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h SequencerPlugin.o: SequencerPlugin.C \ SequencerPlugin.h \ SequencerPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ ../../NoteTable.h \ @@ -182,7 +177,6 @@ SequencerPluginGUI.o: SequencerPluginGUI.C \ SequencerPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_EventMap.h \ ../Widgets/Fl_SEvent.h \ diff --git a/SpiralSound/Plugins/SmoothPlugin/Makefile.in b/SpiralSound/Plugins/SmoothPlugin/Makefile.in index 5149969..c3931d3 100644 --- a/SpiralSound/Plugins/SmoothPlugin/Makefile.in +++ b/SpiralSound/Plugins/SmoothPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SmoothPlugin.h \ SmoothPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = SmoothPlugin.C \ SmoothPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = SmoothPlugin.o \ SmoothPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -149,7 +146,6 @@ SmoothPlugin.o: SmoothPlugin.C \ SmoothPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -159,7 +155,6 @@ SmoothPluginGUI.o: SmoothPluginGUI.C \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/GUI/GUIBase.h b/SpiralSound/Plugins/SpiralLoopPlugin/GUI/GUIBase.h index 9072cbc..a771e86 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/GUI/GUIBase.h +++ b/SpiralSound/Plugins/SpiralLoopPlugin/GUI/GUIBase.h @@ -14,9 +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. -*/ - -#include "../../../SpiralInfo.h" +*/ #ifndef GUIBASE #define GUIBASE diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C b/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C index 2cf5435..3056761 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C +++ b/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include -#include "../../../SpiralInfo.h" #include "Widgets/Fl_Loop.h" #include "LoopGUI.h" diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in b/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in index 6dfbc66..a1626f4 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in +++ b/SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SpiralLoopPlugin.h \ SpiralLoopPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -55,7 +54,6 @@ SOURCES = SpiralLoopPlugin.C \ SpiralLoopPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -68,7 +66,6 @@ OBJECTS = SpiralLoopPlugin.o \ SpiralLoopPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -154,8 +151,7 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h #GUI/Widgets/Fl_Loop.o: GUI/Widgets/Fl_Loop.C \ # GUI/Widgets/Fl_Loop.h @@ -171,7 +167,6 @@ SpiralLoopPlugin.o: SpiralLoopPlugin.C \ SpiralLoopPlugin.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../NoteTable.h \ Fl_Loop.h \ @@ -190,12 +185,9 @@ SpiralLoopPluginGUI.o: SpiralLoopPluginGUI.C \ SpiralLoopPlugin.h \ ../SpiralPlugin.h \ ../../Sample.h \ - ../../SpiralInfo.h \ - ../../Sample.h \ ../../NoteTable.h \ Fl_Loop.h \ Fl_Trigger.h \ - ../../Sample.h \ ../SpiralPluginGUI.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Delay.h b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Delay.h index e19f7dc..327a401 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Delay.h +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Delay.h @@ -14,13 +14,12 @@ * 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. -*/ +*/ -// Stereo module, different delay times for left and right, due to reverb +// Stereo module, different delay times for left and right, due to reverb // functionality. #include -#include "../../../SpiralInfo.h" #ifndef DELAY #define DELAY diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Filter.h b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Filter.h index bcd44c3..c91499d 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Filter.h +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Filter.h @@ -14,11 +14,10 @@ * 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 "../../../NoteTable.h" -#include "../../../SpiralInfo.h" #include "iir_filter.h" #ifndef _FILTER diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Reverb.h b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Reverb.h index 142c7b9..a84501d 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Reverb.h +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralSound/Reverb.h @@ -14,9 +14,8 @@ * 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 "../../../SpiralInfo.h" #include "Delay.h" #include diff --git a/SpiralSound/Plugins/SpiralPlugin.h b/SpiralSound/Plugins/SpiralPlugin.h index 542208c..6a4c47f 100644 --- a/SpiralSound/Plugins/SpiralPlugin.h +++ b/SpiralSound/Plugins/SpiralPlugin.h @@ -59,6 +59,8 @@ struct HostInfo unsigned SCOPE_SEL_COLOUR; unsigned SCOPE_IND_COLOUR; unsigned SCOPE_MRK_COLOUR; + unsigned GUICOL_Device; + unsigned GUIDEVICE_Box; }; ///////////////////////////////////////////////////////////////////// diff --git a/SpiralSound/Plugins/SpiralPluginGUI.C b/SpiralSound/Plugins/SpiralPluginGUI.C index 2e5142a..8f3cbfc 100644 --- a/SpiralSound/Plugins/SpiralPluginGUI.C +++ b/SpiralSound/Plugins/SpiralPluginGUI.C @@ -97,22 +97,22 @@ inline void SpiralPluginGUI::cb_Help_i(Fl_Button* o, void* v) m_HelpWin_text->buffer(new Fl_Text_Buffer); m_HelpWin_text->textsize(12); - + m_HelpWin->add(m_HelpWin_text); m_HelpWin->resizable(m_HelpWin_text); - + m_HelpWin->callback((Fl_Callback*)cb_Help_close); } - + if(Help_owner!=this) { - m_HelpWin_text->buffer()->text(GetHelpText(SpiralInfo::LOCALE).c_str()); + m_HelpWin_text->buffer()->text(GetHelpText(SpiralInfo::LOCALE).c_str()); m_HelpWin->show(); Help_owner=this; } else cb_Help_close_i(m_HelpWin, NULL); } -void SpiralPluginGUI::cb_Help(Fl_Button* o, void* v) +void SpiralPluginGUI::cb_Help(Fl_Button* o, void* v) { ((SpiralPluginGUI*)(o->parent()))->cb_Help_i(o,v); } inline void SpiralPluginGUI::cb_Help_close_i(Fl_Double_Window* w, void* v) @@ -121,6 +121,6 @@ inline void SpiralPluginGUI::cb_Help_close_i(Fl_Double_Window* w, void* v) Help_owner=NULL; } -void SpiralPluginGUI::cb_Help_close(Fl_Double_Window* w, void* v) +void SpiralPluginGUI::cb_Help_close(Fl_Double_Window* w, void* v) { ((SpiralPluginGUI*)(w->parent()))->cb_Help_close_i(w,v); } diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in b/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in index 9ed8c0a..daddaf4 100644 --- a/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in +++ b/SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SplitSwitchPlugin.h \ SplitSwitchPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = SplitSwitchPlugin.C \ SplitSwitchPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = SplitSwitchPlugin.o \ SplitSwitchPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -143,7 +140,6 @@ SplitSwitchPlugin.o: SplitSwitchPlugin.C \ SplitSwitchPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -152,7 +148,6 @@ SplitSwitchPluginGUI.o: SplitSwitchPluginGUI.C \ SplitSwitchPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/SplitterPlugin/Makefile.in b/SpiralSound/Plugins/SplitterPlugin/Makefile.in index cead4f2..b1bbb35 100644 --- a/SpiralSound/Plugins/SplitterPlugin/Makefile.in +++ b/SpiralSound/Plugins/SplitterPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SplitterPlugin.h \ SplitterPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = SplitterPlugin.C \ SplitterPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = SplitterPlugin.o \ SplitterPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -143,7 +140,6 @@ SplitterPlugin.o: SplitterPlugin.C \ SplitterPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -152,7 +148,6 @@ SplitterPluginGUI.o: SplitterPluginGUI.C \ SplitterPlugin.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in b/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in index 371720c..44899d6 100644 --- a/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in +++ b/SpiralSound/Plugins/StereoMixerPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = StereoMixerPlugin.h \ StereoMixerPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -51,7 +50,6 @@ SOURCES = StereoMixerPlugin.C \ StereoMixerPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -60,7 +58,6 @@ OBJECTS = StereoMixerPlugin.o \ StereoMixerPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -151,7 +148,6 @@ StereoMixerPlugin.o: StereoMixerPlugin.C \ StereoMixerPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -160,7 +156,6 @@ StereoMixerPluginGUI.o: StereoMixerPluginGUI.C \ StereoMixerPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../../../GUI/Widgets/SpiralGUI.H diff --git a/SpiralSound/Plugins/StreamPlugin/Makefile.in b/SpiralSound/Plugins/StreamPlugin/Makefile.in index 54dd6de..28522e7 100644 --- a/SpiralSound/Plugins/StreamPlugin/Makefile.in +++ b/SpiralSound/Plugins/StreamPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = StreamPlugin.h \ StreamPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../RiffWav.h \ @@ -53,7 +52,6 @@ SOURCES = StreamPlugin.C \ StreamPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../RiffWav.C \ @@ -64,7 +62,6 @@ OBJECTS = StreamPlugin.o \ StreamPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../RiffWav.o \ @@ -154,15 +151,13 @@ install: ../../RiffWav.o: ../../RiffWav.C \ ../../RiffWav.h \ - ../../Sample.h \ - ../../SpiralInfo.h + ../../Sample.h StreamPlugin.o: StreamPlugin.C \ StreamPlugin.h \ StreamPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../../RiffWav.h \ SpiralIcon.xpm \ @@ -174,7 +169,6 @@ StreamPluginGUI.o: StreamPluginGUI.C \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ ../../Sample.h \ - ../../SpiralInfo.h \ ../../RiffWav.h \ ../../../GUI/Widgets/SpiralGUI.H \ ../Widgets/Fl_Knob.H \ diff --git a/SpiralSound/Plugins/SwitchPlugin/Makefile.in b/SpiralSound/Plugins/SwitchPlugin/Makefile.in index 61e3f81..0e8a130 100644 --- a/SpiralSound/Plugins/SwitchPlugin/Makefile.in +++ b/SpiralSound/Plugins/SwitchPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = SwitchPlugin.h \ SwitchPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = SwitchPlugin.C \ SwitchPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = SwitchPlugin.o \ SwitchPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -142,7 +139,6 @@ 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 e3ba8ac..d7ba9e3 100644 --- a/SpiralSound/Plugins/TransposePlugin/Makefile.in +++ b/SpiralSound/Plugins/TransposePlugin/Makefile.in @@ -38,7 +38,6 @@ HEADERS = TransposePlugin.h \ TransposePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -46,7 +45,6 @@ SOURCES = TransposePlugin.C \ TransposePluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -54,7 +52,6 @@ OBJECTS = TransposePlugin.o \ TransposePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -142,7 +139,6 @@ TransposePlugin.o: TransposePlugin.C \ TransposePluginGUI.o: TransposePluginGUI.C \ TransposePlugin.h \ TransposePluginGUI.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 2b37724..52f8797 100644 --- a/SpiralSound/Plugins/TrigPlugin/Makefile.in +++ b/SpiralSound/Plugins/TrigPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = TrigPlugin.h \ TrigPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = TrigPlugin.C \ TrigPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = TrigPlugin.o \ TrigPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -142,7 +139,6 @@ 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 000958f..0c258ac 100644 --- a/SpiralSound/Plugins/WaveShaperPlugin/Makefile.in +++ b/SpiralSound/Plugins/WaveShaperPlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = WaveShaperPlugin.h \ WaveShaperPluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ @@ -52,7 +51,6 @@ SOURCES = WaveShaperPlugin.C \ WaveShaperPluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.h \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -62,7 +60,6 @@ OBJECTS = WaveShaperPlugin.o \ WaveShaperPluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -155,7 +152,6 @@ WaveShaperPlugin.o: WaveShaperPlugin.C \ WaveShaperPluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -164,7 +160,6 @@ WaveShaperPluginGUI.o: WaveShaperPluginGUI.C \ WaveShaperPlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ ../Widgets/Fl_Knob.H \ ../Widgets/Fl_LED_Button.H \ diff --git a/SpiralSound/Plugins/WaveTablePlugin/Makefile.in b/SpiralSound/Plugins/WaveTablePlugin/Makefile.in index 9441aae..2d28d08 100644 --- a/SpiralSound/Plugins/WaveTablePlugin/Makefile.in +++ b/SpiralSound/Plugins/WaveTablePlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = WaveTablePlugin.h \ WaveTablePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../GUI/WS_Square.h \ @@ -60,7 +59,6 @@ SOURCES = WaveTablePlugin.C \ WaveTablePluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../Widgets/Fl_Knob.cxx \ @@ -70,7 +68,6 @@ OBJECTS = WaveTablePlugin.o \ WaveTablePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../Widgets/Fl_Knob.o \ @@ -163,7 +160,6 @@ WaveTablePlugin.o: WaveTablePlugin.C \ WaveTablePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -182,9 +178,7 @@ WaveTablePluginGUI.o: WaveTablePluginGUI.C \ ../GUI/WS_Sine.h \ ../GUI/WS_Pulse1.h \ ../GUI/WS_Pulse2.h \ - ../GUI/WS_InvSine.h \ - ../../SpiralInfo.h \ - ../../Sample.h + ../GUI/WS_InvSine.h ../../ChannelHandler.o: ../../ChannelHandler.C \ ../../ChannelHandler.h diff --git a/SpiralSound/Plugins/XFadePlugin/Makefile.in b/SpiralSound/Plugins/XFadePlugin/Makefile.in index 37737a4..d004591 100644 --- a/SpiralSound/Plugins/XFadePlugin/Makefile.in +++ b/SpiralSound/Plugins/XFadePlugin/Makefile.in @@ -42,7 +42,6 @@ HEADERS = XFadePlugin.h \ XFadePluginGUI.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ ../../ChannelHandler.h \ ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H @@ -50,7 +49,6 @@ SOURCES = XFadePlugin.C \ XFadePluginGUI.C \ ../SpiralPlugin.C \ ../SpiralPluginGUI.C \ - ../../SpiralInfo.C \ ../../ChannelHandler.C \ ../../Sample.C \ ../../../GUI/Widgets/SpiralGUI.C @@ -58,7 +56,6 @@ OBJECTS = XFadePlugin.o \ XFadePluginGUI.o \ ../SpiralPlugin.o \ ../SpiralPluginGUI.o \ - ../../SpiralInfo.o \ ../../ChannelHandler.o \ ../../Sample.o \ ../../../GUI/Widgets/SpiralGUI.o @@ -142,7 +139,6 @@ XFadePlugin.o: XFadePlugin.C \ XFadePluginGUI.h \ ../SpiralPluginGUI.h \ ../SpiralPlugin.h \ - ../../SpiralInfo.h \ ../../Sample.h \ SpiralIcon.xpm @@ -151,8 +147,6 @@ XFadePluginGUI.o: XFadePluginGUI.C \ XFadePlugin.h \ ../SpiralPlugin.h \ ../SpiralPluginGUI.h \ - ../../SpiralInfo.h \ - ../../Sample.h \ ../../../GUI/Widgets/SpiralGUI.H ../../ChannelHandler.o: ../../ChannelHandler.C \ diff --git a/SpiralSound/RiffWav.C b/SpiralSound/RiffWav.C index bce62c5..0ab1d45 100644 --- a/SpiralSound/RiffWav.C +++ b/SpiralSound/RiffWav.C @@ -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. -*/ +*/ #include #include @@ -22,12 +22,12 @@ #include #include #include "RiffWav.h" -#include "SpiralInfo.h" +//#include "SpiralInfo.h" #include #include #include -//#define TRACE_OUT +//#define TRACE_OUT const int HEADERLEN = (4+24+8); @@ -41,15 +41,15 @@ const int HEADERLEN = (4+24+8); int WavFile::Open(string FileName, Mode mode, Channels channels) { - if (m_Stream!=NULL) + if (m_Stream!=NULL) { cerr<<"WavFile: File already open ["< SpiralInfo::PLUGINVEC; string SpiralInfo::PLUGIN_PATH; - SpiralInfo* SpiralInfo::m_SpiralInfo=NULL; SpiralInfo* SpiralInfo::Get() { diff --git a/SpiralSynthModular.C b/SpiralSynthModular.C index 2c5106c..866cef4 100644 --- a/SpiralSynthModular.C +++ b/SpiralSynthModular.C @@ -78,22 +78,23 @@ SynthModular::SynthModular(): m_NextID(0), m_PauseAudio(false) { - m_Info.BUFSIZE = SpiralInfo::BUFSIZE; - m_Info.FRAGSIZE = SpiralInfo::FRAGSIZE; - m_Info.FRAGCOUNT = SpiralInfo::FRAGCOUNT; + m_Info.BUFSIZE = SpiralInfo::BUFSIZE; + m_Info.FRAGSIZE = SpiralInfo::FRAGSIZE; + m_Info.FRAGCOUNT = SpiralInfo::FRAGCOUNT; m_Info.SAMPLERATE = SpiralInfo::SAMPLERATE; m_Info.OUTPUTFILE = SpiralInfo::OUTPUTFILE; - m_Info.MIDIFILE = SpiralInfo::MIDIFILE; - m_Info.POLY = SpiralInfo::POLY; - m_Info.GUI_COLOUR = SpiralInfo::GUI_COLOUR; - m_Info.SCOPE_BG_COLOUR = SpiralInfo::SCOPE_BG_COLOUR; - m_Info.SCOPE_FG_COLOUR = SpiralInfo::SCOPE_FG_COLOUR; + m_Info.MIDIFILE = SpiralInfo::MIDIFILE; + m_Info.POLY = SpiralInfo::POLY; + m_Info.GUI_COLOUR = SpiralInfo::GUI_COLOUR; + m_Info.SCOPE_BG_COLOUR = SpiralInfo::SCOPE_BG_COLOUR; + m_Info.SCOPE_FG_COLOUR = SpiralInfo::SCOPE_FG_COLOUR; 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.SpiralInfo::GUICOL_Button = SpiralInfo::SpiralInfo::GUICOL_Button; + m_Info.GUICOL_Device = SpiralInfo::GUICOL_Device; + m_Info.GUIDEVICE_Box = SpiralInfo::GUIDEVICE_Box; - for (int n=0; n<512; n++) Numbers[n]=n; + for (int n=0; n<512; n++) Numbers[n]=n; m_CH.Register("PauseAudio",&m_PauseAudio); } @@ -360,8 +361,7 @@ SpiralWindowType *SynthModular::CreateWindow() ////////////////////////////////////////////////////////// -vector SynthModular::BuildPluginList(const string &Path) -{ +vector SynthModular::BuildPluginList (const string &Path) { // Scan plugin path for plugins. DIR *dp; struct dirent *ep; @@ -372,47 +372,37 @@ vector SynthModular::BuildPluginList(const string &Path) vector ret; dp = opendir(path); - if (!dp) - { - cerr << "WARNING: Could not open path " << path << endl; + if (!dp) { + cerr << "WARNING: Could not open path " << path << endl; } - else - { - while ((ep = readdir(dp))) - { - + else { + while ((ep = readdir(dp))) { // Need full path fullpath = path; fullpath.append(ep->d_name); - // Stat file to get type - if (!stat(fullpath.c_str(), &sb)) - { + // Stat file to get type + if (!stat(fullpath.c_str(), &sb)) { // We only want regular files - if (S_ISREG(sb.st_mode)) - { - - // We're not fussed about resolving symbols yet, since we are just - // checking if it's a DLL. + if (S_ISREG(sb.st_mode)) { + // We're not fussed about resolving symbols yet, since we are just + // checking if it's a DLL. handle = dlopen(fullpath.c_str(), RTLD_LAZY); - if (!handle) - { + if (!handle) { cerr << "WARNING: File " << path << ep->d_name << " could not be examined" << endl; cerr << "dlerror() output:" << endl; cerr << dlerror() << endl; } - else - { + else { // It's a DLL. Add name to list ret.push_back(ep->d_name); } - } - } + } + } } } - - return ret; + return ret; } void SynthModular::LoadPlugins(string pluginPath) @@ -442,23 +432,22 @@ void SynthModular::LoadPlugins(string pluginPath) Splash->add(splashtext); Splash->show(); - int ID=-1; + int ID=-1; vector PluginVector; - if (SpiralInfo::USEPLUGINLIST) - { - PluginVector=SpiralInfo::PLUGINVEC; + if (SpiralInfo::USEPLUGINLIST) { + PluginVector=SpiralInfo::PLUGINVEC; } - else - { - if (pluginPath.empty()) - PluginVector=BuildPluginList(SpiralInfo::PLUGIN_PATH); - else { - string::iterator i = pluginPath.end() - 1; - if (*i != '/') pluginPath += '/'; - PluginVector=BuildPluginList(pluginPath); - } + else { + if (pluginPath.empty()) { + PluginVector=BuildPluginList (SpiralInfo::PLUGIN_PATH); + } + else { + string::iterator i = pluginPath.end() - 1; + if (*i != '/') pluginPath += '/'; + PluginVector=BuildPluginList(pluginPath); + } } for (vector::iterator i=PluginVector.begin(); @@ -601,11 +590,9 @@ DeviceWin* SynthModular::NewDeviceWin(int n, int x, int y) nlw->m_Device=Plugin->CreateInstance(); - if (!nlw->m_Device) - { - return NULL; - } - nlw->m_Device->SetBlockingCallback(cb_Blocking); + if (!nlw->m_Device) return NULL; + + nlw->m_Device->SetBlockingCallback(cb_Blocking); nlw->m_Device->SetUpdateCallback(cb_Update); nlw->m_Device->SetParent((void*)this); @@ -614,10 +601,7 @@ DeviceWin* SynthModular::NewDeviceWin(int n, int x, int y) Fl_Pixmap *Pix = new Fl_Pixmap(Plugin->GetIcon()); nlw->m_PluginID = n; - if (temp) - { - temp->position(x+10,y); - } + if (temp) temp->position(x+10,y); DeviceGUIInfo Info=BuildDeviceGUIInfo(PInfo); diff --git a/main.cpp b/main.cpp index 84c2db9..e106a4d 100644 --- a/main.cpp +++ b/main.cpp @@ -213,7 +213,7 @@ int main(int argc, char **argv) } //pthread_cancel(loopthread); - delete synth; + delete synth; return 1; }