projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename TransportMasterManager::init() to ::set_default_configuration() to make its...
[ardour.git]
/
libs
/
ardour
/
midi_scene_changer.cc
diff --git
a/libs/ardour/midi_scene_changer.cc
b/libs/ardour/midi_scene_changer.cc
index 0c2880dcaf97afda5fbf6453550328c7dfc057b3..11805b6d1374e371d156369f331677aa26069582 100644
(file)
--- a/
libs/ardour/midi_scene_changer.cc
+++ b/
libs/ardour/midi_scene_changer.cc
@@
-94,7
+94,7
@@
MIDISceneChanger::gather (const Locations::LocationList& locations)
}
void
}
void
-MIDISceneChanger::rt_deliver (MidiBuffer& mbuf,
fram
epos_t when, boost::shared_ptr<MIDISceneChange> msc)
+MIDISceneChanger::rt_deliver (MidiBuffer& mbuf,
sampl
epos_t when, boost::shared_ptr<MIDISceneChange> msc)
{
if (!msc->active()) {
return;
{
if (!msc->active()) {
return;
@@
-157,7
+157,7
@@
MIDISceneChanger::non_rt_deliver (boost::shared_ptr<MIDISceneChange> msc)
}
void
}
void
-MIDISceneChanger::run (
framepos_t start, fram
epos_t end)
+MIDISceneChanger::run (
samplepos_t start, sampl
epos_t end)
{
if (!output_port || recording() || !_session.transport_rolling()) {
return;
{
if (!output_port || recording() || !_session.transport_rolling()) {
return;
@@
-187,7
+187,7
@@
MIDISceneChanger::run (framepos_t start, framepos_t end)
}
void
}
void
-MIDISceneChanger::locate (
fram
epos_t pos)
+MIDISceneChanger::locate (
sampl
epos_t pos)
{
boost::shared_ptr<MIDISceneChange> msc;
{
boost::shared_ptr<MIDISceneChange> msc;
@@
-279,7
+279,7
@@
void
void
MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program, int channel)
{
void
MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program, int channel)
{
-
fram
ecnt_t time = parser.get_timestamp ();
+
sampl
ecnt_t time = parser.get_timestamp ();
last_program_message_time = time;
last_program_message_time = time;
@@
-302,7
+302,7
@@
MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program
/* check for marker at current location */
/* check for marker at current location */
- loc = locations->mark_at (time, Config->get_inter_scene_gap_
fram
es());
+ loc = locations->mark_at (time, Config->get_inter_scene_gap_
sampl
es());
if (!loc) {
/* create a new marker at the desired position */
if (!loc) {
/* create a new marker at the desired position */
@@
-314,7
+314,7
@@
MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program
return;
}
return;
}
- loc = new Location (_session, time, time, new_name, Location::IsMark);
+ loc = new Location (_session, time, time, new_name, Location::IsMark
, 0
);
new_mark = true;
}
new_mark = true;
}
@@
-356,7
+356,7
@@
MIDISceneChanger::jump_to (int bank, int program)
{
const Locations::LocationList& locations (_session.locations()->list());
boost::shared_ptr<SceneChange> sc;
{
const Locations::LocationList& locations (_session.locations()->list());
boost::shared_ptr<SceneChange> sc;
-
framepos_t where = max_fram
epos;
+
samplepos_t where = max_sampl
epos;
for (Locations::LocationList::const_iterator l = locations.begin(); l != locations.end(); ++l) {
for (Locations::LocationList::const_iterator l = locations.begin(); l != locations.end(); ++l) {
@@
-370,7
+370,7
@@
MIDISceneChanger::jump_to (int bank, int program)
}
}
}
}
- if (where != max_
fram
epos) {
+ if (where != max_
sampl
epos) {
_session.request_locate (where);
}
}
_session.request_locate (where);
}
}