Browse Source

mixer overload LED / GUI resize bug / makefile cleanup

master
edgeeffect 22 years ago
parent
commit
8f01450acd
100 changed files with 1260 additions and 1599 deletions
  1. +2
    -2
      GUI/Widgets/Fl_CommentGUI.C
  2. +5
    -5
      GUI/Widgets/Fl_CommentGUI.h
  3. +53
    -57
      GUI/Widgets/Fl_DeviceGUI.C
  4. +14
    -14
      GUI/Widgets/Fl_DeviceGUI.h
  5. +26
    -0
      GUI/Widgets/SpiralGUI.C
  6. +33
    -0
      GUI/Widgets/SpiralGUI.H
  7. +56
    -54
      Makefile.in
  8. +0
    -1
      SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.h
  9. +32
    -43
      SpiralSound/Plugins/AmpPlugin/Makefile.in
  10. +7
    -13
      SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.h
  11. +22
    -24
      SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in
  12. +0
    -7
      SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.h
  13. +19
    -21
      SpiralSound/Plugins/BeatMatchPlugin/Makefile.in
  14. +8
    -11
      SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in
  15. +1
    -1
      SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
  16. +12
    -18
      SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C
  17. +0
    -2
      SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h
  18. +10
    -11
      SpiralSound/Plugins/ControllerPlugin/Makefile.in
  19. +6
    -13
      SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.h
  20. +15
    -17
      SpiralSound/Plugins/CounterPlugin/Makefile.in
  21. +0
    -1
      SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.h
  22. +18
    -20
      SpiralSound/Plugins/DelayPlugin/Makefile.in
  23. +8
    -15
      SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.h
  24. +17
    -31
      SpiralSound/Plugins/DiskWriterPlugin/Makefile.in
  25. +1
    -8
      SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.h
  26. +20
    -36
      SpiralSound/Plugins/DistributorPlugin/Makefile.in
  27. +0
    -1
      SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.h
  28. +11
    -13
      SpiralSound/Plugins/EchoPlugin/Makefile.in
  29. +3
    -9
      SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.h
  30. +18
    -20
      SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in
  31. +0
    -3
      SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.h
  32. +18
    -24
      SpiralSound/Plugins/EnvelopePlugin/Makefile.in
  33. +11
    -15
      SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.h
  34. +20
    -24
      SpiralSound/Plugins/FilterPlugin/Makefile.in
  35. +5
    -11
      SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.h
  36. +16
    -17
      SpiralSound/Plugins/FlipflopPlugin/Makefile.in
  37. +8
    -12
      SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.h
  38. +18
    -22
      SpiralSound/Plugins/FormantFilterPlugin/Makefile.in
  39. +3
    -5
      SpiralSound/Plugins/JackPlugin/JackPluginGUI.h
  40. +21
    -31
      SpiralSound/Plugins/JackPlugin/Makefile.in
  41. +6
    -11
      SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.h
  42. +19
    -28
      SpiralSound/Plugins/JoystickPlugin/Makefile.in
  43. +8
    -15
      SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.h
  44. +18
    -34
      SpiralSound/Plugins/KeyboardPlugin/Makefile.in
  45. +7
    -9
      SpiralSound/Plugins/LFOPlugin/Makefile.in
  46. +2
    -0
      SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C
  47. +0
    -3
      SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.h
  48. +15
    -23
      SpiralSound/Plugins/LogicPlugin/Makefile.in
  49. +19
    -24
      SpiralSound/Plugins/MasherPlugin/Makefile.in
  50. +13
    -20
      SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.h
  51. +18
    -26
      SpiralSound/Plugins/MatrixPlugin/Makefile.in
  52. +0
    -3
      SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.h
  53. +13
    -18
      SpiralSound/Plugins/MeterPlugin/Makefile.in
  54. +19
    -28
      SpiralSound/Plugins/MidiPlugin/Makefile.in
  55. +38
    -34
      SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C
  56. +1
    -7
      SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.h
  57. +19
    -25
      SpiralSound/Plugins/MixSwitchPlugin/Makefile.in
  58. +2
    -0
      SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C
  59. +0
    -3
      SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.h
  60. +29
    -31
      SpiralSound/Plugins/MixerPlugin/Makefile.in
  61. +34
    -37
      SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
  62. +2
    -2
      SpiralSound/Plugins/MixerPlugin/MixerPlugin.h
  63. +49
    -22
      SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C
  64. +8
    -8
      SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.h
  65. +18
    -22
      SpiralSound/Plugins/MoogFilterPlugin/Makefile.in
  66. +9
    -15
      SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.h
  67. +11
    -15
      SpiralSound/Plugins/NoisePlugin/Makefile.in
  68. +1
    -2
      SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.h
  69. +16
    -24
      SpiralSound/Plugins/NoteSnapPlugin/Makefile.in
  70. +1
    -6
      SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h
  71. +15
    -23
      SpiralSound/Plugins/OperatorPlugin/Makefile.in
  72. +0
    -1
      SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.h
  73. +7
    -7
      SpiralSound/Plugins/OscillatorPlugin/Makefile.in
  74. +0
    -1
      SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h
  75. +19
    -28
      SpiralSound/Plugins/OutputPlugin/Makefile.in
  76. +2
    -10
      SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.h
  77. +10
    -12
      SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in
  78. +23
    -25
      SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.h
  79. +18
    -22
      SpiralSound/Plugins/RingModPlugin/Makefile.in
  80. +5
    -11
      SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.h
  81. +18
    -20
      SpiralSound/Plugins/SVFilterPlugin/Makefile.in
  82. +7
    -13
      SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.h
  83. +18
    -35
      SpiralSound/Plugins/SampleHoldPlugin/Makefile.in
  84. +3
    -10
      SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.h
  85. +15
    -20
      SpiralSound/Plugins/SamplerPlugin/Makefile.in
  86. +19
    -25
      SpiralSound/Plugins/ScopePlugin/Makefile.in
  87. +1
    -5
      SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.h
  88. +18
    -27
      SpiralSound/Plugins/SeqPlugin/Makefile.in
  89. +22
    -35
      SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in
  90. +1
    -0
      SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C
  91. +2
    -7
      SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.h
  92. +20
    -29
      SpiralSound/Plugins/SequencerPlugin/Makefile.in
  93. +16
    -20
      SpiralSound/Plugins/SmoothPlugin/Makefile.in
  94. +5
    -11
      SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h
  95. +8
    -9
      SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in
  96. +7
    -8
      SpiralSound/Plugins/SpiralPlugin.h
  97. +17
    -12
      SpiralSound/Plugins/SpiralPluginGUI.C
  98. +12
    -15
      SpiralSound/Plugins/SpiralPluginGUI.h
  99. +18
    -31
      SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in
  100. +2
    -0
      SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C

+ 2
- 2
GUI/Widgets/Fl_CommentGUI.C View File

@@ -14,14 +14,14 @@
* 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 "Fl_CommentGUI.h"
#include <FL/fl_draw.H>
#include "../../SpiralSynthModularInfo.h"
#include "../../GUI/Widgets/PawfalInput.h"

Fl_CommentGUI::Fl_CommentGUI(const DeviceGUIInfo& Info, Fl_Window *PW, Fl_Pixmap *Icon) :
Fl_CommentGUI::Fl_CommentGUI(const DeviceGUIInfo& Info, SpiralGUIType *PW, Fl_Pixmap *Icon) :
Fl_DeviceGUI(Info,PW,Icon),
m_Comment("double click to edit.")
{


+ 5
- 5
GUI/Widgets/Fl_CommentGUI.h View File

@@ -1,4 +1,4 @@
/* DeviceGUI composite Widget
/* CommentGUI composite Widget
* Copyleft (C) 2002 David Griffiths <dave@pawfal.org>
*
* This program is free software; you can redistribute it and/or modify
@@ -16,16 +16,16 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#include <FL/Fl_Input.h>
#include "Fl_DeviceGUI.h"

#ifndef COMMENTGUI
#define COMMENTGUI

#include <FL/Fl_Input.h>
#include "Fl_DeviceGUI.h"

class Fl_CommentGUI : public Fl_DeviceGUI
{
public:
Fl_CommentGUI(const DeviceGUIInfo& Info, Fl_Window *PW, Fl_Pixmap *Icon);
Fl_CommentGUI(const DeviceGUIInfo& Info, SpiralGUIType *PW, Fl_Pixmap *Icon);

virtual int handle(int event);
virtual void Setup(const DeviceGUIInfo& Info, bool FirstTime = false);


+ 53
- 57
GUI/Widgets/Fl_DeviceGUI.C View File

@@ -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 "Fl_DeviceGUI.h"
#include "Fl_Canvas.h"
@@ -23,9 +23,9 @@
#include "../../SpiralSynthModularInfo.h"

int Fl_DeviceGUI::Numbers[512];
Fl_PortButton::Fl_PortButton(int x, int y, int w, int h, char *n) :
Fl_Button(x,y,w,h,n)
Fl_PortButton::Fl_PortButton(int x, int y, int w, int h, char *n) :
Fl_Button(x,y,w,h,n)
{
m_ConnectionCount=0;
}
@@ -35,25 +35,25 @@ int Fl_PortButton::handle(int event)
if (event==FL_PUSH)
{
m_LastButton=Fl::event_button();
if (m_LastButton == 1)
if (m_LastButton == 1)
{
if (m_Type==INPUT && value()) return 1;
do_callback();
return 1;
}

if (m_LastButton == 3)
if (m_LastButton == 3)
{
do_callback();
return 1;
}
}
return 1;
}

Fl_DeviceGUI::Fl_DeviceGUI(const DeviceGUIInfo& Info, Fl_Group *PW, Fl_Pixmap *Icon, bool Terminal) :
Fl_DeviceGUI::Fl_DeviceGUI(const DeviceGUIInfo& Info, SpiralGUIType *PW, Fl_Pixmap *Icon, bool Terminal) :
Fl_Group(Info.XPos, Info.YPos, Info.Width+(PortGroupWidth*2), Info.Height+TitleBarHeight, ""),
m_PluginWindow(NULL),
m_Icon(NULL),
@@ -62,7 +62,7 @@ m_ID(-1),
m_DelMe(false),
m_IsTerminal(Terminal),
m_Minimised(true)
{
{
for (int n=0; n<512; n++) Numbers[n]=n;

type(1);
@@ -70,26 +70,26 @@ m_Minimised(true)
labeltype(FL_ENGRAVED_LABEL);
align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
color(SpiralSynthModularInfo::GUICOL_Device);
m_Icon=Icon;
m_MiniWidth=w();
m_MiniHeight=h();
m_DragBar = new Fl_DragBar(Info.XPos, Info.YPos, Info.Width+PortGroupWidth*2, TitleBarHeight, m_Name.c_str());
m_DragBar->labelsize(10);
m_DragBar->labelsize(10);
m_DragBar->type(Fl_DragBar::FLDRAG);
m_DragBar->color(SpiralSynthModularInfo::GUICOL_Device);
m_Menu = new Fl_Menu_Button(x(),y(),w(),h(),"");
m_Menu->type(Fl_Menu_Button::POPUP3);
m_Menu->textsize(8);
m_Menu->add("rename", 0, (Fl_Callback*)cb_Rename,this);
m_Menu->add("delete", 0, (Fl_Callback*)cb_Delete,this);
int Centx=x()+w()/2;
int Centy=y()+h()/2;
if (m_Icon)
{
m_IconButton = new Fl_Button(Centx-m_Icon->w()/2,Centy-m_Icon->h()/2,m_Icon->w(),m_Icon->h());
@@ -100,16 +100,15 @@ m_Minimised(true)
{
m_IconButton = NULL;
}
m_PluginWindow = PW;
if (m_PluginWindow)
{
m_PluginWindow->hide();
add(m_PluginWindow);
if (m_PluginWindow) {
m_PluginWindow->hide();
add (m_PluginWindow);
}
resizable(NULL);
//Add the input/output ports
Setup(Info, true);
}
@@ -119,31 +118,29 @@ void Fl_DeviceGUI::Clear()
end();
}

int Fl_DeviceGUI::handle(int event)
{
int t=Fl_Group::handle(event);
if (m_IconButton && m_IconButton->value())
{
m_IconButton->value(false);
if (m_PluginWindow && !m_DelMe)
{
if(!m_PluginWindow->visible())
{
Maximise();
m_IconButton->hide();
}
}
}
if (m_Minimised==false && !m_PluginWindow->visible())
{
Minimise();
if (m_IconButton) m_IconButton->show();
}
return 1;
int Fl_DeviceGUI::handle (int event) {
int t=Fl_Group::handle(event);

if (m_IconButton && m_IconButton->value()) {
m_IconButton->value (false);
if (m_PluginWindow && !m_DelMe) {
if (!m_PluginWindow->visible()) Maximise();
}
}

if (m_PluginWindow && !m_DelMe) {
if (m_PluginWindow->needs_resize()) {
Maximise();
m_PluginWindow->needs_resize(false);
}
}

if (m_Minimised==false && !m_PluginWindow->visible()) {
Minimise();
if (m_IconButton) m_IconButton->show();
}

return 1;
}

void Fl_DeviceGUI::Minimise()
@@ -154,7 +151,7 @@ void Fl_DeviceGUI::Minimise()
}

void Fl_DeviceGUI::Maximise()
{
{
m_Minimised=false;
if (m_PluginWindow->h()+2>m_MiniHeight)
{
@@ -164,7 +161,6 @@ void Fl_DeviceGUI::Maximise()
{
Resize(m_PluginWindow->w()+(PortGroupWidth*2)-5,m_MiniHeight);
}
m_PluginWindow->show();
m_IconButton->hide();
parent()->redraw();
@@ -177,15 +173,15 @@ void Fl_DeviceGUI::Resize(int width, int height)
int oldh = h();
size(width,height);
m_DragBar->size(width,m_DragBar->h());
for (int n=m_Info.NumInputs; n<(int)m_PortVec.size(); n++)
{
m_PortVec[n]->position(x()+width-8,m_PortVec[n]->y());
}
position(x()+(oldw-w())/2,y()+(oldh-h())/2);
position(x()+(oldw-w())/2,y()+(oldh-h())/2);
m_Menu->resize(x(),y(),width,height);
int Centx=x()+w()/2;
int Centy=y()+h()/2;
m_IconButton->position(Centx-m_Icon->w()/2,Centy-m_Icon->h()/2);
@@ -194,9 +190,9 @@ void Fl_DeviceGUI::Resize(int width, int height)
void Fl_DeviceGUI::Setup(const DeviceGUIInfo& Info, bool FirstTime)
{
m_Info=Info;
// Remove all current connections - it's the safest thing to do.
if (parent() && !FirstTime)
if (parent() && !FirstTime)
{
((Fl_Canvas*)(parent()))->ClearConnections(this);
}


+ 14
- 14
GUI/Widgets/Fl_DeviceGUI.h View File

@@ -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 <FL/Fl.H>
#include <FL/Fl_Group.H>
@@ -22,10 +22,11 @@
#include <FL/Fl_Pixmap.h>
#include <FL/Fl_Menu_Button.h>
#include <FL/Fl_Box.h>
#include "Fl_DragBar.H"
#include "SpiralGUI.H"
#include <iostream>
#include <vector>
#include <string>
#include "Fl_DragBar.H"
#include <stdio.h>

#ifndef DEVICEGUI
@@ -81,15 +82,15 @@ struct DeviceGUIInfo
class Fl_DeviceGUI : public Fl_Group
{
public:
Fl_DeviceGUI(const DeviceGUIInfo& Info, Fl_Group *PW, Fl_Pixmap *Icon, bool Terminal=false);
Fl_DeviceGUI(const DeviceGUIInfo& Info, SpiralGUIType *PW, Fl_Pixmap *Icon, bool Terminal=false);
virtual int handle(int event);
enum PortType {INPUT,OUTPUT};
int GetID() { return m_ID; }
void SetID(int s) { m_ID=s; /*DisplayID(s);*/ }
bool Killed() { return m_DelMe; }
int GetID() { return m_ID; }
void SetID(int s) { m_ID=s; /*DisplayID(s);*/ }
bool Killed() { return m_DelMe; }
int GetPortX(int n) { return m_PortVec[n]->x()+PortSize/2; }
int GetPortY(int n) { return m_PortVec[n]->y()+PortSize/2; }
@@ -100,7 +101,7 @@ public:
bool GetPortValue(int n) { return m_PortVec[n]->value(); }
const DeviceGUIInfo* GetInfo() { return &m_Info; }
Fl_Group* GetPluginWindow() { return m_PluginWindow; }
SpiralGUIType* GetPluginWindow() { return m_PluginWindow; }
string GetName() { return m_Name; }
void SetName(const string &s) { m_Name=s; m_DragBar->label(m_Name.c_str()); }
bool IsMinimised() { return m_Minimised; }
@@ -121,7 +122,7 @@ protected:
DeviceGUIInfo m_Info;

