4 files changed, 8 insertions, 13 deletions
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 1cc73474d7..34e92d01a4 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -284,7 +284,7 @@ class MIDIClock_Slave : public Slave {
 	MIDIClock_Slave (Session&, MIDI::Port&, int ppqn = 24);
 
 	/// Constructor for unit tests
-	MIDIClock_Slave (ISlaveSessionProxy* session_proxy, int ppqn = 24);
+	MIDIClock_Slave (ISlaveSessionProxy* session_proxy = 0, int ppqn = 24);
 	~MIDIClock_Slave ();
 
 	void rebind (MIDI::Port&);
@@ -300,7 +300,7 @@ class MIDIClock_Slave : public Slave {
 
 	void set_bandwidth (double a_bandwith) { bandwidth = a_bandwith; }
 
-  private:
+  protected:
 	ISlaveSessionProxy* session;
 	MIDI::Port* port;
 	PBD::ScopedConnectionList port_connections;
diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index 3a43580d64..3141a601f4 100644
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -56,7 +56,6 @@ MIDIClock_Slave::MIDIClock_Slave (ISlaveSessionProxy* session_proxy, int ppqn)
 	, ppqn (ppqn)
 	, bandwidth (30.0 / 60.0) // 1 BpM = 1 / 60 Hz
 {
-	session = session_proxy;
 	reset ();
 }
 
@@ -216,7 +215,7 @@ MIDIClock_Slave::reset ()
 	_starting = false;
 	_started  = false;
 
-	session->request_locate(0, false);
+        if (session) session->request_locate(0, false);
 }
 
 void
diff --git a/libs/ardour/test/midi_clock_slave_test.cpp b/libs/ardour/test/midi_clock_slave_test.cpp
index 4fc5237726..260b60d3b3 100644
--- a/libs/ardour/test/midi_clock_slave_test.cpp
+++ b/libs/ardour/test/midi_clock_slave_test.cpp
@@ -9,8 +9,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MIDIClock_SlaveTest );
 void
 MIDIClock_SlaveTest::testStepResponse ()
 {
+
+
   //CPPUNIT_ASSERT_EQUAL ((uint32_t)(NUM_SAMPLES * linear.speed()), result);	
-  cerr << "Frozz";
 }
 
 
diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h
index 1709962512..ebc2c67345 100644
--- a/libs/ardour/test/midi_clock_slave_test.h
+++ b/libs/ardour/test/midi_clock_slave_test.h
@@ -74,27 +74,22 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy {
         void request_transport_speed (const double speed) { transport_speed = speed; }
 };
 
-class MIDIClock_SlaveTest : public CppUnit::TestFixture
+class MIDIClock_SlaveTest : public CppUnit::TestFixture, ARDOUR::MIDIClock_Slave
 {
     CPPUNIT_TEST_SUITE(MIDIClock_SlaveTest);
     CPPUNIT_TEST(testStepResponse);
     CPPUNIT_TEST_SUITE_END();
-    
-    ISlaveSessionProxy *session_proxy;
-    MIDIClock_Slave    *slave;
-    
+
     public:
        	
         void setUp() {
-          session_proxy = new TestSlaveSessionProxy ();
-          slave = new MIDIClock_Slave (session_proxy);
+          session = new TestSlaveSessionProxy ();
         }
         
         void tearDown() {
         }
 
         void testStepResponse();
-
 };
 
 } // namespace ARDOUR