diff --git a/SpiralSound/Plugins/MousePlugin/MousePlugin.C b/SpiralSound/Plugins/MousePlugin/MousePlugin.C index dd69c4d..e61f1b4 100644 --- a/SpiralSound/Plugins/MousePlugin/MousePlugin.C +++ b/SpiralSound/Plugins/MousePlugin/MousePlugin.C @@ -58,14 +58,14 @@ m_Data (0.0) { m_RefCount++; m_PluginInfo.Name = "Mouse"; - m_PluginInfo.Width = 200; - m_PluginInfo.Height = 400; + m_PluginInfo.Width = 100; + m_PluginInfo.Height = 140; m_PluginInfo.NumInputs = 1; m_PluginInfo.NumOutputs = 1; m_PluginInfo.PortTips.push_back ("Trigger"); m_PluginInfo.PortTips.push_back ("Output"); m_AudioCH->Register ("Port", &m_Port); - m_Version = 1; + m_Version = 2; } MousePlugin::~MousePlugin() { @@ -120,10 +120,11 @@ void MousePlugin::Execute() { } void MousePlugin::StreamOut (ostream &s) { - s << m_Version; + s << m_Version << " " << m_Port; } void MousePlugin::StreamIn (istream &s) { int Version; s >> Version; + if (Version > 1) s >> m_Port; } diff --git a/SpiralSound/Plugins/MousePlugin/MousePlugin.h b/SpiralSound/Plugins/MousePlugin/MousePlugin.h index 5774124..4f5123e 100644 --- a/SpiralSound/Plugins/MousePlugin/MousePlugin.h +++ b/SpiralSound/Plugins/MousePlugin/MousePlugin.h @@ -50,6 +50,7 @@ class MousePlugin : public SpiralPlugin { virtual ~MousePlugin(); virtual PluginInfo& Initialise (const HostInfo *Host); virtual SpiralGUIType* CreateGUI(); + char GetPort (void) { return m_Port; } virtual void Execute(); virtual void ExecuteCommands(); virtual void StreamOut (ostream &s); diff --git a/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C b/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C index 9c85a65..9e0e2a2 100644 --- a/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C +++ b/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C @@ -55,7 +55,7 @@ SpiralPluginGUI (w, h, o, ch) m_Port1->label ("ttyS1"); m_Port1->callback ((Fl_Callback*)cb_Port1); - m_Scope = new ScratchWidget (5, 40, 60, 100, "Scratch"); + m_Scope = new ScratchWidget (10, 32, 80, 100, "Scratch"); m_Scope->color(Info->SCOPE_BG_COLOUR); m_Scope->selection_color(Info->SCOPE_FG_COLOUR); @@ -67,8 +67,9 @@ void MousePluginGUI::Update () { m_Scope->redraw(); } -// Update GUI on Load void MousePluginGUI::UpdateValues (SpiralPlugin* o) { + MousePlugin *Plugin = (MousePlugin*)o; + if (Plugin->GetPort() == '1') m_Port1->setonly(); } inline void MousePluginGUI::cb_Port0_i (Fl_LED_Button* o, void* v) { @@ -77,7 +78,7 @@ inline void MousePluginGUI::cb_Port0_i (Fl_LED_Button* o, void* v) { } void MousePluginGUI::cb_Port0 (Fl_LED_Button* o, void* v) { - ((MousePluginGUI*)(o->parent ()))->cb_Port0 (o, v); + ((MousePluginGUI*)(o->parent ()))->cb_Port0_i (o, v); } inline void MousePluginGUI::cb_Port1_i (Fl_LED_Button* o, void* v) { @@ -86,7 +87,7 @@ inline void MousePluginGUI::cb_Port1_i (Fl_LED_Button* o, void* v) { } void MousePluginGUI::cb_Port1 (Fl_LED_Button* o, void* v) { - ((MousePluginGUI*)(o->parent ()))->cb_Port1 (o, v); + ((MousePluginGUI*)(o->parent ()))->cb_Port1_i (o, v); } const string MousePluginGUI::GetHelpText (const string &loc) {