diff --git a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C index d100601..081be39 100644 --- a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C +++ b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.h b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.h index 35199a8..78354db 100644 --- a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.h +++ b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.h @@ -32,8 +32,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetSensitivity() { return m_Sensitivity; } diff --git a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C index 231fd0a..1e284e9 100644 --- a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C +++ b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// BeatMatchPluginGUI::BeatMatchPluginGUI(int w, int h,BeatMatchPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.h b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.h index 924ef27..f3849c8 100644 --- a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.h +++ b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.h @@ -32,7 +32,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Knob* m_Sense; diff --git a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C index 2a2d32c..ad5e25a 100644 --- a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C +++ b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.h b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.h index f18d757..3964c84 100644 --- a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.h +++ b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.h @@ -32,8 +32,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); int GetCount() { return m_Count; } diff --git a/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C b/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C index 146ab25..aca7b36 100644 --- a/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C +++ b/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C @@ -21,6 +21,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// CounterPluginGUI::CounterPluginGUI(int w, int h,CounterPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.h b/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.h index 6f9cbc0..f6dd00e 100644 --- a/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.h +++ b/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.h @@ -32,7 +32,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Input* m_Count; diff --git a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C index 3ba7dad..9161b16 100644 --- a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C +++ b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C @@ -34,6 +34,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + static const HostInfo* host; #define CHECK_AND_REPORT_ERROR if (result<0) \ diff --git a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.h b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.h index e467236..40aa91b 100644 --- a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.h +++ b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.h @@ -33,8 +33,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} enum GUICommands {NONE,OPENWAV,CLOSEWAV,RECORD,STOP}; struct GUIArgs diff --git a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C index 17091d0..3f02bc3 100644 --- a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C +++ b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + DiskWriterPluginGUI::DiskWriterPluginGUI(int w, int h, SpiralPlugin *o, ChannelHandler *ch,const HostInfo *Info) : SpiralPluginGUI(w,h,o,ch) { diff --git a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.h b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.h index 7a1c3e8..48d1c2e 100644 --- a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.h +++ b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.h @@ -32,7 +32,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C index 97fa182..068b434 100644 --- a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C +++ b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C @@ -20,6 +20,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.h b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.h index 3a3b1fa..9b5d496 100644 --- a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.h +++ b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo& Initialise(const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} private: bool m_Triggered; diff --git a/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C b/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C index 5ab62c6..90d21e0 100644 --- a/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C +++ b/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// DistributorPluginGUI::DistributorPluginGUI(int w, int h,DistributorPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/JackPlugin/JackPlugin.C b/SpiralSound/Plugins/JackPlugin/JackPlugin.C index 8a84ccf..381b5f7 100644 --- a/SpiralSound/Plugins/JackPlugin/JackPlugin.C +++ b/SpiralSound/Plugins/JackPlugin/JackPlugin.C @@ -23,6 +23,8 @@ #include "JackPluginGUI.h" #include "SpiralIcon.xpm" +using namespace std; + static const HostInfo* host; JackClient* JackClient::m_Singleton = NULL; bool JackClient::m_Attached = false; diff --git a/SpiralSound/Plugins/JackPlugin/JackPlugin.h b/SpiralSound/Plugins/JackPlugin/JackPlugin.h index f6f4e91..50e1661 100644 --- a/SpiralSound/Plugins/JackPlugin/JackPlugin.h +++ b/SpiralSound/Plugins/JackPlugin/JackPlugin.h @@ -37,18 +37,18 @@ class JackClient public: static JackClient *Get() { if(!m_Singleton) m_Singleton=new JackClient; return m_Singleton; } static void PackUpAndGoHome() { if(m_Singleton) { delete m_Singleton; m_Singleton=NULL; } } - + bool Attach(); void Detach(); bool IsAttached() { return m_Attached; } - void SetCallback(void(*Run)(void*, bool m),void *Context) { RunCallback=Run; RunContext=Context; } - void GetPortNames(vector &InputNames,vector &OutputNames); - void ConnectInput(int n, const string &JackPort); - void ConnectOutput(int n, const string &JackPort); + void SetCallback(void(*Run)(void*, bool m),void *Context) { RunCallback=Run; RunContext=Context; } + void GetPortNames(std::vector &InputNames,std::vector &OutputNames); + void ConnectInput(int n, const std::string &JackPort); + void ConnectOutput(int n, const std::string &JackPort); void DisconnectInput(int n); void DisconnectOutput(int n); - string GetInputName(int ID) { return m_InputPortMap[ID]->Name; } - string GetOutputName(int ID) { return m_OutputPortMap[ID]->Name; } + std::string GetInputName(int ID) { return m_InputPortMap[ID]->Name; } + std::string GetOutputName(int ID) { return m_OutputPortMap[ID]->Name; } void SetInputBuf(int ID, float* s); void SetOutputBuf(int ID, float* s); @@ -69,17 +69,17 @@ private: JackPort::JackPort() : Connected(false),Buf(NULL),Port(NULL) {} - string Name; + std::string Name; bool Connected; float* Buf; jack_port_t* Port; - string ConnectedTo; + std::string ConnectedTo; }; static JackClient* m_Singleton; static jack_client_t* m_Client; - static map m_InputPortMap; - static map m_OutputPortMap; + static std::map m_InputPortMap; + static std::map m_OutputPortMap; static long unsigned int m_BufferSize; static long unsigned int m_SampleRate; static bool m_Attached; @@ -100,8 +100,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} enum GUICommands{NONE,ATTACH,DETACH,CONNECTINPUT,CONNECTOUTPUT,UPDATE_NAMES}; struct GUIArgs @@ -121,9 +121,9 @@ private: void Attach() { JackClient::Get()->Attach(); } void Detach() { JackClient::Get()->Detach(); } - void GetPortNames(vector &InputNames,vector &OutputNames) { JackClient::Get()->GetPortNames(InputNames,OutputNames); } - void ConnectInput(int n, const string &JackPort) { JackClient::Get()->ConnectInput(n,JackPort); } - void ConnectOutput(int n, const string &JackPort) { JackClient::Get()->ConnectOutput(n,JackPort); } + void GetPortNames(std::vector &InputNames,std::vector &OutputNames) { JackClient::Get()->GetPortNames(InputNames,OutputNames); } + void ConnectInput(int n, const std::string &JackPort) { JackClient::Get()->ConnectInput(n,JackPort); } + void ConnectOutput(int n, const std::string &JackPort) { JackClient::Get()->ConnectOutput(n,JackPort); } static int m_RefCount; static int m_NoExecuted; diff --git a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C index 3ff83bb..7a1e304 100644 --- a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C +++ b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C @@ -22,6 +22,8 @@ #include #include +using namespace std; + static int Numbers[255]; //////////////////////////////////////////////////////////////////////// diff --git a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.h b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.h index a298a53..ff62dc3 100644 --- a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.h +++ b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.h @@ -39,7 +39,7 @@ public: virtual void Update(); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C index 8d623cf..0329fd4 100644 --- a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C +++ b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C @@ -29,6 +29,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + LowLevelJoystick* LowLevelJoystick::m_Singleton = NULL; int JoystickPlugin::m_RefCount=0; int JoystickPlugin::m_NoExecuted=0; diff --git a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.h b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.h index ce286bc..605b28b 100644 --- a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.h +++ b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.h @@ -62,8 +62,8 @@ public: virtual PluginInfo& Initialise(const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} // has to be defined in the plugin virtual void UpdateGUI() { Fl::check(); } diff --git a/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C b/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C index 463ece8..ddf9a92 100644 --- a/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C +++ b/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C @@ -19,6 +19,8 @@ #include "JoystickPluginGUI.h" #include +using namespace std; + JoystickPluginGUI::JoystickPluginGUI(int w, int h,JoystickPlugin *o,const HostInfo *Info) : SpiralPluginGUI(w,h,o) { diff --git a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C index f852c48..be34549 100644 --- a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C +++ b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C @@ -21,6 +21,8 @@ #include "../../NoteTable.h" #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.h b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.h index e458885..748d45b 100644 --- a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.h +++ b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.h @@ -31,8 +31,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); enum GUICommands{NONE,NOTE_ON,NOTE_OFF}; struct GUIArgs diff --git a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C index 5b30ee6..f9fd249 100644 --- a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C +++ b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C @@ -23,6 +23,8 @@ #include #include +using namespace std; + static int NKEYS = 30; static char KEYMAP[30]={'z','s','x','d','c','v','g','b','h','n','j','m','q', '2','w','3','e','r','5','t','6','y','7','u','i','9', diff --git a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.h b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.h index b366f61..e108ef3 100644 --- a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.h +++ b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.h @@ -35,7 +35,7 @@ public: virtual void Update(); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: int m_Num[NUM_KEYS]; diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C index 4bfcd0a..28ac0ac 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C @@ -37,6 +37,8 @@ #include "LADSPAPluginGUI.h" #include "LADSPAInfo.h" +using namespace std; + //////////////////////////////////////////////////// extern "C" { diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h index 26e6d5d..0dc5057 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h @@ -58,8 +58,8 @@ public: virtual SpiralGUIType *CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); unsigned long GetUniqueID() { return m_UniqueID; } const char *GetName() { return (const char *)m_Name; } @@ -105,15 +105,15 @@ private: void ResetPortSettings(void); void SetGUIExports(void); - const LADSPA_Descriptor *m_PlugDesc; - vector m_LADSPABufVec; - LADSPA_Handle m_PlugInstHandle; + const LADSPA_Descriptor *m_PlugDesc; + std::vector m_LADSPABufVec; + LADSPA_Handle m_PlugInstHandle; - vector m_PortID; - vector m_InputPortMin; - vector m_InputPortMax; - vector m_InputPortClamp; - vector m_InputPortDefault; + std::vector m_PortID; + std::vector m_InputPortMin; + std::vector m_InputPortMax; + std::vector m_InputPortClamp; + std::vector m_InputPortDefault; int m_Version; diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C index d79ec1d..4b65367 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C @@ -31,6 +31,8 @@ #include "LADSPAPluginGUI.h" #include "LADSPAInfo.h" +using namespace std; + LADSPAPluginGUI::LADSPAPluginGUI(int w, int h, LADSPAPlugin *o, ChannelHandler *ch, diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h index a8b2218..a0357f8 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h @@ -60,7 +60,7 @@ public: virtual void Update(void); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: void ClearPlugin(void); void SelectPlugin(void); @@ -91,7 +91,7 @@ private: float ConvertControlValue(unsigned long p, float value); Fl_Color m_GUIColour; - Fl_Boxtype m_GUIBox; + Fl_Boxtype m_GUIBox; // Buttons Fl_Button *m_BKnob; diff --git a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C index fbb5b3e..a8579fd 100644 --- a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C +++ b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C @@ -21,6 +21,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { return new LFOPlugin; } diff --git a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.h b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.h index abc07e9..ac712e1 100644 --- a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.h +++ b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.h @@ -32,8 +32,8 @@ class LFOPlugin : public SpiralPlugin { virtual PluginInfo &Initialise (const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); virtual void Execute(); - virtual void StreamOut (ostream &s); - virtual void StreamIn (istream &s); + virtual void StreamOut (std::ostream &s); + virtual void StreamIn (std::istream &s); //typedef char Type; enum Type {SINE, TRIANGLE, SQUARE, SAW}; void WriteWaves(); @@ -50,11 +50,11 @@ class LFOPlugin : public SpiralPlugin { float m_Freq; Sample m_Table[NUM_TABLES]; int m_TableLength; - friend istream &operator>> (istream &s, LFOPlugin &o); - friend ostream &operator<< (ostream &s, LFOPlugin &o); + friend std::istream &operator>> (std::istream &s, LFOPlugin &o); + friend std::ostream &operator<< (std::ostream &s, LFOPlugin &o); }; -istream &operator>> (istream &s, LFOPlugin &o); -ostream &operator<< (ostream &s, LFOPlugin &o); +std::istream &operator>> (std::istream &s, LFOPlugin &o); +std::ostream &operator<< (std::ostream &s, LFOPlugin &o); #endif diff --git a/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C b/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C index ef3cda0..e95c57b 100644 --- a/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C +++ b/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C @@ -1,207 +1,209 @@ -/* SpiralPlugin - * Copyleft (C) 2002 Andy Preston - * - * 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 "LFOPluginGUI.h" -#include -#include -#include "../GUI/WS_Sine.h" -#include "../GUI/WS_Tri.h" -#include "../GUI/WS_Square.h" -#include "../GUI/WS_Saw.h" - -LFOPluginGUI::LFOPluginGUI (int w, int h, LFOPlugin *o, ChannelHandler *ch, const HostInfo *Info) : -SpiralPluginGUI (w, h, o, ch), -m_PixmapSine (image_Sine), -m_PixmapTri (image_Tri), -m_PixmapSquare (image_Square), -m_PixmapSaw (image_Saw) { - - m_ShapeSine = new Fl_LED_Button (0, 10, 23, 23); - m_ShapeSine->type (FL_RADIO_BUTTON); - m_PixmapSine.label (m_ShapeSine); - m_ShapeSine->set(); - m_ShapeSine->callback ((Fl_Callback*)cb_Sine); - - m_ShapeTri = new Fl_LED_Button (0, 31, 23, 23); - m_ShapeTri->type (FL_RADIO_BUTTON); - m_PixmapTri.label (m_ShapeTri); - m_ShapeTri->callback ((Fl_Callback*)cb_Tri); - - m_ShapeSquare = new Fl_LED_Button (0, 53, 23, 23); - m_ShapeSquare->type (FL_RADIO_BUTTON); - m_PixmapSquare.label (m_ShapeSquare); - m_ShapeSquare->callback ((Fl_Callback*)cb_Square); - - m_ShapeSaw = new Fl_LED_Button (0, 74, 23, 23); - m_ShapeSaw->type (FL_RADIO_BUTTON); - m_PixmapSaw.label (m_ShapeSaw); - m_ShapeSaw->callback ((Fl_Callback*)cb_Saw); - - m_TheTabs = new Fl_Tabs (50, 10, 119, 88, ""); - m_TheTabs->box (FL_PLASTIC_DOWN_BOX); - m_TheTabs->color (Info->GUI_COLOUR); - add (m_TheTabs); - - m_CtlGroup = new Fl_Group (50, 24, 119, 64, "Control"); - m_CtlGroup->labelsize (10); - m_TheTabs->add (m_CtlGroup); - - m_Perd = new Fl_Knob (85, 30, 50, 50, "Period"); - m_Perd->user_data ((void*)(this)); - m_Perd->color (Info->GUI_COLOUR); - m_Perd->type (Fl_Knob::LINELIN); - m_Perd->labelsize (10); - m_Perd->scaleticks (20); - m_Perd->maximum (120); - m_Perd->minimum (0.1); - m_Perd->step (0.001); - m_Perd->value (10); - m_Perd->callback ((Fl_Callback*)cb_Perd); - m_CtlGroup->add (m_Perd); - - m_NumGroup = new Fl_Group (50, 24, 119, 64, "Numbers"); - m_NumGroup->labelsize (10); - m_TheTabs->add (m_NumGroup); - - m_NumPerd = new Fl_Counter (55, 30, 110, 20, "Period (Secs)"); - m_NumPerd->user_data ((void*)(this)); - m_NumPerd->textsize (10); - m_NumPerd->labelsize (10); - m_NumPerd->box (FL_PLASTIC_UP_BOX); - m_NumPerd->color (Info->GUI_COLOUR); - m_NumPerd->value (m_Perd->value()); - m_NumPerd->step (m_Perd->step()); - m_NumPerd->lstep (0.1); - m_NumPerd->maximum (m_Perd->maximum()); - m_NumPerd->minimum (m_Perd->minimum()); - m_NumPerd->callback ((Fl_Callback*)cb_NumPerd); - m_NumGroup->add (m_NumPerd); - - m_NumFreq = new Fl_Counter (55, 64, 110, 20, "Freq (Hz)"); - m_NumFreq->user_data ((void*)(this)); - m_NumFreq->textsize (10); - m_NumFreq->labelsize (10); - m_NumFreq->box (FL_PLASTIC_UP_BOX); - m_NumFreq->color (Info->GUI_COLOUR); - m_NumFreq->value (1 / m_Perd->value()); - m_NumFreq->step (0.001); - m_NumFreq->lstep (0.1); - m_NumFreq->maximum (1 / m_Perd->minimum()); - m_NumFreq->minimum (1 / m_Perd->maximum()); - m_NumFreq->callback ((Fl_Callback*)cb_NumFreq); - m_NumGroup->add (m_NumFreq); - - end(); -} - -void LFOPluginGUI::UpdateValues (SpiralPlugin *o) { - - LFOPlugin* Plugin = (LFOPlugin*)o; - m_ShapeSine->value (0); - m_ShapeTri->value (0); - m_ShapeSquare->value (0); - m_ShapeSaw->value (0); - switch (Plugin->GetType()) { - case LFOPlugin::SINE : m_ShapeSine->value (1); break; - case LFOPlugin::TRIANGLE : m_ShapeTri->value (1); break; - case LFOPlugin::SQUARE : m_ShapeSquare->value (1); break; - case LFOPlugin::SAW : m_ShapeSaw->value (1); break; - } - float x = Plugin->GetFreq(); - m_NumFreq->value (x); - x = 1 / x; - m_Perd->value (x); - m_NumPerd->value (x); -} - -// Callbacks for Knob - -inline void LFOPluginGUI::cb_Perd_i (Fl_Knob* o, void* v) { - m_NumPerd->value ((double)o->value()); - float f = 1.0f / o->value(); - m_NumFreq->value (f); - m_GUICH->Set ("Freq", f); -} - -void LFOPluginGUI::cb_Perd (Fl_Knob* o, void* v) { - ((LFOPluginGUI*)(o->user_data()))->cb_Perd_i (o, v); -} - -// Callbacks for Counters - -inline void LFOPluginGUI::cb_NumPerd_i (Fl_Knob* o, void* v) { - m_Perd->value (o->value()); - float f = 1.0f / o->value(); - m_NumFreq->value (f); - m_GUICH->Set ("Freq", f); -} - -void LFOPluginGUI::cb_NumPerd (Fl_Knob* o, void* v) { - ((LFOPluginGUI*)(o->user_data()))->cb_NumPerd_i (o, v); -} - -inline void LFOPluginGUI::cb_NumFreq_i (Fl_Knob* o, void* v) { - float p = 1.0f / o->value(); - m_Perd->value (p); - m_NumPerd->value (p); - m_GUICH->Set ("Freq", (float)(o->value())); -} - -void LFOPluginGUI::cb_NumFreq (Fl_Knob* o, void* v) { - ((LFOPluginGUI*)(o->user_data()))->cb_NumFreq_i (o, v); -} - -// Callbacks for waveform buttons - -inline void LFOPluginGUI::cb_Sine_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set("Type", LFOPlugin::SINE); -} -void LFOPluginGUI::cb_Sine(Fl_LED_Button* o, void* v) { - ((LFOPluginGUI*)(o->parent()))->cb_Sine_i (o, v); -} - - -inline void LFOPluginGUI::cb_Tri_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set("Type", LFOPlugin::TRIANGLE); -} -void LFOPluginGUI::cb_Tri (Fl_LED_Button* o, void* v) { - ((LFOPluginGUI*)(o->parent()))->cb_Tri_i (o, v); -} - - -inline void LFOPluginGUI::cb_Square_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set("Type", LFOPlugin::SQUARE); -} -void LFOPluginGUI::cb_Square (Fl_LED_Button* o, void* v) { - ((LFOPluginGUI*)(o->parent()))->cb_Square_i (o, v); -} - - -inline void LFOPluginGUI::cb_Saw_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set("Type", LFOPlugin::SAW); -} -void LFOPluginGUI::cb_Saw (Fl_LED_Button* o, void* v) { - ((LFOPluginGUI*)(o->parent()))->cb_Saw_i (o, v); -} - -const string LFOPluginGUI::GetHelpText(const string &loc){ - return string("") - + "A very low frequency oscillator. Also produces inverted and \"cosine\"\n" - + "outputs (output phase shifted by 180 degrees)\n" - + "Period length goes down to 2 minutes :]\n"; -} +/* SpiralPlugin + * Copyleft (C) 2002 Andy Preston + * + * 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 "LFOPluginGUI.h" +#include +#include +#include "../GUI/WS_Sine.h" +#include "../GUI/WS_Tri.h" +#include "../GUI/WS_Square.h" +#include "../GUI/WS_Saw.h" + +using namespace std; + +LFOPluginGUI::LFOPluginGUI (int w, int h, LFOPlugin *o, ChannelHandler *ch, const HostInfo *Info) : +SpiralPluginGUI (w, h, o, ch), +m_PixmapSine (image_Sine), +m_PixmapTri (image_Tri), +m_PixmapSquare (image_Square), +m_PixmapSaw (image_Saw) { + + m_ShapeSine = new Fl_LED_Button (0, 10, 23, 23); + m_ShapeSine->type (FL_RADIO_BUTTON); + m_PixmapSine.label (m_ShapeSine); + m_ShapeSine->set(); + m_ShapeSine->callback ((Fl_Callback*)cb_Sine); + + m_ShapeTri = new Fl_LED_Button (0, 31, 23, 23); + m_ShapeTri->type (FL_RADIO_BUTTON); + m_PixmapTri.label (m_ShapeTri); + m_ShapeTri->callback ((Fl_Callback*)cb_Tri); + + m_ShapeSquare = new Fl_LED_Button (0, 53, 23, 23); + m_ShapeSquare->type (FL_RADIO_BUTTON); + m_PixmapSquare.label (m_ShapeSquare); + m_ShapeSquare->callback ((Fl_Callback*)cb_Square); + + m_ShapeSaw = new Fl_LED_Button (0, 74, 23, 23); + m_ShapeSaw->type (FL_RADIO_BUTTON); + m_PixmapSaw.label (m_ShapeSaw); + m_ShapeSaw->callback ((Fl_Callback*)cb_Saw); + + m_TheTabs = new Fl_Tabs (50, 10, 119, 88, ""); + m_TheTabs->box (FL_PLASTIC_DOWN_BOX); + m_TheTabs->color (Info->GUI_COLOUR); + add (m_TheTabs); + + m_CtlGroup = new Fl_Group (50, 24, 119, 64, "Control"); + m_CtlGroup->labelsize (10); + m_TheTabs->add (m_CtlGroup); + + m_Perd = new Fl_Knob (85, 30, 50, 50, "Period"); + m_Perd->user_data ((void*)(this)); + m_Perd->color (Info->GUI_COLOUR); + m_Perd->type (Fl_Knob::LINELIN); + m_Perd->labelsize (10); + m_Perd->scaleticks (20); + m_Perd->maximum (120); + m_Perd->minimum (0.1); + m_Perd->step (0.001); + m_Perd->value (10); + m_Perd->callback ((Fl_Callback*)cb_Perd); + m_CtlGroup->add (m_Perd); + + m_NumGroup = new Fl_Group (50, 24, 119, 64, "Numbers"); + m_NumGroup->labelsize (10); + m_TheTabs->add (m_NumGroup); + + m_NumPerd = new Fl_Counter (55, 30, 110, 20, "Period (Secs)"); + m_NumPerd->user_data ((void*)(this)); + m_NumPerd->textsize (10); + m_NumPerd->labelsize (10); + m_NumPerd->box (FL_PLASTIC_UP_BOX); + m_NumPerd->color (Info->GUI_COLOUR); + m_NumPerd->value (m_Perd->value()); + m_NumPerd->step (m_Perd->step()); + m_NumPerd->lstep (0.1); + m_NumPerd->maximum (m_Perd->maximum()); + m_NumPerd->minimum (m_Perd->minimum()); + m_NumPerd->callback ((Fl_Callback*)cb_NumPerd); + m_NumGroup->add (m_NumPerd); + + m_NumFreq = new Fl_Counter (55, 64, 110, 20, "Freq (Hz)"); + m_NumFreq->user_data ((void*)(this)); + m_NumFreq->textsize (10); + m_NumFreq->labelsize (10); + m_NumFreq->box (FL_PLASTIC_UP_BOX); + m_NumFreq->color (Info->GUI_COLOUR); + m_NumFreq->value (1 / m_Perd->value()); + m_NumFreq->step (0.001); + m_NumFreq->lstep (0.1); + m_NumFreq->maximum (1 / m_Perd->minimum()); + m_NumFreq->minimum (1 / m_Perd->maximum()); + m_NumFreq->callback ((Fl_Callback*)cb_NumFreq); + m_NumGroup->add (m_NumFreq); + + end(); +} + +void LFOPluginGUI::UpdateValues (SpiralPlugin *o) { + + LFOPlugin* Plugin = (LFOPlugin*)o; + m_ShapeSine->value (0); + m_ShapeTri->value (0); + m_ShapeSquare->value (0); + m_ShapeSaw->value (0); + switch (Plugin->GetType()) { + case LFOPlugin::SINE : m_ShapeSine->value (1); break; + case LFOPlugin::TRIANGLE : m_ShapeTri->value (1); break; + case LFOPlugin::SQUARE : m_ShapeSquare->value (1); break; + case LFOPlugin::SAW : m_ShapeSaw->value (1); break; + } + float x = Plugin->GetFreq(); + m_NumFreq->value (x); + x = 1 / x; + m_Perd->value (x); + m_NumPerd->value (x); +} + +// Callbacks for Knob + +inline void LFOPluginGUI::cb_Perd_i (Fl_Knob* o, void* v) { + m_NumPerd->value ((double)o->value()); + float f = 1.0f / o->value(); + m_NumFreq->value (f); + m_GUICH->Set ("Freq", f); +} + +void LFOPluginGUI::cb_Perd (Fl_Knob* o, void* v) { + ((LFOPluginGUI*)(o->user_data()))->cb_Perd_i (o, v); +} + +// Callbacks for Counters + +inline void LFOPluginGUI::cb_NumPerd_i (Fl_Knob* o, void* v) { + m_Perd->value (o->value()); + float f = 1.0f / o->value(); + m_NumFreq->value (f); + m_GUICH->Set ("Freq", f); +} + +void LFOPluginGUI::cb_NumPerd (Fl_Knob* o, void* v) { + ((LFOPluginGUI*)(o->user_data()))->cb_NumPerd_i (o, v); +} + +inline void LFOPluginGUI::cb_NumFreq_i (Fl_Knob* o, void* v) { + float p = 1.0f / o->value(); + m_Perd->value (p); + m_NumPerd->value (p); + m_GUICH->Set ("Freq", (float)(o->value())); +} + +void LFOPluginGUI::cb_NumFreq (Fl_Knob* o, void* v) { + ((LFOPluginGUI*)(o->user_data()))->cb_NumFreq_i (o, v); +} + +// Callbacks for waveform buttons + +inline void LFOPluginGUI::cb_Sine_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set("Type", LFOPlugin::SINE); +} +void LFOPluginGUI::cb_Sine(Fl_LED_Button* o, void* v) { + ((LFOPluginGUI*)(o->parent()))->cb_Sine_i (o, v); +} + + +inline void LFOPluginGUI::cb_Tri_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set("Type", LFOPlugin::TRIANGLE); +} +void LFOPluginGUI::cb_Tri (Fl_LED_Button* o, void* v) { + ((LFOPluginGUI*)(o->parent()))->cb_Tri_i (o, v); +} + + +inline void LFOPluginGUI::cb_Square_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set("Type", LFOPlugin::SQUARE); +} +void LFOPluginGUI::cb_Square (Fl_LED_Button* o, void* v) { + ((LFOPluginGUI*)(o->parent()))->cb_Square_i (o, v); +} + + +inline void LFOPluginGUI::cb_Saw_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set("Type", LFOPlugin::SAW); +} +void LFOPluginGUI::cb_Saw (Fl_LED_Button* o, void* v) { + ((LFOPluginGUI*)(o->parent()))->cb_Saw_i (o, v); +} + +const string LFOPluginGUI::GetHelpText(const string &loc){ + return string("") + + "A very low frequency oscillator. Also produces inverted and \"cosine\"\n" + + "outputs (output phase shifted by 180 degrees)\n" + + "Period length goes down to 2 minutes :]\n"; +} diff --git a/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.h b/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.h index 078e60b..a4937bb 100644 --- a/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.h +++ b/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.h @@ -1,60 +1,60 @@ -/* SpiralPlugin - * Copyleft (C) 2002 Andy Preston - * - * 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 LFO_GUI_H -#define LFO_GUI_H - -#include -#include -#include -#include "../Widgets/Fl_Knob.H" -#include "../Widgets/Fl_LED_Button.H" -#include "../SpiralPluginGUI.h" -#include "LFOPlugin.h" - -class LFOPluginGUI : public SpiralPluginGUI { - public: - LFOPluginGUI (int w, int h, LFOPlugin *o, ChannelHandler *ch, const HostInfo *Info); - virtual void UpdateValues (SpiralPlugin *o); - protected: - const string GetHelpText (const string &loc); - private: - Fl_Tabs *m_TheTabs; - Fl_Group *m_CtlGroup, *m_NumGroup; - Fl_LED_Button *m_ShapeSine, *m_ShapeTri, *m_ShapeSquare, *m_ShapeSaw; - Fl_Pixmap m_PixmapSine, m_PixmapTri, m_PixmapSquare, m_PixmapSaw; - Fl_Knob *m_Perd; - Fl_Counter *m_NumFreq, *m_NumPerd; - // callbacks - inline void cb_Perd_i (Fl_Knob *o, void *v); - static void cb_Perd (Fl_Knob *o, void *v); - inline void cb_NumFreq_i (Fl_Knob *o, void *v); - static void cb_NumFreq (Fl_Knob *o, void *v); - inline void cb_NumPerd_i (Fl_Knob *o, void *v); - static void cb_NumPerd (Fl_Knob *o, void *v); - inline void cb_Sine_i (Fl_LED_Button *o, void *v); - static void cb_Sine (Fl_LED_Button *o, void *v); - inline void cb_Tri_i (Fl_LED_Button *o, void *v); - static void cb_Tri (Fl_LED_Button *o, void *v); - inline void cb_Square_i (Fl_LED_Button *o, void *v); - static void cb_Square (Fl_LED_Button *o, void *v); - inline void cb_Saw_i (Fl_LED_Button *o, void *v); - static void cb_Saw (Fl_LED_Button *o, void *v); -}; - -#endif +/* SpiralPlugin + * Copyleft (C) 2002 Andy Preston + * + * 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 LFO_GUI_H +#define LFO_GUI_H + +#include +#include +#include +#include "../Widgets/Fl_Knob.H" +#include "../Widgets/Fl_LED_Button.H" +#include "../SpiralPluginGUI.h" +#include "LFOPlugin.h" + +class LFOPluginGUI : public SpiralPluginGUI { + public: + LFOPluginGUI (int w, int h, LFOPlugin *o, ChannelHandler *ch, const HostInfo *Info); + virtual void UpdateValues (SpiralPlugin *o); + protected: + const std::string GetHelpText (const std::string &loc); + private: + Fl_Tabs *m_TheTabs; + Fl_Group *m_CtlGroup, *m_NumGroup; + Fl_LED_Button *m_ShapeSine, *m_ShapeTri, *m_ShapeSquare, *m_ShapeSaw; + Fl_Pixmap m_PixmapSine, m_PixmapTri, m_PixmapSquare, m_PixmapSaw; + Fl_Knob *m_Perd; + Fl_Counter *m_NumFreq, *m_NumPerd; + // callbacks + inline void cb_Perd_i (Fl_Knob *o, void *v); + static void cb_Perd (Fl_Knob *o, void *v); + inline void cb_NumFreq_i (Fl_Knob *o, void *v); + static void cb_NumFreq (Fl_Knob *o, void *v); + inline void cb_NumPerd_i (Fl_Knob *o, void *v); + static void cb_NumPerd (Fl_Knob *o, void *v); + inline void cb_Sine_i (Fl_LED_Button *o, void *v); + static void cb_Sine (Fl_LED_Button *o, void *v); + inline void cb_Tri_i (Fl_LED_Button *o, void *v); + static void cb_Tri (Fl_LED_Button *o, void *v); + inline void cb_Square_i (Fl_LED_Button *o, void *v); + static void cb_Square (Fl_LED_Button *o, void *v); + inline void cb_Saw_i (Fl_LED_Button *o, void *v); + static void cb_Saw (Fl_LED_Button *o, void *v); +}; + +#endif diff --git a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C index d107cd1..229fb1b 100644 --- a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C +++ b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C @@ -22,6 +22,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.h b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.h index 87e4847..4384c56 100644 --- a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.h +++ b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.h @@ -32,8 +32,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); enum OperatorType{NONE,AND,OR,NOT,NAND,NOR,XOR,XNOR}; diff --git a/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C b/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C index f6cbe52..68d13c6 100644 --- a/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C +++ b/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C @@ -21,6 +21,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// LogicPluginGUI::LogicPluginGUI(int w, int h,LogicPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.h b/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.h index 8160cf3..923cefa 100644 --- a/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.h +++ b/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.h @@ -33,7 +33,7 @@ public: LogicPluginGUI(int w, int h, LogicPlugin *o,ChannelHandler *ch,const HostInfo *Info); virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Counter *m_Inputs; Fl_Button *m_AND,*m_OR,*m_NOT,*m_NAND,*m_NOR,*m_XOR,*m_XNOR; diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C index cc4239d..77d5cb4 100644 --- a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C +++ b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C @@ -23,6 +23,8 @@ #define PI 3.141592654 +using namespace std; + float RandRange(float L, float H) { return ((rand()%10000/10000.0f)*(H-L))+L; diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h index 297b61d..ac4dac3 100644 --- a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h +++ b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h @@ -33,8 +33,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); // has to be defined in the plugin virtual void UpdateGUI() { Fl::check(); } @@ -63,12 +63,12 @@ private: int Grain; }; - vector m_OverlapVec; + std::vector m_OverlapVec; - friend istream &operator>>(istream &s, MasherPlugin &o); - friend ostream &operator<<(ostream &s, MasherPlugin &o); + friend std::istream &operator>>(std::istream &s, MasherPlugin &o); + friend std::ostream &operator<<(std::ostream &s, MasherPlugin &o); }; -istream &operator>>(istream &s, MasherPlugin &o); -ostream &operator<<(ostream &s, MasherPlugin &o); +std::istream &operator>>(std::istream &s, MasherPlugin &o); +std::ostream &operator<<(std::ostream &s, MasherPlugin &o); #endif diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C b/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C index e9a21a5..bcffb55 100644 --- a/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C +++ b/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C @@ -1,121 +1,123 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "MasherPluginGUI.h" -#include -#include - -//////////////////////////////////////////// - -MasherPluginGUI::MasherPluginGUI(int w, int h,MasherPlugin *o,ChannelHandler *ch,const HostInfo *Info) : -SpiralPluginGUI(w,h,o,ch) -{ - m_Plugin=o; - - m_Pitch = new Fl_Knob (5, 20, 40, 40, "GrainPitch"); - m_Pitch->type(Fl_Knob::DOTLIN); - m_Pitch->color(Info->GUI_COLOUR); - m_Pitch->labelsize(10); - m_Pitch->maximum(5); - m_Pitch->step(0.001); - m_Pitch->value(1); - m_Pitch->callback((Fl_Callback*)cb_Pitch); - - m_Random = new Fl_Knob (70, 20, 40, 40, "Randomness"); - m_Random->type(Fl_Knob::DOTLIN); - m_Random->color(Info->GUI_COLOUR); - m_Random->labelsize(10); - m_Random->maximum(100); - m_Random->step(1); - m_Random->value(1); - m_Random->callback((Fl_Callback*)cb_Random); - - m_GrainStoreSize = new Fl_Knob (5, 80, 40, 40, "Num Grains"); - m_GrainStoreSize->type(Fl_Knob::DOTLIN); - m_GrainStoreSize->color(Info->GUI_COLOUR); - m_GrainStoreSize->labelsize(10); - m_GrainStoreSize->maximum(MAX_GRAINSTORE_SIZE-2); - m_GrainStoreSize->step(1); - m_GrainStoreSize->value(1); - m_GrainStoreSize->callback((Fl_Callback*)cb_GrainStoreSize); - - m_Density = new Fl_Knob (70, 80, 40, 40, "Density"); - m_Density->type(Fl_Knob::DOTLIN); - m_Density->color(Info->GUI_COLOUR); - m_Density->labelsize(10); - m_Density->maximum(MAX_GRAINSTORE_SIZE); - m_Density->step(1); - m_Density->value(1); - m_Density->callback((Fl_Callback*)cb_Density); - - end(); -} - -extern "C" int sprintf(char *,const char *,...); - -void MasherPluginGUI::UpdateValues(SpiralPlugin *o) -{ - MasherPlugin* Plugin = (MasherPlugin*)o; - m_Pitch->value(Plugin->GetGrainPitch()); - m_Random->value(Plugin->GetRandomness()); - m_GrainStoreSize->value(Plugin->GetGrainStoreSize()); - m_Density->value(Plugin->GetDensity()); -} - -inline void MasherPluginGUI::cb_Random_i(Fl_Knob* o, void* v) -{ - m_GUICH->Set("Randomness",(int)o->value()); -} -void MasherPluginGUI::cb_Random(Fl_Knob* o, void* v) -{ ((MasherPluginGUI*)(o->parent()))->cb_Random_i(o,v); } - -inline void MasherPluginGUI::cb_Pitch_i(Fl_Knob* o, void* v) -{ - m_GUICH->Set("GrainPitch",(float)o->value()); -} -void MasherPluginGUI::cb_Pitch(Fl_Knob* o, void* v) -{ ((MasherPluginGUI*)(o->parent()))->cb_Pitch_i(o,v); } - -inline void MasherPluginGUI::cb_MinGrainSize_i(Fl_Knob* o, void* v) -{ - m_GUICH->Set("Period",(int)o->value()+1); -} -void MasherPluginGUI::cb_MinGrainSize(Fl_Knob* o, void* v) -{ ((MasherPluginGUI*)(o->parent()))->cb_MinGrainSize_i(o,v); } - -inline void MasherPluginGUI::cb_GrainStoreSize_i(Fl_Knob* o, void* v) -{ - m_GUICH->Set("GrainStoreSize",(int)o->value()+1); -} -void MasherPluginGUI::cb_GrainStoreSize(Fl_Knob* o, void* v) -{ ((MasherPluginGUI*)(o->parent()))->cb_GrainStoreSize_i(o,v); } - -inline void MasherPluginGUI::cb_Density_i(Fl_Knob* o, void* v) -{ - m_GUICH->Set("Density",(int)o->value()); -} -void MasherPluginGUI::cb_Density(Fl_Knob* o, void* v) -{ ((MasherPluginGUI*)(o->parent()))->cb_Density_i(o,v); } - -const string MasherPluginGUI::GetHelpText(const string &loc){ - return string("") - + "Top secret sample masher plugin. Granulates the incoming stream and\n" - + "carries out various patented algorithms on the result.\n\n" - + "Truth is I don't really know how it works, but makes sounds like\n" - + "tttttthhhIIiissssSSSSSSsssssSsSSsS."; -} +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "MasherPluginGUI.h" +#include +#include + +using namespace std; + +//////////////////////////////////////////// + +MasherPluginGUI::MasherPluginGUI(int w, int h,MasherPlugin *o,ChannelHandler *ch,const HostInfo *Info) : +SpiralPluginGUI(w,h,o,ch) +{ + m_Plugin=o; + + m_Pitch = new Fl_Knob (5, 20, 40, 40, "GrainPitch"); + m_Pitch->type(Fl_Knob::DOTLIN); + m_Pitch->color(Info->GUI_COLOUR); + m_Pitch->labelsize(10); + m_Pitch->maximum(5); + m_Pitch->step(0.001); + m_Pitch->value(1); + m_Pitch->callback((Fl_Callback*)cb_Pitch); + + m_Random = new Fl_Knob (70, 20, 40, 40, "Randomness"); + m_Random->type(Fl_Knob::DOTLIN); + m_Random->color(Info->GUI_COLOUR); + m_Random->labelsize(10); + m_Random->maximum(100); + m_Random->step(1); + m_Random->value(1); + m_Random->callback((Fl_Callback*)cb_Random); + + m_GrainStoreSize = new Fl_Knob (5, 80, 40, 40, "Num Grains"); + m_GrainStoreSize->type(Fl_Knob::DOTLIN); + m_GrainStoreSize->color(Info->GUI_COLOUR); + m_GrainStoreSize->labelsize(10); + m_GrainStoreSize->maximum(MAX_GRAINSTORE_SIZE-2); + m_GrainStoreSize->step(1); + m_GrainStoreSize->value(1); + m_GrainStoreSize->callback((Fl_Callback*)cb_GrainStoreSize); + + m_Density = new Fl_Knob (70, 80, 40, 40, "Density"); + m_Density->type(Fl_Knob::DOTLIN); + m_Density->color(Info->GUI_COLOUR); + m_Density->labelsize(10); + m_Density->maximum(MAX_GRAINSTORE_SIZE); + m_Density->step(1); + m_Density->value(1); + m_Density->callback((Fl_Callback*)cb_Density); + + end(); +} + +extern "C" int sprintf(char *,const char *,...); + +void MasherPluginGUI::UpdateValues(SpiralPlugin *o) +{ + MasherPlugin* Plugin = (MasherPlugin*)o; + m_Pitch->value(Plugin->GetGrainPitch()); + m_Random->value(Plugin->GetRandomness()); + m_GrainStoreSize->value(Plugin->GetGrainStoreSize()); + m_Density->value(Plugin->GetDensity()); +} + +inline void MasherPluginGUI::cb_Random_i(Fl_Knob* o, void* v) +{ + m_GUICH->Set("Randomness",(int)o->value()); +} +void MasherPluginGUI::cb_Random(Fl_Knob* o, void* v) +{ ((MasherPluginGUI*)(o->parent()))->cb_Random_i(o,v); } + +inline void MasherPluginGUI::cb_Pitch_i(Fl_Knob* o, void* v) +{ + m_GUICH->Set("GrainPitch",(float)o->value()); +} +void MasherPluginGUI::cb_Pitch(Fl_Knob* o, void* v) +{ ((MasherPluginGUI*)(o->parent()))->cb_Pitch_i(o,v); } + +inline void MasherPluginGUI::cb_MinGrainSize_i(Fl_Knob* o, void* v) +{ + m_GUICH->Set("Period",(int)o->value()+1); +} +void MasherPluginGUI::cb_MinGrainSize(Fl_Knob* o, void* v) +{ ((MasherPluginGUI*)(o->parent()))->cb_MinGrainSize_i(o,v); } + +inline void MasherPluginGUI::cb_GrainStoreSize_i(Fl_Knob* o, void* v) +{ + m_GUICH->Set("GrainStoreSize",(int)o->value()+1); +} +void MasherPluginGUI::cb_GrainStoreSize(Fl_Knob* o, void* v) +{ ((MasherPluginGUI*)(o->parent()))->cb_GrainStoreSize_i(o,v); } + +inline void MasherPluginGUI::cb_Density_i(Fl_Knob* o, void* v) +{ + m_GUICH->Set("Density",(int)o->value()); +} +void MasherPluginGUI::cb_Density(Fl_Knob* o, void* v) +{ ((MasherPluginGUI*)(o->parent()))->cb_Density_i(o,v); } + +const string MasherPluginGUI::GetHelpText(const string &loc){ + return string("") + + "Top secret sample masher plugin. Granulates the incoming stream and\n" + + "carries out various patented algorithms on the result.\n\n" + + "Truth is I don't really know how it works, but makes sounds like\n" + + "tttttthhhIIiissssSSSSSSsssssSsSSsS."; +} diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.h b/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.h index 88f14e7..bd87fc8 100644 --- a/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.h +++ b/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.h @@ -1,61 +1,61 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include -#include "../Widgets/Fl_Knob.H" -#include "MasherPlugin.h" -#include "../SpiralPluginGUI.h" - -#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; - -protected: - 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*); - 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); - static void cb_MinGrainSize(Fl_Knob*, void*); - inline void cb_GrainStoreSize_i(Fl_Knob* o, void* v); - static void cb_GrainStoreSize(Fl_Knob*, void*); - inline void cb_Density_i(Fl_Knob* o, void* v); - static void cb_Density(Fl_Knob*, void*); - -}; - -#endif +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include +#include "../Widgets/Fl_Knob.H" +#include "MasherPlugin.h" +#include "../SpiralPluginGUI.h" + +#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; + +protected: + const std::string GetHelpText(const std::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*); + 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); + static void cb_MinGrainSize(Fl_Knob*, void*); + inline void cb_GrainStoreSize_i(Fl_Knob* o, void* v); + static void cb_GrainStoreSize(Fl_Knob*, void*); + inline void cb_Density_i(Fl_Knob* o, void* v); + static void cb_Density(Fl_Knob*, void*); + +}; + +#endif diff --git a/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C b/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C index 19af8ac..2038230 100644 --- a/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C +++ b/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C @@ -19,6 +19,8 @@ #include "MeterPluginGUI.h" #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { return new MeterPlugin; } diff --git a/SpiralSound/Plugins/MeterPlugin/MeterPlugin.h b/SpiralSound/Plugins/MeterPlugin/MeterPlugin.h index be9c28d..56ec1f8 100644 --- a/SpiralSound/Plugins/MeterPlugin/MeterPlugin.h +++ b/SpiralSound/Plugins/MeterPlugin/MeterPlugin.h @@ -29,8 +29,8 @@ class MeterPlugin : public SpiralPlugin { virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut (ostream &s); - virtual void StreamIn (istream &s); + virtual void StreamOut (std::ostream &s); + virtual void StreamIn (std::istream &s); int GetVUMode (void) { return m_VUMode; } enum GUICommands {NONE, SETVU, SETMM}; private: diff --git a/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.C b/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.C index 0a456bc..7317d32 100644 --- a/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.C +++ b/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.C @@ -19,6 +19,8 @@ #include "MeterPluginGUI.h" #include +using namespace std; + char label_buf[10]; MeterPluginGUI::MeterPluginGUI (int w, int h, MeterPlugin *o, ChannelHandler *ch, const HostInfo *Info) : diff --git a/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.h b/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.h index 184035b..1b09653 100644 --- a/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.h +++ b/SpiralSound/Plugins/MeterPlugin/MeterPluginGUI.h @@ -34,7 +34,7 @@ class MeterPluginGUI : public SpiralPluginGUI { virtual void Update (); virtual void draw (); protected: - const string GetHelpText (const string &loc); + const std::string GetHelpText (const std::string &loc); private: bool m_Bypass; float *m_Data, m_Min, m_Max; diff --git a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C index 3636271..a0e4925 100644 --- a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C +++ b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C @@ -23,6 +23,8 @@ #include "../../Midi.h" #include "SpiralIcon.xpm" +using namespace std; + int MidiPlugin::m_RefCount = 0; extern "C" { diff --git a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.h b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.h index 188d61e..1c01651 100644 --- a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.h +++ b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.h @@ -32,8 +32,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); // has to be defined in the plugin virtual void UpdateGUI() { Fl::check(); } @@ -52,7 +52,7 @@ public: private: GUIArgs m_GUIArgs; - void AddControl(int s,const string &Name); + void AddControl(int s,const std::string &Name); void DeleteControl(); int m_DeviceNum; @@ -69,7 +69,7 @@ private: static int m_RefCount; - vector m_ControlList; + std::vector m_ControlList; }; #endif diff --git a/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C b/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C index 1ed314b..c007f81 100644 --- a/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C +++ b/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C @@ -22,6 +22,8 @@ #include #include +using namespace std; + //////////////////////////////////////////////////////////////////////// int OptionsList(const vector &List) diff --git a/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.h b/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.h index ba560e8..c2a3c36 100644 --- a/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.h +++ b/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.h @@ -25,7 +25,7 @@ #ifndef MIDIGUI #define MIDIGUI -int OptionsList(const vector &List); +int OptionsList(const std::vector &List); class MidiPluginGUI : public SpiralPluginGUI { @@ -35,7 +35,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C index 49bb169..8e96c97 100644 --- a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C +++ b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C @@ -21,6 +21,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance () { return new MixSwitchPlugin; } diff --git a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.h b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.h index d94209e..fbc3d1c 100644 --- a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.h +++ b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.h @@ -30,8 +30,8 @@ class MixSwitchPlugin : public SpiralPlugin { virtual SpiralGUIType* CreateGUI (); virtual void Execute (); virtual void ExecuteCommands(); - virtual void StreamOut (ostream &s); - virtual void StreamIn (istream &s); + virtual void StreamOut (std::ostream &s); + virtual void StreamIn (std::istream &s); int GetSwitch (void) { return m_SwitchPos + 1; } int GetChans (void) { return m_PluginInfo.NumInputs - 2; } enum GUICommands {NONE, SETCHANS}; @@ -46,11 +46,11 @@ class MixSwitchPlugin : public SpiralPlugin { int m_SwitchPos; bool m_Triggered; void CreatePorts (int n = 2, bool AddPorts = false); - friend istream &operator>> (istream &s, MixSwitchPlugin &o); - friend ostream &operator<< (ostream &s, MixSwitchPlugin &o); + friend std::istream &operator>> (std::istream &s, MixSwitchPlugin &o); + friend std::ostream &operator<< (std::ostream &s, MixSwitchPlugin &o); }; -istream &operator>> (istream &s, MixSwitchPlugin &o); -ostream &operator<< (ostream &s, MixSwitchPlugin &o); +std::istream &operator>> (std::istream &s, MixSwitchPlugin &o); +std::ostream &operator<< (std::ostream &s, MixSwitchPlugin &o); #endif diff --git a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C index 8510307..a2253eb 100644 --- a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C +++ b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C @@ -22,6 +22,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// MixSwitchPluginGUI::MixSwitchPluginGUI (int w, int h, MixSwitchPlugin *o, ChannelHandler *ch, const HostInfo *Info) : diff --git a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.h b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.h index 1dd336a..2bf26be 100644 --- a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.h +++ b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.h @@ -30,7 +30,7 @@ class MixSwitchPluginGUI : public SpiralPluginGUI { virtual void UpdateValues(SpiralPlugin *o); virtual void Update(); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Counter *m_Switch, *m_Chans; inline void cb_Switch_i (Fl_Counter* o, void* v); diff --git a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C index 622ef23..03d0ddc 100644 --- a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C +++ b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C @@ -22,6 +22,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.h b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.h index 3d06052..621141b 100644 --- a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.h +++ b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.h @@ -31,8 +31,8 @@ class MixerPlugin : public SpiralPlugin { virtual SpiralGUIType *CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); // has to be defined in the plugin virtual void UpdateGUI() { Fl::check(); } enum GUICommands { NONE, SETCH, SETNUM }; diff --git a/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C b/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C index 9894a6c..8003c58 100644 --- a/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C +++ b/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// MixerPluginGUI::MixerPluginGUI (int w, int h, MixerPlugin *o, ChannelHandler *ch, const HostInfo *Info) : diff --git a/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.h b/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.h index 176f703..753e637 100644 --- a/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.h +++ b/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.h @@ -34,11 +34,11 @@ class MixerPluginGUI : public SpiralPluginGUI { virtual void UpdateValues(SpiralPlugin *o); virtual void Update (); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: void AddChan (bool SendData = false, bool ResizeIt = false); void DeleteChan (bool SendData = true); - vector m_SlidVec; + std::vector m_SlidVec; Fl_Pack *m_MainPack, *m_Buttons; Fl_Button *m_Add, *m_Delete; Fl_LED_Button *m_PeakInd; diff --git a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C index 3a22802..e27b3b0 100644 --- a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C +++ b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C @@ -23,6 +23,8 @@ #define PI 3.141592654 +using namespace std; + static const int GRANULARITY = 10; extern "C" { diff --git a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.h b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.h index ef48524..dce831d 100644 --- a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.h +++ b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetCutoff() { return Cutoff; } float GetResonance() { return Resonance; } @@ -49,10 +49,10 @@ private: float in1,in2,in3,in4,out1,out2,out3,out4; - friend istream &operator>>(istream &s, MoogFilterPlugin &o); - friend ostream &operator<<(ostream &s, MoogFilterPlugin &o); + friend std::istream &operator>>(std::istream &s, MoogFilterPlugin &o); + friend std::ostream &operator<<(std::ostream &s, MoogFilterPlugin &o); }; -istream &operator>>(istream &s, MoogFilterPlugin &o); -ostream &operator<<(ostream &s, MoogFilterPlugin &o); +std::istream &operator>>(std::istream &s, MoogFilterPlugin &o); +std::ostream &operator<<(std::ostream &s, MoogFilterPlugin &o); #endif diff --git a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C index a74c51a..07d4c29 100644 --- a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C +++ b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// MoogFilterPluginGUI::MoogFilterPluginGUI(int w, int h,MoogFilterPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.h b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.h index 81e6d15..cdc750c 100644 --- a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.h +++ b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.h @@ -33,7 +33,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Slider *Cutoff; diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C index faa9ef2..ceeabc5 100644 --- a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C +++ b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C @@ -21,6 +21,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.h b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.h index 0a0f3dc..98f4f2a 100644 --- a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.h +++ b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); enum Type {WHITE,PINK}; Type GetType() {return m_Type;} diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C b/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C index 29664ca..4ed0509 100644 --- a/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C +++ b/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C @@ -1,71 +1,73 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "NoisePluginGUI.h" -#include -#include - -NoisePluginGUI::NoisePluginGUI(int w, int h,NoisePlugin *o,ChannelHandler *ch,const HostInfo *Info) : -SpiralPluginGUI(w,h,o,ch) -{ - White = new Fl_LED_Button (15, 12, 55, 20, "White"); - White->type (FL_RADIO_BUTTON); - White->labelsize (10); - White->set (); - White->callback ((Fl_Callback*)cb_White); - - Pink = new Fl_LED_Button (15, 34, 55, 20, "Pink"); - Pink->type (FL_RADIO_BUTTON); - Pink->labelsize (10); - Pink->callback ((Fl_Callback*)cb_Pink); - end(); -} - -void NoisePluginGUI::UpdateValues(SpiralPlugin *o) -{ - NoisePlugin *Plugin = (NoisePlugin*)o; - - switch (Plugin->GetType()) - { - case NoisePlugin::WHITE : White->value(1); break; - case NoisePlugin::PINK : Pink->value(1); break; - } -} - -//// Callbacks //// - -inline void NoisePluginGUI::cb_White_i(Fl_LED_Button* o, void* v) -{ m_GUICH->Set("Type",(char)NoisePlugin::WHITE); } - -void NoisePluginGUI::cb_White(Fl_LED_Button* o, void* v) -{ ((NoisePluginGUI*)(o->parent()))->cb_White_i(o,v); } - -inline void NoisePluginGUI::cb_Pink_i(Fl_LED_Button* o, void* v) -{ m_GUICH->Set("Type",(char)NoisePlugin::PINK); } - -void NoisePluginGUI::cb_Pink(Fl_LED_Button* o, void* v) -{ ((NoisePluginGUI*)(o->parent()))->cb_Pink_i(o,v); } - - -const string NoisePluginGUI::GetHelpText(const string &loc){ - return string("") - + "Makes noise, white noise is just raw randomness, pink noise\n" - + "is white noise filtered to contain equal amounts of each\n" - + "frequency, it should sound more natural and be more useful\n" - + "for synthesis uses"; -} +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "NoisePluginGUI.h" +#include +#include + +using namespace std; + +NoisePluginGUI::NoisePluginGUI(int w, int h,NoisePlugin *o,ChannelHandler *ch,const HostInfo *Info) : +SpiralPluginGUI(w,h,o,ch) +{ + White = new Fl_LED_Button (15, 12, 55, 20, "White"); + White->type (FL_RADIO_BUTTON); + White->labelsize (10); + White->set (); + White->callback ((Fl_Callback*)cb_White); + + Pink = new Fl_LED_Button (15, 34, 55, 20, "Pink"); + Pink->type (FL_RADIO_BUTTON); + Pink->labelsize (10); + Pink->callback ((Fl_Callback*)cb_Pink); + end(); +} + +void NoisePluginGUI::UpdateValues(SpiralPlugin *o) +{ + NoisePlugin *Plugin = (NoisePlugin*)o; + + switch (Plugin->GetType()) + { + case NoisePlugin::WHITE : White->value(1); break; + case NoisePlugin::PINK : Pink->value(1); break; + } +} + +//// Callbacks //// + +inline void NoisePluginGUI::cb_White_i(Fl_LED_Button* o, void* v) +{ m_GUICH->Set("Type",(char)NoisePlugin::WHITE); } + +void NoisePluginGUI::cb_White(Fl_LED_Button* o, void* v) +{ ((NoisePluginGUI*)(o->parent()))->cb_White_i(o,v); } + +inline void NoisePluginGUI::cb_Pink_i(Fl_LED_Button* o, void* v) +{ m_GUICH->Set("Type",(char)NoisePlugin::PINK); } + +void NoisePluginGUI::cb_Pink(Fl_LED_Button* o, void* v) +{ ((NoisePluginGUI*)(o->parent()))->cb_Pink_i(o,v); } + + +const string NoisePluginGUI::GetHelpText(const string &loc){ + return string("") + + "Makes noise, white noise is just raw randomness, pink noise\n" + + "is white noise filtered to contain equal amounts of each\n" + + "frequency, it should sound more natural and be more useful\n" + + "for synthesis uses"; +} diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.h b/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.h index 12a9b44..ab453c3 100644 --- a/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.h +++ b/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.h @@ -30,7 +30,7 @@ class NoisePluginGUI : public SpiralPluginGUI NoisePluginGUI(int w, int h, NoisePlugin *o, ChannelHandler *ch, const HostInfo *Info); virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_LED_Button *White, *Pink; //// Callbacks //// diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C index 8933a06..542030f 100644 --- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C +++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.h b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.h index e6edcda..3884fb2 100644 --- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.h +++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.h @@ -32,8 +32,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); bool GetFilter(int n) { return m_Filter[n]; } diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C index 7581dbb..6b5c964 100644 --- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C +++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// NoteSnapPluginGUI::NoteSnapPluginGUI(int w, int h,NoteSnapPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h index 1865415..4fb1c91 100644 --- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h +++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.h @@ -33,7 +33,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: int m_Num[NUM_KEYS]; diff --git a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C index 3f7f4fe..0e3c7fb 100644 --- a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C +++ b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.h b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.h index 0b7502f..23ea9d3 100644 --- a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.h +++ b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.h @@ -32,8 +32,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); enum OperatorType{NONE,ADD,SUB,DIV,MUL}; diff --git a/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C b/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C index 660f4e2..e839a8c 100644 --- a/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C +++ b/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C @@ -21,6 +21,8 @@ #include //#include +using namespace std; + //////////////////////////////////////////// OperatorPluginGUI::OperatorPluginGUI(int w, int h,OperatorPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.h b/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.h index 7d98fda..cec3ce2 100644 --- a/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.h +++ b/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.h @@ -30,7 +30,7 @@ class OperatorPluginGUI : public SpiralPluginGUI { OperatorPluginGUI (int w, int h, OperatorPlugin *o, ChannelHandler *ch, const HostInfo *Info); virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Button *m_Add, *m_Sub, *m_Mul, *m_Div; Fl_Counter *m_Constant; diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C index e3260ad..19d6738 100644 --- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C +++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C @@ -21,6 +21,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + static const int IN_FREQ = 0; static const int IN_PW = 1; static const int IN_SHLEN = 2; diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.h b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.h index 1124bc8..256796a 100644 --- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.h +++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); typedef char Type; enum {NONE,SQUARE,SAW,NOISE}; @@ -71,11 +71,11 @@ private: static const int FIXED; - friend istream &operator>>(istream &s, OscillatorPlugin &o); - friend ostream &operator<<(ostream &s, OscillatorPlugin &o); + friend std::istream &operator>>(std::istream &s, OscillatorPlugin &o); + friend std::ostream &operator<<(std::ostream &s, OscillatorPlugin &o); }; -istream &operator>>(istream &s, OscillatorPlugin &o); -ostream &operator<<(ostream &s, OscillatorPlugin &o); +std::istream &operator>>(std::istream &s, OscillatorPlugin &o); +std::ostream &operator<<(std::ostream &s, OscillatorPlugin &o); #endif diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C index e198423..ffff9e8 100644 --- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C +++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C @@ -1,417 +1,419 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "OscillatorPluginGUI.h" -#include -#include -#include "../GUI/WS_Square.h" -#include "../GUI/WS_Noise.h" -#include "../GUI/WS_Saw.h" - -OscillatorPluginGUI::OscillatorPluginGUI (int w, int h, OscillatorPlugin *o, ChannelHandler *ch, const HostInfo *Info) : -SpiralPluginGUI (w, h, o, ch), -m_PixmapSquare (image_Square), -m_PixmapNoise (image_Noise), -m_PixmapSaw (image_Saw), -m_FineFreq (0) -{ - m_ShapeSquare = new Fl_LED_Button (2, 24, 23, 23); - m_ShapeSquare->type (FL_RADIO_BUTTON); - m_PixmapSquare.label (m_ShapeSquare); - m_ShapeSquare->set(); - m_ShapeSquare->callback ((Fl_Callback*)cb_Square); - add (m_ShapeSquare); - - m_ShapeSaw = new Fl_LED_Button (2, 58, 23, 23); - m_ShapeSaw->type (FL_RADIO_BUTTON); - m_PixmapSaw.label (m_ShapeSaw); - m_ShapeSaw->callback ((Fl_Callback*)cb_Saw); - add (m_ShapeSaw); - - m_ShapeNoise = new Fl_LED_Button (2, 92, 23, 23); - m_ShapeNoise->type (FL_RADIO_BUTTON); - m_PixmapNoise.label (m_ShapeNoise); - m_ShapeNoise->callback ((Fl_Callback*)cb_Noise); - add (m_ShapeNoise); - - m_Tabs = new Fl_Tabs (44, 10, 168, 124); - m_Tabs->box (FL_PLASTIC_DOWN_BOX); - m_Tabs->color (Info->GUI_COLOUR); - add (m_Tabs); - - m_CtlGroup = new Fl_Group (44, 24, 168, 110, "Control"); - m_CtlGroup->labelsize (10); - m_Tabs->add (m_CtlGroup); - - m_PulseWidth = new Fl_Slider (50, 32, 20, 86, "PW"); - m_PulseWidth->user_data ((void*)(this)); - m_PulseWidth->type (FL_VERT_NICE_SLIDER); - m_PulseWidth->box (FL_PLASTIC_DOWN_BOX); - m_PulseWidth->selection_color (Info->GUI_COLOUR); - m_PulseWidth->labelsize (10); - m_PulseWidth->maximum (1); - m_PulseWidth->step (0.01); - m_PulseWidth->value (0.5); - m_PulseWidth->callback ((Fl_Callback*)cb_PulseWidth); - m_CtlGroup->add (m_PulseWidth); - - m_SHLen = new Fl_Slider (74, 32, 20, 86, "SH"); - m_SHLen->user_data ((void*)(this)); - m_SHLen->type (FL_VERT_NICE_SLIDER); - m_SHLen->box (FL_PLASTIC_DOWN_BOX); - m_SHLen->selection_color (Info->GUI_COLOUR); - m_SHLen->labelsize (10); - m_SHLen->maximum (0.2); - m_SHLen->step (0.001); - m_SHLen->value (0.1); - m_SHLen->callback ((Fl_Callback*)cb_SHLen); - m_CtlGroup->add (m_SHLen); - - m_FineTune = new Fl_Knob (98, 32, 60, 60, "Fine Tune"); - m_FineTune->user_data ((void*)(this)); - m_FineTune->color (Info->GUI_COLOUR); - m_FineTune->type (Fl_Knob::LINELIN); - m_FineTune->labelsize (10); - m_FineTune->scaleticks (20); - m_FineTune->maximum (1.414); - m_FineTune->step (0.000001); - m_FineTune->value (1); - m_FineTune->callback ((Fl_Callback*)cb_FineTune); - m_CtlGroup->add (m_FineTune); - - m_Reset = new Fl_Button (108, 106, 40, 20, "Reset"); - m_Reset->user_data ((void*)(this)); - m_Reset->labelsize (10); - m_Reset->box (FL_PLASTIC_UP_BOX); - m_Reset->color (Info->GUI_COLOUR); - m_Reset->selection_color (Info->GUI_COLOUR); - m_Reset->callback ((Fl_Callback*)cb_Reset); - m_CtlGroup->add (m_Reset); - - m_Octave = new Fl_Knob (160, 27, 40, 40, "Octave"); - m_Octave->user_data ((void*)(this)); - m_Octave->color (Info->GUI_COLOUR); - m_Octave->type (Fl_Knob::LINELIN); - m_Octave->labelsize (10); - m_Octave->maximum (6); - m_Octave->step (1); - m_Octave->value (3); - m_Octave->scaleticks (6); - m_Octave->cursor (50); - m_Octave->callback ((Fl_Callback*)cb_Octave); - m_CtlGroup->add (m_Octave); - - m_ModAmount = new Fl_Knob (160, 79, 40, 40, "Mod Depth"); - m_ModAmount->user_data ((void*)(this)); - m_ModAmount->color (Info->GUI_COLOUR); - m_ModAmount->type (Fl_Knob::LINELIN); - m_ModAmount->labelsize (10); - m_ModAmount->maximum (2.0f); - m_ModAmount->step (0.001); - m_ModAmount->value (1.0); - m_ModAmount->callback ((Fl_Callback*)cb_ModAmount); - m_CtlGroup->add (m_ModAmount); - - m_NumGroup = new Fl_Group (44, 24, 168, 110, "Numbers"); - m_NumGroup->labelsize (10); - m_Tabs->add (m_NumGroup); - - m_NumPulseWidth = new Fl_Counter (54, 32, 55, 20, "PW (%)"); - m_NumPulseWidth->user_data ((void*)(this)); - m_NumPulseWidth->type (FL_SIMPLE_COUNTER); - m_NumPulseWidth->box (FL_PLASTIC_UP_BOX); - m_NumPulseWidth->color (Info->GUI_COLOUR); - m_NumPulseWidth->labelsize (10); - m_NumPulseWidth->textsize (10); - m_NumPulseWidth->minimum (0); - m_NumPulseWidth->maximum (100); - m_NumPulseWidth->step (1); - m_NumPulseWidth->value (m_PulseWidth->value() * 100); - m_NumPulseWidth->callback ((Fl_Callback*)cb_NumPulseWidth); - m_NumGroup->add (m_NumPulseWidth); - - m_NumSHLen = new Fl_Counter (54, 98, 55, 20, "S&H (Secs)"); - m_NumSHLen->user_data ((void*)(this)); - m_NumSHLen->type (FL_SIMPLE_COUNTER); - m_NumSHLen->box (FL_PLASTIC_UP_BOX); - m_NumSHLen->color (Info->GUI_COLOUR); - m_NumSHLen->labelsize (10); - m_NumSHLen->textsize (10); - m_NumSHLen->minimum (0); - m_NumSHLen->maximum (0.2f); - m_NumSHLen->step (.001); - //m_NumSHLen->lstep (.1); - m_NumSHLen->value (0.2f - m_SHLen->value()); - m_NumSHLen->callback ((Fl_Callback*)cb_NumSHLen); - m_NumGroup->add (m_NumSHLen); - - m_NumFreq = new Fl_Counter (114, 32, 90, 20, "Freq (Hz)"); - m_NumFreq->user_data ((void*)(this)); - m_NumFreq->box (FL_PLASTIC_UP_BOX); - m_NumFreq->color (Info->GUI_COLOUR); - m_NumFreq->labelsize (10); - m_NumFreq->textsize (10); - m_NumFreq->minimum (0); - m_NumFreq->step (0.1); - m_NumFreq->lstep (10); - m_NumFreq->callback ((Fl_Callback*)cb_NumFreq); - m_NumGroup->add (m_NumFreq); - - m_NumOctave = new Fl_Counter (128, 66, 64, 20, "Octave"); - m_NumOctave->user_data ((void*)(this)); - m_NumOctave->type (FL_SIMPLE_COUNTER); - m_NumOctave->box (FL_PLASTIC_UP_BOX); - m_NumOctave->color (Info->GUI_COLOUR); - m_NumOctave->labelsize (10); - m_NumOctave->textsize (10); - m_NumOctave->minimum (-3); - m_NumOctave->maximum (3); - m_NumOctave->step (1); - m_NumOctave->value (0); - m_NumOctave->callback ((Fl_Callback*)cb_NumOctave); - m_NumGroup->add (m_NumOctave); - - m_NumModAmount = new Fl_Counter (128, 98, 64, 20, "Mod (%)"); - m_NumModAmount->user_data ((void*)(this)); - m_NumModAmount->type (FL_SIMPLE_COUNTER); - m_NumModAmount->box (FL_PLASTIC_UP_BOX); - m_NumModAmount->color (Info->GUI_COLOUR); - m_NumModAmount->labelsize (10); - m_NumModAmount->textsize (10); - m_NumModAmount->minimum (0); - m_NumModAmount->maximum (200); - m_NumModAmount->step (1); - m_NumModAmount->value (m_ModAmount->value() * 100); - m_NumModAmount->callback ((Fl_Callback*)cb_NumModAmount); - m_NumGroup->add (m_NumModAmount); - - end(); - UpdateFreq(); -} - -void OscillatorPluginGUI::UpdateValues (SpiralPlugin *o) { - float val; - OscillatorPlugin *Plugin = (OscillatorPlugin*)o; - - m_ShapeSquare->value(0); - m_ShapeNoise->value(0); - m_ShapeSaw->value(0); - switch (Plugin->GetType()) { - case OscillatorPlugin::SQUARE : m_ShapeSquare->value(1); break; - case OscillatorPlugin::NOISE : m_ShapeNoise->value(1); break; - case OscillatorPlugin::SAW : m_ShapeSaw->value(1); break; - case OscillatorPlugin::NONE : break; - } - - val = Plugin->GetPulseWidth(); - m_PulseWidth->value (val); - m_NumPulseWidth->value (val * 100); - - val = 0.2f - Plugin->GetSHLen(); - m_SHLen->value (val); - m_NumSHLen->value (val); - - val = Plugin->GetModAmount(); - m_ModAmount->value (val); - m_NumModAmount->value (val * 100); - - m_NumOctave->value (Plugin->GetOctave()); - m_Octave->value ((int)m_NumOctave->value() + 3); - m_FineTune->value (sqrt (Plugin->GetFineFreq())); - UpdateFreq(); -} - -// Utility functions - -float OscillatorPluginGUI::CalcFineFreq (float Fine) { - int oct = (int)m_NumOctave->value(); - m_FineFreq = Fine * Fine; - float fr = 110.0f * m_FineFreq; - if (oct > 0) fr *= 1 << oct; - if (oct < 0) fr /= 1 << (-oct); - return fr; -} - -void OscillatorPluginGUI::UpdateFreq (void) { - // always do max first - CalcFineFreq leaves a value in m_FineFreq - m_NumFreq->maximum (CalcFineFreq (m_FineTune->maximum())); - m_NumFreq->value (CalcFineFreq (m_FineTune->value())); -} - -// Callbacks - Controls outside the tabs - -inline void OscillatorPluginGUI::cb_Square_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)OscillatorPlugin::SQUARE); -} - -void OscillatorPluginGUI::cb_Square (Fl_LED_Button* o, void* v) { - ((OscillatorPluginGUI*)(o->parent()))->cb_Square_i (o, v); -} - -inline void OscillatorPluginGUI::cb_Saw_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)OscillatorPlugin::SAW); -} - -void OscillatorPluginGUI::cb_Saw (Fl_LED_Button* o, void* v) { - ((OscillatorPluginGUI*)(o->parent()))->cb_Saw_i (o, v); -} - -inline void OscillatorPluginGUI::cb_Noise_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type",(char)OscillatorPlugin::NOISE); -} - -void OscillatorPluginGUI::cb_Noise (Fl_LED_Button* o, void* v) { - ((OscillatorPluginGUI*)(o->parent()))->cb_Noise_i (o, v); -} - -// Callbacks - Control Group - -inline void OscillatorPluginGUI::cb_PulseWidth_i (Fl_Slider* o, void* v) { - float val = o->value(); - m_GUICH->Set ("PulseWidth", val); - m_NumPulseWidth->value (val * 100); -} - -void OscillatorPluginGUI::cb_PulseWidth (Fl_Slider* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_PulseWidth_i (o, v); -} - -inline void OscillatorPluginGUI::cb_SHLen_i (Fl_Slider* o, void* v) { - float val = 0.2f - o->value(); - m_GUICH->Set ("SHLen", val); - m_NumSHLen->value (val); -} - -void OscillatorPluginGUI::cb_SHLen (Fl_Slider* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_SHLen_i (o, v); -} - -inline void OscillatorPluginGUI::cb_FineTune_i (Fl_Knob* o, void* v) { - UpdateFreq(); - m_GUICH->Set ("FineFreq", m_FineFreq); -} - -void OscillatorPluginGUI::cb_FineTune (Fl_Knob* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_FineTune_i (o, v); -} - -inline void OscillatorPluginGUI::cb_Reset_i (Fl_Button* o, void* v) { - m_FineTune->value (1); - UpdateFreq(); - m_GUICH->Set ("FineFreq", m_FineFreq); -} - -void OscillatorPluginGUI::cb_Reset (Fl_Button* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_Reset_i (o, v); -} - -inline void OscillatorPluginGUI::cb_Octave_i (Fl_Knob* o, void* v) { - m_NumOctave->value ((int)m_Octave->value() - 3); - UpdateFreq(); - m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); -} - -void OscillatorPluginGUI::cb_Octave (Fl_Knob* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_Octave_i (o, v); -} - -inline void OscillatorPluginGUI::cb_ModAmount_i (Fl_Knob* o, void* v) { - float val = o->value(); - m_GUICH->Set ("ModAmount", val); - m_NumModAmount->value (val * 100); -} - -void OscillatorPluginGUI::cb_ModAmount (Fl_Knob* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_ModAmount_i (o, v); -} - -// Callbacks - Number Group - -inline void OscillatorPluginGUI::cb_NumPulseWidth_i (Fl_Counter* o, void* v) { - float val = o->value() / 100; - m_GUICH->Set ("PulseWidth", val); - m_PulseWidth->value (val); -} - -void OscillatorPluginGUI::cb_NumPulseWidth (Fl_Counter* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_NumPulseWidth_i (o, v); -} - -inline void OscillatorPluginGUI::cb_NumSHLen_i (Fl_Counter* o, void* v) { - float val = o->value(); - m_GUICH->Set ("SHLen", val); - m_SHLen->value (0.2f - val); -} - -void OscillatorPluginGUI::cb_NumSHLen (Fl_Counter* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_NumSHLen_i (o, v); -} - -inline void OscillatorPluginGUI::cb_NumFreq_i (Fl_Counter* o, void* v) { - int oct = (int)m_NumOctave->value(); - float fr = o->value (); - if (oct > 0) fr /= 1 << oct; - if (oct < 0) fr *= 1 << (-oct); - m_FineFreq = fr / 110.0f; - m_GUICH->Set ("FineFreq", m_FineFreq); - m_FineTune->value (sqrt (m_FineFreq)); -} - -void OscillatorPluginGUI::cb_NumOctave (Fl_Counter* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_NumOctave_i (o, v); -} - -inline void OscillatorPluginGUI::cb_NumOctave_i (Fl_Counter* o, void* v) { - m_Octave->value ((int)m_NumOctave->value() + 3); - UpdateFreq(); - m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); -} - -void OscillatorPluginGUI::cb_NumFreq (Fl_Counter* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_NumFreq_i (o, v); -} - -inline void OscillatorPluginGUI::cb_NumModAmount_i (Fl_Counter* o, void* v) { - float val = o->value() / 100; - m_GUICH->Set ("ModAmount", val); - m_ModAmount->value (val); -} - -void OscillatorPluginGUI::cb_NumModAmount (Fl_Counter* o, void* v) { - ((OscillatorPluginGUI*)(o->user_data()))->cb_NumModAmount_i (o, v); -} - -// Help Text - -const string OscillatorPluginGUI::GetHelpText(const string &loc){ - return string("") - + "The Oscillator generates raw waveforms from CV controls. Three wave \n" - + "shapes are included, Square wave, Triangle wave and white noise.\n\n" - + "In the square and triangle shapes, the Frequency CV controls the pitch \n" - + "of the signal generated, and the pulse-width turns the squarewave into \n" - + "a pulse wave of varying harmonics, and the triangle wave into a sawtooth,\n" - + "or reverse sawtooth wave.\n\n" - + "The sample & hold CV changes the time between samples with the white noise.\n" - + "This is usful for making the Oscillator into a random CV generator.\n\n" - + "The plugin window allows you to select the wave shape, set the octave and\n" - + "fine tune the frequency (use the reset button to reset the frequency back\n" - + "to it's default value). There are also controls to set the pulse-width,\n" - + "sample and hold manually, and control the modulation depth of the input CV's.\n\n" - + "The frequency can be set extremely low on this oscillator, so you can use\n" - + "it as an LFO for controlling other plugins."; -} +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "OscillatorPluginGUI.h" +#include +#include +#include "../GUI/WS_Square.h" +#include "../GUI/WS_Noise.h" +#include "../GUI/WS_Saw.h" + +using namespace std; + +OscillatorPluginGUI::OscillatorPluginGUI (int w, int h, OscillatorPlugin *o, ChannelHandler *ch, const HostInfo *Info) : +SpiralPluginGUI (w, h, o, ch), +m_PixmapSquare (image_Square), +m_PixmapNoise (image_Noise), +m_PixmapSaw (image_Saw), +m_FineFreq (0) +{ + m_ShapeSquare = new Fl_LED_Button (2, 24, 23, 23); + m_ShapeSquare->type (FL_RADIO_BUTTON); + m_PixmapSquare.label (m_ShapeSquare); + m_ShapeSquare->set(); + m_ShapeSquare->callback ((Fl_Callback*)cb_Square); + add (m_ShapeSquare); + + m_ShapeSaw = new Fl_LED_Button (2, 58, 23, 23); + m_ShapeSaw->type (FL_RADIO_BUTTON); + m_PixmapSaw.label (m_ShapeSaw); + m_ShapeSaw->callback ((Fl_Callback*)cb_Saw); + add (m_ShapeSaw); + + m_ShapeNoise = new Fl_LED_Button (2, 92, 23, 23); + m_ShapeNoise->type (FL_RADIO_BUTTON); + m_PixmapNoise.label (m_ShapeNoise); + m_ShapeNoise->callback ((Fl_Callback*)cb_Noise); + add (m_ShapeNoise); + + m_Tabs = new Fl_Tabs (44, 10, 168, 124); + m_Tabs->box (FL_PLASTIC_DOWN_BOX); + m_Tabs->color (Info->GUI_COLOUR); + add (m_Tabs); + + m_CtlGroup = new Fl_Group (44, 24, 168, 110, "Control"); + m_CtlGroup->labelsize (10); + m_Tabs->add (m_CtlGroup); + + m_PulseWidth = new Fl_Slider (50, 32, 20, 86, "PW"); + m_PulseWidth->user_data ((void*)(this)); + m_PulseWidth->type (FL_VERT_NICE_SLIDER); + m_PulseWidth->box (FL_PLASTIC_DOWN_BOX); + m_PulseWidth->selection_color (Info->GUI_COLOUR); + m_PulseWidth->labelsize (10); + m_PulseWidth->maximum (1); + m_PulseWidth->step (0.01); + m_PulseWidth->value (0.5); + m_PulseWidth->callback ((Fl_Callback*)cb_PulseWidth); + m_CtlGroup->add (m_PulseWidth); + + m_SHLen = new Fl_Slider (74, 32, 20, 86, "SH"); + m_SHLen->user_data ((void*)(this)); + m_SHLen->type (FL_VERT_NICE_SLIDER); + m_SHLen->box (FL_PLASTIC_DOWN_BOX); + m_SHLen->selection_color (Info->GUI_COLOUR); + m_SHLen->labelsize (10); + m_SHLen->maximum (0.2); + m_SHLen->step (0.001); + m_SHLen->value (0.1); + m_SHLen->callback ((Fl_Callback*)cb_SHLen); + m_CtlGroup->add (m_SHLen); + + m_FineTune = new Fl_Knob (98, 32, 60, 60, "Fine Tune"); + m_FineTune->user_data ((void*)(this)); + m_FineTune->color (Info->GUI_COLOUR); + m_FineTune->type (Fl_Knob::LINELIN); + m_FineTune->labelsize (10); + m_FineTune->scaleticks (20); + m_FineTune->maximum (1.414); + m_FineTune->step (0.000001); + m_FineTune->value (1); + m_FineTune->callback ((Fl_Callback*)cb_FineTune); + m_CtlGroup->add (m_FineTune); + + m_Reset = new Fl_Button (108, 106, 40, 20, "Reset"); + m_Reset->user_data ((void*)(this)); + m_Reset->labelsize (10); + m_Reset->box (FL_PLASTIC_UP_BOX); + m_Reset->color (Info->GUI_COLOUR); + m_Reset->selection_color (Info->GUI_COLOUR); + m_Reset->callback ((Fl_Callback*)cb_Reset); + m_CtlGroup->add (m_Reset); + + m_Octave = new Fl_Knob (160, 27, 40, 40, "Octave"); + m_Octave->user_data ((void*)(this)); + m_Octave->color (Info->GUI_COLOUR); + m_Octave->type (Fl_Knob::LINELIN); + m_Octave->labelsize (10); + m_Octave->maximum (6); + m_Octave->step (1); + m_Octave->value (3); + m_Octave->scaleticks (6); + m_Octave->cursor (50); + m_Octave->callback ((Fl_Callback*)cb_Octave); + m_CtlGroup->add (m_Octave); + + m_ModAmount = new Fl_Knob (160, 79, 40, 40, "Mod Depth"); + m_ModAmount->user_data ((void*)(this)); + m_ModAmount->color (Info->GUI_COLOUR); + m_ModAmount->type (Fl_Knob::LINELIN); + m_ModAmount->labelsize (10); + m_ModAmount->maximum (2.0f); + m_ModAmount->step (0.001); + m_ModAmount->value (1.0); + m_ModAmount->callback ((Fl_Callback*)cb_ModAmount); + m_CtlGroup->add (m_ModAmount); + + m_NumGroup = new Fl_Group (44, 24, 168, 110, "Numbers"); + m_NumGroup->labelsize (10); + m_Tabs->add (m_NumGroup); + + m_NumPulseWidth = new Fl_Counter (54, 32, 55, 20, "PW (%)"); + m_NumPulseWidth->user_data ((void*)(this)); + m_NumPulseWidth->type (FL_SIMPLE_COUNTER); + m_NumPulseWidth->box (FL_PLASTIC_UP_BOX); + m_NumPulseWidth->color (Info->GUI_COLOUR); + m_NumPulseWidth->labelsize (10); + m_NumPulseWidth->textsize (10); + m_NumPulseWidth->minimum (0); + m_NumPulseWidth->maximum (100); + m_NumPulseWidth->step (1); + m_NumPulseWidth->value (m_PulseWidth->value() * 100); + m_NumPulseWidth->callback ((Fl_Callback*)cb_NumPulseWidth); + m_NumGroup->add (m_NumPulseWidth); + + m_NumSHLen = new Fl_Counter (54, 98, 55, 20, "S&H (Secs)"); + m_NumSHLen->user_data ((void*)(this)); + m_NumSHLen->type (FL_SIMPLE_COUNTER); + m_NumSHLen->box (FL_PLASTIC_UP_BOX); + m_NumSHLen->color (Info->GUI_COLOUR); + m_NumSHLen->labelsize (10); + m_NumSHLen->textsize (10); + m_NumSHLen->minimum (0); + m_NumSHLen->maximum (0.2f); + m_NumSHLen->step (.001); + //m_NumSHLen->lstep (.1); + m_NumSHLen->value (0.2f - m_SHLen->value()); + m_NumSHLen->callback ((Fl_Callback*)cb_NumSHLen); + m_NumGroup->add (m_NumSHLen); + + m_NumFreq = new Fl_Counter (114, 32, 90, 20, "Freq (Hz)"); + m_NumFreq->user_data ((void*)(this)); + m_NumFreq->box (FL_PLASTIC_UP_BOX); + m_NumFreq->color (Info->GUI_COLOUR); + m_NumFreq->labelsize (10); + m_NumFreq->textsize (10); + m_NumFreq->minimum (0); + m_NumFreq->step (0.1); + m_NumFreq->lstep (10); + m_NumFreq->callback ((Fl_Callback*)cb_NumFreq); + m_NumGroup->add (m_NumFreq); + + m_NumOctave = new Fl_Counter (128, 66, 64, 20, "Octave"); + m_NumOctave->user_data ((void*)(this)); + m_NumOctave->type (FL_SIMPLE_COUNTER); + m_NumOctave->box (FL_PLASTIC_UP_BOX); + m_NumOctave->color (Info->GUI_COLOUR); + m_NumOctave->labelsize (10); + m_NumOctave->textsize (10); + m_NumOctave->minimum (-3); + m_NumOctave->maximum (3); + m_NumOctave->step (1); + m_NumOctave->value (0); + m_NumOctave->callback ((Fl_Callback*)cb_NumOctave); + m_NumGroup->add (m_NumOctave); + + m_NumModAmount = new Fl_Counter (128, 98, 64, 20, "Mod (%)"); + m_NumModAmount->user_data ((void*)(this)); + m_NumModAmount->type (FL_SIMPLE_COUNTER); + m_NumModAmount->box (FL_PLASTIC_UP_BOX); + m_NumModAmount->color (Info->GUI_COLOUR); + m_NumModAmount->labelsize (10); + m_NumModAmount->textsize (10); + m_NumModAmount->minimum (0); + m_NumModAmount->maximum (200); + m_NumModAmount->step (1); + m_NumModAmount->value (m_ModAmount->value() * 100); + m_NumModAmount->callback ((Fl_Callback*)cb_NumModAmount); + m_NumGroup->add (m_NumModAmount); + + end(); + UpdateFreq(); +} + +void OscillatorPluginGUI::UpdateValues (SpiralPlugin *o) { + float val; + OscillatorPlugin *Plugin = (OscillatorPlugin*)o; + + m_ShapeSquare->value(0); + m_ShapeNoise->value(0); + m_ShapeSaw->value(0); + switch (Plugin->GetType()) { + case OscillatorPlugin::SQUARE : m_ShapeSquare->value(1); break; + case OscillatorPlugin::NOISE : m_ShapeNoise->value(1); break; + case OscillatorPlugin::SAW : m_ShapeSaw->value(1); break; + case OscillatorPlugin::NONE : break; + } + + val = Plugin->GetPulseWidth(); + m_PulseWidth->value (val); + m_NumPulseWidth->value (val * 100); + + val = 0.2f - Plugin->GetSHLen(); + m_SHLen->value (val); + m_NumSHLen->value (val); + + val = Plugin->GetModAmount(); + m_ModAmount->value (val); + m_NumModAmount->value (val * 100); + + m_NumOctave->value (Plugin->GetOctave()); + m_Octave->value ((int)m_NumOctave->value() + 3); + m_FineTune->value (sqrt (Plugin->GetFineFreq())); + UpdateFreq(); +} + +// Utility functions + +float OscillatorPluginGUI::CalcFineFreq (float Fine) { + int oct = (int)m_NumOctave->value(); + m_FineFreq = Fine * Fine; + float fr = 110.0f * m_FineFreq; + if (oct > 0) fr *= 1 << oct; + if (oct < 0) fr /= 1 << (-oct); + return fr; +} + +void OscillatorPluginGUI::UpdateFreq (void) { + // always do max first - CalcFineFreq leaves a value in m_FineFreq + m_NumFreq->maximum (CalcFineFreq (m_FineTune->maximum())); + m_NumFreq->value (CalcFineFreq (m_FineTune->value())); +} + +// Callbacks - Controls outside the tabs + +inline void OscillatorPluginGUI::cb_Square_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)OscillatorPlugin::SQUARE); +} + +void OscillatorPluginGUI::cb_Square (Fl_LED_Button* o, void* v) { + ((OscillatorPluginGUI*)(o->parent()))->cb_Square_i (o, v); +} + +inline void OscillatorPluginGUI::cb_Saw_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)OscillatorPlugin::SAW); +} + +void OscillatorPluginGUI::cb_Saw (Fl_LED_Button* o, void* v) { + ((OscillatorPluginGUI*)(o->parent()))->cb_Saw_i (o, v); +} + +inline void OscillatorPluginGUI::cb_Noise_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type",(char)OscillatorPlugin::NOISE); +} + +void OscillatorPluginGUI::cb_Noise (Fl_LED_Button* o, void* v) { + ((OscillatorPluginGUI*)(o->parent()))->cb_Noise_i (o, v); +} + +// Callbacks - Control Group + +inline void OscillatorPluginGUI::cb_PulseWidth_i (Fl_Slider* o, void* v) { + float val = o->value(); + m_GUICH->Set ("PulseWidth", val); + m_NumPulseWidth->value (val * 100); +} + +void OscillatorPluginGUI::cb_PulseWidth (Fl_Slider* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_PulseWidth_i (o, v); +} + +inline void OscillatorPluginGUI::cb_SHLen_i (Fl_Slider* o, void* v) { + float val = 0.2f - o->value(); + m_GUICH->Set ("SHLen", val); + m_NumSHLen->value (val); +} + +void OscillatorPluginGUI::cb_SHLen (Fl_Slider* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_SHLen_i (o, v); +} + +inline void OscillatorPluginGUI::cb_FineTune_i (Fl_Knob* o, void* v) { + UpdateFreq(); + m_GUICH->Set ("FineFreq", m_FineFreq); +} + +void OscillatorPluginGUI::cb_FineTune (Fl_Knob* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_FineTune_i (o, v); +} + +inline void OscillatorPluginGUI::cb_Reset_i (Fl_Button* o, void* v) { + m_FineTune->value (1); + UpdateFreq(); + m_GUICH->Set ("FineFreq", m_FineFreq); +} + +void OscillatorPluginGUI::cb_Reset (Fl_Button* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_Reset_i (o, v); +} + +inline void OscillatorPluginGUI::cb_Octave_i (Fl_Knob* o, void* v) { + m_NumOctave->value ((int)m_Octave->value() - 3); + UpdateFreq(); + m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); +} + +void OscillatorPluginGUI::cb_Octave (Fl_Knob* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_Octave_i (o, v); +} + +inline void OscillatorPluginGUI::cb_ModAmount_i (Fl_Knob* o, void* v) { + float val = o->value(); + m_GUICH->Set ("ModAmount", val); + m_NumModAmount->value (val * 100); +} + +void OscillatorPluginGUI::cb_ModAmount (Fl_Knob* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_ModAmount_i (o, v); +} + +// Callbacks - Number Group + +inline void OscillatorPluginGUI::cb_NumPulseWidth_i (Fl_Counter* o, void* v) { + float val = o->value() / 100; + m_GUICH->Set ("PulseWidth", val); + m_PulseWidth->value (val); +} + +void OscillatorPluginGUI::cb_NumPulseWidth (Fl_Counter* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_NumPulseWidth_i (o, v); +} + +inline void OscillatorPluginGUI::cb_NumSHLen_i (Fl_Counter* o, void* v) { + float val = o->value(); + m_GUICH->Set ("SHLen", val); + m_SHLen->value (0.2f - val); +} + +void OscillatorPluginGUI::cb_NumSHLen (Fl_Counter* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_NumSHLen_i (o, v); +} + +inline void OscillatorPluginGUI::cb_NumFreq_i (Fl_Counter* o, void* v) { + int oct = (int)m_NumOctave->value(); + float fr = o->value (); + if (oct > 0) fr /= 1 << oct; + if (oct < 0) fr *= 1 << (-oct); + m_FineFreq = fr / 110.0f; + m_GUICH->Set ("FineFreq", m_FineFreq); + m_FineTune->value (sqrt (m_FineFreq)); +} + +void OscillatorPluginGUI::cb_NumOctave (Fl_Counter* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_NumOctave_i (o, v); +} + +inline void OscillatorPluginGUI::cb_NumOctave_i (Fl_Counter* o, void* v) { + m_Octave->value ((int)m_NumOctave->value() + 3); + UpdateFreq(); + m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); +} + +void OscillatorPluginGUI::cb_NumFreq (Fl_Counter* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_NumFreq_i (o, v); +} + +inline void OscillatorPluginGUI::cb_NumModAmount_i (Fl_Counter* o, void* v) { + float val = o->value() / 100; + m_GUICH->Set ("ModAmount", val); + m_ModAmount->value (val); +} + +void OscillatorPluginGUI::cb_NumModAmount (Fl_Counter* o, void* v) { + ((OscillatorPluginGUI*)(o->user_data()))->cb_NumModAmount_i (o, v); +} + +// Help Text + +const string OscillatorPluginGUI::GetHelpText(const string &loc){ + return string("") + + "The Oscillator generates raw waveforms from CV controls. Three wave \n" + + "shapes are included, Square wave, Triangle wave and white noise.\n\n" + + "In the square and triangle shapes, the Frequency CV controls the pitch \n" + + "of the signal generated, and the pulse-width turns the squarewave into \n" + + "a pulse wave of varying harmonics, and the triangle wave into a sawtooth,\n" + + "or reverse sawtooth wave.\n\n" + + "The sample & hold CV changes the time between samples with the white noise.\n" + + "This is usful for making the Oscillator into a random CV generator.\n\n" + + "The plugin window allows you to select the wave shape, set the octave and\n" + + "fine tune the frequency (use the reset button to reset the frequency back\n" + + "to it's default value). There are also controls to set the pulse-width,\n" + + "sample and hold manually, and control the modulation depth of the input CV's.\n\n" + + "The frequency can be set extremely low on this oscillator, so you can use\n" + + "it as an LFO for controlling other plugins."; +} diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h index d088a43..b598c8b 100644 --- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h +++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h @@ -35,7 +35,7 @@ class OscillatorPluginGUI : public SpiralPluginGUI { OscillatorPluginGUI (int w, int h, OscillatorPlugin *o, ChannelHandler *ch, const HostInfo *Info); virtual void UpdateValues (SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: // Utility Functions void UpdateFreq (void); diff --git a/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C b/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C index b8637cc..65d77dc 100644 --- a/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C +++ b/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C @@ -44,6 +44,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + static const int IN_FREQ = 0; static const int IN_PW = 1; static const int IN_SHLEN = 2; diff --git a/SpiralSound/Plugins/OutputPlugin/OutputPlugin.h b/SpiralSound/Plugins/OutputPlugin/OutputPlugin.h index 6fdaa6f..3725808 100644 --- a/SpiralSound/Plugins/OutputPlugin/OutputPlugin.h +++ b/SpiralSound/Plugins/OutputPlugin/OutputPlugin.h @@ -77,8 +77,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} enum GUICommands {NONE, OPENREAD, OPENWRITE, OPENDUPLEX, CLOSE, SET_VOLUME, CLEAR_NOTIFY}; float m_Volume; diff --git a/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C b/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C index 9adf4a9..2770d0f 100644 --- a/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C +++ b/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + OutputPluginGUI::OutputPluginGUI(int w, int h, SpiralPlugin *o, ChannelHandler *ch,const HostInfo *Info) : SpiralPluginGUI(w,h,o,ch) { diff --git a/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.h b/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.h index caf12cd..a22964d 100644 --- a/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.h +++ b/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.h @@ -34,7 +34,7 @@ public: virtual void Update(); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Knob *Volume; diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C index 9b1926d..78eadad 100644 --- a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C +++ b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C @@ -23,6 +23,8 @@ #include "../../NoteTable.h" #include +using namespace std; + static const int NOTETRIG = NUM_SAMPLES*2+1; static const int REC_INPUT = 16; diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.h b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.h index b06957b..2e1d1da 100644 --- a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.h +++ b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.h @@ -27,7 +27,7 @@ static const int TRANSBUF_SIZE = 0x10000; struct SampleDesc { - string Pathname; + std::string Pathname; float Volume; float Velocity; float Pitch; @@ -55,11 +55,11 @@ public: virtual SpiralGUIType *CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); - virtual bool SaveExternalFiles(const string &Dir); - virtual void LoadExternalFiles(const string &Dir); + virtual bool SaveExternalFiles(const std::string &Dir); + virtual void LoadExternalFiles(const std::string &Dir); enum GUICommands{NONE,LOAD,SAVE,SETVOL,SETPITCH,SETLOOP,SETPING,SETNOTE,SETOCT, SETPLAYPOINTS,SETREC,CUT,COPY,PASTE,CROP,MIX,REV,AMP,SETCURRENT, @@ -77,8 +77,8 @@ public: char Name[256]; }; - void LoadSample(int n, const string &Name); - void SaveSample(int n, const string &Name); + void LoadSample(int n, const std::string &Name); + void SaveSample(int n, const std::string &Name); Sample* GetSample(int n) { return m_SampleVec[n]; } float GetVolume(int n) { return m_SampleDescVec[n]->Volume; } @@ -92,8 +92,8 @@ public: long GetLoopStart(int n) { return m_SampleDescVec[n]->LoopStart; } long GetLoopEnd(int n) { return m_SampleDescVec[n]->LoopEnd; } - vector m_SampleVec; - vector m_SampleDescVec; + std::vector m_SampleVec; + std::vector m_SampleDescVec; private: diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C index 67ee5d8..87495ec 100644 --- a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C +++ b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C @@ -21,6 +21,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// Fl_WaveDisplay::Fl_WaveDisplay(int x,int y,int w,int h, char *Name) : diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.h b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.h index c511818..6fad88b 100644 --- a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.h +++ b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.h @@ -83,7 +83,7 @@ public: int GetCurrentSample() { return (int)m_SampleNum->value(); } protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C index 3aec22e..9376d9f 100644 --- a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C +++ b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C @@ -21,6 +21,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.h b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.h index 9a4946e..7fb3bd3 100644 --- a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.h +++ b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetAmount() { return m_Amount; } @@ -41,10 +41,10 @@ public: private: float m_Amount; - friend istream &operator>>(istream &s, RingModPlugin &o); - friend ostream &operator<<(ostream &s, RingModPlugin &o); + friend std::istream &operator>>(std::istream &s, RingModPlugin &o); + friend std::ostream &operator<<(std::ostream &s, RingModPlugin &o); }; -istream &operator>>(istream &s, RingModPlugin &o); -ostream &operator<<(ostream &s, RingModPlugin &o); +std::istream &operator>>(std::istream &s, RingModPlugin &o); +std::ostream &operator<<(std::ostream &s, RingModPlugin &o); #endif diff --git a/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C b/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C index cb11765..3cc40d8 100644 --- a/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C +++ b/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// RingModPluginGUI::RingModPluginGUI (int w, int h, RingModPlugin *o, ChannelHandler *ch, const HostInfo *Info) : diff --git a/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.h b/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.h index 3af81f1..ab5166b 100644 --- a/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.h +++ b/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.h @@ -33,7 +33,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Knob *m_Amount; diff --git a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C index afb2d69..74bbf8b 100644 --- a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C +++ b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C @@ -20,6 +20,8 @@ #include "SVFilterPluginGUI.h" #include "SpiralIcon.xpm" +using namespace std; + static const double PI = 3.141592654; static const int GRANULARITY = 10; diff --git a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.h b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.h index 2a11586..e02d71c 100644 --- a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.h +++ b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.h @@ -34,8 +34,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetCutoff() { return Cutoff; } float GetResonance() { return Resonance; } @@ -56,10 +56,10 @@ private: // Outputs double m_h, m_b, m_l, m_p, m_n; - friend istream &operator>>(istream &s, SVFilterPlugin &o); - friend ostream &operator<<(ostream &s, SVFilterPlugin &o); + friend std::istream &operator>>(std::istream &s, SVFilterPlugin &o); + friend std::ostream &operator<<(std::ostream &s, SVFilterPlugin &o); }; -istream &operator>>(istream &s, SVFilterPlugin &o); -ostream &operator<<(ostream &s, SVFilterPlugin &o); +std::istream &operator>>(std::istream &s, SVFilterPlugin &o); +std::ostream &operator<<(std::ostream &s, SVFilterPlugin &o); #endif diff --git a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C index 578e9d0..2686af3 100644 --- a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C +++ b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SVFilterPluginGUI::SVFilterPluginGUI(int w, int h,SVFilterPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.h b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.h index fd01047..6c6a9b9 100644 --- a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.h +++ b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.h @@ -33,7 +33,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Slider *Cutoff; diff --git a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C index ad83ec0..fb58085 100644 --- a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C +++ b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C @@ -20,6 +20,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.h b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.h index c4150b2..3229bd6 100644 --- a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.h +++ b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo& Initialise(const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} private: float m_val; diff --git a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C index ecb78b3..97963ed 100644 --- a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C +++ b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SampleHoldPluginGUI::SampleHoldPluginGUI(int w, int h,SampleHoldPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.h b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.h index 4edd810..83a3e6d 100644 --- a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.h +++ b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.h @@ -31,7 +31,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C index 3eaeee5..1194c5f 100644 --- a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C +++ b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C @@ -22,6 +22,8 @@ #include "../../RiffWav.h" #include "../../NoteTable.h" +using namespace std; + static const int NOTETRIG = NUM_SAMPLES*2+1; extern "C" { diff --git a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.h b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.h index dcb6af9..b7f25b3 100644 --- a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.h +++ b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.h @@ -26,7 +26,7 @@ static const int NUM_SAMPLES = 8; struct SampleDesc { - string Pathname; + std::string Pathname; float Volume; float Pitch; float PitchMod; @@ -47,13 +47,13 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); // has to be defined in the plugin virtual void UpdateGUI() { Fl::check(); } - void LoadSample(int n, const string &Name); + void LoadSample(int n, const std::string &Name); void SetVolume(int n, float s) { m_SampleDescVec[n]->Volume=s; } float GetVolume(int n) { return m_SampleDescVec[n]->Volume; } @@ -64,8 +64,8 @@ public: void SetNote(int n, int s) { m_SampleDescVec[n]->Note=s; } int GetNote(int n) { return m_SampleDescVec[n]->Note; } - vector m_SampleVec; - vector m_SampleDescVec; + std::vector m_SampleVec; + std::vector m_SampleDescVec; private: }; diff --git a/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C b/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C index 7b1fee2..faf55a0 100644 --- a/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C +++ b/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C @@ -21,6 +21,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SamplerPluginGUI::SamplerPluginGUI(int w, int h,SamplerPlugin *o,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C index 6130a43..9a7325c 100644 --- a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C +++ b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C @@ -20,6 +20,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() diff --git a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.h b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.h index 584fd0c..8da071d 100644 --- a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.h +++ b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo& Initialise(const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} private: diff --git a/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C b/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C index c12b531..25296f9 100644 --- a/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C +++ b/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + ScopeWidget::ScopeWidget (int x, int y, int w, int h, const char *l, int BUFSIZE) : Fl_Widget (x, y, w, h, l), m_Data (NULL), diff --git a/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.h b/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.h index 91c00e1..230b1b6 100644 --- a/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.h +++ b/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.h @@ -54,7 +54,7 @@ class ScopePluginGUI : public SpiralPluginGUI virtual void draw(); void Display (const float *data); protected: - const string GetHelpText (const string &loc); + const std::string GetHelpText (const std::string &loc); private: bool m_Bypass; // Fl_Button *Bypass; diff --git a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C index aab12da..da51ac9 100644 --- a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C +++ b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C @@ -22,6 +22,8 @@ #include "../../RiffWav.h" #include "../../NoteTable.h" +using namespace std; + // for note on's static const float TRIGGER_LEV=0.1; diff --git a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.h b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.h index c179485..9a7734e 100644 --- a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.h +++ b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.h @@ -34,8 +34,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); // has to be defined in the plugin virtual void UpdateGUI() { Fl::check(); } diff --git a/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C b/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C index 08f98f7..659d5ca 100644 --- a/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C +++ b/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C @@ -22,6 +22,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SeqPluginGUI::SeqPluginGUI(int w, int h,SeqPlugin *o,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C index ea8f938..f9fd8b6 100644 --- a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C +++ b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.h b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.h index f379d8b..2a532fd 100644 --- a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.h +++ b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.h @@ -34,8 +34,8 @@ public: virtual SpiralGUIType *CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); int GetBegin() { return m_Begin; } int GetEnd() { return m_End; } @@ -54,7 +54,7 @@ public: int Value[NUM_VALUES]; }; - vector m_Lines; + std::vector m_Lines; private: diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C index 5ce9c31..468f2e5 100644 --- a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C +++ b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C @@ -22,6 +22,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// CountLine::CountLine (int n, Fl_Color col) : diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.h b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.h index 19b0e15..03c6fe6 100644 --- a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.h +++ b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.h @@ -63,11 +63,11 @@ public: int GetNumLines() { return m_LineVec.size(); } void SetLED(int n); - void StreamOut(ostream &s); - void StreamIn(istream &s); + void StreamOut(std::ostream &s); + void StreamIn(std::istream &s); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: @@ -81,7 +81,7 @@ private: Fl_Counter *m_End; Fl_Button *m_UseRange; - list m_LineVec; + std::list m_LineVec; //// Callbacks //// inline void cb_New_i(Fl_Button* o, void* v); diff --git a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C index 1ff7bc6..cdd8556 100644 --- a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C +++ b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C @@ -22,6 +22,8 @@ #include "../../RiffWav.h" #include "../../NoteTable.h" +using namespace std; + // for note on's static const float TRIGGER_LEV=0.1; diff --git a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.h b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.h index 2c52b8a..38cff3b 100644 --- a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.h +++ b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.h @@ -39,14 +39,14 @@ public: float Time; float Length; int MidiNote; - float Vol; + float Vol; - friend istream &operator>>(istream &s, Note &o); - friend ostream &operator<<(ostream &s, Note &o); + friend std::istream &operator>>(std::istream &s, Note &o); + friend std::ostream &operator<<(std::ostream &s, Note &o); }; -istream &operator>>(istream &s, Note &o); -ostream &operator<<(ostream &s, Note &o); +std::istream &operator>>(std::istream &s, Note &o); +std::ostream &operator<<(std::ostream &s, Note &o); class Pattern { @@ -62,12 +62,12 @@ public: map m_NoteMap; - friend istream &operator>>(istream &s, Pattern &o); - friend ostream &operator<<(ostream &s, Pattern &o); + friend std::istream &operator>>(std::istream &s, Pattern &o); + friend std::ostream &operator<<(std::ostream &s, Pattern &o); }; -istream &operator>>(istream &s, Pattern &o); -ostream &operator<<(ostream &s, Pattern &o); +std::istream &operator>>(std::istream &s, Pattern &o); +std::ostream &operator<<(std::ostream &s, Pattern &o); class Sequence { @@ -99,12 +99,12 @@ private: float m_Length; int m_Channel; - friend istream &operator>>(istream &s, Sequence &o); - friend ostream &operator<<(ostream &s, Sequence &o); + friend std::istream &operator>>(std::istream &s, Sequence &o); + friend std::ostream &operator<<(std::ostream &s, Sequence &o); }; -istream &operator>>(istream &s, Sequence &o); -ostream &operator<<(ostream &s, Sequence &o); +std::istream &operator>>(std::istream &s, Sequence &o); +std::ostream &operator<<(std::ostream &s, Sequence &o); class Track { @@ -131,17 +131,17 @@ private: void AddPattern(int ID); void RemovePattern(int ID); - map m_PatternMap; - map m_SequenceMap; + std::map m_PatternMap; + std::map m_SequenceMap; int m_NextPatternID; - friend istream &operator>>(istream &s, Track &o); - friend ostream &operator<<(ostream &s, Track &o); + friend std::istream &operator>>(std::istream &s, Track &o); + friend std::ostream &operator<<(std::ostream &s, Track &o); }; -istream &operator>>(istream &s, Track &o); -ostream &operator<<(ostream &s, Track &o); +std::istream &operator>>(std::istream &s, Track &o); +std::ostream &operator<<(std::ostream &s, Track &o); /////////////////////////////////////////////////////////////////////////// diff --git a/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C b/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C index 901db15..23ac3d9 100644 --- a/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C +++ b/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C @@ -23,6 +23,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SequencerPluginGUI::PatternWin::PatternWin(int w,int h,const char* n) : diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C index d1bf420..23d0d94 100644 --- a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C +++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C @@ -20,6 +20,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.h b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.h index 6edbeed..d72aa78 100644 --- a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.h +++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo& Initialise(const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetUp() { return m_Up; } float GetDown() { return m_Down; } diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C index 2f67d48..a758b07 100644 --- a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C +++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SmoothPluginGUI::SmoothPluginGUI(int w, int h,SmoothPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h index 9791501..ba5bd46 100644 --- a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h +++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.h @@ -32,7 +32,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C index 9d13667..ff84be0 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C @@ -22,6 +22,8 @@ #include "../../RiffWav.h" #include "../../NoteTable.h" +using namespace std; + static const float TRIG_THRESH = 0.1; static const int RECBUFFERSIZE = 16384; static const float RECORD_GAIN = 1.0f; diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.h b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.h index 66f51f2..da40110 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.h +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.h @@ -27,7 +27,7 @@ static const int MAX_TRIGGERS = 8; struct SampleDesc { - string Pathname; + std::string Pathname; float Volume; float Pitch; float PitchMod; @@ -56,10 +56,10 @@ public: virtual SpiralGUIType *CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); - virtual bool SaveExternalFiles(const string &Dir); - virtual void LoadExternalFiles(const string &Dir); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); + virtual bool SaveExternalFiles(const std::string &Dir); + virtual void LoadExternalFiles(const std::string &Dir); enum GUICommands{NONE,START,STOP,RECORD,OVERDUB,ENDRECORD,LOAD,SAVE,CUT, COPY,PASTE,PASTEMIX,ZERO_RANGE,REVERSE_RANGE,SELECT_ALL,DOUBLE,HALF, @@ -98,8 +98,8 @@ public: const float GetSpeed() {return m_Speed;} const float GetVolume() { return m_Volume; } const float GetCurrentAngle() { return m_LoopPoint?(m_Pos/m_LoopPoint)*360.0f:0; } - const string& GetSampleName() { return m_Sample; } - vector *GetTriggerVec() { return &m_TriggerVec; } + const std::string& GetSampleName() { return m_Sample; } + std::vector *GetTriggerVec() { return &m_TriggerVec; } void Cut(int Start, int End); void Copy(int Start, int End); @@ -111,7 +111,7 @@ public: void Halve(); void SelectAll(); void Move(int Start); - + Sample *GetStoreBuffer() { return &m_StoreBuffer; } private: @@ -160,9 +160,9 @@ private: char m_SampleBuffer[TRANSBUF_SIZE]; long m_SampleSize; - vector m_TriggerVec; + std::vector m_TriggerVec; - string m_Sample; + std::string m_Sample; }; #endif diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C index f89924b..fddd7b8 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C @@ -21,6 +21,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SpiralLoopPluginGUI::SpiralLoopPluginGUI(int w, int h,SpiralLoopPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.h b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.h index afedb70..0d3bbd4 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.h +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.h @@ -38,7 +38,7 @@ public: SpiralLoopPluginGUI(int w, int h, SpiralLoopPlugin *o,ChannelHandler *ch,const HostInfo *Info); virtual void UpdateValues(SpiralPlugin *o); virtual void Update(); - virtual const string GetHelpText(const string &loc); + virtual const std::string GetHelpText(const std::string &loc); private: void UpdateSampleDisplay(); @@ -70,7 +70,7 @@ private: Fl_Button *m_Hold; Fl_Button *m_Undo; - vector m_TriggerVec; + std::vector m_TriggerVec; Fl_Loop* m_LoopGUI; diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C index a104ddc..4726e24 100644 --- a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C +++ b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C @@ -21,6 +21,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance () { return new SplitSwitchPlugin; } diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.h b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.h index 7fffbc1..4df7e7d 100644 --- a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.h +++ b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.h @@ -30,8 +30,8 @@ class SplitSwitchPlugin : public SpiralPlugin { virtual SpiralGUIType* CreateGUI (); virtual void Execute (); virtual void ExecuteCommands (); - virtual void StreamOut (ostream &s); - virtual void StreamIn (istream &s); + virtual void StreamOut (std::ostream &s); + virtual void StreamIn (std::istream &s); int GetSwitch (void) { return m_SwitchPos + 1; } int GetChans (void) { return m_PluginInfo.NumOutputs - 1; } enum GUICommands {NONE, SETCHANS}; @@ -46,11 +46,11 @@ class SplitSwitchPlugin : public SpiralPlugin { void SetSwitch (int n); int m_SwitchPos; bool m_Triggered; - friend istream &operator>> (istream &s, SplitSwitchPlugin &o); - friend ostream &operator<< (ostream &s, SplitSwitchPlugin &o); + friend std::istream &operator>> (std::istream &s, SplitSwitchPlugin &o); + friend std::ostream &operator<< (std::ostream &s, SplitSwitchPlugin &o); }; -istream &operator>> (istream &s, SplitSwitchPlugin &o); -ostream &operator<< (ostream &s, SplitSwitchPlugin &o); +std::istream &operator>> (std::istream &s, SplitSwitchPlugin &o); +std::ostream &operator<< (std::ostream &s, SplitSwitchPlugin &o); #endif diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C index 65834bd..d940cc8 100644 --- a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C +++ b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SplitSwitchPluginGUI::SplitSwitchPluginGUI (int w, int h, SplitSwitchPlugin *o, ChannelHandler *ch, const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.h b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.h index 44079c4..915cf7a 100644 --- a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.h +++ b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.h @@ -30,7 +30,7 @@ class SplitSwitchPluginGUI : public SpiralPluginGUI { virtual void UpdateValues(SpiralPlugin *o); virtual void Update(); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Counter *m_Switch, *m_Chans; inline void cb_Switch_i (Fl_Counter* o, void* v); diff --git a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C index 2d6c13a..25e850d 100644 --- a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C +++ b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C @@ -20,6 +20,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.h b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.h index 9530a33..72444dd 100644 --- a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.h +++ b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo& Initialise(const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s) {} - virtual void StreamIn(istream &s) {} + virtual void StreamOut(std::ostream &s) {} + virtual void StreamIn(std::istream &s) {} private: }; diff --git a/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C b/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C index aafac95..43ccbe9 100644 --- a/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C +++ b/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SplitterPluginGUI::SplitterPluginGUI(int w, int h,SplitterPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.h b/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.h index 42772ae..93a58ba 100644 --- a/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.h +++ b/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.h @@ -31,7 +31,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C index 6e60c91..c30ae8b 100644 --- a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C +++ b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C @@ -20,6 +20,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.h b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.h index d7fc268..b8712ad 100644 --- a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.h +++ b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.h @@ -34,8 +34,8 @@ public: virtual SpiralGUIType *CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetChannel(int n) { return m_ChannelVal[n]; } float GetPan(int n) { return m_Pan[n]; } diff --git a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C index 69fcf51..7cf6200 100644 --- a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C +++ b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// StereoMixerPluginGUI::StereoMixerPluginGUI (int w, int h, StereoMixerPlugin *o, ChannelHandler *ch, const HostInfo *Info) : diff --git a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.h b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.h index 82331de..1cdacfc 100644 --- a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.h +++ b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.h @@ -32,7 +32,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: diff --git a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C index 116b568..8b14479 100644 --- a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C +++ b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C @@ -22,6 +22,8 @@ #include "../../RiffWav.h" #include "../../NoteTable.h" +using namespace std; + static const float TRIG_THRESH = 0.1; static const float BUFSECONDS = 1.0f; diff --git a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.h b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.h index 7c9b463..e5711cc 100644 --- a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.h +++ b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.h @@ -31,8 +31,8 @@ class StreamPlugin : public SpiralPlugin { virtual SpiralGUIType *CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut (ostream &s); - virtual void StreamIn (istream &s); + virtual void StreamOut (std::ostream &s); + virtual void StreamIn (std::istream &s); enum GUICommands { NONE, SET_TIME, LOAD, RESTART, STOP, PLAY }; // has to be defined in the plugin //virtual void UpdateGUI() { Fl::check(); } diff --git a/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C b/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C index 347c2f1..9a8eb54 100644 --- a/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C +++ b/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C @@ -21,6 +21,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// StreamPluginGUI::StreamPluginGUI(int w, int h,StreamPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.h b/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.h index f6362ef..d6b2c2c 100644 --- a/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.h +++ b/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.h @@ -35,7 +35,7 @@ class StreamPluginGUI : public SpiralPluginGUI { virtual void Update (); virtual void UpdateValues (SpiralPlugin *o); protected: - const string GetHelpText (const string &loc); + const std::string GetHelpText (const std::string &loc); private: bool m_Playing; float m_PitchValue; diff --git a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C index d89932f..4c237c7 100644 --- a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C +++ b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.h b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.h index 13cff1d..022db98 100644 --- a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.h +++ b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.h @@ -32,9 +32,9 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); - virtual string GetGroupName() { return "Maths/Logic"; } + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); + virtual std::string GetGroupName() { return "Maths/Logic"; } bool GetMix() { return m_Mix; } diff --git a/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C b/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C index 9fbe370..daade23 100644 --- a/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C +++ b/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C @@ -20,6 +20,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// SwitchPluginGUI::SwitchPluginGUI(int w, int h,SwitchPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.h b/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.h index b3175a7..f94a1ba 100644 --- a/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.h +++ b/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.h @@ -32,7 +32,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Button* m_Mix; diff --git a/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C b/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C index e6f70d3..9904038 100644 --- a/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C +++ b/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance () { diff --git a/SpiralSound/Plugins/TransposePlugin/TransposePlugin.h b/SpiralSound/Plugins/TransposePlugin/TransposePlugin.h index 1a68e13..049f417 100644 --- a/SpiralSound/Plugins/TransposePlugin/TransposePlugin.h +++ b/SpiralSound/Plugins/TransposePlugin/TransposePlugin.h @@ -30,8 +30,8 @@ class TransposePlugin : public SpiralPlugin { virtual SpiralGUIType* CreateGUI (); virtual void Execute (); //virtual void ExecuteCommands (); - virtual void StreamOut (ostream &s); - virtual void StreamIn (istream &s); + virtual void StreamOut (std::ostream &s); + virtual void StreamIn (std::istream &s); int GetAmount () { return m_Amount; } private: int m_Amount; diff --git a/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C b/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C index ccba17c..2739b4b 100644 --- a/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C +++ b/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C @@ -19,6 +19,8 @@ #include "TransposePluginGUI.h" #include +using namespace std; + //////////////////////////////////////////// TransposePluginGUI::TransposePluginGUI (int w, int h,TransposePlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.h b/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.h index 267d335..7f62e8f 100644 --- a/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.h +++ b/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.h @@ -29,7 +29,7 @@ class TransposePluginGUI : public SpiralPluginGUI { TransposePluginGUI (int w, int h, TransposePlugin *o, ChannelHandler *ch, const HostInfo *Info); virtual void UpdateValues (SpiralPlugin *o); protected: - const string GetHelpText (const string &loc); + const std::string GetHelpText (const std::string &loc); private: Fl_Counter* m_Amount; inline void cb_Amount_i (Fl_Counter* o, void* v); diff --git a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C index 704714e..214b352 100644 --- a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C +++ b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C @@ -21,6 +21,8 @@ #include "SpiralIcon.xpm" #include "../../NoteTable.h" +using namespace std; + static const float PI=3.141592654; static const float RAD=(PI/180)*360; diff --git a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.h b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.h index c2c88f4..951b7a8 100644 --- a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.h +++ b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.h @@ -32,8 +32,8 @@ public: virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); enum OperatorType{NONE,SIN,COS,TAN}; diff --git a/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C b/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C index 67e85ac..2836acf 100644 --- a/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C +++ b/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C @@ -21,6 +21,8 @@ #include #include +using namespace std; + //////////////////////////////////////////// TrigPluginGUI::TrigPluginGUI(int w, int h,TrigPlugin *o,ChannelHandler *ch,const HostInfo *Info) : diff --git a/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.h b/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.h index 334b81e..227f3d9 100644 --- a/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.h +++ b/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.h @@ -32,7 +32,7 @@ public: virtual void UpdateValues(SpiralPlugin *o); protected: - const string GetHelpText(const string &loc); + const std::string GetHelpText(const std::string &loc); private: Fl_Button *m_Sin,*m_Cos,*m_Tan; diff --git a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C index 8d7c78f..5167f35 100644 --- a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C +++ b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C @@ -20,6 +20,8 @@ #include "WaveShaperPluginGUI.h" #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.h b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.h index c393648..6662511 100644 --- a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.h +++ b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.h @@ -31,8 +31,8 @@ class WaveShaperPlugin : public SpiralPlugin { virtual SpiralGUIType* CreateGUI(); virtual void Execute(); virtual void ExecuteCommands(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetCoef(int); int GetWaveType(void); enum GUICommands { NONE, SETWAVETYPE, SETCOEF }; @@ -46,11 +46,11 @@ class WaveShaperPlugin : public SpiralPlugin { int m_Wave; void calc (void); void set (int index, float v); - friend istream &operator>> (istream &s, WaveShaperPlugin &o); - friend ostream &operator<< (ostream &s, WaveShaperPlugin &o); + friend std::istream &operator>> (std::istream &s, WaveShaperPlugin &o); + friend std::ostream &operator<< (std::ostream &s, WaveShaperPlugin &o); }; -istream &operator>> (istream &s, WaveShaperPlugin &o); -ostream &operator<< (ostream &s, WaveShaperPlugin &o); +std::istream &operator>> (std::istream &s, WaveShaperPlugin &o); +std::ostream &operator<< (std::ostream &s, WaveShaperPlugin &o); #endif diff --git a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C index d5036bd..52d0559 100644 --- a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C +++ b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C @@ -22,6 +22,8 @@ #include #include +using namespace std; + FunctionPlot::FunctionPlot(int ox, int oy, int ww, int hh) : Fl_Widget (ox, oy, ww, hh), m_IndColour(FL_YELLOW), diff --git a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.h b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.h index 2e37b95..b8bf175 100644 --- a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.h +++ b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.h @@ -50,7 +50,7 @@ class WaveShaperPluginGUI : public SpiralPluginGUI { virtual void UpdateValues (SpiralPlugin *o); virtual void Update (); protected: - const string GetHelpText (const string &loc); + const std::string GetHelpText (const std::string &loc); private: FunctionPlot *fplot; Fl_LED_Button *radio_polynomial, *radio_sines; diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C index cef1a67..d49778d 100644 --- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C +++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C @@ -20,6 +20,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + static const int IN_FREQ = 0; static const int IN_PW = 1; static const int IN_SHLEN = 2; diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.h b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.h index be05e28..c754c41 100644 --- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.h +++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.h @@ -34,8 +34,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); // has to be defined in the plugin virtual void UpdateGUI() { Fl::check(); } @@ -66,11 +66,11 @@ private: Sample m_Table[NUM_TABLES]; int m_TableLength; - friend istream &operator>>(istream &s, WaveTablePlugin &o); - friend ostream &operator<<(ostream &s, WaveTablePlugin &o); + friend std::istream &operator>>(std::istream &s, WaveTablePlugin &o); + friend std::ostream &operator<<(std::ostream &s, WaveTablePlugin &o); }; -istream &operator>>(istream &s, WaveTablePlugin &o); -ostream &operator<<(ostream &s, WaveTablePlugin &o); +std::istream &operator>>(std::istream &s, WaveTablePlugin &o); +std::ostream &operator<<(std::ostream &s, WaveTablePlugin &o); #endif diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C index 1962a8d..632f5cf 100644 --- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C +++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C @@ -1,403 +1,405 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "WaveTablePluginGUI.h" -#include -#include -#include "../GUI/WS_Square.h" -#include "../GUI/WS_Saw.h" -#include "../GUI/WS_RevSaw.h" -#include "../GUI/WS_Tri.h" -#include "../GUI/WS_Sine.h" -#include "../GUI/WS_Pulse1.h" -#include "../GUI/WS_Pulse2.h" -#include "../GUI/WS_InvSine.h" - -WaveTablePluginGUI::WaveTablePluginGUI (int w, int h, SpiralPlugin *o, ChannelHandler *ch, const HostInfo *Info) : -SpiralPluginGUI (w, h, o, ch), -m_PixmapSine (image_Sine), -m_PixmapSquare (image_Square), -m_PixmapSaw (image_Saw), -m_PixmapRevSaw (image_RevSaw), -m_PixmapTri (image_Tri), -m_PixmapPulse1 (image_Pulse1), -m_PixmapPulse2 (image_Pulse2), -m_PixmapInvSine (image_InvSine), -m_FineFreq (0) -{ - m_ShapeSine = new Fl_LED_Button (2, 15, 23, 23); - m_ShapeSine->type (FL_RADIO_BUTTON); - m_PixmapSine.label (m_ShapeSine); - m_ShapeSine->set(); - m_ShapeSine->callback ((Fl_Callback*)cb_Sine); - add (m_ShapeSine); - - m_ShapeSquare = new Fl_LED_Button (2, 45, 23, 23); - m_ShapeSquare->type (FL_RADIO_BUTTON); - m_PixmapSquare.label (m_ShapeSquare); - m_ShapeSquare->callback ((Fl_Callback*)cb_Square); - add (m_ShapeSquare); - - m_ShapeSaw = new Fl_LED_Button (2, 75, 23, 23); - m_ShapeSaw->type (FL_RADIO_BUTTON); - m_PixmapSaw.label (m_ShapeSaw); - m_ShapeSaw->callback ((Fl_Callback*)cb_Saw); - add (m_ShapeSaw); - - m_ShapeRevSaw = new Fl_LED_Button (2, 105, 23, 23); - m_ShapeRevSaw->type (FL_RADIO_BUTTON); - m_PixmapRevSaw.label (m_ShapeRevSaw); - m_ShapeRevSaw->callback ((Fl_Callback*)cb_RevSaw); - add (m_ShapeRevSaw); - - m_ShapeTri = new Fl_LED_Button(44, 15, 23, 23); - m_ShapeTri->type (FL_RADIO_BUTTON); - m_PixmapTri.label (m_ShapeTri); - m_ShapeTri->callback ((Fl_Callback*)cb_Tri); - add (m_ShapeTri); - - m_ShapePulse1 = new Fl_LED_Button (44, 45, 23, 23); - m_ShapePulse1->type (FL_RADIO_BUTTON); - m_PixmapPulse1.label (m_ShapePulse1); - m_ShapePulse1->callback ((Fl_Callback*)cb_Pulse1); - add (m_ShapePulse1); - - m_ShapePulse2 = new Fl_LED_Button (44, 75, 23, 23); - m_ShapePulse2->type (FL_RADIO_BUTTON); - m_PixmapPulse2.label (m_ShapePulse2); - m_ShapePulse2->callback ((Fl_Callback*)cb_Pulse2); - add (m_ShapePulse2); - - m_ShapeInvSine = new Fl_LED_Button (44, 105, 23, 23); - m_ShapeInvSine->type (FL_RADIO_BUTTON); - m_PixmapInvSine.label (m_ShapeInvSine); - m_ShapeInvSine->callback ((Fl_Callback*)cb_InvSine); - add (m_ShapeInvSine); - - m_Tabs = new Fl_Tabs (88, 10, 124, 124); - m_Tabs->box (FL_PLASTIC_DOWN_BOX); - m_Tabs->color (Info->GUI_COLOUR); - add (m_Tabs); - - m_CtlGroup = new Fl_Group (88, 24, 124, 110, "Control"); - m_CtlGroup->labelsize (10); - m_Tabs->add (m_CtlGroup); - - m_FineTune = new Fl_Knob (98, 32, 60, 60, "Fine Tune"); - m_FineTune->user_data ((void*)(this)); - m_FineTune->color (Info->GUI_COLOUR); - m_FineTune->type (Fl_Knob::LINELIN); - m_FineTune->labelsize (10); - m_FineTune->scaleticks (20); - m_FineTune->maximum (1.414); - m_FineTune->step (0.000001); - m_FineTune->value (1); - m_FineTune->callback ((Fl_Callback*)cb_FineTune); - m_CtlGroup->add (m_FineTune); - - m_Reset = new Fl_Button (108, 106, 40, 20, "Reset"); - m_Reset->user_data ((void*)(this)); - m_Reset->labelsize (10); - m_Reset->box (FL_PLASTIC_UP_BOX); - m_Reset->color (Info->GUI_COLOUR); - m_Reset->selection_color (Info->GUI_COLOUR); - m_Reset->callback ((Fl_Callback*)cb_Reset); - m_CtlGroup->add (m_Reset); - - m_Octave = new Fl_Knob (160, 27, 40, 40, "Octave"); - m_Octave->user_data ((void*)(this)); - m_Octave->color (Info->GUI_COLOUR); - m_Octave->type (Fl_Knob::LINELIN); - m_Octave->labelsize (10); - m_Octave->maximum (6); - m_Octave->step (1); - m_Octave->value (3); - m_Octave->scaleticks (6); - m_Octave->cursor (50); - m_Octave->callback ((Fl_Callback*)cb_Octave); - m_CtlGroup->add (m_Octave); - - m_ModAmount = new Fl_Knob (160, 79, 40, 40, "Mod Depth"); - m_ModAmount->user_data ((void*)(this)); - m_ModAmount->color (Info->GUI_COLOUR); - m_ModAmount->type (Fl_Knob::LINELIN); - m_ModAmount->labelsize (10); - m_ModAmount->maximum (2.0f); - m_ModAmount->step (0.001); - m_ModAmount->value (1.0); - m_ModAmount->callback ((Fl_Callback*)cb_ModAmount); - m_CtlGroup->add (m_ModAmount); - - m_NumGroup = new Fl_Group (88, 24, 124, 110, "Numbers"); - m_NumGroup->labelsize (10); - m_Tabs->add (m_NumGroup); - - m_NumFreq = new Fl_Counter (108, 32, 90, 20, "Freq (Hz)"); - m_NumFreq->user_data ((void*)(this)); - m_NumFreq->box (FL_PLASTIC_UP_BOX); - m_NumFreq->color (Info->GUI_COLOUR); - m_NumFreq->labelsize (10); - m_NumFreq->textsize (10); - m_NumFreq->minimum (0); - m_NumFreq->step (0.1); - m_NumFreq->lstep (10); - m_NumFreq->callback ((Fl_Callback*)cb_NumFreq); - m_NumGroup->add (m_NumFreq); - - m_NumOctave = new Fl_Counter (120, 66, 64, 20, "Octave"); - m_NumOctave->user_data ((void*)(this)); - m_NumOctave->type (FL_SIMPLE_COUNTER); - m_NumOctave->box (FL_PLASTIC_UP_BOX); - m_NumOctave->color (Info->GUI_COLOUR); - m_NumOctave->labelsize (10); - m_NumOctave->textsize (10); - m_NumOctave->minimum (-3); - m_NumOctave->maximum (3); - m_NumOctave->step (1); - m_NumOctave->value (0); - m_NumOctave->callback ((Fl_Callback*)cb_NumOctave); - m_NumGroup->add (m_NumOctave); - - m_NumModAmount = new Fl_Counter (120, 98, 64, 20, "Mod (%)"); - m_NumModAmount->user_data ((void*)(this)); - m_NumModAmount->type (FL_SIMPLE_COUNTER); - m_NumModAmount->box (FL_PLASTIC_UP_BOX); - m_NumModAmount->color (Info->GUI_COLOUR); - m_NumModAmount->labelsize (10); - m_NumModAmount->textsize (10); - m_NumModAmount->minimum (0); - m_NumModAmount->maximum (200); - m_NumModAmount->step (1); - m_NumModAmount->value (m_ModAmount->value() * 100); - m_NumModAmount->callback ((Fl_Callback*)cb_NumModAmount); - m_NumGroup->add (m_NumModAmount); - - end(); - UpdateFreq(); -} - -void WaveTablePluginGUI::UpdateValues (SpiralPlugin *o) { - float val; - WaveTablePlugin *Plugin = (WaveTablePlugin*)o; - - m_ShapeSquare->value(0); - m_ShapeRevSaw->value(0); - m_ShapeSaw->value(0); - m_ShapeTri->value(0); - m_ShapeSine->value(0); - m_ShapePulse1->value(0); - m_ShapePulse2->value(0); - m_ShapeInvSine->value(0); - switch (Plugin->GetType()) { - case WaveTablePlugin::SQUARE : m_ShapeSquare->value(1); break; - case WaveTablePlugin::SINE : m_ShapeSine->value(1); break; - case WaveTablePlugin::SAW : m_ShapeSaw->value(1); break; - case WaveTablePlugin::REVSAW : m_ShapeRevSaw->value(1); break; - case WaveTablePlugin::TRIANGLE : m_ShapeTri->value(1); break; - case WaveTablePlugin::PULSE1 : m_ShapePulse1->value(1); break; - case WaveTablePlugin::PULSE2 : m_ShapePulse2->value(1); break; - case WaveTablePlugin::INVSINE : m_ShapeInvSine->value(1); break; - default : break; - } - val = Plugin->GetModAmount(); - m_ModAmount->value (val); - m_NumModAmount->value (val * 100); - - m_NumOctave->value (Plugin->GetOctave()); - m_Octave->value ((int)m_NumOctave->value() + 3); - m_FineTune->value (sqrt (Plugin->GetFineFreq())); - UpdateFreq(); -} - -// Utility functions - -float WaveTablePluginGUI::CalcFineFreq (float Fine) { - int oct = (int)m_NumOctave->value(); - m_FineFreq = Fine * Fine; - float fr = 110.0f * m_FineFreq; - if (oct > 0) fr *= 1 << oct; - if (oct < 0) fr /= 1 << (-oct); - return fr; -} - -void WaveTablePluginGUI::UpdateFreq (void) { - // always do max first - CalcFineFreq leaves a value in m_FineFreq - m_NumFreq->maximum (CalcFineFreq (m_FineTune->maximum())); - m_NumFreq->value (CalcFineFreq (m_FineTune->value())); -} - -// Callbacks - Controls outside the tabs - -inline void WaveTablePluginGUI::cb_Sine_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::SINE); -} - -void WaveTablePluginGUI::cb_Sine (Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_Sine_i (o, v); -} - -inline void WaveTablePluginGUI::cb_Square_i(Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::SQUARE); -} - -void WaveTablePluginGUI::cb_Square(Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_Square_i (o, v); -} - -inline void WaveTablePluginGUI::cb_Saw_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::SAW); -} - -void WaveTablePluginGUI::cb_Saw (Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_Saw_i (o, v); -} - -inline void WaveTablePluginGUI::cb_RevSaw_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::REVSAW); -} - -void WaveTablePluginGUI::cb_RevSaw (Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_RevSaw_i (o, v); -} - -inline void WaveTablePluginGUI::cb_Tri_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::TRIANGLE); -} - -void WaveTablePluginGUI::cb_Tri (Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_Tri_i (o, v); -} - -inline void WaveTablePluginGUI::cb_Pulse1_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::PULSE1); -} - -void WaveTablePluginGUI::cb_Pulse1 (Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_Pulse1_i (o, v); -} - -inline void WaveTablePluginGUI::cb_Pulse2_i(Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::PULSE2); -} - -void WaveTablePluginGUI::cb_Pulse2 (Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_Pulse2_i (o, v); -} - -inline void WaveTablePluginGUI::cb_InvSine_i (Fl_LED_Button* o, void* v) { - m_GUICH->Set ("Type", (char)WaveTablePlugin::INVSINE); -} - -void WaveTablePluginGUI::cb_InvSine (Fl_LED_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->parent()))->cb_InvSine_i (o, v); -} - -// Callbacks - Control Group - -inline void WaveTablePluginGUI::cb_FineTune_i(Fl_Knob* o, void* v) -{ - UpdateFreq(); - m_GUICH->Set ("FineFreq", m_FineFreq); -} - -void WaveTablePluginGUI::cb_FineTune (Fl_Knob* o, void* v) { - ((WaveTablePluginGUI*)(o->user_data()))->cb_FineTune_i (o, v); -} - -inline void WaveTablePluginGUI::cb_Reset_i (Fl_Button* o, void* v) { - m_FineTune->value (1); - UpdateFreq(); - m_GUICH->Set ("FineFreq", m_FineFreq); -} - -void WaveTablePluginGUI::cb_Reset (Fl_Button* o, void* v) { - ((WaveTablePluginGUI*)(o->user_data()))->cb_Reset_i (o, v); -} - -inline void WaveTablePluginGUI::cb_Octave_i (Fl_Knob* o, void* v) { - m_NumOctave->value ((int)m_Octave->value() - 3); - UpdateFreq(); - m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); -} - -void WaveTablePluginGUI::cb_Octave (Fl_Knob* o, void* v) { - ((WaveTablePluginGUI*)(o->user_data()))->cb_Octave_i (o, v); -} - -inline void WaveTablePluginGUI::cb_ModAmount_i (Fl_Knob* o, void* v) { - float val = o->value(); - m_GUICH->Set ("ModAmount", val); - m_NumModAmount->value (val * 100); -} - -void WaveTablePluginGUI::cb_ModAmount (Fl_Knob* o, void* v) { - ((WaveTablePluginGUI*)(o->user_data()))->cb_ModAmount_i (o, v); -} - -// Callbacks - Number Group - -inline void WaveTablePluginGUI::cb_NumFreq_i (Fl_Counter* o, void* v) { - int oct = (int)m_NumOctave->value(); - float fr = o->value (); - if (oct > 0) fr /= 1 << oct; - if (oct < 0) fr *= 1 << (-oct); - m_FineFreq = fr / 110.0f; - m_GUICH->Set ("FineFreq", m_FineFreq); - m_FineTune->value (sqrt (m_FineFreq)); -} - -void WaveTablePluginGUI::cb_NumOctave (Fl_Counter* o, void* v) { - ((WaveTablePluginGUI*)(o->user_data()))->cb_NumOctave_i (o, v); -} - -inline void WaveTablePluginGUI::cb_NumOctave_i (Fl_Counter* o, void* v) { - m_Octave->value ((int)m_NumOctave->value() + 3); - UpdateFreq(); - m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); -} - -void WaveTablePluginGUI::cb_NumFreq (Fl_Counter* o, void* v) { - ((WaveTablePluginGUI*)(o->user_data()))->cb_NumFreq_i (o, v); -} - -inline void WaveTablePluginGUI::cb_NumModAmount_i (Fl_Counter* o, void* v) { - float val = o->value() / 100; - m_GUICH->Set ("ModAmount", val); - m_ModAmount->value (val); -} - -void WaveTablePluginGUI::cb_NumModAmount (Fl_Counter* o, void* v) { - ((WaveTablePluginGUI*)(o->user_data()))->cb_NumModAmount_i (o, v); -} - -// Help Text - -const string WaveTablePluginGUI::GetHelpText(const string &loc){ - return string("") - + "The WaveTable plugin is a fast multifunction oscillator with a variety \n" - + "of wave shapes:\n" - + "Sine, Square, Saw, Reverse Saw, Triangle, Two pulse shapes and an inverse\n" - + "sinewave.\n\n" - + "These wave shapes are internally represented as samples, rather than\n" - + "being continually calculated like the conventional oscillator. This \n" - + "makes the plugin fast, but restricts the modulations you can do on the\n" - + "wave forms (no pulsewidth).\n\n" - + "The oscillator can be pitched very low for use as a LFO CV generator,\n" - + "using any of the supported wave shapes. User wave shapes are planned,\n" - + "so you will be able to load your own samples in."; -} +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "WaveTablePluginGUI.h" +#include +#include +#include "../GUI/WS_Square.h" +#include "../GUI/WS_Saw.h" +#include "../GUI/WS_RevSaw.h" +#include "../GUI/WS_Tri.h" +#include "../GUI/WS_Sine.h" +#include "../GUI/WS_Pulse1.h" +#include "../GUI/WS_Pulse2.h" +#include "../GUI/WS_InvSine.h" + +using namespace std; + +WaveTablePluginGUI::WaveTablePluginGUI (int w, int h, SpiralPlugin *o, ChannelHandler *ch, const HostInfo *Info) : +SpiralPluginGUI (w, h, o, ch), +m_PixmapSine (image_Sine), +m_PixmapSquare (image_Square), +m_PixmapSaw (image_Saw), +m_PixmapRevSaw (image_RevSaw), +m_PixmapTri (image_Tri), +m_PixmapPulse1 (image_Pulse1), +m_PixmapPulse2 (image_Pulse2), +m_PixmapInvSine (image_InvSine), +m_FineFreq (0) +{ + m_ShapeSine = new Fl_LED_Button (2, 15, 23, 23); + m_ShapeSine->type (FL_RADIO_BUTTON); + m_PixmapSine.label (m_ShapeSine); + m_ShapeSine->set(); + m_ShapeSine->callback ((Fl_Callback*)cb_Sine); + add (m_ShapeSine); + + m_ShapeSquare = new Fl_LED_Button (2, 45, 23, 23); + m_ShapeSquare->type (FL_RADIO_BUTTON); + m_PixmapSquare.label (m_ShapeSquare); + m_ShapeSquare->callback ((Fl_Callback*)cb_Square); + add (m_ShapeSquare); + + m_ShapeSaw = new Fl_LED_Button (2, 75, 23, 23); + m_ShapeSaw->type (FL_RADIO_BUTTON); + m_PixmapSaw.label (m_ShapeSaw); + m_ShapeSaw->callback ((Fl_Callback*)cb_Saw); + add (m_ShapeSaw); + + m_ShapeRevSaw = new Fl_LED_Button (2, 105, 23, 23); + m_ShapeRevSaw->type (FL_RADIO_BUTTON); + m_PixmapRevSaw.label (m_ShapeRevSaw); + m_ShapeRevSaw->callback ((Fl_Callback*)cb_RevSaw); + add (m_ShapeRevSaw); + + m_ShapeTri = new Fl_LED_Button(44, 15, 23, 23); + m_ShapeTri->type (FL_RADIO_BUTTON); + m_PixmapTri.label (m_ShapeTri); + m_ShapeTri->callback ((Fl_Callback*)cb_Tri); + add (m_ShapeTri); + + m_ShapePulse1 = new Fl_LED_Button (44, 45, 23, 23); + m_ShapePulse1->type (FL_RADIO_BUTTON); + m_PixmapPulse1.label (m_ShapePulse1); + m_ShapePulse1->callback ((Fl_Callback*)cb_Pulse1); + add (m_ShapePulse1); + + m_ShapePulse2 = new Fl_LED_Button (44, 75, 23, 23); + m_ShapePulse2->type (FL_RADIO_BUTTON); + m_PixmapPulse2.label (m_ShapePulse2); + m_ShapePulse2->callback ((Fl_Callback*)cb_Pulse2); + add (m_ShapePulse2); + + m_ShapeInvSine = new Fl_LED_Button (44, 105, 23, 23); + m_ShapeInvSine->type (FL_RADIO_BUTTON); + m_PixmapInvSine.label (m_ShapeInvSine); + m_ShapeInvSine->callback ((Fl_Callback*)cb_InvSine); + add (m_ShapeInvSine); + + m_Tabs = new Fl_Tabs (88, 10, 124, 124); + m_Tabs->box (FL_PLASTIC_DOWN_BOX); + m_Tabs->color (Info->GUI_COLOUR); + add (m_Tabs); + + m_CtlGroup = new Fl_Group (88, 24, 124, 110, "Control"); + m_CtlGroup->labelsize (10); + m_Tabs->add (m_CtlGroup); + + m_FineTune = new Fl_Knob (98, 32, 60, 60, "Fine Tune"); + m_FineTune->user_data ((void*)(this)); + m_FineTune->color (Info->GUI_COLOUR); + m_FineTune->type (Fl_Knob::LINELIN); + m_FineTune->labelsize (10); + m_FineTune->scaleticks (20); + m_FineTune->maximum (1.414); + m_FineTune->step (0.000001); + m_FineTune->value (1); + m_FineTune->callback ((Fl_Callback*)cb_FineTune); + m_CtlGroup->add (m_FineTune); + + m_Reset = new Fl_Button (108, 106, 40, 20, "Reset"); + m_Reset->user_data ((void*)(this)); + m_Reset->labelsize (10); + m_Reset->box (FL_PLASTIC_UP_BOX); + m_Reset->color (Info->GUI_COLOUR); + m_Reset->selection_color (Info->GUI_COLOUR); + m_Reset->callback ((Fl_Callback*)cb_Reset); + m_CtlGroup->add (m_Reset); + + m_Octave = new Fl_Knob (160, 27, 40, 40, "Octave"); + m_Octave->user_data ((void*)(this)); + m_Octave->color (Info->GUI_COLOUR); + m_Octave->type (Fl_Knob::LINELIN); + m_Octave->labelsize (10); + m_Octave->maximum (6); + m_Octave->step (1); + m_Octave->value (3); + m_Octave->scaleticks (6); + m_Octave->cursor (50); + m_Octave->callback ((Fl_Callback*)cb_Octave); + m_CtlGroup->add (m_Octave); + + m_ModAmount = new Fl_Knob (160, 79, 40, 40, "Mod Depth"); + m_ModAmount->user_data ((void*)(this)); + m_ModAmount->color (Info->GUI_COLOUR); + m_ModAmount->type (Fl_Knob::LINELIN); + m_ModAmount->labelsize (10); + m_ModAmount->maximum (2.0f); + m_ModAmount->step (0.001); + m_ModAmount->value (1.0); + m_ModAmount->callback ((Fl_Callback*)cb_ModAmount); + m_CtlGroup->add (m_ModAmount); + + m_NumGroup = new Fl_Group (88, 24, 124, 110, "Numbers"); + m_NumGroup->labelsize (10); + m_Tabs->add (m_NumGroup); + + m_NumFreq = new Fl_Counter (108, 32, 90, 20, "Freq (Hz)"); + m_NumFreq->user_data ((void*)(this)); + m_NumFreq->box (FL_PLASTIC_UP_BOX); + m_NumFreq->color (Info->GUI_COLOUR); + m_NumFreq->labelsize (10); + m_NumFreq->textsize (10); + m_NumFreq->minimum (0); + m_NumFreq->step (0.1); + m_NumFreq->lstep (10); + m_NumFreq->callback ((Fl_Callback*)cb_NumFreq); + m_NumGroup->add (m_NumFreq); + + m_NumOctave = new Fl_Counter (120, 66, 64, 20, "Octave"); + m_NumOctave->user_data ((void*)(this)); + m_NumOctave->type (FL_SIMPLE_COUNTER); + m_NumOctave->box (FL_PLASTIC_UP_BOX); + m_NumOctave->color (Info->GUI_COLOUR); + m_NumOctave->labelsize (10); + m_NumOctave->textsize (10); + m_NumOctave->minimum (-3); + m_NumOctave->maximum (3); + m_NumOctave->step (1); + m_NumOctave->value (0); + m_NumOctave->callback ((Fl_Callback*)cb_NumOctave); + m_NumGroup->add (m_NumOctave); + + m_NumModAmount = new Fl_Counter (120, 98, 64, 20, "Mod (%)"); + m_NumModAmount->user_data ((void*)(this)); + m_NumModAmount->type (FL_SIMPLE_COUNTER); + m_NumModAmount->box (FL_PLASTIC_UP_BOX); + m_NumModAmount->color (Info->GUI_COLOUR); + m_NumModAmount->labelsize (10); + m_NumModAmount->textsize (10); + m_NumModAmount->minimum (0); + m_NumModAmount->maximum (200); + m_NumModAmount->step (1); + m_NumModAmount->value (m_ModAmount->value() * 100); + m_NumModAmount->callback ((Fl_Callback*)cb_NumModAmount); + m_NumGroup->add (m_NumModAmount); + + end(); + UpdateFreq(); +} + +void WaveTablePluginGUI::UpdateValues (SpiralPlugin *o) { + float val; + WaveTablePlugin *Plugin = (WaveTablePlugin*)o; + + m_ShapeSquare->value(0); + m_ShapeRevSaw->value(0); + m_ShapeSaw->value(0); + m_ShapeTri->value(0); + m_ShapeSine->value(0); + m_ShapePulse1->value(0); + m_ShapePulse2->value(0); + m_ShapeInvSine->value(0); + switch (Plugin->GetType()) { + case WaveTablePlugin::SQUARE : m_ShapeSquare->value(1); break; + case WaveTablePlugin::SINE : m_ShapeSine->value(1); break; + case WaveTablePlugin::SAW : m_ShapeSaw->value(1); break; + case WaveTablePlugin::REVSAW : m_ShapeRevSaw->value(1); break; + case WaveTablePlugin::TRIANGLE : m_ShapeTri->value(1); break; + case WaveTablePlugin::PULSE1 : m_ShapePulse1->value(1); break; + case WaveTablePlugin::PULSE2 : m_ShapePulse2->value(1); break; + case WaveTablePlugin::INVSINE : m_ShapeInvSine->value(1); break; + default : break; + } + val = Plugin->GetModAmount(); + m_ModAmount->value (val); + m_NumModAmount->value (val * 100); + + m_NumOctave->value (Plugin->GetOctave()); + m_Octave->value ((int)m_NumOctave->value() + 3); + m_FineTune->value (sqrt (Plugin->GetFineFreq())); + UpdateFreq(); +} + +// Utility functions + +float WaveTablePluginGUI::CalcFineFreq (float Fine) { + int oct = (int)m_NumOctave->value(); + m_FineFreq = Fine * Fine; + float fr = 110.0f * m_FineFreq; + if (oct > 0) fr *= 1 << oct; + if (oct < 0) fr /= 1 << (-oct); + return fr; +} + +void WaveTablePluginGUI::UpdateFreq (void) { + // always do max first - CalcFineFreq leaves a value in m_FineFreq + m_NumFreq->maximum (CalcFineFreq (m_FineTune->maximum())); + m_NumFreq->value (CalcFineFreq (m_FineTune->value())); +} + +// Callbacks - Controls outside the tabs + +inline void WaveTablePluginGUI::cb_Sine_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::SINE); +} + +void WaveTablePluginGUI::cb_Sine (Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_Sine_i (o, v); +} + +inline void WaveTablePluginGUI::cb_Square_i(Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::SQUARE); +} + +void WaveTablePluginGUI::cb_Square(Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_Square_i (o, v); +} + +inline void WaveTablePluginGUI::cb_Saw_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::SAW); +} + +void WaveTablePluginGUI::cb_Saw (Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_Saw_i (o, v); +} + +inline void WaveTablePluginGUI::cb_RevSaw_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::REVSAW); +} + +void WaveTablePluginGUI::cb_RevSaw (Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_RevSaw_i (o, v); +} + +inline void WaveTablePluginGUI::cb_Tri_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::TRIANGLE); +} + +void WaveTablePluginGUI::cb_Tri (Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_Tri_i (o, v); +} + +inline void WaveTablePluginGUI::cb_Pulse1_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::PULSE1); +} + +void WaveTablePluginGUI::cb_Pulse1 (Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_Pulse1_i (o, v); +} + +inline void WaveTablePluginGUI::cb_Pulse2_i(Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::PULSE2); +} + +void WaveTablePluginGUI::cb_Pulse2 (Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_Pulse2_i (o, v); +} + +inline void WaveTablePluginGUI::cb_InvSine_i (Fl_LED_Button* o, void* v) { + m_GUICH->Set ("Type", (char)WaveTablePlugin::INVSINE); +} + +void WaveTablePluginGUI::cb_InvSine (Fl_LED_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->parent()))->cb_InvSine_i (o, v); +} + +// Callbacks - Control Group + +inline void WaveTablePluginGUI::cb_FineTune_i(Fl_Knob* o, void* v) +{ + UpdateFreq(); + m_GUICH->Set ("FineFreq", m_FineFreq); +} + +void WaveTablePluginGUI::cb_FineTune (Fl_Knob* o, void* v) { + ((WaveTablePluginGUI*)(o->user_data()))->cb_FineTune_i (o, v); +} + +inline void WaveTablePluginGUI::cb_Reset_i (Fl_Button* o, void* v) { + m_FineTune->value (1); + UpdateFreq(); + m_GUICH->Set ("FineFreq", m_FineFreq); +} + +void WaveTablePluginGUI::cb_Reset (Fl_Button* o, void* v) { + ((WaveTablePluginGUI*)(o->user_data()))->cb_Reset_i (o, v); +} + +inline void WaveTablePluginGUI::cb_Octave_i (Fl_Knob* o, void* v) { + m_NumOctave->value ((int)m_Octave->value() - 3); + UpdateFreq(); + m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); +} + +void WaveTablePluginGUI::cb_Octave (Fl_Knob* o, void* v) { + ((WaveTablePluginGUI*)(o->user_data()))->cb_Octave_i (o, v); +} + +inline void WaveTablePluginGUI::cb_ModAmount_i (Fl_Knob* o, void* v) { + float val = o->value(); + m_GUICH->Set ("ModAmount", val); + m_NumModAmount->value (val * 100); +} + +void WaveTablePluginGUI::cb_ModAmount (Fl_Knob* o, void* v) { + ((WaveTablePluginGUI*)(o->user_data()))->cb_ModAmount_i (o, v); +} + +// Callbacks - Number Group + +inline void WaveTablePluginGUI::cb_NumFreq_i (Fl_Counter* o, void* v) { + int oct = (int)m_NumOctave->value(); + float fr = o->value (); + if (oct > 0) fr /= 1 << oct; + if (oct < 0) fr *= 1 << (-oct); + m_FineFreq = fr / 110.0f; + m_GUICH->Set ("FineFreq", m_FineFreq); + m_FineTune->value (sqrt (m_FineFreq)); +} + +void WaveTablePluginGUI::cb_NumOctave (Fl_Counter* o, void* v) { + ((WaveTablePluginGUI*)(o->user_data()))->cb_NumOctave_i (o, v); +} + +inline void WaveTablePluginGUI::cb_NumOctave_i (Fl_Counter* o, void* v) { + m_Octave->value ((int)m_NumOctave->value() + 3); + UpdateFreq(); + m_GUICH->Set ("Octave", (int)m_NumOctave->value ()); +} + +void WaveTablePluginGUI::cb_NumFreq (Fl_Counter* o, void* v) { + ((WaveTablePluginGUI*)(o->user_data()))->cb_NumFreq_i (o, v); +} + +inline void WaveTablePluginGUI::cb_NumModAmount_i (Fl_Counter* o, void* v) { + float val = o->value() / 100; + m_GUICH->Set ("ModAmount", val); + m_ModAmount->value (val); +} + +void WaveTablePluginGUI::cb_NumModAmount (Fl_Counter* o, void* v) { + ((WaveTablePluginGUI*)(o->user_data()))->cb_NumModAmount_i (o, v); +} + +// Help Text + +const string WaveTablePluginGUI::GetHelpText(const string &loc){ + return string("") + + "The WaveTable plugin is a fast multifunction oscillator with a variety \n" + + "of wave shapes:\n" + + "Sine, Square, Saw, Reverse Saw, Triangle, Two pulse shapes and an inverse\n" + + "sinewave.\n\n" + + "These wave shapes are internally represented as samples, rather than\n" + + "being continually calculated like the conventional oscillator. This \n" + + "makes the plugin fast, but restricts the modulations you can do on the\n" + + "wave forms (no pulsewidth).\n\n" + + "The oscillator can be pitched very low for use as a LFO CV generator,\n" + + "using any of the supported wave shapes. User wave shapes are planned,\n" + + "so you will be able to load your own samples in."; +} diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h index 109797b..71fe54a 100644 --- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h +++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h @@ -1,89 +1,89 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef W_TABLE_GUI -#define W_TABLE_GUI - -#include -#include -#include -#include -#include -#include "../Widgets/Fl_LED_Button.H" -#include "../Widgets/Fl_Knob.H" -#include "../SpiralPluginGUI.h" -#include "WaveTablePlugin.h" - -class WaveTablePluginGUI : public SpiralPluginGUI { - public: - WaveTablePluginGUI (int w, int h, SpiralPlugin *o, ChannelHandler *ch, const HostInfo *Info); - virtual void UpdateValues (SpiralPlugin* o); - protected: - const string GetHelpText(const string &loc); - private: - // Utility Functions - void UpdateFreq (void); - float CalcFineFreq (float Fine); - // Widgets - Fl_Tabs *m_Tabs; - Fl_Group *m_CtlGroup, *m_NumGroup; - Fl_Button *m_Reset; - Fl_LED_Button *m_ShapeSine, *m_ShapeSquare, *m_ShapeSaw, *m_ShapeRevSaw, - *m_ShapeTri, *m_ShapePulse1, *m_ShapePulse2, *m_ShapeInvSine; - Fl_Pixmap m_PixmapSine, m_PixmapSquare, m_PixmapSaw, m_PixmapRevSaw, - m_PixmapTri, m_PixmapPulse1, m_PixmapPulse2, m_PixmapInvSine; - Fl_Knob *m_Octave, *m_ModAmount, *m_FineTune; - Fl_Counter *m_NumFreq, *m_NumModAmount, *m_NumOctave; - // Data - float m_FineFreq; - // Callbacks - no group - inline void cb_Sine_i (Fl_LED_Button* o, void* v); - static void cb_Sine (Fl_LED_Button* o, void* v); - inline void cb_Square_i (Fl_LED_Button* o, void* v); - static void cb_Square (Fl_LED_Button* o, void* v); - inline void cb_Saw_i (Fl_LED_Button* o, void* v); - static void cb_Saw (Fl_LED_Button* o, void* v); - inline void cb_RevSaw_i (Fl_LED_Button* o, void* v); - static void cb_RevSaw (Fl_LED_Button* o, void* v); - inline void cb_Tri_i (Fl_LED_Button* o, void* v); - static void cb_Tri (Fl_LED_Button* o, void* v); - inline void cb_Pulse1_i (Fl_LED_Button* o, void* v); - static void cb_Pulse1 (Fl_LED_Button* o, void* v); - inline void cb_Pulse2_i (Fl_LED_Button* o, void* v); - static void cb_Pulse2 (Fl_LED_Button* o, void* v); - inline void cb_InvSine_i (Fl_LED_Button* o, void* v); - static void cb_InvSine (Fl_LED_Button* o, void* v); - // Callbacks - Control Group - inline void cb_Octave_i (Fl_Knob* o, void* v); - static void cb_Octave (Fl_Knob* o, void* v); - inline void cb_FineTune_i (Fl_Knob* o, void* v); - static void cb_FineTune (Fl_Knob* o, void* v); - inline void cb_Reset_i (Fl_Button* o, void* v); - static void cb_Reset (Fl_Button* o, void* v); - inline void cb_ModAmount_i (Fl_Knob* o, void* v); - static void cb_ModAmount (Fl_Knob* o, void* v); - // Callbacks - Numbers Group - inline void cb_NumFreq_i (Fl_Counter* o, void* v); - static void cb_NumFreq (Fl_Counter* o, void* v); - inline void cb_NumOctave_i (Fl_Counter* o, void* v); - static void cb_NumOctave (Fl_Counter* o, void* v); - inline void cb_NumModAmount_i (Fl_Counter* o, void* v); - static void cb_NumModAmount (Fl_Counter* o, void* v); -}; - -#endif +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#ifndef W_TABLE_GUI +#define W_TABLE_GUI + +#include +#include +#include +#include +#include +#include "../Widgets/Fl_LED_Button.H" +#include "../Widgets/Fl_Knob.H" +#include "../SpiralPluginGUI.h" +#include "WaveTablePlugin.h" + +class WaveTablePluginGUI : public SpiralPluginGUI { + public: + WaveTablePluginGUI (int w, int h, SpiralPlugin *o, ChannelHandler *ch, const HostInfo *Info); + virtual void UpdateValues (SpiralPlugin* o); + protected: + const std::string GetHelpText(const std::string &loc); + private: + // Utility Functions + void UpdateFreq (void); + float CalcFineFreq (float Fine); + // Widgets + Fl_Tabs *m_Tabs; + Fl_Group *m_CtlGroup, *m_NumGroup; + Fl_Button *m_Reset; + Fl_LED_Button *m_ShapeSine, *m_ShapeSquare, *m_ShapeSaw, *m_ShapeRevSaw, + *m_ShapeTri, *m_ShapePulse1, *m_ShapePulse2, *m_ShapeInvSine; + Fl_Pixmap m_PixmapSine, m_PixmapSquare, m_PixmapSaw, m_PixmapRevSaw, + m_PixmapTri, m_PixmapPulse1, m_PixmapPulse2, m_PixmapInvSine; + Fl_Knob *m_Octave, *m_ModAmount, *m_FineTune; + Fl_Counter *m_NumFreq, *m_NumModAmount, *m_NumOctave; + // Data + float m_FineFreq; + // Callbacks - no group + inline void cb_Sine_i (Fl_LED_Button* o, void* v); + static void cb_Sine (Fl_LED_Button* o, void* v); + inline void cb_Square_i (Fl_LED_Button* o, void* v); + static void cb_Square (Fl_LED_Button* o, void* v); + inline void cb_Saw_i (Fl_LED_Button* o, void* v); + static void cb_Saw (Fl_LED_Button* o, void* v); + inline void cb_RevSaw_i (Fl_LED_Button* o, void* v); + static void cb_RevSaw (Fl_LED_Button* o, void* v); + inline void cb_Tri_i (Fl_LED_Button* o, void* v); + static void cb_Tri (Fl_LED_Button* o, void* v); + inline void cb_Pulse1_i (Fl_LED_Button* o, void* v); + static void cb_Pulse1 (Fl_LED_Button* o, void* v); + inline void cb_Pulse2_i (Fl_LED_Button* o, void* v); + static void cb_Pulse2 (Fl_LED_Button* o, void* v); + inline void cb_InvSine_i (Fl_LED_Button* o, void* v); + static void cb_InvSine (Fl_LED_Button* o, void* v); + // Callbacks - Control Group + inline void cb_Octave_i (Fl_Knob* o, void* v); + static void cb_Octave (Fl_Knob* o, void* v); + inline void cb_FineTune_i (Fl_Knob* o, void* v); + static void cb_FineTune (Fl_Knob* o, void* v); + inline void cb_Reset_i (Fl_Button* o, void* v); + static void cb_Reset (Fl_Button* o, void* v); + inline void cb_ModAmount_i (Fl_Knob* o, void* v); + static void cb_ModAmount (Fl_Knob* o, void* v); + // Callbacks - Numbers Group + inline void cb_NumFreq_i (Fl_Counter* o, void* v); + static void cb_NumFreq (Fl_Counter* o, void* v); + inline void cb_NumOctave_i (Fl_Counter* o, void* v); + static void cb_NumOctave (Fl_Counter* o, void* v); + inline void cb_NumModAmount_i (Fl_Counter* o, void* v); + static void cb_NumModAmount (Fl_Counter* o, void* v); +}; + +#endif diff --git a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C index 6f4712f..cb59df3 100644 --- a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C +++ b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C @@ -21,6 +21,8 @@ #include #include "SpiralIcon.xpm" +using namespace std; + extern "C" { SpiralPlugin* SpiralPlugin_CreateInstance() { diff --git a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.h b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.h index d047319..1f364ba 100644 --- a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.h +++ b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.h @@ -31,8 +31,8 @@ public: virtual PluginInfo &Initialise(const HostInfo *Host); virtual SpiralGUIType *CreateGUI(); virtual void Execute(); - virtual void StreamOut(ostream &s); - virtual void StreamIn(istream &s); + virtual void StreamOut(std::ostream &s); + virtual void StreamIn(std::istream &s); float GetMix() { return m_Mix; } @@ -41,10 +41,10 @@ public: private: float m_Mix; - friend istream &operator>>(istream &s, XFadePlugin &o); - friend ostream &operator<<(ostream &s, XFadePlugin &o); + friend std::istream &operator>>(std::istream &s, XFadePlugin &o); + friend std::ostream &operator<<(std::ostream &s, XFadePlugin &o); }; -istream &operator>>(istream &s, XFadePlugin &o); -ostream &operator<<(ostream &s, XFadePlugin &o); +std::istream &operator>>(std::istream &s, XFadePlugin &o); +std::ostream &operator<<(std::ostream &s, XFadePlugin &o); #endif diff --git a/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C b/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C index 15b7296..9c744bf 100644 --- a/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C +++ b/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C @@ -1,71 +1,73 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "XFadePluginGUI.h" -#include -#include - -//////////////////////////////////////////// - -XFadePluginGUI::XFadePluginGUI(int w, int h,XFadePlugin *o,ChannelHandler *ch,const HostInfo *Info) : -SpiralPluginGUI(w,h,o,ch) -{ - m_Mix = new Fl_Slider(5, 20, 200, 20, ""); - m_Mix->type(FL_HOR_NICE_SLIDER); - m_Mix->box (FL_PLASTIC_DOWN_BOX); - m_Mix->selection_color(Info->GUI_COLOUR); - m_Mix->labelsize(10); - m_Mix->maximum(1); - m_Mix->step(0.0001); - m_Mix->value(0.5); - m_Mix->callback((Fl_Callback*)cb_Mix); - - end(); -} - -void XFadePluginGUI::UpdateValues(SpiralPlugin *o) -{ - XFadePlugin *Plugin = (XFadePlugin*)o; - m_Mix->value(Plugin->GetMix()); -} - -inline void XFadePluginGUI::cb_Mix_i(Fl_Slider* o, void* v) -{ - m_GUICH->Set("Mix",(float)o->value()); -} -void XFadePluginGUI::cb_Mix(Fl_Slider* o, void* v) -{ ((XFadePluginGUI*)(o->parent()))->cb_Mix_i(o,v); } - -const string XFadePluginGUI::GetHelpText(const string &loc) -{ - if (loc=="EN") - { - return "For mixing stereo inputs like a superstar DJ would."; - } - else if (loc=="FR") - { - return "FR: For mixing stereo inputs like a superstar DJ would."; - } - else if (loc=="DE") - { - return "DE: For mixing stereo inputs like a superstar DJ would."; - } - - // default to english? - return "DE: For mixing stereo inputs like a superstar DJ would."; -} +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "XFadePluginGUI.h" +#include +#include + +using namespace std; + +//////////////////////////////////////////// + +XFadePluginGUI::XFadePluginGUI(int w, int h,XFadePlugin *o,ChannelHandler *ch,const HostInfo *Info) : +SpiralPluginGUI(w,h,o,ch) +{ + m_Mix = new Fl_Slider(5, 20, 200, 20, ""); + m_Mix->type(FL_HOR_NICE_SLIDER); + m_Mix->box (FL_PLASTIC_DOWN_BOX); + m_Mix->selection_color(Info->GUI_COLOUR); + m_Mix->labelsize(10); + m_Mix->maximum(1); + m_Mix->step(0.0001); + m_Mix->value(0.5); + m_Mix->callback((Fl_Callback*)cb_Mix); + + end(); +} + +void XFadePluginGUI::UpdateValues(SpiralPlugin *o) +{ + XFadePlugin *Plugin = (XFadePlugin*)o; + m_Mix->value(Plugin->GetMix()); +} + +inline void XFadePluginGUI::cb_Mix_i(Fl_Slider* o, void* v) +{ + m_GUICH->Set("Mix",(float)o->value()); +} +void XFadePluginGUI::cb_Mix(Fl_Slider* o, void* v) +{ ((XFadePluginGUI*)(o->parent()))->cb_Mix_i(o,v); } + +const string XFadePluginGUI::GetHelpText(const string &loc) +{ + if (loc=="EN") + { + return "For mixing stereo inputs like a superstar DJ would."; + } + else if (loc=="FR") + { + return "FR: For mixing stereo inputs like a superstar DJ would."; + } + else if (loc=="DE") + { + return "DE: For mixing stereo inputs like a superstar DJ would."; + } + + // default to english? + return "DE: For mixing stereo inputs like a superstar DJ would."; +} diff --git a/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.h b/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.h index 8a75c88..9f7678d 100644 --- a/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.h +++ b/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.h @@ -1,46 +1,46 @@ -/* SpiralPlugin - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include "XFadePlugin.h" -#include "../SpiralPluginGUI.h" - -#ifndef XFADE_GUI_H -#define XFADE_GUI_H - -class XFadePluginGUI : public SpiralPluginGUI -{ -public: - XFadePluginGUI(int w, int h, XFadePlugin *o,ChannelHandler *ch,const HostInfo *Info); - - virtual void UpdateValues(SpiralPlugin *o); - -protected: - virtual const string GetHelpText(const string &loc); - -private: - Fl_Slider *m_Mix; - - //// Callbacks //// - - inline void cb_Mix_i(Fl_Slider* o, void* v); - static void cb_Mix(Fl_Slider*, void*); -}; - -#endif +/* SpiralPlugin + * Copyleft (C) 2000 David Griffiths + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include +#include +#include "XFadePlugin.h" +#include "../SpiralPluginGUI.h" + +#ifndef XFADE_GUI_H +#define XFADE_GUI_H + +class XFadePluginGUI : public SpiralPluginGUI +{ +public: + XFadePluginGUI(int w, int h, XFadePlugin *o,ChannelHandler *ch,const HostInfo *Info); + + virtual void UpdateValues(SpiralPlugin *o); + +protected: + virtual const std::string GetHelpText(const std::string &loc); + +private: + Fl_Slider *m_Mix; + + //// Callbacks //// + + inline void cb_Mix_i(Fl_Slider* o, void* v); + static void cb_Mix(Fl_Slider*, void*); +}; + +#endif diff --git a/SpiralSound/RiffWav.C b/SpiralSound/RiffWav.C index 0ab1d45..c41ff01 100644 --- a/SpiralSound/RiffWav.C +++ b/SpiralSound/RiffWav.C @@ -1,434 +1,436 @@ -/* SpiralSynth - * Copyleft (C) 2000 David Griffiths - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include -#include -#include -#include "RiffWav.h" -//#include "SpiralInfo.h" -#include -#include -#include - -//#define TRACE_OUT - -const int HEADERLEN = (4+24+8); - -#if __BYTE_ORDER == BIG_ENDIAN -#define SWAPSHORT(a) (a)=(((a)<<8)|(((a)>>8)&0xff)) -#define SWAPINT(a) (a)=(((a)&0x000000ff)<<24)|(((a)&0x0000ff00)<<8)|(((a)&0x00ff0000)>>8)|(((a)&0xff000000)>>24) -#else -#define SWAPSHORT(a) -#define SWAPINT(a) -#endif - -int WavFile::Open(string FileName, Mode mode, Channels channels) -{ - if (m_Stream!=NULL) - { - cerr<<"WavFile: File already open ["<16) - { - fseek(m_Stream,m_Header.FmtLength-16,SEEK_CUR); - } - - fread(&m_DataHeader,sizeof(DataHeader),1,m_Stream); - - SWAPINT(m_DataHeader.DataLengthBytes); - - while (m_DataHeader.DataName[0]!='d' || - m_DataHeader.DataName[1]!='a' || - m_DataHeader.DataName[2]!='t' || - m_DataHeader.DataName[3]!='a') - { - // crawl through the rest of the propriatory headers - // if we need to to try and get to the data header - if (feof(m_Stream) || fseek(m_Stream,-(sizeof(DataHeader)-1),SEEK_CUR)==-1) - { - cerr<<"WavFile: File open error, wrong format ["<1) v=1; - temp[n]=(short)(v*SHRT_MAX); - SWAPSHORT(temp[n]); - } - - m_DataHeader.DataLengthBytes+=data.GetLength()*2; - fwrite(temp,sizeof(&temp),data.GetLength()/2,m_Stream); - - // leak! - delete[] temp; - - return 1; -} - -int WavFile::Save(short *data, int Bytes) -{ - if (m_Stream==NULL || data==NULL) - { - return 0; - } - - m_DataHeader.DataLengthBytes+=Bytes; - fwrite(data,sizeof(data),Bytes/4,m_Stream); - return 1; -} - -int WavFile::GetSize() -{ - if (m_Header.FmtBitsPerSample!=8 && m_Header.FmtBitsPerSample!=16) - { - cerr<<"WavFile Warning: FmtBitsPerSample="<1) // mix the channels into a mono buffer - { - #ifdef TRACE_OUT - cerr<<"WavFile::Load - Channels = "<1) // mix the channels into a mono buffer - { - #ifdef TRACE_OUT - cerr<<"WavFile::Load - Channels = "<1) // untangle the interleaved data - { - int SizeBytes=NumSamples*4; // stereo,16bit - short *TempBuf = new short[NumSamples*2]; - if (SizeBytes!=(int)fread(TempBuf,1,SizeBytes,m_Stream)) - { - cerr<<"WavFile: Read chunk error"< + * + * 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 +#include +#include +#include +#include +#include "RiffWav.h" +//#include "SpiralInfo.h" +#include +#include +#include + +//#define TRACE_OUT + +using namespace std; + +const int HEADERLEN = (4+24+8); + +#if __BYTE_ORDER == BIG_ENDIAN +#define SWAPSHORT(a) (a)=(((a)<<8)|(((a)>>8)&0xff)) +#define SWAPINT(a) (a)=(((a)&0x000000ff)<<24)|(((a)&0x0000ff00)<<8)|(((a)&0x00ff0000)>>8)|(((a)&0xff000000)>>24) +#else +#define SWAPSHORT(a) +#define SWAPINT(a) +#endif + +int WavFile::Open(string FileName, Mode mode, Channels channels) +{ + if (m_Stream!=NULL) + { + cerr<<"WavFile: File already open ["<16) + { + fseek(m_Stream,m_Header.FmtLength-16,SEEK_CUR); + } + + fread(&m_DataHeader,sizeof(DataHeader),1,m_Stream); + + SWAPINT(m_DataHeader.DataLengthBytes); + + while (m_DataHeader.DataName[0]!='d' || + m_DataHeader.DataName[1]!='a' || + m_DataHeader.DataName[2]!='t' || + m_DataHeader.DataName[3]!='a') + { + // crawl through the rest of the propriatory headers + // if we need to to try and get to the data header + if (feof(m_Stream) || fseek(m_Stream,-(sizeof(DataHeader)-1),SEEK_CUR)==-1) + { + cerr<<"WavFile: File open error, wrong format ["<1) v=1; + temp[n]=(short)(v*SHRT_MAX); + SWAPSHORT(temp[n]); + } + + m_DataHeader.DataLengthBytes+=data.GetLength()*2; + fwrite(temp,sizeof(&temp),data.GetLength()/2,m_Stream); + + // leak! + delete[] temp; + + return 1; +} + +int WavFile::Save(short *data, int Bytes) +{ + if (m_Stream==NULL || data==NULL) + { + return 0; + } + + m_DataHeader.DataLengthBytes+=Bytes; + fwrite(data,sizeof(data),Bytes/4,m_Stream); + return 1; +} + +int WavFile::GetSize() +{ + if (m_Header.FmtBitsPerSample!=8 && m_Header.FmtBitsPerSample!=16) + { + cerr<<"WavFile Warning: FmtBitsPerSample="<1) // mix the channels into a mono buffer + { + #ifdef TRACE_OUT + cerr<<"WavFile::Load - Channels = "<1) // mix the channels into a mono buffer + { + #ifdef TRACE_OUT + cerr<<"WavFile::Load - Channels = "<1) // untangle the interleaved data + { + int SizeBytes=NumSamples*4; // stereo,16bit + short *TempBuf = new short[NumSamples*2]; + if (SizeBytes!=(int)fread(TempBuf,1,SizeBytes,m_Stream)) + { + cerr<<"WavFile: Read chunk error"<