Fl_DragBar* m_DragBar;
Fl_Group* m_PluginWindow;
SpiralGUIType* m_PluginWindow;
Fl_Pixmap* m_Icon;
Fl_Button* m_IconButton;
Fl_Menu_Button* m_Menu;
@@ -146,9 +147,8 @@ private:
bool m_DelMe;
bool m_IsTerminal;
bool m_Minimised;
int m_MiniWidth;
int m_MiniHeight;

int m_MiniWidth, m_MiniHeight;
};

#endif

+ 26
- 0
GUI/Widgets/SpiralGUI.C View File

@@ -0,0 +1,26 @@
/* Copyleft (C) 2000 David Griffiths <dave@pawfal.org>
*
* 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 "SpiralGUI.H"

SpiralGUIType::SpiralGUIType (int x, int y, int w, int h, const char *label = 0) :
Fl_Group (x, y, w, h, label),
m_NeedsResize (false) {
}

SpiralGUIType::~SpiralGUIType () {
}

+ 33
- 0
GUI/Widgets/SpiralGUI.H View File

@@ -0,0 +1,33 @@
/* Copyleft (C) 2000 David Griffiths <dave@pawfal.org>
*
* 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 GUI_TYPE_H
#define GUI_TYPE_H

#include <FL/Fl_Group.H>

class SpiralGUIType : public Fl_Group {
public:
SpiralGUIType (int x, int y, int w, int h, const char *label = 0);
~SpiralGUIType ();
bool needs_resize (void) { return m_NeedsResize; }
void needs_resize (bool nr) { m_NeedsResize = nr; }
private:
bool m_NeedsResize;
};

#endif

+ 56
- 54
Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building SpiralSynthModular
# Generated by tmake at 20:13, 2001/10/04
# Project: SpiralSynthModular
# Template: app
#############################################################################

SHELL = @SHELL@
@@ -14,11 +11,11 @@ CXX = g++
CFLAGS = @CFLAGS@ @FLTK_CFLAGS@
CXXFLAGS= @CXXFLAGS@ @FLTK_CXXFLAGS@
INCPATH =
LINK = g++
LFLAGS =
LINK = g++
LFLAGS =
LIBS = @FLTK_LIBS@ -lm -ldl -lpng -lpthread
MOC = moc
UIC =
UIC =

TAR = tar -cf
GZIP = gzip -9f
@@ -48,6 +45,9 @@ SpiralPlugins = $(libdir)/SpiralPlugins
HEADERS = SpiralSynthModular.h \
SpiralSynthModularInfo.h \
GraphSort.h \
SettingsWindow.h \
SpiralSynthPluginLocation.h \
GUI/Widgets/SpiralGUI.H \
GUI/Widgets/Fl_DeviceGUI.h \
GUI/Widgets/Fl_CommentGUI.h \
GUI/Widgets/Fl_DragBar.H \
@@ -56,16 +56,16 @@ HEADERS = SpiralSynthModular.h \
GUI/Widgets/PawfalInput.h \
SpiralSound/SpiralInfo.h \
SpiralSound/Sample.h \
SpiralSound/Plugins/SpiralPlugin.h \
SpiralSound/Plugins/SpiralPluginGUI.h \
SpiralSound/PluginManager.h \
SpiralSound/ChannelHandler.h \
SettingsWindow.h \
SpiralSynthPluginLocation.h
SpiralSound/Plugins/SpiralPlugin.h \
SpiralSound/Plugins/SpiralPluginGUI.h
SOURCES = main.cpp \
SpiralSynthModular.C \
SpiralSynthModularInfo.C \
GraphSort.C \
SettingsWindow.C \
GUI/Widgets/SpiralGUI.C \
GUI/Widgets/Fl_DeviceGUI.C \
GUI/Widgets/Fl_CommentGUI.C \
GUI/Widgets/Fl_DragBar.cxx \
@@ -74,15 +74,16 @@ SOURCES = main.cpp \
GUI/Widgets/PawfalInput.C \
SpiralSound/SpiralInfo.C \
SpiralSound/Sample.C \
SpiralSound/Plugins/SpiralPlugin.C \
SpiralSound/Plugins/SpiralPluginGUI.C \
SpiralSound/PluginManager.C \
SpiralSound/ChannelHandler.C \
SettingsWindow.C
SpiralSound/Plugins/SpiralPlugin.C \
SpiralSound/Plugins/SpiralPluginGUI.C
OBJECTS = main.o \
SpiralSynthModular.o \
SpiralSynthModularInfo.o \
GraphSort.o \
SettingsWindow.o \
GUI/Widgets/SpiralGUI.o \
GUI/Widgets/Fl_DeviceGUI.o \
GUI/Widgets/Fl_CommentGUI.o \
GUI/Widgets/Fl_DragBar.o \
@@ -91,17 +92,16 @@ OBJECTS = main.o \
GUI/Widgets/PawfalInput.o \
SpiralSound/SpiralInfo.o \
SpiralSound/Sample.o \
SpiralSound/Plugins/SpiralPlugin.o \
SpiralSound/Plugins/SpiralPluginGUI.o \
SpiralSound/PluginManager.o \
SpiralSound/ChannelHandler.o \
SettingsWindow.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
SpiralSound/Plugins/SpiralPlugin.o \
SpiralSound/Plugins/SpiralPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = spiralsynthmodular

SUBDIRS = @PLUGINLIST@
@@ -132,9 +132,9 @@ all: $(TARGET)
list='$(SUBDIRS)'; \
for subdir in $$list; do \
(cd SpiralSound/Plugins/$$subdir ; make) \
done;
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
done;
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -154,7 +154,7 @@ clean:
list='$(SUBDIRS)'; \
for subdir in $$list; do \
(cd SpiralSound/Plugins/$$subdir ; make clean) \
done;
done;

install: spiralsynthmodular
$(INSTALL) spiralsynthmodular $(bindir)
@@ -162,8 +162,8 @@ install: spiralsynthmodular
list='$(SUBDIRS)'; \
for subdir in $$list; do \
(cd SpiralSound/Plugins/$$subdir ; make install) \
done;
done;
uninstall:
rm -f $(bindir)/spiralsynthmodular
rm -rf $(SpiralPlugins)
@@ -183,26 +183,26 @@ SpiralSynthModular.o: SpiralSynthModular.C \
SpiralSynthModular.h \
SpiralSynthModularInfo.h \
SpiralSound/SpiralInfo.h \
GUI/Widgets/Fl_DeviceGUI.h \
GUI/Widgets/Fl_CommentGUI.h \
GUI/Widgets/Fl_Canvas.h \
GUI/Widgets/PawfalYesNo.h \
GUI/Widgets/PawfalInput.h \
SpiralSound/Plugins/SpiralPlugin.h \
SettingsWindow.h \
SpiralSound/PluginManager.h \
GUI/SSM.xpm \
GUI/load.xpm \
GUI/save.xpm \
GUI/new.xpm \
GUI/options.xpm \
GUI/edit.xpm \
GUI/comment.xpm
GUI/comment.xpm \
GUI/Widgets/SpiralGUI.H \
GUI/Widgets/Fl_DeviceGUI.h \
GUI/Widgets/Fl_CommentGUI.h \
GUI/Widgets/Fl_Canvas.h \
GUI/Widgets/PawfalYesNo.h \
GUI/Widgets/PawfalInput.h \
SpiralSound/PluginManager.h \
SpiralSound/Plugins/SpiralPlugin.h

SpiralSynthModularInfo.o: SpiralSynthModularInfo.C \
SpiralSynthModularInfo.h \
SpiralSound/SpiralInfo.h \
SpiralSynthPluginLocation.h
SpiralSynthPluginLocation.h \
SpiralSound/SpiralInfo.h

GraphSort.o: GraphSort.C \
GraphSort.h
@@ -211,18 +211,20 @@ SpiralSound/ChannelHandler.o: SpiralSound/ChannelHandler.C \
SpiralSound/ChannelHandler.h

GUI/Widgets/Fl_DeviceGUI.o: GUI/Widgets/Fl_DeviceGUI.C \
GUI/Widgets/SpiralGUI.H \
GUI/Widgets/Fl_DeviceGUI.h \
GUI/Widgets/Fl_DragBar.H \
GUI/Widgets/Fl_Canvas.h \
GUI/Widgets/../../GraphSort.h \
GUI/Widgets/../../SpiralSynthModularInfo.h \
GraphSort.h \
SpiralSynthModularInfo.h \
SpiralSound/SpiralInfo.h

GUI/Widgets/Fl_CommentGUI.o: GUI/Widgets/Fl_CommentGUI.C \
GUI/Widgets/SpiralGUI.H \
GUI/Widgets/Fl_CommentGUI.h \
GUI/Widgets/Fl_DeviceGUI.h \
GUI/Widgets/Fl_DragBar.H \
GUI/Widgets/../../SpiralSynthModularInfo.h \
SpiralSynthModularInfo.h \
SpiralSound/SpiralInfo.h

GUI/Widgets/Fl_DragBar.o: GUI/Widgets/Fl_DragBar.cxx \
@@ -230,10 +232,11 @@ GUI/Widgets/Fl_DragBar.o: GUI/Widgets/Fl_DragBar.cxx \

GUI/Widgets/Fl_Canvas.o: GUI/Widgets/Fl_Canvas.C \
GUI/Widgets/Fl_Canvas.h \
GUI/Widgets/../../GraphSort.h \
GUI/Widgets/SpiralGUI.H \
GUI/Widgets/Fl_DeviceGUI.h \
GUI/Widgets/Fl_DragBar.H \
GUI/Widgets/../../SpiralSynthModularInfo.h \
GraphSort.h \
SpiralSynthModularInfo.h \
SpiralSound/SpiralInfo.h

GUI/Widgets/PawfalInput.o: GUI/Widgets/PawfalInput.C \
@@ -252,38 +255,37 @@ SpiralSound/Sample.o: SpiralSound/Sample.C \

SpiralSound/Plugins/SpiralPlugin.o: SpiralSound/Plugins/SpiralPlugin.C \
SpiralSound/Plugins/SpiralPlugin.h \
SpiralSound/Plugins/../Sample.h \
SpiralSound/Sample.h \
SpiralSound/SpiralInfo.h \
SpiralSound/Sample.h

SpiralSound/Plugins/SpiralPluginGUI.o: SpiralSound/Plugins/SpiralPluginGUI.C \
SpiralSound/Plugins/SpiralPluginGUI.h \
SpiralSound/Plugins/Widgets/Fl_DragBar.H \
SpiralSound/Plugins/SpiralPlugin.h \
SpiralSound/Plugins/../Sample.h \
SpiralSound/Sample.h \
SpiralSound/SpiralInfo.h \
SpiralSound/Sample.h

SpiralSound/PluginManager.o: SpiralSound/PluginManager.C \
SpiralSound/PluginManager.h \
SpiralSound/Plugins/SpiralPlugin.h \
SpiralSound/Plugins/../Sample.h \
SpiralSound/Sample.h \
SpiralSound/SpiralInfo.h \
SpiralSound/Sample.h
SpiralSound/Sample.h \
SpiralSound/Plugins/SpiralPlugin.h

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 \
GUI/Widgets/Fl_DragBar.H \
GUI/Widgets/Fl_CommentGUI.h \
GUI/Widgets/Fl_DeviceGUI.h \
GUI/Widgets/Fl_Canvas.h \
GUI/Widgets/../../GraphSort.h \
SpiralSound/Plugins/SpiralPlugin.h \
SpiralSound/Plugins/../Sample.h \
GUI/options.xpm

+ 0
- 1
SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.h View File

@@ -17,7 +17,6 @@
*/
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Tabs.H>
#include <FL/Fl_Slider.H>


+ 32
- 43
SpiralSound/Plugins/AmpPlugin/Makefile.in View File

@@ -1,22 +1,19 @@
#############################################################################
# Makefile for building AmpPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: AmpPlugin
# Template: app
#############################################################################

####### Compiler, tools and options

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
@@ -41,36 +38,33 @@ mandir = @mandir@

####### Files

HEADERS = ../SpiralPlugin.h \
HEADERS = AmpPlugin.h \
AmpPluginGUI.h
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../Sample.h \
AmpPlugin.h \
AmpPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../../../GUI/Widgets/SpiralGUI.H \
SOURCES = AmpPlugin.C \
AmpPluginGUI.C \
../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../Sample.C \
AmpPlugin.C \
AmpPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../../../GUI/Widgets/SpiralGUI.C
OBJECTS = AmpPlugin.o \
AmpPluginGUI.o \
../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../Sample.o \
AmpPlugin.o \
AmpPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
../../../GUI/Widgets/SpiralGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = AmpPlugin.so

####### Implicit rules
@@ -97,7 +91,7 @@ TARGET = AmpPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -112,7 +106,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -130,15 +124,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.H
../../Sample.h \
../../../GUI/Widgets/SpiralGUI.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 \
@@ -146,24 +137,22 @@ install:

AmpPlugin.o: AmpPlugin.C \
AmpPlugin.h \
AmpPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
AmpPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

AmpPluginGUI.o: AmpPluginGUI.C \
AmpPluginGUI.h \
AmpPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 7
- 13
SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.h View File

@@ -17,10 +17,7 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>

#include "AnotherFilterPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"
@@ -28,29 +25,26 @@
#ifndef GUI
#define GUI


