diff --git a/GUI/Widgets/Fl_Canvas.C b/GUI/Widgets/Fl_Canvas.C index 602ac84..9d98767 100644 --- a/GUI/Widgets/Fl_Canvas.C +++ b/GUI/Widgets/Fl_Canvas.C @@ -321,7 +321,7 @@ int Fl_Canvas::handle(int event) redraw(); } - if (Fl::event_button()==3) + if (Fl::event_button()==2) { if (event==FL_PUSH) { @@ -333,7 +333,7 @@ int Fl_Canvas::handle(int event) if (event==FL_DRAG) redraw(); - if (event==FL_RELEASE && Fl::event_button()==3) + if (event==FL_RELEASE) { m_ToolMenu=false; if (m_Selected!=-1 && cb_AddDevice) diff --git a/GUI/Widgets/Fl_DeviceGUI.C b/GUI/Widgets/Fl_DeviceGUI.C index 069f5a5..603a647 100644 --- a/GUI/Widgets/Fl_DeviceGUI.C +++ b/GUI/Widgets/Fl_DeviceGUI.C @@ -176,6 +176,7 @@ void Fl_DeviceGUI::Resize(int width, int height) } position(x()+(oldw-w())/2,y()+(oldh-h())/2); + m_Menu->resize(x(),y(),width,height); int Centx=x()+w()/2; int Centy=y()+h()/2; diff --git a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C index f51f4c7..cdbdc67 100644 --- a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C +++ b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C @@ -147,6 +147,19 @@ void JackPluginGUI::cb_Attach(Fl_Button* o, void* v) inline void JackPluginGUI::cb_Detach_i(Fl_Button* o, void* v) { //m_GUICH->SetCommand(JackPlugin::DETACH); + + for (int n=0; nvalue(false); + m_OutputButton[n]->label("None"); + } + + for (int n=0; nvalue(false); + m_InputButton[n]->label("None"); + } + JackClient::Get()->Detach(); } void JackPluginGUI::cb_Detach(Fl_Button* o, void* v) diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C index fff1620..ef97561 100644 --- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C +++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C @@ -222,7 +222,7 @@ void SpiralLoopPlugin::ExecuteCommands() void SpiralLoopPlugin::StreamOut(ostream &s) { - s<::iterator i=m_TriggerVec.begin(); @@ -269,7 +269,7 @@ void SpiralLoopPlugin::LoadWav(const char *Filename) WavFile wav; if (wav.Open(Filename, WavFile::READ)) { - Clear(); + //Clear(); AllocateMem(wav.GetSize()); wav.Load(m_StoreBuffer); } @@ -323,7 +323,7 @@ bool SpiralLoopPlugin::GetOutput(Sample &data) // brute force fix if (Pos>0 && Posvalue(Plugin->GetVolume()); m_Speed->value(Plugin->GetSpeed()); m_Length->value(Plugin->GetLoopLength()/m_SampleSize); + m_LoopGUI->SetLength(Plugin->GetLoopLength()); } void SpiralLoopPluginGUI::Update() diff --git a/SpiralSynthModularInfo.C b/SpiralSynthModularInfo.C index 56ef132..37b4304 100644 --- a/SpiralSynthModularInfo.C +++ b/SpiralSynthModularInfo.C @@ -34,14 +34,16 @@ string SpiralInfo::MIDIFILE = "/dev/midi"; int SpiralInfo::POLY = 1; bool SpiralInfo::USEPLUGINLIST = false; -//int SpiralInfo::GUI_COLOUR = 139; -//int SpiralInfo::GUIBG_COLOUR = 0; -//int SpiralInfo::GUIBG2_COLOUR = 49;//45; - -int SpiralSynthModularInfo::GUICOL_Tool=179; +/*int SpiralSynthModularInfo::GUICOL_Tool=179; int SpiralSynthModularInfo::GUICOL_Button=181; int SpiralSynthModularInfo::GUICOL_Canvas=181; int SpiralSynthModularInfo::GUICOL_Device=181; +int SpiralSynthModularInfo::GUIDEVICE_Box=30;*/ + +int SpiralSynthModularInfo::GUICOL_Tool=48; +int SpiralSynthModularInfo::GUICOL_Button=42; +int SpiralSynthModularInfo::GUICOL_Canvas=50; +int SpiralSynthModularInfo::GUICOL_Device=52; int SpiralSynthModularInfo::GUIDEVICE_Box=30; vector SpiralSynthModularInfo::PLUGINVEC;