ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity
14,985 Commits 91 Branches 19 Tags 274 MiB
2a28345bab
Commit Graph

53 Commits

Author SHA1 Message Date
Paul Davis
49b9d22217 remove debug output 2014-10-15 19:08:46 -04:00
Paul Davis
ab658d7ca1 add mutex/lock to all Evoral::SMF methods that use _smf/libsmf, to avoid inadvertent corruption via multithreaded access. 
Serialization of Session::save_state() will already protect against most of this, but there is really no
good reason why Evoral::SMF's API should require single-threaded/explicit serialization.
 2014-10-15 18:44:22 -04:00
Paul Davis
8c9749e42f merge with master and fix 4 conflicts by hand 2014-06-02 11:32:13 -04:00
Damien Zammit
2f6065b32c Fixed problem where importing invalid midi files caused crash. 2014-04-29 06:48:29 +10:00
Robin Gareus
167991eceb fix mismatch typo in sizeof 2014-03-23 00:17:19 +01:00
John Emmas
dd8ba245bb 'libs/evoral' - DLL visibility stuff and associated changes needed for building with MSVC. Currently includes debugging information and things that are just commented out until we have known compatibility with the other platforms (i.e. contains stuff to be removed at a later date) 2014-01-12 17:36:17 +00:00
Carl Hetherington
9237c7411c Catch exception thrown by SMF code when it cannot write 
to a file (#4640).


git-svn-id: svn://localhost/ardour2/branches/3.0@11259 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-18 02:10:40 +00:00
David Robillard
efe14fbd52 Fix broken whitespace via merciless application of the emacs hammer. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10782 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-23 00:17:31 +00:00
Paul Davis
8177e85bf9 fix mismatching use of operator new() when allocating buffer to passed into libsmf - should be malloc'ed 
git-svn-id: svn://localhost/ardour2/branches/3.0@9339 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-09 15:36:54 +00:00
David Robillard
0906b39918 Fix my name :) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9302 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-06 15:00:16 +00:00
Carl Hetherington
f8ebb4582d Unify program change and bank handling so that they are manipulated together. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8346 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-28 18:19:40 +00:00
Paul Davis
b85b4d9e54 make ardour3 build and link on OS X (tiger, at least) 
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-13 05:14:48 +00:00
Paul Davis
a52c992de5 remove debug output during note ID load & save 
git-svn-id: svn://localhost/ardour2/branches/3.0@7966 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-04 19:12:07 +00:00
Paul Davis
f9d6a7329c use newly-public libsmf functions for variable length quantities to load+store MIDI note IDS. THIS BREAKS MIDI NOTE HISTORY IN ALL EXISTING SESSIONS 
git-svn-id: svn://localhost/ardour2/branches/3.0@7953 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-03 00:07:42 +00:00
Carl Hetherington
b6eede26fa Remove debugging code. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7834 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-23 22:54:47 +00:00
Paul Davis
75fb4557e5 removed #if 0 code 
git-svn-id: svn://localhost/ardour2/branches/3.0@7461 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-21 17:46:45 +00:00
Paul Davis
6ef49a0b86 force creation of MIDI (SMF) files on disk whenever an SMF object is created, to avoid "source exists but no file don disk exists" issue 
git-svn-id: svn://localhost/ardour2/branches/3.0@7459 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-21 13:02:58 +00:00
Paul Davis
bf91ed99ec add note IDs and use them for looking up notes during a history rebuild. NOTE: INVALIDATES OLDER HISTORY FILES 
git-svn-id: svn://localhost/ardour2/branches/3.0@7449 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-20 16:27:34 +00:00
Paul Davis
c8e3f32533 newly created files for use in recording appear in a .stubs folder, and are moved out of it when recording stops 
git-svn-id: svn://localhost/ardour2/branches/3.0@7426 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-16 14:55:11 +00:00
Paul Davis
d3a4655ddd allow zero length MIDI files again and remove debug output 
git-svn-id: svn://localhost/ardour2/branches/3.0@7347 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-01 15:02:18 +00:00
Paul Davis
37978aa214 lots of details relating to MIDI file management; try to ignore ALSA sequencer MIDI ports named "Midi-Through" 
git-svn-id: svn://localhost/ardour2/branches/3.0@7305 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-26 13:45:59 +00:00
Paul Davis
f4401c5928 midway snapshot of work done on managing Region & Source lifetimes correctly. may fix missing MIDI file bug ; save empty playlists because they may be referred to by the history file ; undo commands auto-delete when objects they refer to die (currently not commands built from XML deserialization); Sources now know how many regions are using them for something, meaning that we know if we can delete the files holding any data for the source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7291 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-23 20:14:07 +00:00
Carl Hetherington
40ffadf219 Return delta time even for metadata events. Should fix #3244. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7282 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-20 22:49:35 +00:00
Carl Hetherington
f1114dedee Move FileManager code into libpbd. Use it for SMF read/write. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7108 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-16 20:54:50 +00:00
David Robillard
3fd5f15e26 Indentation. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5874 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-22 22:05:49 +00:00
David Robillard
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. 
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-14 16:10:01 +00:00
Paul Davis
fa4e858eb3 do not allow smf_source's reads to stomp on cached read_end position in parent class, which creates chaos by being out of sync with MidiSource::_model_iterator. this doesn't totally fix MIDI playback, but it helps 
git-svn-id: svn://localhost/ardour2/branches/3.0@5665 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-16 01:08:51 +00:00
Paul Davis
bf0a99f0c0 fix up marshall/unmarshall of note data for MidiModel::DiffCommand 
git-svn-id: svn://localhost/ardour2/branches/3.0@5662 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-14 16:01:32 +00:00
David Robillard
022818b4a7 Fix the horrible mess that was anything related to sources and paths. 
Most significant changes:

 - Factor out FileSource from AudioFileSource, use for SMFSource too
 - Explicitly pass embedded rather than mysterious name mangling or whatever
 - Destroy a ton of duplicated or very-nearly-duplicated code
 - Clean up and document all that weird source stuff in session.cc