class AnotherFilterPluginGUI : public SpiralPluginGUI
{
public:
AnotherFilterPluginGUI(int w, int h, AnotherFilterPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:
Fl_Group *GUIFilterGroup;
Fl_Slider *Cutoff;
Fl_Knob *Resonance;
//// Callbacks ////
inline void cb_Cutoff_i(Fl_Slider* o, void* v);
static void cb_Cutoff(Fl_Slider*, void*);
inline void cb_Resonance_i(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
};

#endif

+ 22
- 24
SpiralSound/Plugins/AnotherFilterPlugin/Makefile.in View File

@@ -40,34 +40,34 @@ mandir = @mandir@

HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../ChannelHandler.h \
../../Sample.h \
../../../GUI/Widgets/SpiralGUI.H \
AnotherFilterPlugin.h \
AnotherFilterPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../ChannelHandler.C \
../../Sample.C \
../../../GUI/Widgets/SpiralGUI.C \
AnotherFilterPlugin.C \
AnotherFilterPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../Sample.o \
../../ChannelHandler.o \
../../../GUI/Widgets/SpiralGUI.o \
AnotherFilterPlugin.o \
AnotherFilterPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = AnotherFilterPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = AnotherFilterPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../SpiralPlugin.h \
../../Sample.h
../../../GUI/Widgets/SpiralGUI.H \

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,26 +143,24 @@ install:

AnotherFilterPlugin.o: AnotherFilterPlugin.C \
AnotherFilterPlugin.h \
AnotherFilterPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
AnotherFilterPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm

AnotherFilterPluginGUI.o: AnotherFilterPluginGUI.C \
AnotherFilterPluginGUI.h \
AnotherFilterPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../Widgets/Fl_Knob.H \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 0
- 7
SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.h View File

@@ -17,14 +17,7 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Input.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "BeatMatchPlugin.h"
#include "../SpiralPluginGUI.h"



+ 19
- 21
SpiralSound/Plugins/BeatMatchPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building BeatMatchPlugin.so
# Generated by tmake at 21:08, 2001/11/12
# Project: BeatMatchPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -43,34 +40,34 @@ mandir = @mandir@

HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../ChannelHandler.h \
../../Sample.h \
../../../GUI/Widgets/SpiralGUI.H \
BeatMatchPlugin.h \
BeatMatchPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../ChannelHandler.C \
../../Sample.C \
../../../GUI/Widgets/SpiralGUI.C \
BeatMatchPlugin.C \
BeatMatchPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../ChannelHandler.o \
../../Sample.o \
../../../GUI/Widgets/SpiralGUI.o \
BeatMatchPlugin.o \
BeatMatchPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = BeatMatchPlugin.so

####### Implicit rules
@@ -97,7 +94,7 @@ TARGET = BeatMatchPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -123,15 +120,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../SpiralPlugin.h \
../../Sample.h
../../Sample.h \
../../../GUI/Widgets/SpiralGUI.H

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -149,7 +146,8 @@ BeatMatchPluginGUI.o: BeatMatchPluginGUI.C \
BeatMatchPlugin.h \
BeatMatchPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h
../SpiralPluginGUI.h \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 8
- 11
SpiralSound/Plugins/ComplexEnvelopePlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building ComplexEnvelopePlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: ComplexEnvelopePlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
Bezier.h \
ComplexEnvelopePlugin.h \
@@ -54,7 +51,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
Bezier.C \
ComplexEnvelopePlugin.C \
@@ -63,7 +60,7 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
Bezier.o \
ComplexEnvelopePlugin.o \
@@ -133,15 +130,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -158,7 +155,7 @@ ComplexEnvelopePlugin.o: ComplexEnvelopePlugin.C \
../../Sample.h \
ComplexEnvelopePluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
Bezier.h \
SpiralIcon.xpm

@@ -171,7 +168,7 @@ ComplexEnvelopePluginGUI.o: ComplexEnvelopePluginGUI.C \
../../Sample.h \
../SpiralPluginGUI.h \
Bezier.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 1
- 1
SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C View File

@@ -51,7 +51,7 @@ m_Num(4)
{
m_Version=5;

m_PluginInfo.Name="CV Control";
m_PluginInfo.Name="CV";
m_PluginInfo.Width=240;
m_PluginInfo.Height=224;
m_PluginInfo.NumInputs=0;


+ 12
- 18
SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C View File

@@ -146,8 +146,7 @@ void ControllerPluginGUI::UpdateValues(SpiralPlugin *o)
Clear();

c=Plugin->GetNum();
for (int n=0; n<c; n++)
{
for (int n=0; n<c; n++) {
AddCV();
m_GUIVec[n]->m_Title->value(Plugin->GetName(n).c_str());

@@ -158,12 +157,12 @@ void ControllerPluginGUI::UpdateValues(SpiralPlugin *o)
sprintf(temp,"%.6f",max);
m_GUIVec[n]->m_Max->value(temp);

// Scale and invert value to match slider range (0->1)
// Scale and invert value to match slider range (0->1)
float val = 1.0f - (Plugin->GetVal(n) - min) / (max - min);
m_GUIVec[n]->m_Chan->value(val);
}

resize(x(),y(),c*60,h());
resize(x(), y(), c*60, h());
}

inline void ControllerPluginGUI::cb_Title_i(Fl_Input* o, void* v)
@@ -248,13 +247,9 @@ inline void ControllerPluginGUI::cb_Min_i(Fl_Input* o, void* v)
void ControllerPluginGUI::cb_Min(Fl_Input* o, void* v)
{ ((ControllerPluginGUI*)(o->parent()->user_data()))->cb_Min_i(o,v);}

inline void ControllerPluginGUI::cb_Add_i(Fl_Button* o, void* v)
{
if (m_CVCount<MAX_CHANNELS)
{
inline void ControllerPluginGUI::cb_Add_i(Fl_Button* o, void* v) {
if (m_CVCount<MAX_CHANNELS) {
AddCV();
resize(x(),y(),w()+60,h());
redraw();
int num = (int)m_GUIVec.size();
float min = atof(m_GUIVec[num - 1]->m_Min->value());
float max = atof(m_GUIVec[num - 1]->m_Max->value());
@@ -271,21 +266,20 @@ inline void ControllerPluginGUI::cb_Add_i(Fl_Button* o, void* v)
m_GUICH->Set("Value",val);
m_GUICH->Set("Min",min);
m_GUICH->SetCommand(ControllerPlugin::SETALL);
m_GUICH->Wait();
resize(x(),y(),w()+60,h());
}
}
void ControllerPluginGUI::cb_Add(Fl_Button* o, void* v)
{ ((ControllerPluginGUI*)(o->parent()->parent()))->cb_Add_i(o,v);}

inline void ControllerPluginGUI::cb_Delete_i(Fl_Button* o, void* v)
{
if (m_GUIVec.size()>1)
{
inline void ControllerPluginGUI::cb_Delete_i(Fl_Button* o, void* v) {
if (m_GUIVec.size()>1) {
DeleteCV();
resize(x(),y(),w()-60,h());
redraw();

m_GUICH->Set("Number",(int)m_GUIVec.size());
m_GUICH->SetCommand(ControllerPlugin::SETNUM);
m_GUICH->Wait();
resize(x(),y(),w()-60,h());
}
}
void ControllerPluginGUI::cb_Delete(Fl_Button* o, void* v)
@@ -359,7 +353,7 @@ void ControllerPluginGUI::StreamOut(ostream &s)
s<<(*i)->m_Title->value()<<" ";
s<<(*i)->m_Min->value()<<" ";
s<<(*i)->m_Max->value()<<" ";
s<<(*i)->m_Chan->value()<<endl;
s<<(*i)->m_Chan->value()<<endl;
}
}



+ 0
- 2
SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h View File

@@ -17,14 +17,12 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Pack.H>
#include <FL/Fl_Int_Input.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Slider.H>

#include "ControllerPlugin.h"
#include "../SpiralPluginGUI.h"



+ 10
- 11
SpiralSound/Plugins/ControllerPlugin/Makefile.in View File

@@ -41,21 +41,21 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
ControllerPlugin.h \
ControllerPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
ControllerPlugin.C \
ControllerPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
ControllerPlugin.o \
ControllerPluginGUI.o
@@ -124,12 +124,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.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 \
@@ -137,24 +137,23 @@ install:

ControllerPlugin.o: ControllerPlugin.C \
ControllerPlugin.h \
ControllerPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
ControllerPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

ControllerPluginGUI.o: ControllerPluginGUI.C \
ControllerPluginGUI.h \
ControllerPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 6
- 13
SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.h View File

@@ -14,17 +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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Input.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "CounterPlugin.h"
#include "../SpiralPluginGUI.h"

@@ -35,18 +28,18 @@ class CounterPluginGUI : public SpiralPluginGUI
{
public:
CounterPluginGUI(int w, int h, CounterPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);

private:
Fl_Input* m_Count;
//// Callbacks ////
inline void cb_Count_i(Fl_Input* o, void* v);
static void cb_Count(Fl_Input* o, void* v);
static void cb_Count(Fl_Input* o, void* v);
};

#endif

+ 15
- 17
SpiralSound/Plugins/CounterPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building CounterPlugin.so
# Generated by tmake at 21:08, 2001/11/12
# Project: CounterPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
CounterPlugin.h \
CounterPluginGUI.h
@@ -53,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
CounterPlugin.C \
CounterPluginGUI.C
@@ -61,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
CounterPlugin.o \
CounterPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = CounterPlugin.so

####### Implicit rules
@@ -97,7 +94,7 @@ TARGET = CounterPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -123,15 +120,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -149,7 +146,8 @@ CounterPluginGUI.o: CounterPluginGUI.C \
CounterPlugin.h \
CounterPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h
../SpiralPluginGUI.h \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 0
- 1
SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.h View File

@@ -17,7 +17,6 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Tabs.H>
#include <FL/Fl_Counter.H>


+ 18
- 20
SpiralSound/Plugins/DelayPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
DelayPlugin.h \
DelayPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
DelayPlugin.C \
DelayPluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
DelayPlugin.o \
DelayPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = DelayPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = DelayPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,25 +143,23 @@ install:

DelayPlugin.o: DelayPlugin.C \
DelayPlugin.h \
DelayPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
DelayPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm

DelayPluginGUI.o: DelayPluginGUI.C \
DelayPluginGUI.h \
DelayPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 8
- 15
SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.h View File

@@ -14,40 +14,33 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Pixmap.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "DiskWriterPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef SCOPEGUI
#define SCOPEGUI
#ifndef DISK_WRITER_GUI_H
#define DISK_WRITER_GUI_H

class DiskWriterPluginGUI : public SpiralPluginGUI
{
public:
DiskWriterPluginGUI(int w, int h, SpiralPlugin *o, ChannelHandler *ch, const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);

protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:

Fl_Button *Open;
Fl_Button *Record;

//// Callbacks ////
inline void cb_Record_i(Fl_Button* o, void* v);
static void cb_Record(Fl_Button* o, void* v);
inline void cb_Open_i(Fl_Button* o, void* v);


+ 17
- 31
SpiralSound/Plugins/DiskWriterPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building DiskWriterPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: DiskWriterPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -44,8 +41,7 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
../../RiffWav.h \
DiskWriterPlugin.h \
@@ -53,8 +49,7 @@ HEADERS = ../SpiralPlugin.h \
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
../../RiffWav.C \
DiskWriterPlugin.C \
@@ -62,18 +57,17 @@ SOURCES = ../SpiralPlugin.C \
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
../../RiffWav.o \
DiskWriterPlugin.o \
DiskWriterPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = DiskWriterPlugin.so

####### Implicit rules
@@ -100,7 +94,7 @@ TARGET = DiskWriterPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -115,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -133,15 +127,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -155,29 +146,24 @@ install:
DiskWriterPlugin.o: DiskWriterPlugin.C \
DiskWriterPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../../RiffWav.h \
DiskWriterPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

DiskWriterPluginGUI.o: DiskWriterPluginGUI.C \
DiskWriterPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
DiskWriterPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../../RiffWav.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 1
- 8
SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.h View File

@@ -14,22 +14,15 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "DistributorPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef DistributorGUI
#define DistributorGUI


class DistributorPluginGUI : public SpiralPluginGUI
{
public:


+ 20
- 36
SpiralSound/Plugins/DistributorPlugin/Makefile.in View File

@@ -1,9 +1,5 @@
# Generated automatically from Makefile.in by configure.
#############################################################################
# Makefile for building DistributorPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: DistributorPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,33 +41,30 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
DistributorPlugin.h \
DistributorPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
DistributorPlugin.C \
DistributorPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
DistributorPlugin.o \
DistributorPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = DistributorPlugin.so

####### Implicit rules
@@ -98,7 +91,7 @@ TARGET = DistributorPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -113,7 +106,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -131,15 +124,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../SpiralPlugin.h \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -147,28 +137,22 @@ install:

DistributorPlugin.o: DistributorPlugin.C \
DistributorPlugin.h \
DistributorPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
DistributorPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
SpiralIcon.xpm

DistributorPluginGUI.o: DistributorPluginGUI.C \
DistributorPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
DistributorPlugin.h \
DistributorPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 0
- 1
SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.h View File

@@ -20,7 +20,6 @@
#define EchoGUI

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Tabs.H>
#include <FL/Fl_Counter.H>


+ 11
- 13
SpiralSound/Plugins/EchoPlugin/Makefile.in View File

@@ -43,7 +43,7 @@ HEADERS = ../SpiralPlugin.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_LED_Button.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
EchoPlugin.h \
EchoPluginGUI.h
@@ -52,7 +52,7 @@ SOURCES = ../SpiralPlugin.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
EchoPlugin.C \
EchoPluginGUI.C
@@ -60,7 +60,7 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_LED_Button.o \
../../Sample.o \
EchoPlugin.o \
@@ -130,7 +130,7 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H \
../Widgets/Fl_LED_Button.H \
../SpiralPlugin.h \
@@ -142,8 +142,8 @@ 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 \
@@ -151,13 +151,12 @@ install:

EchoPlugin.o: EchoPlugin.C \
EchoPlugin.h \
EchoPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
EchoPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm
@@ -165,12 +164,11 @@ EchoPlugin.o: EchoPlugin.C \
EchoPluginGUI.o: EchoPluginGUI.C \
EchoPluginGUI.h \
EchoPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../Widgets/Fl_Knob.H



+ 3
- 9
SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.h View File

@@ -14,21 +14,15 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "EnvFollowerPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef SplitterGUI
#define SplitterGUI

#ifndef ENV_FOLLOWER_GUI
#define ENV_FOLLOWER_GUI

class EnvFollowerPluginGUI : public SpiralPluginGUI
{


+ 18
- 20
SpiralSound/Plugins/EnvFollowerPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
EnvFollowerPlugin.h \
EnvFollowerPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
EnvFollowerPlugin.C \
EnvFollowerPluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
EnvFollowerPlugin.o \
EnvFollowerPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = EnvFollowerPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = EnvFollowerPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,23 +143,21 @@ install:

EnvFollowerPlugin.o: EnvFollowerPlugin.C \
EnvFollowerPlugin.h \
EnvFollowerPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
EnvFollowerPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../../../GUI/Widgets/SpiralGUI.H \
SpiralIcon.xpm

EnvFollowerPluginGUI.o: EnvFollowerPluginGUI.C \
EnvFollowerPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
EnvFollowerPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h


+ 0
- 3
SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.h View File

@@ -17,13 +17,10 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>
#include <FL/Fl_Tabs.H>
#include <FL/Fl_Counter.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Output.H>
#include "EnvelopePlugin.h"
#include "../SpiralPluginGUI.h"



+ 18
- 24
SpiralSound/Plugins/EnvelopePlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building EnvelopePlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: EnvelopePlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
EnvelopePlugin.h \
EnvelopePluginGUI.h
@@ -53,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
EnvelopePlugin.C \
EnvelopePluginGUI.C
@@ -61,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
EnvelopePlugin.o \
EnvelopePluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = EnvelopePlugin.so

####### Implicit rules
@@ -97,7 +94,7 @@ TARGET = EnvelopePlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -112,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -130,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -146,24 +143,21 @@ install:

EnvelopePlugin.o: EnvelopePlugin.C \
EnvelopePlugin.h \
EnvelopePluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
EnvelopePluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

EnvelopePluginGUI.o: EnvelopePluginGUI.C \
EnvelopePluginGUI.h \
EnvelopePlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 11
- 15
SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.h View File

@@ -14,13 +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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>
#include <FL/Fl_Button.H>
#include "FilterPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"
@@ -28,35 +26,33 @@
#ifndef FilterGUI
#define FilterGUI


class FilterPluginGUI : public SpiralPluginGUI
{
public:
FilterPluginGUI(int w, int h, FilterPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:
Fl_Group *GUIFilterGroup;

Fl_Slider *Cutoff;
Fl_Knob *Resonance;
Fl_Button *RevCutoff;
Fl_Button *RevResonance;
//// Callbacks ////
inline void cb_Cutoff_i(Fl_Slider* o, void* v);
static void cb_Cutoff(Fl_Slider*, void*);
inline void cb_Resonance_i(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
inline void cb_RevCutoff_i(Fl_Button* o, void* v);
static void cb_RevCutoff(Fl_Button*, void*);
inline void cb_RevResonance_i(Fl_Button* o, void* v);
static void cb_RevResonance(Fl_Button* o, void* v);
static void cb_RevResonance(Fl_Button* o, void* v);

};



+ 20
- 24
SpiralSound/Plugins/FilterPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
iir_filter.h \
FilterPlugin.h \
@@ -51,7 +51,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
iir_filter.C \
FilterPlugin.C \
@@ -60,17 +60,17 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
iir_filter.o \
FilterPlugin.o \
FilterPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = FilterPlugin.so

####### Implicit rules
@@ -97,7 +97,7 @@ TARGET = FilterPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -112,7 +112,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -130,15 +130,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -149,27 +149,23 @@ iir_filter.o: iir_filter.C \

FilterPlugin.o: FilterPlugin.C \
FilterPlugin.h \
FilterPluginGUI.h \
iir_filter.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
iir_filter.h \
FilterPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm

FilterPluginGUI.o: FilterPluginGUI.C \
FilterPluginGUI.h \
FilterPlugin.h \
iir_filter.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
iir_filter.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 5
- 11
SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.h View File

@@ -14,17 +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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Input.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "FlipflopPlugin.h"
#include "../SpiralPluginGUI.h"

@@ -35,16 +29,16 @@ class FlipflopPluginGUI : public SpiralPluginGUI
{
public:
FlipflopPluginGUI(int w, int h, FlipflopPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);

private:
Fl_Knob *m_TriggerTime;
Fl_Button *m_Monostable;
//// Callbacks ////
inline void cb_TriggerTime_i(Fl_Knob* o, void*);
static void cb_TriggerTime(Fl_Knob* o, void*);


+ 16
- 17
SpiralSound/Plugins/FlipflopPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building FlipflopPlugin.so
# Generated by tmake at 21:08, 2001/11/12
# Project: FlipflopPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
FlipflopPlugin.h \
FlipflopPluginGUI.h
@@ -53,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
FlipflopPlugin.C \
FlipflopPluginGUI.C
@@ -61,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
FlipflopPlugin.o \
FlipflopPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = FlipflopPlugin.so

####### Implicit rules
@@ -97,7 +94,7 @@ TARGET = FlipflopPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -123,15 +120,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -149,7 +146,9 @@ FlipflopPluginGUI.o: FlipflopPluginGUI.C \
FlipflopPlugin.h \
FlipflopPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h
../SpiralPluginGUI.h \
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 8
- 12
SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.h View File

@@ -14,13 +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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Output.H>

#include "FormantFilterPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"
@@ -28,25 +25,24 @@
#ifndef GUI
#define GUI


class FormantFilterPluginGUI : public SpiralPluginGUI
{
public:
FormantFilterPluginGUI(int w, int h, FormantFilterPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:
Fl_Knob *Selection;
Fl_Output *Display;
//// Callbacks ////
inline void cb_Selection_i(Fl_Knob* o, void* v);
static void cb_Selection(Fl_Knob* o, void* v);
static void cb_Selection(Fl_Knob* o, void* v);
};

#endif

+ 18
- 22
SpiralSound/Plugins/FormantFilterPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
FormantFilterPlugin.h \
FormantFilterPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
FormantFilterPlugin.C \
FormantFilterPluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
FormantFilterPlugin.o \
FormantFilterPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = FormantFilterPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = FormantFilterPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,25 +143,21 @@ install:

FormantFilterPlugin.o: FormantFilterPlugin.C \
FormantFilterPlugin.h \
FormantFilterPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
FormantFilterPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm

FormantFilterPluginGUI.o: FormantFilterPluginGUI.C \
FormantFilterPluginGUI.h \
FormantFilterPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 3
- 5
SpiralSound/Plugins/JackPlugin/JackPluginGUI.h View File

@@ -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 <FL/Fl.H>
#include <FL/Fl_Window.H>
@@ -22,15 +22,13 @@
#include <FL/Fl_Button.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Box.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "../Widgets/Fl_LED_Button.H"
#include "JackPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef SCOPEGUI
#define SCOPEGUI
#ifndef JACK_GUI_H
#define JACK_GUI_H

class JackPluginGUI : public SpiralPluginGUI
{


+ 21
- 31
SpiralSound/Plugins/JackPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building JackPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: JackPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -47,7 +44,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../../Sample.h \
../../RiffWav.h \
@@ -57,7 +54,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../Widgets/Fl_LED_Button.cxx \
../../Sample.C \
../../RiffWav.C \
@@ -67,18 +64,18 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_LED_Button.o \
../../Sample.o \
../../RiffWav.o \
JackPlugin.o \
JackPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = JackPlugin.so

####### Implicit rules
@@ -105,7 +102,7 @@ TARGET = JackPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -120,7 +117,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -138,7 +135,7 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../SpiralPlugin.h \
../../Sample.h
@@ -146,12 +143,12 @@ install:
../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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

../Widgets/Fl_LED_Button.o: ../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_LED_Button.H
../../Sample.o: ../../Sample.C \
../../Sample.h \
../../SpiralInfo.h
@@ -163,32 +160,25 @@ install:

JackPlugin.o: JackPlugin.C \
JackPlugin.h \
JackPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../../RiffWav.h \
JackPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_LED_Button.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

JackPluginGUI.o: JackPluginGUI.C \
JackPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_LED_Button.H \
JackPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../../RiffWav.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_Knob.H \
../Widgets/Fl_LED_Button.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 6
- 11
SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.h View File

@@ -17,33 +17,28 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Box.H>

#include <stdio.h>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "JoystickPlugin.h"
#include "../SpiralPluginGUI.h"
#include <stdio.h>

#ifndef SCOPEGUI
#define SCOPEGUI
#ifndef JOY_GUI_H
#define JOY_GUI_H

class JoystickPluginGUI : public SpiralPluginGUI
{
public:
JoystickPluginGUI(int w, int h, JoystickPlugin *o,const HostInfo *Info);
virtual void draw();
virtual void UpdateValues();
virtual SpiralPlugin* GetPlugin() { return m_Plugin; }
JoystickPlugin *m_Plugin;
private:
Fl_Button *Invertx;
Fl_Button *Inverty;


+ 19
- 28
SpiralSound/Plugins/JoystickPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building JoystickPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: JoystickPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
JoystickPlugin.h \
JoystickPluginGUI.h
@@ -53,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
JoystickPlugin.C \
JoystickPluginGUI.C
@@ -61,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
JoystickPlugin.o \
JoystickPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = JoystickPlugin.so

####### Implicit rules
@@ -97,7 +94,7 @@ TARGET = JoystickPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -112,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -130,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -146,28 +143,22 @@ install:

JoystickPlugin.o: JoystickPlugin.C \
JoystickPlugin.h \
JoystickPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
JoystickPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

JoystickPluginGUI.o: JoystickPluginGUI.C \
JoystickPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
JoystickPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 8
- 15
SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.h View File

@@ -14,22 +14,15 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Counter.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "KeyboardPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef MIDIGUI
#define MIDIGUI
#ifndef KEYBOARD_GUI_H
#define KEYBOARD_GUI_H

const int NUM_KEYS = 132;

@@ -37,13 +30,13 @@ class KeyboardPluginGUI : public SpiralPluginGUI
{
public:
KeyboardPluginGUI(int w, int h, KeyboardPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
virtual void Update();
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:
int m_Num[NUM_KEYS];
Fl_Button* m_Key[NUM_KEYS];
@@ -53,7 +46,7 @@ private:

//// Callbacks ////
inline void cb_Key_i(Fl_Button* o, void* v);
static void cb_Key(Fl_Button* o, void* v);
static void cb_Key(Fl_Button* o, void* v);
};

#endif

+ 18
- 34
SpiralSound/Plugins/KeyboardPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building KeyboardPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: KeyboardPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -44,33 +41,30 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
KeyboardPlugin.h \
KeyboardPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
KeyboardPlugin.C \
KeyboardPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
KeyboardPlugin.o \
KeyboardPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = KeyboardPlugin.so

####### Implicit rules
@@ -97,7 +91,7 @@ TARGET = KeyboardPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -112,7 +106,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -130,15 +124,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -146,29 +137,22 @@ install:

KeyboardPlugin.o: KeyboardPlugin.C \
KeyboardPlugin.h \
KeyboardPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
KeyboardPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../NoteTable.h \
SpiralIcon.xpm

KeyboardPluginGUI.o: KeyboardPluginGUI.C \
KeyboardPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
KeyboardPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 7
- 9
SpiralSound/Plugins/LFOPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_LED_Button.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../GUI/WS_Sine.h \
../GUI/WS_Tri.h \
../GUI/WS_Square.h \
@@ -55,7 +55,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../ChannelHandler.C \
../../Sample.C \
LFOPlugin.C \
@@ -64,7 +64,7 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_LED_Button.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../ChannelHandler.o \
../../Sample.o \
LFOPlugin.o \
@@ -135,7 +135,7 @@ install:
../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
@@ -144,8 +144,8 @@ 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 \
@@ -156,7 +156,6 @@ LFOPlugin.o: LFOPlugin.C \
LFOPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
SpiralIcon.xpm
@@ -166,14 +165,13 @@ LFOPluginGUI.o: LFOPluginGUI.C \
LFOPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../Widgets/Fl_Knob.H \
../GUI/WS_Sine.h \
../GUI/WS_Tri.h \
../GUI/WS_Square.h \
../GUI/WS_Saw.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h



+ 2
- 0
SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C View File

@@ -133,6 +133,8 @@ inline void LogicPluginGUI::cb_Inputs_i (Fl_Counter* o, void* v) {
else {
m_GUICH->Set ("Inputs", int (o->value ()));
m_GUICH->SetCommand (LogicPlugin::SETINPUTS);
m_GUICH->Wait ();
needs_resize (true);
}
}



+ 0
- 3
SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.h View File

@@ -17,11 +17,8 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Counter.H>
#include "../Widgets/Fl_DragBar.H"
#include "LogicPlugin.h"
#include "../SpiralPluginGUI.h"



+ 15
- 23
SpiralSound/Plugins/LogicPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building LogicPlugin.so
# Generated by tmake at 21:08, 2001/11/12
# Project: LogicPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -44,33 +41,30 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
LogicPlugin.h \
LogicPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
LogicPlugin.C \
LogicPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
LogicPlugin.o \
LogicPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = LogicPlugin.so

####### Implicit rules
@@ -97,7 +91,7 @@ TARGET = LogicPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -123,15 +117,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -149,7 +140,8 @@ LogicPluginGUI.o: LogicPluginGUI.C \
LogicPlugin.h \
LogicPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h
../SpiralPluginGUI.h \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 19
- 24
SpiralSound/Plugins/MasherPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building MasherPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: MasherPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
MasherPlugin.h \
MasherPluginGUI.h
@@ -53,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
MasherPlugin.C \
MasherPluginGUI.C
@@ -61,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
MasherPlugin.o \
MasherPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = MasherPlugin.so

####### Implicit rules
@@ -97,7 +94,7 @@ TARGET = MasherPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -112,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -130,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -146,24 +143,22 @@ install:

MasherPlugin.o: MasherPlugin.C \
MasherPlugin.h \
MasherPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
MasherPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

MasherPluginGUI.o: MasherPluginGUI.C \
MasherPluginGUI.h \
MasherPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 13
- 20
SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.h View File

@@ -14,46 +14,39 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>
#include <FL/Fl_Output.H>
#include <FL/Fl_Box.H>
#include "../Widgets/Fl_Knob.H"
#include "MasherPlugin.h"
#include "../SpiralPluginGUI.h"
#ifndef AmpGUI
#define AmpGUI
#ifndef MASHER_GUI_H
#define MASHER_GUI_H
class MasherPluginGUI : public SpiralPluginGUI
{
public:
MasherPluginGUI(int w, int h, MasherPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
virtual SpiralPlugin* GetPlugin() { return m_Plugin; }
MasherPlugin *m_Plugin;
virtual SpiralPlugin* GetPlugin() { return m_Plugin; }
MasherPlugin *m_Plugin;
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:
Fl_Knob *m_Random;
Fl_Knob *m_Pitch;
Fl_Knob *m_GrainStoreSize;
Fl_Knob *m_Density;
//// Callbacks ////
inline void cb_Random_i(Fl_Knob* o, void* v);
static void cb_Random(Fl_Knob*, void*);
static void cb_Random(Fl_Knob*, void*);
inline void cb_Pitch_i(Fl_Knob* o, void* v);
static void cb_Pitch(Fl_Knob*, void*);
inline void cb_MinGrainSize_i(Fl_Knob* o, void* v);


+ 18
- 26
SpiralSound/Plugins/MatrixPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building MatrixPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: MatrixPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../../Sample.h \
MatrixPlugin.h \
@@ -54,7 +51,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../Widgets/Fl_LED_Button.cxx \
../../Sample.C \
MatrixPlugin.C \
@@ -63,17 +60,17 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_LED_Button.o \
../../Sample.o \
MatrixPlugin.o \
MatrixPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = MatrixPlugin.so

####### Implicit rules
@@ -100,7 +97,7 @@ TARGET = MatrixPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -115,7 +112,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -133,15 +130,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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

../Widgets/Fl_LED_Button.o: ../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_LED_Button.H
@@ -152,15 +149,11 @@ install:

MatrixPlugin.o: MatrixPlugin.C \
MatrixPlugin.h \
MatrixPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
MatrixPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
../Widgets/Fl_LED_Button.H \
SpiralIcon.xpm \
../../RiffWav.h \
../../NoteTable.h
@@ -168,12 +161,11 @@ MatrixPlugin.o: MatrixPlugin.C \
MatrixPluginGUI.o: MatrixPluginGUI.C \
MatrixPluginGUI.h \
MatrixPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H \
../Widgets/Fl_LED_Button.H



+ 0
- 3
SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.h View File

@@ -17,14 +17,11 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Scroll.H>
#include <FL/Fl_Slider.H>
#include <FL/Fl_Counter.H>
#include <FL/Fl_Output.H>
#include <FL/Fl_Box.H>

#include "MatrixPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"


+ 13
- 18
SpiralSound/Plugins/MeterPlugin/Makefile.in View File

@@ -41,7 +41,7 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_SevenSeg.H \
../Widgets/Fl_VU_Meter.h \
../../Sample.h \
@@ -50,7 +50,7 @@ HEADERS = ../SpiralPlugin.h \
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../Widgets/Fl_SevenSeg.cxx \
../Widgets/Fl_VU_Meter.cxx \
../../Sample.C \
@@ -59,7 +59,7 @@ SOURCES = ../SpiralPlugin.C \
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_SevenSeg.o \
../Widgets/Fl_VU_Meter.o \
../../Sample.o \
@@ -130,12 +130,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.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

../Widgets/Fl_VU_Meter.o: ../Widgets/Fl_VU_Meter.cxx \
../Widgets/Fl_VU_Meter.h
@@ -149,28 +149,23 @@ install:

MeterPlugin.o: MeterPlugin.C \
MeterPlugin.h \
MeterPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
MeterPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_VU_Meter.h \
../Widgets/Fl_SevenSeg.H \
../SpiralPluginGUI.h \
SpiralIcon.xpm

MeterPluginGUI.o: MeterPluginGUI.C \
MeterPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_VU_Meter.h \
../Widgets/Fl_SevenSeg.H \
MeterPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_VU_Meter.h \
../Widgets/Fl_SevenSeg.H \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h
../../Sample.h

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 19
- 28
SpiralSound/Plugins/MidiPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building MidiPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: MidiPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
../../Midi.h \
MidiPlugin.h \
@@ -54,7 +51,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
../../Midi.C \
MidiPlugin.C \
@@ -63,17 +60,17 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
../../Midi.o \
MidiPlugin.o \
MidiPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = MidiPlugin.so

####### Implicit rules
@@ -100,7 +97,7 @@ TARGET = MidiPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -115,7 +112,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -133,15 +130,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -153,30 +150,24 @@ install:

MidiPlugin.o: MidiPlugin.C \
MidiPlugin.h \
MidiPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
MidiPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../NoteTable.h \
../../Midi.h \
SpiralIcon.xpm

MidiPluginGUI.o: MidiPluginGUI.C \
MidiPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
MidiPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 38
- 34
SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C View File

@@ -139,8 +139,8 @@ inline void MidiPluginGUI::cb_ContinuousNotes_i(Fl_Button* o, void* v)
void MidiPluginGUI::cb_ContinuousNotes(Fl_Button* o, void* v)
{ ((MidiPluginGUI*)(o->parent()))->cb_ContinuousNotes_i(o,v);}

inline void MidiPluginGUI::cb_AddControl_i(Fl_Button* o, void* v)
{
inline void MidiPluginGUI::cb_AddControl_i(Fl_Button* o, void* v)
{
vector<string> List;

List.push_back("0 Bank Select");
@@ -250,19 +250,19 @@ inline void MidiPluginGUI::cb_AddControl_i(Fl_Button* o, void* v)
List.push_back("104 None");
List.push_back("105 None");
List.push_back("106 None");
List.push_back("107 None");
List.push_back("108 None");
List.push_back("109 None");
List.push_back("110 None");
List.push_back("111 None");
List.push_back("112 None");
List.push_back("113 None");
List.push_back("114 None");
List.push_back("115 None");
List.push_back("116 None");
List.push_back("117 None");
List.push_back("118 None");
List.push_back("119 None");
List.push_back("107 None");
List.push_back("108 None");
List.push_back("109 None");
List.push_back("110 None");
List.push_back("111 None");
List.push_back("112 None");
List.push_back("113 None");
List.push_back("114 None");
List.push_back("115 None");
List.push_back("116 None");
List.push_back("117 None");
List.push_back("118 None");
List.push_back("119 None");
List.push_back("120 All Sound Off");
List.push_back("121 All Controllers Off");
List.push_back("122 Local Keyboard (on/off)");
@@ -271,47 +271,51 @@ inline void MidiPluginGUI::cb_AddControl_i(Fl_Button* o, void* v)
List.push_back("125 Omni Mode On");
List.push_back("126 Mono Operation");
List.push_back("127 Poly Operation");
int c=OptionsList(List)-1;
if (c>-1)
if (c>-1)
{
m_GUICH->Set("CC",c);
char Temp[256];
sprintf(Temp,"%s",List[c].c_str());
m_GUICH->SetData("Name",Temp);
m_GUICH->SetCommand(MidiPlugin::ADDCONTROL);
//m_Plugin->AddControl(c,List[c]);
m_GUICH->Wait ();
needs_resize (true);

//m_Plugin->AddControl(c,List[c]);
}
}
void MidiPluginGUI::cb_AddControl(Fl_Button* o, void* v)
void MidiPluginGUI::cb_AddControl(Fl_Button* o, void* v)
{ ((MidiPluginGUI*)(o->parent()))->cb_AddControl_i(o,v);}

inline void MidiPluginGUI::cb_RemoveControl_i(Fl_Button* o, void* v)
inline void MidiPluginGUI::cb_RemoveControl_i(Fl_Button* o, void* v)
{
m_GUICH->SetCommand(MidiPlugin::DELCONTROL);
m_GUICH->Wait ();
needs_resize (true);
}
void MidiPluginGUI::cb_RemoveControl(Fl_Button* o, void* v)
void MidiPluginGUI::cb_RemoveControl(Fl_Button* o, void* v)
{ ((MidiPluginGUI*)(o->parent()))->cb_RemoveControl_i(o,v);}

const string MidiPluginGUI::GetHelpText(const string &loc){
return string("")
+ "A plugin that converts midi signals into SSM's CVs. The midi plugin\n"
+ "outputs a Frequency CV, which comes from the last note pressed and\n"
+ "Trigger CV which lets you know the timing and the velocity of the\n"
+ "A plugin that converts midi signals into SSM's CVs. The midi plugin\n"
+ "outputs a Frequency CV, which comes from the last note pressed and\n"
+ "Trigger CV which lets you know the timing and the velocity of the\n"
+ "event.\n"
+ "It also detects pitchbend, channel pressure and aftertouch information,\n"
+ "It also detects pitchbend, channel pressure and aftertouch information,\n"
+ "and outputs these as continuous CV data.\n\n"
+ "You can select the Midi device used with the selector. Devices 0-16 are\n"
+ "valid Midi channels. You can run multiple Midi plugins simultaneously\n"
+ "to get data from different device numbers to make an externally\n"
+ "You can select the Midi device used with the selector. Devices 0-16 are\n"
+ "valid Midi channels. You can run multiple Midi plugins simultaneously\n"
+ "to get data from different device numbers to make an externally\n"
+ "controlled song.\n\n"
+ "The note frequency CV can optionally be switched into \"Note Cut\" mode,\n"
+ "where the frequecy is set to zero when the key is released. This is\n"
+ "useful for a number of things, including retriggering samples from\n"
+ "The note frequency CV can optionally be switched into \"Note Cut\" mode,\n"
+ "where the frequecy is set to zero when the key is released. This is\n"
+ "useful for a number of things, including retriggering samples from\n"
+ "frequency information (see sampler).\n"
+ "Extra ports can be added to handle the 128 controller messages. Click\n"
+ "add control, and you will get a menu window to pick the controller you\n"
+ "Extra ports can be added to handle the 128 controller messages. Click\n"
+ "add control, and you will get a menu window to pick the controller you\n"
+ "need.\n"
+ "The MidiPlugin also supports midi note output to external devices";
}


+ 1
- 7
SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.h View File

@@ -14,17 +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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Counter.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "MidiPlugin.h"
#include "../SpiralPluginGUI.h"



+ 19
- 25
SpiralSound/Plugins/MixSwitchPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
MixSwitchPlugin.h \
MixSwitchPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
MixSwitchPlugin.C \
MixSwitchPluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
MixSwitchPlugin.o \
MixSwitchPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = MixSwitchPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = MixSwitchPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,28 +143,22 @@ install:

MixSwitchPlugin.o: MixSwitchPlugin.C \
MixSwitchPlugin.h \
MixSwitchPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
MixSwitchPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

MixSwitchPluginGUI.o: MixSwitchPluginGUI.C \
MixSwitchPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
MixSwitchPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 2
- 0
SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C View File

@@ -57,6 +57,8 @@ inline void MixSwitchPluginGUI::cb_Chans_i (Fl_Counter* o, void* v) {
else {
m_GUICH->Set ("Chans", int (o->value ()));
m_GUICH->SetCommand (MixSwitchPlugin::SETCHANS);
m_GUICH->Wait ();
needs_resize (true);
}
}



+ 0
- 3
SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.h View File

@@ -17,10 +17,7 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Counter.H>

#include "MixSwitchPlugin.h"
#include "../SpiralPluginGUI.h"



+ 29
- 31
SpiralSound/Plugins/MixerPlugin/Makefile.in View File

@@ -40,34 +40,34 @@ mandir = @mandir@

HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../Sample.h \
../../ChannelHandler.h \
../Widgets/Fl_LED_Button.H \
../../../GUI/Widgets/SpiralGUI.H \
MixerPlugin.h \
MixerPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../Sample.C \
../../ChannelHandler.C \
../Widgets/Fl_LED_Button.cxx \
../../../GUI/Widgets/SpiralGUI.C \
MixerPlugin.C \
MixerPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../Sample.o \
../../ChannelHandler.o \
../Widgets/Fl_LED_Button.o \
../../../GUI/Widgets/SpiralGUI.o \
MixerPlugin.o \
MixerPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = MixerPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = MixerPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -126,41 +126,39 @@ install:
../../Sample.h

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.H

../Widgets/Fl_DragBar.o: ../Widgets/Fl_DragBar.cxx \
../Widgets/Fl_DragBar.H

../../Sample.o: ../../Sample.C \
../../Sample.h \
../../SpiralInfo.h

../Widgets/Fl_LED_Button.o: ../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_LED_Button.H

../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \
../../../GUI/Widgets/SpiralGUI.H

MixerPlugin.o: MixerPlugin.C \
MixerPlugin.h \
MixerPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
MixerPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

MixerPluginGUI.o: MixerPluginGUI.C \
MixerPluginGUI.h \
MixerPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 34
- 37
SpiralSound/Plugins/MixerPlugin/MixerPlugin.C View File

@@ -23,25 +23,23 @@
#include "SpiralIcon.xpm"

extern "C" {
SpiralPlugin* SpiralPlugin_CreateInstance()
{
return new MixerPlugin;
}

char** SpiralPlugin_GetIcon()
{
return SpiralIcon_xpm;
}
SpiralPlugin* SpiralPlugin_CreateInstance() {
return new MixerPlugin;
}

int SpiralPlugin_GetID()
{
return 0x0007;
}
char** SpiralPlugin_GetIcon() {
return SpiralIcon_xpm;
}

int SpiralPlugin_GetID() {
return 0x0007;
}

string SpiralPlugin_GetGroupName() {
return "Amps/Mixers";
}

string SpiralPlugin_GetGroupName()
{
return "Amps/Mixers";
}
}

///////////////////////////////////////////////////////
@@ -50,37 +48,36 @@ MixerPlugin::MixerPlugin() :
m_NumChannels(0)
{
m_Version = 2;
m_PluginInfo.Name="Mixer";
m_PluginInfo.Width=80;
m_PluginInfo.Height=140;
m_PluginInfo.Name = "Mixer";
m_PluginInfo.Width = 80;
m_PluginInfo.Height = 140;
m_GUIArgs.Peak = false;
CreatePorts ();
for (int n=0; n<MAX_CHANNELS; n++) m_ChannelVal[n]=1.0f;
m_AudioCH->Register("Value", &m_GUIArgs.Value);
m_AudioCH->Register("Num", &m_GUIArgs.Num);
for (int n=0; n<MAX_CHANNELS; n++) m_ChannelVal[n] = 1.0f;
m_AudioCH->Register ("Value", &m_GUIArgs.Value);
m_AudioCH->Register ("Num", &m_GUIArgs.Num);
m_AudioCH->Register ("Peak", &m_GUIArgs.Peak, ChannelHandler::OUTPUT);
}

MixerPlugin::~MixerPlugin()
{
MixerPlugin::~MixerPlugin() {
}

PluginInfo &MixerPlugin::Initialise(const HostInfo *Host)
{
return SpiralPlugin::Initialise(Host);
PluginInfo &MixerPlugin::Initialise (const HostInfo *Host) {
return SpiralPlugin::Initialise (Host);
}

SpiralGUIType *MixerPlugin::CreateGUI()
{
return new MixerPluginGUI(m_PluginInfo.Width,
m_PluginInfo.Height,
this,m_AudioCH,m_HostInfo);
SpiralGUIType *MixerPlugin::CreateGUI() {
return new MixerPluginGUI (m_PluginInfo.Width, m_PluginInfo.Height, this, m_AudioCH, m_HostInfo);
}

void MixerPlugin::Execute () {
// Mix the inputs
for (int n=0; n<m_HostInfo->BUFSIZE; n++) {
float out = 0.0;
for (int c=0; c<m_NumChannels; c++) out += (GetInput (c, n) * m_ChannelVal[c]);
for (int c=0; c<m_NumChannels; c++)
out += (GetInput (c, n) * m_ChannelVal[c]);
SetOutput (0, n, out);
m_GUIArgs.Peak = (out > 1.0);
}
}

@@ -88,7 +85,7 @@ void MixerPlugin::ExecuteCommands() {
if (m_AudioCH->IsCommandWaiting()) {
switch (m_AudioCH->GetCommand()) {
case SETCH:
SetChannel (m_GUIArgs.Num, m_GUIArgs.Value);
m_ChannelVal[m_GUIArgs.Num] = m_GUIArgs.Value;
break;
case SETNUM:
SetChannels (m_GUIArgs.Num);
@@ -101,8 +98,7 @@ void MixerPlugin::SetChannels (int n) {
// once to clear the connections with the current info
// do we need this????
UpdatePluginInfoWithHost();
// Things can get a bit confused deleting and adding inputs
// so we just chuck away all the ports...
// Things can get a bit confused deleting and adding inputs so we just chuck away all the ports...
RemoveAllInputs ();
RemoveAllOutputs ();
m_PluginInfo.NumInputs = 0;
@@ -115,6 +111,7 @@ void MixerPlugin::SetChannels (int n) {
}

void MixerPlugin::CreatePorts (int n, bool AddPorts) {
// default values n = 4 AddPorts = false
int c;
m_PluginInfo.NumInputs = n;
m_NumChannels = n;
@@ -127,7 +124,7 @@ void MixerPlugin::CreatePorts (int n, bool AddPorts) {
m_PluginInfo.PortTips.push_back ("Output");
if (AddPorts) {
for (c=0; c<m_PluginInfo.NumInputs; c++) AddInput();
for (c=0; c<m_PluginInfo.NumOutputs; c++) AddOutput();
AddOutput();
}
}



+ 2
- 2
SpiralSound/Plugins/MixerPlugin/MixerPlugin.h View File

@@ -17,7 +17,7 @@
*/

#include "../SpiralPlugin.h"
#include <FL/Fl_Pixmap.H>
//#include <FL/Fl_Pixmap.H>

#ifndef MixerPLUGIN
#define MixerPLUGIN
@@ -40,6 +40,7 @@ class MixerPlugin : public SpiralPlugin {
struct GUIArgs {
int Num;
float Value;
bool Peak;
};
float GetChannel (int n) { return m_ChannelVal[n]; }
int GetChannels (void) { return m_NumChannels; }
@@ -47,7 +48,6 @@ class MixerPlugin : public SpiralPlugin {
void CreatePorts (int n = 4, bool AddPorts = false);
GUIArgs m_GUIArgs;
int m_NumChannels;
void SetChannel (int n, float s) { m_ChannelVal[n]=s; }
void SetChannels (int n);
float m_ChannelVal[MAX_CHANNELS];
};


+ 49
- 22
SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C View File

@@ -22,37 +22,45 @@

////////////////////////////////////////////

MixerPluginGUI::MixerPluginGUI(int w, int h,MixerPlugin *o,ChannelHandler *ch,const HostInfo *Info) :
SpiralPluginGUI(w,h,o,ch)
MixerPluginGUI::MixerPluginGUI (int w, int h, MixerPlugin *o, ChannelHandler *ch, const HostInfo *Info) :
SpiralPluginGUI (w, h, o, ch)
{
m_GUIColour=(Fl_Color)Info->GUI_COLOUR;
m_GUIColour = (Fl_Color)Info->GUI_COLOUR;
for (int n=0; n<MAX_CHANNELS; n++) Numbers[n]=n;
m_MainPack = new Fl_Pack(0, 15, w, 100);
m_MainPack = new Fl_Pack (0, 15, w, 100);
m_MainPack->type (FL_HORIZONTAL);
add (m_MainPack);

// start with four...
AddChan(); AddChan(); AddChan(); AddChan();

m_Buttons = new Fl_Pack (0, 118, 45, 20);
m_Buttons = new Fl_Pack (0, 118, 62, 20);
m_Buttons->type (FL_HORIZONTAL);
add (m_Buttons);

m_Delete = new Fl_Button (2, 0, 20, 20, "-");
m_Delete->user_data ((void*)(this));
m_Delete->box (FL_PLASTIC_UP_BOX);
m_Delete->color (Info->GUI_COLOUR);
m_Delete->selection_color (Info->GUI_COLOUR);
m_Delete->callback ((Fl_Callback*)cb_Delete);
m_Buttons->add (m_Delete);
m_Add = new Fl_Button (24, 0, 20, 20, "+");

m_Add = new Fl_Button (22, 0, 20, 20, "+");
m_Add->user_data ((void*)(this));
m_Add->box (FL_PLASTIC_UP_BOX);
m_Add->color (Info->GUI_COLOUR);
m_Add->selection_color (Info->GUI_COLOUR);
m_Add->callback ((Fl_Callback*)cb_Add);
m_Buttons->add (m_Add);

m_PeakInd = new Fl_LED_Button (42, 0, 20, 20, "");
m_Buttons->add (m_PeakInd);
}

void MixerPluginGUI::AddChan (bool SendData, bool ResizeIt) {
Fl_Slider *NewSlide = new Fl_Slider (0, 0, 20, 100, "");
NewSlide->user_data ((void*)(this));
NewSlide->type (FL_VERT_NICE_SLIDER);
NewSlide->selection_color (m_GUIColour);
NewSlide->box (FL_PLASTIC_DOWN_BOX);
@@ -64,9 +72,7 @@ void MixerPluginGUI::AddChan (bool SendData, bool ResizeIt) {
NewSlide->callback ((Fl_Callback*)cb_Chan, (void*)&Numbers[num]);
m_MainPack->add (NewSlide);
m_SlidVec.push_back (NewSlide);
if (ResizeIt) resize (x(), y(), w()+20, h());
if (SendData) {
if (ResizeIt) redraw ();
m_GUICH->Set ("Num", ++num);
m_GUICH->SetCommand (MixerPlugin::SETNUM);
m_GUICH->Wait ();
@@ -74,9 +80,13 @@ void MixerPluginGUI::AddChan (bool SendData, bool ResizeIt) {
m_GUICH->Set ("Value", (float)(2.0f - NewSlide->value ()));
m_GUICH->SetCommand(MixerPlugin::SETCH);
}
if (ResizeIt) {
m_GUICH->Wait ();
if (w() < num*20) resize (x(), y(), w()+20, h());
}
}

void MixerPluginGUI::DeleteChan (bool SendData, bool DrawIt) {
void MixerPluginGUI::DeleteChan (bool SendData) {
vector<Fl_Slider*>::iterator i = m_SlidVec.end ();
i--;
m_MainPack->remove (*i);
@@ -86,51 +96,68 @@ void MixerPluginGUI::DeleteChan (bool SendData, bool DrawIt) {
m_GUICH->Set ("Num", (int)m_SlidVec.size());
m_GUICH->SetCommand (MixerPlugin::SETNUM);
}
resize (x(), y(), w()-20, h());
if (DrawIt) redraw();
if (w() > 60) {
m_GUICH->Wait ();
resize (x(), y(), w()-20, h());
}
}

void MixerPluginGUI::UpdateValues(SpiralPlugin *o) {
MixerPlugin *Plugin = (MixerPlugin *)o;
unsigned int chans = Plugin->GetChannels();
while (chans < m_SlidVec.size()) DeleteChan (false, false);
while (chans < m_SlidVec.size()) DeleteChan (false);
while (chans > m_SlidVec.size()) AddChan (false, true);
for (unsigned int n=0; n<chans; n++)
m_SlidVec[n]->value (2.0f - Plugin->GetChannel (n));
redraw();
}

inline void MixerPluginGUI::cb_Add_i(Fl_Button* o, void* v) {
void MixerPluginGUI::Update () {
if (m_GUICH->GetBool ("Peak")) m_PeakInd->value (true);
}

inline void MixerPluginGUI::cb_Add_i (Fl_Button* o, void* v) {
m_PeakInd->value (false);
if ((int)m_SlidVec.size() < MAX_CHANNELS) AddChan (true, true);
}

void MixerPluginGUI::cb_Add(Fl_Button* o, void* v) {
((MixerPluginGUI*)(o->parent()->parent()))->cb_Add_i(o,v);
void MixerPluginGUI::cb_Add (Fl_Button* o, void* v) {
((MixerPluginGUI*)(o->user_data()))->cb_Add_i (o, v);
}

inline void MixerPluginGUI::cb_Delete_i(Fl_Button* o, void* v) {
inline void MixerPluginGUI::cb_Delete_i (Fl_Button* o, void* v) {
m_PeakInd->value (false);
if (m_SlidVec.size() > 2) DeleteChan ();
}

void MixerPluginGUI::cb_Delete(Fl_Button* o, void* v) {
((MixerPluginGUI*)(o->parent()->parent()))->cb_Delete_i(o,v);
void MixerPluginGUI::cb_Delete (Fl_Button* o, void* v) {
((MixerPluginGUI*)(o->user_data()))->cb_Delete_i (o, v);
}

inline void MixerPluginGUI::cb_Chan_i(Fl_Slider* o, void* v) {
inline void MixerPluginGUI::cb_Chan_i (Fl_Slider* o, void* v) {
// This line works fine
// cerr << *(int*)(v) << endl << (float)(2.0f-o->value()) << endl;
// The segfault comes when you do any of the following - don't know why
m_PeakInd->value (false);
m_GUICH->Set("Num", (*(int*)(v)));
m_GUICH->Set("Value", (float)(2.0f-o->value()));
m_GUICH->SetCommand (MixerPlugin::SETCH);
}

void MixerPluginGUI::cb_Chan(Fl_Slider* o, void* v) {
((MixerPluginGUI*)(o->parent()->parent()))->cb_Chan_i(o,v);
// If you use user_data() instead of parent()->parent() you get a segfault - don't know why
((MixerPluginGUI*)(o->parent()->parent()))->cb_Chan_i (o, v);
}

const string MixerPluginGUI::GetHelpText(const string &loc){
// you sometimes get a segfault on exit too - again - don't know why

const string MixerPluginGUI::GetHelpText (const string &loc){
return string("")
+ "A general purpose mixer, not much else to say really.\n"
+ "A general purpose mixer.\n"
+ "Useful for mixing CV values as well as mono audio\n"
+ "signals.\n"
+ "The LED indicates the the mixer output is at peak\n"
+ "level, click on it, or change levels to reset it.\n"
+ "Add up to 16 channels using the '+' button.\n"
+ "Use the '-' button to remove unwanted channels.\n";
}

+ 8
- 8
SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.h View File

@@ -16,32 +16,32 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#ifndef MixerGUI
#define MixerGUI

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Pack.H>
#include <FL/Fl_Slider.H>
#include "../Widgets/Fl_LED_Button.H"
#include "MixerPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef MixerGUI
#define MixerGUI

static int Numbers[MAX_CHANNELS];

class MixerPluginGUI : public SpiralPluginGUI {
public:
MixerPluginGUI(int w, int h, MixerPlugin *o,ChannelHandler *ch,const HostInfo *Info);
MixerPluginGUI (int w, int h, MixerPlugin *o, ChannelHandler *ch, const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
virtual void Update ();
protected:
const string GetHelpText(const string &loc);
private:
void AddChan (bool SendData = false, bool ResizeIt = false);
void DeleteChan (bool SendData = true, bool DrawIt = true);
void DeleteChan (bool SendData = true);
vector<Fl_Slider*> m_SlidVec;
Fl_Pack *m_MainPack, *m_Buttons;
Fl_Button *m_Add, *m_Delete;
Fl_LED_Button *m_PeakInd;
Fl_Color m_GUIColour;
//// Callbacks ////
inline void cb_Chan_i (Fl_Slider* o, void* v);


+ 18
- 22
SpiralSound/Plugins/MoogFilterPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
MoogFilterPlugin.h \
MoogFilterPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
MoogFilterPlugin.C \
MoogFilterPluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
MoogFilterPlugin.o \
MoogFilterPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = MoogFilterPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = MoogFilterPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,25 +143,21 @@ install:

MoogFilterPlugin.o: MoogFilterPlugin.C \
MoogFilterPlugin.h \
MoogFilterPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
MoogFilterPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm

MoogFilterPluginGUI.o: MoogFilterPluginGUI.C \
MoogFilterPluginGUI.h \
MoogFilterPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 9
- 15
SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.h View File

@@ -17,40 +17,34 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>

#include "MoogFilterPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"

#ifndef SVFilterGUI
#define SVFilterGUI

#ifndef MoogFilterGUI
#define MoogFilterGUI

class MoogFilterPluginGUI : public SpiralPluginGUI
{
public:
MoogFilterPluginGUI(int w, int h, MoogFilterPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:
Fl_Group *GUIFilterGroup;
Fl_Slider *Cutoff;
Fl_Knob *Resonance;
//// Callbacks ////
inline void cb_Cutoff_i(Fl_Slider* o, void* v);
static void cb_Cutoff(Fl_Slider*, void*);
inline void cb_Resonance_i(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
};

#endif

+ 11
- 15
SpiralSound/Plugins/NoisePlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_LED_Button.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
NoisePlugin.h \
NoisePluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
NoisePlugin.C \
NoisePluginGUI.C
@@ -58,7 +58,7 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_LED_Button.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
NoisePlugin.o \
NoisePluginGUI.o
@@ -127,7 +127,7 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../SpiralPlugin.h \
../../Sample.h
@@ -135,8 +135,8 @@ 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 \
@@ -144,24 +144,20 @@ install:

NoisePlugin.o: NoisePlugin.C \
NoisePlugin.h \
NoisePluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
NoisePluginGUI.h \
../Widgets/Fl_LED_Button.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

NoisePluginGUI.o: NoisePluginGUI.C \
NoisePluginGUI.h \
../Widgets/Fl_LED_Button.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
NoisePlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../../SpiralInfo.h \
../../Sample.h



+ 1
- 2
SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.h View File

@@ -16,8 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#include <FL/Fl_Box.H>

#include <FL/Fl.H>
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_LED_Button.H"
#include "NoisePlugin.h"


+ 16
- 24
SpiralSound/Plugins/NoteSnapPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building NoteSnapPlugin.so
# Generated by tmake at 21:08, 2001/11/12
# Project: NoteSnapPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -44,33 +41,30 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
NoteSnapPlugin.h \
NoteSnapPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
NoteSnapPlugin.C \
NoteSnapPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
NoteSnapPlugin.o \
NoteSnapPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = NoteSnapPlugin.so

####### Implicit rules
@@ -97,7 +91,7 @@ TARGET = NoteSnapPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -132,15 +126,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -149,16 +140,17 @@ install:
NoteSnapPlugin.o: NoteSnapPlugin.C \
NoteSnapPlugin.h \
NoteSnapPluginGUI.h \
../../NoteTable.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../NoteTable.h \
SpiralIcon.xpm

NoteSnapPluginGUI.o: NoteSnapPluginGUI.C \
NoteSnapPlugin.h \
NoteSnapPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h
../SpiralPluginGUI.h \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 1
- 6
SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h View File

@@ -14,15 +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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>

//#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "NoteSnapPlugin.h"
#include "../SpiralPluginGUI.h"



+ 15
- 23
SpiralSound/Plugins/OperatorPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building OperatorPlugin.so
# Generated by tmake at 21:08, 2001/11/12
# Project: OperatorPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -44,33 +41,30 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
OperatorPlugin.h \
OperatorPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
OperatorPlugin.C \
OperatorPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
OperatorPlugin.o \
OperatorPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = OperatorPlugin.so

####### Implicit rules
@@ -97,7 +91,7 @@ TARGET = OperatorPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -123,15 +117,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -149,7 +140,8 @@ OperatorPluginGUI.o: OperatorPluginGUI.C \
OperatorPlugin.h \
OperatorPluginGUI.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h
../SpiralPluginGUI.h \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 0
- 1
SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.h View File

@@ -19,7 +19,6 @@
#include <FL/Fl.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Counter.H>
#include "../Widgets/Fl_DragBar.H"
#include "OperatorPlugin.h"
#include "../SpiralPluginGUI.h"



+ 7
- 7
SpiralSound/Plugins/OscillatorPlugin/Makefile.in View File

@@ -41,7 +41,7 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../GUI/WS_Square.h \
../GUI/WS_Noise.h \
@@ -54,7 +54,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
../../ChannelHandler.C \
OscillatorPlugin.C \
@@ -62,7 +62,7 @@ SOURCES = ../SpiralPlugin.C \
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_LED_Button.o \
../../Sample.o \
../../ChannelHandler.o \
@@ -133,7 +133,7 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

@@ -143,8 +143,8 @@ 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 \
@@ -163,7 +163,7 @@ OscillatorPluginGUI.o: OscillatorPluginGUI.C \
OscillatorPluginGUI.h \
OscillatorPlugin.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_LED_Button.H \
../GUI/WS_Square.h \
../GUI/WS_Noise.h \


+ 0
- 1
SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h View File

@@ -21,7 +21,6 @@

#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Slider.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Counter.H>
#include <FL/Fl_Tabs.h>
#include <FL/Fl_Group.h>


+ 19
- 28
SpiralSound/Plugins/OutputPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building OutputPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: OutputPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
../../RiffWav.h \
OutputPlugin.h \
@@ -54,7 +51,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
../../RiffWav.C \
OutputPlugin.C \
@@ -63,17 +60,17 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
../../RiffWav.o \
OutputPlugin.o \
OutputPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = OutputPlugin.so

####### Implicit rules
@@ -100,7 +97,7 @@ TARGET = OutputPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -115,7 +112,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -133,15 +130,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -154,30 +151,24 @@ install:

OutputPlugin.o: OutputPlugin.C \
OutputPlugin.h \
OutputPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../../RiffWav.h \
OutputPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

OutputPluginGUI.o: OutputPluginGUI.C \
OutputPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
OutputPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../../RiffWav.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 2
- 10
SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.h View File

@@ -17,18 +17,13 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Pixmap.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "OutputPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef SCOPEGUI
#define SCOPEGUI
#ifndef OUTPUT_GUI_H
#define OUTPUT_GUI_H

class OutputPluginGUI : public SpiralPluginGUI
{
@@ -42,10 +37,7 @@ protected:
const string GetHelpText(const string &loc);

private:

Fl_Group *GUIMixGroup;
Fl_Knob *Volume;

Fl_Button *OpenRead;
Fl_Button *OpenWrite;
Fl_Button *OpenDuplex;


+ 10
- 12
SpiralSound/Plugins/PoshSamplerPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
../../RiffWav.h \
PoshSamplerPlugin.h \
@@ -51,7 +51,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
../../RiffWav.C \
PoshSamplerPlugin.C \
@@ -60,7 +60,7 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
../../RiffWav.o \
PoshSamplerPlugin.o \
@@ -130,15 +130,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -151,13 +151,11 @@ install:

PoshSamplerPlugin.o: PoshSamplerPlugin.C \
PoshSamplerPlugin.h \
PoshSamplerPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../SpiralInfo.h \
../../Sample.h \
PoshSamplerPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm \
../../RiffWav.h \
../../NoteTable.h
@@ -166,10 +164,10 @@ PoshSamplerPluginGUI.o: PoshSamplerPluginGUI.C \
PoshSamplerPluginGUI.h \
PoshSamplerPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 23
- 25
SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.h View File

@@ -14,19 +14,17 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Counter.H>

#include "PoshSamplerPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"

#ifndef MixerGUI
#define MixerGUI
#ifndef POSH_SAMP_GUI_H
#define POSH_SAMP_GUI_H

class Fl_WaveDisplay : public Fl_Widget
{
@@ -65,7 +63,7 @@ class Fl_WaveDisplay : public Fl_Widget
long m_ViewStart;
long m_ViewEnd;
long m_PlayPos;
long m_PlayStart;
long m_LoopStart;
long m_LoopEnd;
@@ -77,16 +75,16 @@ class PoshSamplerPluginGUI : public SpiralPluginGUI
{
public:
PoshSamplerPluginGUI(int w, int h, PoshSamplerPlugin *o,ChannelHandler *ch, const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
virtual void Update();
void SetPlayPos(long s) { m_Display->SetPlayPos(s); }
int GetCurrentSample() { return (int)m_SampleNum->value(); }
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:

void UpdateSampleDisplay(int num);
@@ -94,7 +92,7 @@ private:
char m_TextBuf[256];
int Numbers[NUM_SAMPLES];
bool m_UpdateMe;
Fl_Button* m_Load;
Fl_Button* m_Save;
Fl_Button* m_PosMarker;
@@ -109,7 +107,7 @@ private:
Fl_Counter* m_SampleNum;
Fl_Button* m_ZoomIn;
Fl_Button* m_ZoomOut;
Fl_Button* m_Cut;
Fl_Button* m_Copy;
Fl_Button* m_Paste;
@@ -117,28 +115,28 @@ private:
Fl_Button* m_Crop;
Fl_Button* m_Reverse;
Fl_Button* m_Amp;
//// Callbacks ////
inline void cb_Load_i(Fl_Button* o, void* v);
static void cb_Load(Fl_Button* o, void* v);
static void cb_Load(Fl_Button* o, void* v);
inline void cb_Save_i(Fl_Button* o, void* v);
static void cb_Save(Fl_Button* o, void* v);
static void cb_Save(Fl_Button* o, void* v);
inline void cb_PosMarker_i(Fl_Button* o, void* v);
static void cb_PosMarker(Fl_Button* o, void* v);
static void cb_PosMarker(Fl_Button* o, void* v);
inline void cb_Record_i(Fl_Button* o, void* v);
static void cb_Record(Fl_Button* o, void* v);
static void cb_Record(Fl_Button* o, void* v);
inline void cb_Volume_i(Fl_Knob* o, void* v);
static void cb_Volume(Fl_Knob* o, void* v);
static void cb_Volume(Fl_Knob* o, void* v);
inline void cb_Pitch_i(Fl_Knob* o, void* v);
static void cb_Pitch(Fl_Knob* o, void* v);
static void cb_Pitch(Fl_Knob* o, void* v);
inline void cb_Octave_i(Fl_Knob* o, void* v);
static void cb_Octave(Fl_Knob* o, void* v);
static void cb_Octave(Fl_Knob* o, void* v);
inline void cb_Loop_i(Fl_Button* o, void* v);
static void cb_Loop(Fl_Button* o, void* v);
static void cb_Loop(Fl_Button* o, void* v);
inline void cb_PingPong_i(Fl_Button* o, void* v);
static void cb_PingPong(Fl_Button* o, void* v);
static void cb_PingPong(Fl_Button* o, void* v);
inline void cb_Note_i(Fl_Counter* o, void* v);
static void cb_Note(Fl_Counter* o, void* v);
static void cb_Note(Fl_Counter* o, void* v);
inline void cb_SampleNum_i(Fl_Counter* o, void* v);
static void cb_SampleNum(Fl_Counter* o, void* v);



+ 18
- 22
SpiralSound/Plugins/RingModPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
RingModPlugin.h \
RingModPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
RingModPlugin.C \
RingModPluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
RingModPlugin.o \
RingModPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = RingModPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = RingModPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,25 +143,21 @@ install:

RingModPlugin.o: RingModPlugin.C \
RingModPlugin.h \
RingModPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
RingModPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm

RingModPluginGUI.o: RingModPluginGUI.C \
RingModPluginGUI.h \
RingModPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 5
- 11
SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.h View File

@@ -17,10 +17,6 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>

#include "RingModPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"
@@ -33,18 +29,16 @@ class RingModPluginGUI : public SpiralPluginGUI
{
public:
RingModPluginGUI(int w, int h, RingModPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);

private:
Fl_Group *GUIFilterGroup;
Fl_Knob *m_Amount;
//// Callbacks ////

//// Callbacks ////
inline void cb_Amount_i(Fl_Knob* o, void* v);
static void cb_Amount(Fl_Knob*, void*);
};


+ 18
- 20
SpiralSound/Plugins/SVFilterPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
SVFilterPlugin.h \
SVFilterPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
SVFilterPlugin.C \
SVFilterPluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
SVFilterPlugin.o \
SVFilterPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SVFilterPlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = SVFilterPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,23 +143,21 @@ install:

SVFilterPlugin.o: SVFilterPlugin.C \
SVFilterPlugin.h \
SVFilterPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
SVFilterPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm

SVFilterPluginGUI.o: SVFilterPluginGUI.C \
SVFilterPluginGUI.h \
SVFilterPlugin.h \
../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../Sample.h \
../../SpiralInfo.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 7
- 13
SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.h View File

@@ -17,10 +17,7 @@
*/

#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>

#include "SVFilterPlugin.h"
#include "../SpiralPluginGUI.h"
#include "../Widgets/Fl_Knob.H"
@@ -28,29 +25,26 @@
#ifndef SVFilterGUI
#define SVFilterGUI


class SVFilterPluginGUI : public SpiralPluginGUI
{
public:
SVFilterPluginGUI(int w, int h, SVFilterPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);
protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);
private:
Fl_Group *GUIFilterGroup;
Fl_Slider *Cutoff;
Fl_Knob *Resonance;
//// Callbacks ////
inline void cb_Cutoff_i(Fl_Slider* o, void* v);
static void cb_Cutoff(Fl_Slider*, void*);
inline void cb_Resonance_i(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
static void cb_Resonance(Fl_Knob* o, void* v);
};

#endif

+ 18
- 35
SpiralSound/Plugins/SampleHoldPlugin/Makefile.in View File

@@ -1,9 +1,5 @@
# Generated automatically from Makefile.in by configure.
#############################################################################
# Makefile for building SampleHoldPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: SampleHoldPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,33 +41,30 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
SampleHoldPlugin.h \
SampleHoldPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
SampleHoldPlugin.C \
SampleHoldPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
SampleHoldPlugin.o \
SampleHoldPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SampleHoldPlugin.so

####### Implicit rules
@@ -98,7 +91,7 @@ TARGET = SampleHoldPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -113,7 +106,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -131,15 +124,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -147,28 +137,21 @@ install:

SampleHoldPlugin.o: SampleHoldPlugin.C \
SampleHoldPlugin.h \
SampleHoldPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
SampleHoldPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

SampleHoldPluginGUI.o: SampleHoldPluginGUI.C \
SampleHoldPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
SampleHoldPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 3
- 10
SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.h View File

@@ -14,31 +14,24 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "SampleHoldPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef SampleHoldGUI
#define SampleHoldGUI


class SampleHoldPluginGUI : public SpiralPluginGUI
{
public:
SampleHoldPluginGUI(int w, int h, SampleHoldPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);

protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);

private:



+ 15
- 20
SpiralSound/Plugins/SamplerPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building SamplerPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: SamplerPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
../../RiffWav.h \
SamplerPlugin.h \
@@ -54,7 +51,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
../../RiffWav.C \
SamplerPlugin.C \
@@ -63,17 +60,17 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
../../RiffWav.o \
SamplerPlugin.o \
SamplerPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SamplerPlugin.so

####### Implicit rules
@@ -100,7 +97,7 @@ TARGET = SamplerPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -115,7 +112,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -133,15 +130,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -160,8 +157,6 @@ SamplerPlugin.o: SamplerPlugin.C \
../../Sample.h \
SamplerPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm \
../../RiffWav.h \
../../NoteTable.h
@@ -174,7 +169,7 @@ SamplerPluginGUI.o: SamplerPluginGUI.C \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 19
- 25
SpiralSound/Plugins/ScopePlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
ScopePlugin.h \
ScopePluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
ScopePlugin.C \
ScopePluginGUI.C
@@ -58,16 +58,16 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
ScopePlugin.o \
ScopePluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = ScopePlugin.so

####### Implicit rules
@@ -94,7 +94,7 @@ TARGET = ScopePlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,28 +143,22 @@ install:

ScopePlugin.o: ScopePlugin.C \
ScopePlugin.h \
ScopePluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
ScopePluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

ScopePluginGUI.o: ScopePluginGUI.C \
ScopePluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
ScopePlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 1
- 5
SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.h View File

@@ -14,15 +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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "ScopePlugin.h"
#include "../SpiralPluginGUI.h"



+ 18
- 27
SpiralSound/Plugins/SeqPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building SeqPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: SeqPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_EventMap.h \
../Widgets/Fl_SEvent.h \
../../Sample.h \
@@ -56,7 +53,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../Widgets/Fl_EventMap.C \
../Widgets/Fl_SEvent.C \
../../Sample.C \
@@ -67,19 +64,19 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_EventMap.o \
../Widgets/Fl_SEvent.o \
../../Sample.o \
../../RiffWav.o \
SeqPlugin.o \
SeqPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SeqPlugin.so

####### Implicit rules
@@ -106,7 +103,7 @@ TARGET = SeqPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -121,7 +118,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -139,15 +136,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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

../Widgets/Fl_EventMap.o: ../Widgets/Fl_EventMap.C \
../Widgets/Fl_EventMap.h \
@@ -168,16 +165,11 @@ install:

SeqPlugin.o: SeqPlugin.C \
SeqPlugin.h \
SeqPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../Widgets/Fl_EventMap.h \
../Widgets/Fl_SEvent.h \
SeqPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm \
../../RiffWav.h \
../../NoteTable.h
@@ -186,13 +178,12 @@ SeqPluginGUI.o: SeqPluginGUI.C \
SeqPluginGUI.h \
SeqPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../Widgets/Fl_EventMap.h \
../Widgets/Fl_SEvent.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 22
- 35
SpiralSound/Plugins/SeqSelectorPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building SeqSelectorPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: SeqSelectorPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -44,8 +41,7 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
../Widgets/Fl_LED_Button.H \
SeqSelectorPlugin.h \
@@ -53,8 +49,7 @@ HEADERS = ../SpiralPlugin.h \
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
../Widgets/Fl_LED_Button.cxx \
SeqSelectorPlugin.C \
@@ -62,18 +57,17 @@ SOURCES = ../SpiralPlugin.C \
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
../Widgets/Fl_LED_Button.o \
SeqSelectorPlugin.o \
SeqSelectorPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SeqSelectorPlugin.so

####### Implicit rules
@@ -100,7 +94,7 @@ TARGET = SeqSelectorPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -115,7 +109,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -133,46 +127,39 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.H

../Widgets/Fl_DragBar.o: ../Widgets/Fl_DragBar.cxx \
../Widgets/Fl_DragBar.H

../../Sample.o: ../../Sample.C \
../../Sample.h \
../../SpiralInfo.h

../../../GUI/Widgets/SpiralGUI.o: ../../../GUI/Widgets/SpiralGUI.C \
../../../GUI/Widgets/SpiralGUI.H

../Widgets/Fl_LED_Button.o: ../Widgets/Fl_LED_Button.cxx \
../Widgets/Fl_LED_Button.H

SeqSelectorPlugin.o: SeqSelectorPlugin.C \
SeqSelectorPlugin.h \
SeqSelectorPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../NoteTable.h \
../../Sample.h \
SeqSelectorPluginGUI.h \
../Widgets/Fl_LED_Button.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm \
../../NoteTable.h
SpiralIcon.xpm

SeqSelectorPluginGUI.o: SeqSelectorPluginGUI.C \
SeqSelectorPluginGUI.h \
../Widgets/Fl_LED_Button.H \
SeqSelectorPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../Widgets/Fl_LED_Button.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 1
- 0
SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C View File

@@ -20,6 +20,7 @@
#include "SeqSelectorPluginGUI.h"
#include <FL/fl_draw.h>
#include <FL/fl_draw.H>
#include <FL/Fl_Box.H>

////////////////////////////////////////////



+ 2
- 7
SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.h View File

@@ -18,21 +18,16 @@

#include "list"
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Slider.H>
#include <FL/Fl_Counter.H>
#include <FL/Fl_Scroll.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Pack.H>
#include "../Widgets/Fl_LED_Button.H"

#include "SeqSelectorPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef MixerGUI
#define MixerGUI
#ifndef SEQ_SEL_GUI_H
#define SEQ_SEL_GUI_H

class CountLine : public Fl_Group
{


+ 20
- 29
SpiralSound/Plugins/SequencerPlugin/Makefile.in View File

@@ -1,8 +1,5 @@
#############################################################################
# Makefile for building SequencerPlugin.so
# Generated by tmake at 22:13, 2001/09/17
# Project: SequencerPlugin
# Template: app
#############################################################################

####### Compiler, tools and options
@@ -45,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_EventMap.h \
../Widgets/Fl_SEvent.h \
../../Sample.h \
@@ -56,7 +53,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../Widgets/Fl_EventMap.C \
../Widgets/Fl_SEvent.C \
../../Sample.C \
@@ -67,19 +64,19 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_EventMap.o \
../Widgets/Fl_SEvent.o \
../../Sample.o \
../../RiffWav.o \
SequencerPlugin.o \
SequencerPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SequencerPlugin.so

####### Implicit rules
@@ -106,7 +103,7 @@ TARGET = SequencerPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -121,7 +118,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -139,15 +136,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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

../Widgets/Fl_EventMap.o: ../Widgets/Fl_EventMap.C \
../Widgets/Fl_EventMap.h \
@@ -168,31 +165,25 @@ install:

SequencerPlugin.o: SequencerPlugin.C \
SequencerPlugin.h \
SequencerPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../Widgets/Fl_EventMap.h \
../Widgets/Fl_SEvent.h \
SequencerPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm \
../../RiffWav.h \
../../NoteTable.h
../../NoteTable.h \
SpiralIcon.xpm

SequencerPluginGUI.o: SequencerPluginGUI.C \
SequencerPluginGUI.h \
SequencerPlugin.h \
../SpiralPlugin.h \
../../Sample.h \
../SpiralPluginGUI.h \
../../SpiralInfo.h \
../../Sample.h \
../Widgets/Fl_EventMap.h \
../Widgets/Fl_SEvent.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../../ChannelHandler.o: ../../ChannelHandler.C \


+ 16
- 20
SpiralSound/Plugins/SmoothPlugin/Makefile.in View File

@@ -42,7 +42,7 @@ HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
SmoothPlugin.h \
SmoothPluginGUI.h
@@ -50,7 +50,7 @@ SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
SmoothPlugin.C \
SmoothPluginGUI.C
@@ -58,15 +58,15 @@ OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
SmoothPlugin.o \
SmoothPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SmoothPlugin.so

@@ -127,15 +127,15 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,26 +143,22 @@ install:

SmoothPlugin.o: SmoothPlugin.C \
SmoothPlugin.h \
SmoothPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
SmoothPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
SpiralIcon.xpm

SmoothPluginGUI.o: SmoothPluginGUI.C \
SmoothPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
SmoothPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h
../Widgets/Fl_Knob.H \
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 5
- 11
SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h View File

@@ -14,31 +14,25 @@
* 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 <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>

#include "../Widgets/Fl_Knob.H"
#include "../Widgets/Fl_DragBar.H"
#include "SmoothPlugin.h"
#include "../SpiralPluginGUI.h"

#ifndef SmoothGUI
#define SmoothGUI


class SmoothPluginGUI : public SpiralPluginGUI
{
public:
SmoothPluginGUI(int w, int h, SmoothPlugin *o,ChannelHandler *ch,const HostInfo *Info);
virtual void UpdateValues(SpiralPlugin *o);

protected:
const string GetHelpText(const string &loc);
const string GetHelpText(const string &loc);

private:

@@ -47,9 +41,9 @@ private:

//// Callbacks ////
inline void cb_Up_i(Fl_Knob* o, void* v);
static void cb_Up(Fl_Knob* o, void* v);
static void cb_Up(Fl_Knob* o, void* v);
inline void cb_Down_i(Fl_Knob* o, void* v);
static void cb_Down(Fl_Knob* o, void* v);
static void cb_Down(Fl_Knob* o, void* v);
};

#endif

+ 8
- 9
SpiralSound/Plugins/SpiralLoopPlugin/Makefile.in View File

@@ -47,7 +47,7 @@ HEADERS = ../SpiralPlugin.h \
Fl_Trigger.h \
SpiralLoopPlugin.h \
SpiralLoopPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H \
../Widgets/Fl_LED_Button.H
SOURCES = ../SpiralPlugin.C \
@@ -59,7 +59,7 @@ SOURCES = ../SpiralPlugin.C \
Fl_Trigger.C \
SpiralLoopPlugin.C \
SpiralLoopPluginGUI.C \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_LED_Button.cxx
OBJECTS = ../SpiralPlugin.o \
@@ -71,7 +71,7 @@ OBJECTS = ../SpiralPlugin.o \
Fl_Trigger.o \
SpiralLoopPlugin.o \
SpiralLoopPluginGUI.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_LED_Button.o
INTERFACES =
@@ -138,12 +138,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.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 \
@@ -154,7 +154,6 @@ install:
../../Sample.h \
../../SpiralInfo.h


#GUI/Widgets/Fl_Loop.o: GUI/Widgets/Fl_Loop.C \
# GUI/Widgets/Fl_Loop.h

@@ -177,7 +176,7 @@ SpiralLoopPlugin.o: SpiralLoopPlugin.C \
../../Sample.h \
SpiralLoopPluginGUI.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H \
SpiralIcon.xpm \
../../RiffWav.h \
@@ -195,7 +194,7 @@ SpiralLoopPluginGUI.o: SpiralLoopPluginGUI.C \
Fl_Trigger.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../Widgets/Fl_Knob.H

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \


+ 7
- 8
SpiralSound/Plugins/SpiralPlugin.h View File

@@ -16,6 +16,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#ifndef SPIRALPLUGIN
#define SPIRALPLUGIN

#include <vector>
#include <map>
#include <string>
@@ -25,11 +28,7 @@
#include <FL/Fl_Group.h>
#include "../Sample.h"
#include "../ChannelHandler.h"

#ifndef SPIRALPLUGIN
#define SPIRALPLUGIN

#define SpiralGUIType Fl_Group
#include "../../GUI/Widgets/SpiralGUI.H"

static const float MAX_FREQ = 13000;

@@ -73,16 +72,16 @@ class SpiralPlugin
public:
SpiralPlugin();
virtual ~SpiralPlugin();
virtual PluginInfo& Initialise(const HostInfo *Host);
// execute the audio
virtual void Execute()=0;
// run the commands from the GUI
virtual void ExecuteCommands() {}
// create the GUI, do not store the pointer - it wont be threadsafe to use it
virtual SpiralGUIType* CreateGUI()=0;
// stream the plugins state
virtual void StreamOut(ostream &s)=0;
virtual void StreamIn(istream &s)=0;


+ 17
- 12
SpiralSound/Plugins/SpiralPluginGUI.C View File

@@ -30,22 +30,22 @@ SpiralPluginGUI* SpiralPluginGUI::Help_owner=NULL;

SpiralPluginGUI::SpiralPluginGUI(int w, int h, SpiralPlugin* o, ChannelHandler *ch) :
SpiralGUIType(0,0,w,h,"")
{
{
Fl::visible_focus(false);
m_GUICH = ch;
box(FL_NO_BOX);
m_Hide = new Fl_Button(2,2,10,10,"X");
m_Hide->labeltype(FL_ENGRAVED_LABEL);
m_Hide->labelsize(10);
m_Hide->labelsize(10);
m_Hide->box(FL_NO_BOX);
m_Hide->callback((Fl_Callback*)cb_Hide);
add(m_Hide);
m_Help = new Fl_Button(w-11,2,10,10,"?");
m_Help->labeltype(FL_ENGRAVED_LABEL);
m_Help->labelsize(10);
m_Help->labelsize(10);
m_Help->box(FL_NO_BOX);
m_Help->down_box(FL_NO_BOX);
m_Help->callback((Fl_Callback*)cb_Help);
@@ -58,6 +58,11 @@ SpiralPluginGUI::~SpiralPluginGUI()
Fl::check();
}

void SpiralPluginGUI::resize (int x, int y, int w, int h) {
if (w != this->w() || h != this->h()) needs_resize (true);
SpiralGUIType::resize (x, y, w, h);
}

void SpiralPluginGUI::Update()
{
}
@@ -69,22 +74,22 @@ const string SpiralPluginGUI::GetHelpText(const string &loc)

//// Callbacks ////

inline void SpiralPluginGUI::cb_Hide_i(Fl_Button* o, void* v)
inline void SpiralPluginGUI::cb_Hide_i(Fl_Button* o, void* v)
{ hide(); }
void SpiralPluginGUI::cb_Hide(Fl_Button* o, void* v)
void SpiralPluginGUI::cb_Hide(Fl_Button* o, void* v)
{ ((SpiralPluginGUI*)(o->parent()))->cb_Hide_i(o,v); }

// Boo - changed to use one 'global' help win. for all plugins, coz Fl_Text_Display
// Boo - changed to use one 'global' help win. for all plugins, coz Fl_Text_Display
// seems to be too buggy to create and destroy it multiple times.
// (symptom was - ssm crashes after opening/closing plugin help window 4-7 times)
// (i use FLTK 1.1.0 rc7)
inline void SpiralPluginGUI::cb_Help_i(Fl_Button* o, void* v)
{
inline void SpiralPluginGUI::cb_Help_i(Fl_Button* o, void* v)
{
//Boo - create 'global' help window
if (m_HelpWin==NULL)
{
int h_w=450,h_h=200;
m_HelpWin = new Fl_Double_Window(h_w,h_h,"Help");

m_HelpWin_text = new Fl_Text_Display(0,0,h_w,h_h);


+ 12
- 15
SpiralSound/Plugins/SpiralPluginGUI.h View File

@@ -14,7 +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.
*/
*/

#ifndef SPIRALPLUGINGUI
#define SPIRALPLUGINGUI

#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
@@ -22,32 +25,26 @@
#include <FL/Fl_Text_Display.H>
#include <iostream>
#include <math.h>

#include "Widgets/Fl_DragBar.H"
#include "SpiralPlugin.h" // for the channel handler
#include "../../GUI/Widgets/SpiralGUI.H"

#ifndef SPIRALPLUGINGUI
#define SPIRALPLUGINGUI

#define SpiralGUIType Fl_Group
class SpiralPluginGUI : public SpiralGUIType
{
public:
SpiralPluginGUI(int w, int h, SpiralPlugin* o, ChannelHandler *ch);
~SpiralPluginGUI();
virtual void resize (int x, int y, int w, int h);

virtual void Update();
// called while audio thread is suspended, so direct access to the
// called while audio thread is suspended, so direct access to the
// spiralplugin is acceptable
virtual void UpdateValues(SpiralPlugin *o)=0;

protected:

ChannelHandler *m_GUICH;
virtual const string GetHelpText(const string &loc);
private:
Fl_Button* m_Hide;
Fl_Button* m_Help;
@@ -55,9 +52,9 @@ private:
static Fl_Double_Window* m_HelpWin;
static Fl_Text_Display* m_HelpWin_text;
static SpiralPluginGUI* Help_owner;
string m_Title;
//// Callbacks ////
inline void cb_Hide_i(Fl_Button* o, void* v);
static void cb_Hide(Fl_Button*, void*);


+ 18
- 31
SpiralSound/Plugins/SplitSwitchPlugin/Makefile.in View File

@@ -41,33 +41,30 @@ mandir = @mandir@
HEADERS = ../SpiralPlugin.h \
../SpiralPluginGUI.h \
../../ChannelHandler.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../../Sample.h \
SplitSwitchPlugin.h \
SplitSwitchPluginGUI.h
SOURCES = ../SpiralPlugin.C \
../SpiralPluginGUI.C \
../../ChannelHandler.C \
../Widgets/Fl_Knob.cxx \
../Widgets/Fl_DragBar.cxx \
../../../GUI/Widgets/SpiralGUI.C \
../../Sample.C \
SplitSwitchPlugin.C \
SplitSwitchPluginGUI.C
OBJECTS = ../SpiralPlugin.o \
../SpiralPluginGUI.o \
../../ChannelHandler.o \
../Widgets/Fl_Knob.o \
../Widgets/Fl_DragBar.o \
../../../GUI/Widgets/SpiralGUI.o \
../../Sample.o \
SplitSwitchPlugin.o \
SplitSwitchPluginGUI.o
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC =
OBJMOC =
DIST =
TARGET = SplitSwitchPlugin.so

####### Implicit rules
@@ -94,7 +91,7 @@ TARGET = SplitSwitchPlugin.so

all: $(TARGET)

$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)

moc: $(SRCMOC)
@@ -109,7 +106,7 @@ dist:
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-rm -f *~ core
install:
$(INSTALL) $(TARGET) $(libdir)/SpiralPlugins

@@ -127,15 +124,12 @@ install:

../SpiralPluginGUI.o: ../SpiralPluginGUI.C \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
../../../GUI/Widgets/SpiralGUI.H \
../SpiralPlugin.h \
../../Sample.h

../Widgets/Fl_Knob.o: ../Widgets/Fl_Knob.cxx \
../Widgets/Fl_Knob.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 \
@@ -143,28 +137,21 @@ install:

SplitSwitchPlugin.o: SplitSwitchPlugin.C \
SplitSwitchPlugin.h \
SplitSwitchPluginGUI.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
SplitSwitchPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H \
SpiralIcon.xpm

SplitSwitchPluginGUI.o: SplitSwitchPluginGUI.C \
SplitSwitchPluginGUI.h \
../Widgets/Fl_Knob.H \
../Widgets/Fl_DragBar.H \
SplitSwitchPlugin.h \
../SpiralPluginGUI.h \
../SpiralPlugin.h \
../../Sample.h \
../../SpiralInfo.h \
../../Sample.h \
../SpiralPluginGUI.h \
../Widgets/Fl_DragBar.H
../../../GUI/Widgets/SpiralGUI.H

../../ChannelHandler.o: ../../ChannelHandler.C \
../../ChannelHandler.h

+ 2
- 0
SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C View File

@@ -55,6 +55,8 @@ inline void SplitSwitchPluginGUI::cb_Chans_i (Fl_Counter* o, void* v) {
else {
m_GUICH->Set ("Chans", int (o->value ()));
m_GUICH->SetCommand (SplitSwitchPlugin::SETCHANS);
m_GUICH->Wait ();
needs_resize (true);
}
}



Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save