smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Marker at the same position restriction: we should not allow to place marker closer then 1 frame (video) to the existing one.

Browse source
This commit is contained in:
GZharun 2014-12-16 13:20:53 +02:00
parent 29fb3816d6
commit 614353a2b0
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -50,6 +50,7 @@ CONFIG_VARIABLE (int32_t, mmc_send_device_id, "mmc-send-device-id", 0)
CONFIG_VARIABLE (int32_t, initial_program_change, "initial-program-change", -1)
CONFIG_VARIABLE (bool, first_midi_bank_is_zero, "display-first-midi-bank-as-zero", false)
CONFIG_VARIABLE (int32_t, inter_scene_gap_msecs, "inter-scene-gap-msecs", 1)
CONFIG_VARIABLE (int32_t, inter_scene_gap_frames, "inter-scene-gap-frames", 1)
/* Timecode and related */

34
libs/ardour/midi_scene_changer.cc
View file

@ -264,12 +264,12 @@ MIDISceneChanger::recording() const
}
void
MIDISceneChanger::bank_change_input (MIDI::Parser& /*parser*/, unsigned short, int)
MIDISceneChanger::bank_change_input (MIDI::Parser& /*parser*/, unsigned short, int)
{
if (recording()) {
have_seen_bank_changes = true;
}
MIDIInputActivity (); /* EMIT SIGNAL */
have_seen_bank_changes = true;
}
MIDIInputActivity (); /* EMIT SIGNAL */
}
void
@ -294,8 +294,11 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program
Locations* locations (_session.locations ());
Location* loc;
bool new_mark = false;
framecnt_t slop = (framecnt_t) floor ((Config->get_inter_scene_gap_msecs() / 1000.0) * _session.frame_rate());
double frames_per_sec = _session.timecode_frames_per_second();
float maker_slop_sec = Config->get_inter_scene_gap_frames()/frames_per_sec;
framecnt_t slop = (framecnt_t) floor (maker_slop_sec * _session.frame_rate() );
/* check for marker at current location */
loc = locations->mark_at (time, slop);
@ -312,17 +315,16 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program
loc = new Location (_session, time, time, new_name, Location::IsMark);
new_mark = true;
}
int bank = -1;
if (have_seen_bank_changes) {
bank = input_port->channel (channel)->bank();
}
MIDISceneChange* msc =new MIDISceneChange (channel, bank, program & 0x7f);
MIDISceneChange* msc = new MIDISceneChange (channel, bank, program & 0x7f);
/* check for identical scene change so we can re-use color, if any */
Locations::LocationList copy (locations->list());
for (Locations::LocationList::const_iterator l = copy.begin(); l != copy.end(); ++l) {
@ -334,17 +336,15 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program
}
}
loc->set_scene_change (boost::shared_ptr<MIDISceneChange> (msc));
/* this will generate a "changed" signal to be emitted by locations,
and we will call ::gather() to update our list of MIDI events.
*/
if (new_mark) {
loc->set_scene_change (boost::shared_ptr<MIDISceneChange> (msc));
/* this will generate a "changed" signal to be emitted by locations,
and we will call ::gather() to update our list of MIDI events.
*/
locations->add (loc);
}
MIDIInputActivity (); /* EMIT SIGNAL */
MIDIInputActivity (); /* EMIT SIGNAL */
}
void