git-svn-id: svn://localhost/ardour2/branches/3.0@4609 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-17 02:11:49 +00:00
David Robillard
fd1a3cfa4c Gracefully ignore illegal MIDI events at the buffer level (i.e. from Jack). 
Ardour should now be able to more or less tolerate crazy incoming MIDI (except for SYSEX).


git-svn-id: svn://localhost/ardour2/branches/3.0@4592 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 00:53:26 +00:00
David Robillard
85ab341795 Gracefully ignore illegal MIDI events. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4591 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 00:36:11 +00:00
David Robillard
67ce82c9b4 Shutup. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4574 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 02:14:23 +00:00
David Robillard
5d519f8bb1 De-templatify Evoral::SMF which has no concept of time other than SMF time. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4571 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 01:32:41 +00:00
David Robillard
d0cc3120ae Make SMF::append_event_delta take a buffer and a size rather than an Event (no point, more generic, etc.). 
git-svn-id: svn://localhost/ardour2/branches/3.0@4567 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 22:52:38 +00:00
David Robillard
f8d171d297 Remove unused (and timestamp type nasty) last_event_time() from SMF. 
I swear I already did this.


git-svn-id: svn://localhost/ardour2/branches/3.0@4564 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 22:40:55 +00:00
David Robillard
cdbb1f898e Update for libsmf API changes. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4561 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 22:23:40 +00:00
David Robillard
80e54c6ea0 MIDI robustness. 
- Separate SMF::open and SMF::create, more powerful interface for both.
- Correctly handle note ons with velocity 0 as note offs in sequence.
- Use SMF (i.e. libsmf) for MIDI import


git-svn-id: svn://localhost/ardour2/branches/3.0@4558 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 20:52:15 +00:00
David Robillard
b2a051f6c6 More powerful SMF::open interface. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4554 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 17:54:45 +00:00
David Robillard
d439459589 Remove abstract MIDIFile interface (maintaining interface with old crap was getting annoying). 
git-svn-id: svn://localhost/ardour2/branches/3.0@4553 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 17:39:49 +00:00
David Robillard
5ffdf1857e LibSMF -> SMF 
git-svn-id: svn://localhost/ardour2/branches/3.0@4552 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 17:35:34 +00:00
David Robillard
6314c69971 SMF -> OldSMF 
git-svn-id: svn://localhost/ardour2/branches/3.0@4551 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-14 17:28:57 +00:00
David Robillard
550613a898 verbosity-- 
git-svn-id: svn://localhost/ardour2/branches/3.0@4536 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-11 20:47:40 +00:00
David Robillard
3d1b648130 Remove unused (and weirdly typed) time parameter from begin_write. 
Fix append_event_unlocked shadowing.


git-svn-id: svn://localhost/ardour2/branches/3.0@4535 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-11 20:37:22 +00:00
David Robillard
9579ea0801 StandardMIDIFile -> MIDIFile. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4533 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-11 20:15:25 +00:00
David Robillard
33bbc5cd84 Detect libsmf error and throw exceptions. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4532 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-11 17:59:33 +00:00
Hans Baier
494e7feec6 * Code readability: Template parameter <T> -> <Time> 
git-svn-id: svn://localhost/ardour2/branches/3.0@4521 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-10 22:06:56 +00:00
Hans Baier
1872d48507 *Evoral::SMF fix reading/writing of SysEx Events 
git-svn-id: svn://localhost/ardour2/branches/3.0@4517 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-10 08:43:35 +00:00
Hans Baier
3d594b460b * Add SysEx Support to MidiModel / SMF 
git-svn-id: svn://localhost/ardour2/branches/3.0@4492 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-06 20:31:00 +00:00
Hans Baier
5c73fc42c4 * midi_event_size(uchar status): return size including status / handle sysex 
git-svn-id: svn://localhost/ardour2/branches/3.0@4486 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-03 08:46:24 +00:00
David Robillard
166ef64e3d Make (MIDI) event time stamp type a template parameter. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4473 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-02 02:36:05 +00:00