summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/midi_scene_changer.h
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour/midi_scene_changer.h')
-rw-r--r--libs/ardour/ardour/midi_scene_changer.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h
index 792f4fb74f..cc9553aab8 100644
--- a/libs/ardour/ardour/midi_scene_changer.h
+++ b/libs/ardour/ardour/midi_scene_changer.h
@@ -35,15 +35,15 @@ class MIDISceneChanger : public SceneChanger
MIDISceneChanger (Session&);
~MIDISceneChanger ();
- void run (framepos_t start, framepos_t end);
+ void run (samplepos_t start, samplepos_t end);
void set_input_port (boost::shared_ptr<MidiPort>);
void set_output_port (boost::shared_ptr<MidiPort>);
- uint8_t bank_at (framepos_t, uint8_t channel);
- uint8_t program_at (framepos_t, uint8_t channel);
+ uint8_t bank_at (samplepos_t, uint8_t channel);
+ uint8_t program_at (samplepos_t, uint8_t channel);
void set_recording (bool);
- void locate (framepos_t);
+ void locate (samplepos_t);
/** Signal emitted whenever any relevant MIDI input is detected.
*/
@@ -54,7 +54,7 @@ class MIDISceneChanger : public SceneChanger
PBD::Signal0<void> MIDIOutputActivity;
private:
- typedef std::multimap<framepos_t,boost::shared_ptr<MIDISceneChange> > Scenes;
+ typedef std::multimap<samplepos_t,boost::shared_ptr<MIDISceneChange> > Scenes;
boost::shared_ptr<MidiPort> input_port;
boost::shared_ptr<MidiPort> output_port;
@@ -62,7 +62,7 @@ class MIDISceneChanger : public SceneChanger
Scenes scenes;
bool _recording;
bool have_seen_bank_changes;
- framepos_t last_program_message_time;
+ samplepos_t last_program_message_time;
unsigned short current_bank;
int last_delivered_program;
int last_delivered_bank;
@@ -70,7 +70,7 @@ class MIDISceneChanger : public SceneChanger
void gather (const Locations::LocationList&);
bool recording () const;
void jump_to (int bank, int program);
- void rt_deliver (MidiBuffer&, framepos_t, boost::shared_ptr<MIDISceneChange>);
+ void rt_deliver (MidiBuffer&, samplepos_t, boost::shared_ptr<MIDISceneChange>);
void non_rt_deliver (boost::shared_ptr<MIDISceneChange>);
void bank_change_input (MIDI::Parser&, unsigned short, int channel);