smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 02:56:35 +01:00
Code Issues Projects Releases Wiki Activity

Make sure that the MidiSource constructor doesn't set the wrong _flags.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8996 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-03-01 02:04:34 +00:00
parent 9efd8e2e40
commit e47dd1a96a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/smf_source.cc
View file

@ -52,7 +52,7 @@ using namespace PBD;
/** Constructor used for new internal-to-session files. File cannot exist. */ /** Constructor used for new internal-to-session files. File cannot exist. */
SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags)
: Source(s, DataType::MIDI, path, flags) : Source(s, DataType::MIDI, path, flags)
, MidiSource(s, path) , MidiSource(s, path, flags)
, FileSource(s, DataType::MIDI, path, string(), flags) , FileSource(s, DataType::MIDI, path, string(), flags)
, Evoral::SMF() , Evoral::SMF()
, _last_ev_time_beats(0.0) , _last_ev_time_beats(0.0)
@ -328,7 +328,7 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, fr
cerr << "SMFSource: Warning: Skipping event with non-monotonic time" << endl; cerr << "SMFSource: Warning: Skipping event with non-monotonic time" << endl;
return; return;
} }
BeatsFramesConverter converter(_session.tempo_map(), position); BeatsFramesConverter converter(_session.tempo_map(), position);
const double ev_time_beats = converter.from(ev.time()); const double ev_time_beats = converter.from(ev.time());
Evoral::event_id_t event_id; Evoral::event_id_t event_id;