Rename SearchPath class Searchpath

[ardour.git] / libs / ardour / test / midi_clock_slave_test.h

diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h
index 3b9278b872e406013363c13852a90acddb19e8ec..56bda2ba58a91ee8bbb1e4750fbc2c51e44811cf 100644 (file)
--- a/libs/ardour/test/midi_clock_slave_test.h
+++ b/libs/ardour/test/midi_clock_slave_test.h
@@ -48,8 +48,8 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy {
           meter             (4.0, 4.0)
         {
           _tempo_map = new TempoMap (FRAME_RATE);
-          _tempo_map->add_tempo (tempo, BBT_Time(1, 1, 0));
-          _tempo_map->add_meter (meter, BBT_Time(1, 1, 0));          
+          _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0));
+          _tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0));          
         }
 
         // Controlling the mock object
@@ -61,12 +61,12 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy {
         }
 
         // Implementation
-       TempoMap&   tempo_map ()                const { return *_tempo_map; }
-       nframes_t   frame_rate ()               const { return FRAME_RATE; }
+       TempoMap&  tempo_map ()                const { return *_tempo_map; }
+       framecnt_t frame_rate ()               const { return FRAME_RATE; }
        framepos_t audible_frame ()            const { return _transport_frame; }
        framepos_t transport_frame ()          const { return _transport_frame; }
-       nframes_t  frames_since_cycle_start () const { return 0; }
-       framecnt_t frame_time ()               const { return _frame_time; }
+       pframes_t  frames_since_cycle_start () const { return 0; }
+       framepos_t frame_time ()               const { return _frame_time; }
 
        void request_locate (framepos_t frame, bool with_roll = false) { 
           _transport_frame = frame;