Merged with trunk R992.

[ardour.git] / libs / ardour / ardour / audio_track.h

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 1277b598d414e2b86b8a605652c2f89822052680..fdf373a1cb168937cb3c1d52a6d2637c2919cabb 100644 (file)
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -37,27 +37,27 @@ class AudioTrack : public Track
        AudioTrack (Session&, const XMLNode&);
        ~AudioTrack ();
 
-       int roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-               jack_nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
+       int roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+               nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
        
-       int no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-               jack_nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
+       int no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+               nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
        
-       int silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-               jack_nframes_t offset, bool can_record, bool rec_monitors_input);
+       int silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+               nframes_t offset, bool can_record, bool rec_monitors_input);
 
        boost::shared_ptr<AudioDiskstream> audio_diskstream() const;
 
        int use_diskstream (string name);
        int use_diskstream (const PBD::ID& id);
        
-       int export_stuff (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t end_frame);
+       int export_stuff (BufferSet& bufs, nframes_t nframes, nframes_t end_frame);
 
        void freeze (InterThreadInfo&);
        void unfreeze ();
 
        void bounce (InterThreadInfo&);
-       void bounce_range (jack_nframes_t start, jack_nframes_t end, InterThreadInfo&);
+       void bounce_range (nframes_t start, nframes_t end, InterThreadInfo&);
 
        int set_state(const XMLNode& node);