summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/midi_track.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-09-17 18:20:37 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-09-17 18:20:37 +0000
commitede4ecbb00ecc866c502454c81e711baea780ccd (patch)
treed4a05e59cc96651ddf0eeab929f58fb7a7019fb0 /libs/ardour/ardour/midi_track.h
parent10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (diff)
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_track.h')
-rw-r--r--libs/ardour/ardour/midi_track.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index ea2b0804f8..0475f3f5ea 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -54,7 +54,7 @@ public:
void set_latency_delay (nframes_t);
- int export_stuff (BufferSet& bufs, nframes_t nframes, sframes_t end_frame);
+ int export_stuff (BufferSet& bufs, nframes_t nframes, framepos_t end_frame);
void freeze_me (InterThreadInfo&);
void unfreeze ();
@@ -110,7 +110,7 @@ protected:
private:
boost::shared_ptr<MidiDiskstream> midi_diskstream () const;
- void write_out_of_band_data (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+ void write_out_of_band_data (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes);
void set_state_part_two ();
void set_state_part_three ();
@@ -122,7 +122,7 @@ private:
uint8_t _default_channel;
bool _midi_thru;
- int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
+ int no_roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool state_changing, bool can_record, bool rec_monitors_input);
void push_midi_input_to_step_edit_ringbuffer (nframes_t nframes);
};