From 063f5fb8f01bef72f3dcbb850a0b6d44441be691 Mon Sep 17 00:00:00 2001
From: nebogeo <nebogeo>
Date: Mon, 29 Jul 2002 23:18:17 +0000
Subject: [PATCH] fixed speed dial problems

---
 SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C    | 2 --
 SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.h    | 3 +--
 SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C | 6 +++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
index 194c40b..d65d06a 100644
--- a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
+++ b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
@@ -55,8 +55,6 @@ m_Triggered(false),
 m_ClockHigh(false),
 m_CopyPattern(0)
 {
-cerr<<hex<<this<<dec<<endl;
-
 	m_Version=2;
 
 	m_PluginInfo.Name="Matrix";
diff --git a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.h b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.h
index 6886eac..914b89e 100644
--- a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.h
+++ b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.h
@@ -57,8 +57,7 @@ public:
 	float GetStepTime()              { return m_StepTime; }
 	Pattern* GetPattern() 			 { return &m_Matrix[m_Current]; }
 	
-	void CopyPattern() { m_CopyPattern = m_Current; cerr<<m_Current<<" "<<m_CopyPattern<<endl;
- }
+	void CopyPattern() { m_CopyPattern = m_Current; }
     void PastePattern();
     void ClearPattern();
     void TransposeUp();
diff --git a/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C b/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
index bf728be..7a1d359 100644
--- a/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
+++ b/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
@@ -68,6 +68,10 @@ SpiralPluginGUI(w,h,o)
 	m_SpeedVal = new Fl_Counter (5, 125, 85, 20, "");
 	m_SpeedVal->labelsize(10);
 	m_SpeedVal->value(10);
+	m_SpeedVal->type(FL_SIMPLE_COUNTER);
+	m_SpeedVal->step(1);
+	m_SpeedVal->callback((Fl_Callback*)cb_Speed);
+	add(m_SpeedVal);
 	
 	m_Octave = new Fl_Counter(5, 90, 40, 20, "Octave");
     m_Octave->labelsize(10);
@@ -142,7 +146,7 @@ void MatrixPluginGUI::UpdateValues()
 {
 	m_Pattern->value(m_Plugin->GetCurrent());
 	m_Length->value(m_Plugin->GetPattern()->Length);
-	m_Speed->value(m_Plugin->GetPattern()->Speed*10);
+	m_Speed->value(m_Plugin->GetPattern()->Speed);
 	m_SpeedVal->value((int)m_Speed->value());
 	m_Octave->value(m_Plugin->GetPattern()->Octave);