ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity
10,169 Commits 92 Branches 19 Tags 271 MiB
aaea166135
Commit Graph

118 Commits

Author SHA1 Message Date
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
David Robillard
fc77ae0738 Replace a bunch of potential crashes with graceful handling of the situation. 
We really need some kind of more sophisticated assert macro that can be
switched to non-fatal logging mode for release builds.  A log message, which is
often all that would happen, is a lot better than a trainwrecked performance...


git-svn-id: svn://localhost/ardour2/branches/3.0@13892 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-19 07:00:43 +00:00
Paul Davis
d7ea70f4f1 force use of a weak_ptr<> when binding in MidiStreamView, hopefully avoiding putting a shared_ptr<Region> into an object 
git-svn-id: svn://localhost/ardour2/branches/3.0@13845 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-15 15:12:30 +00:00
Carl Hetherington
5dc49d678f Fit note range on adding regions to tracks during import (#4106). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12705 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-13 16:47:06 +00:00
Carl Hetherington
dfd842812c Deselect MIDI notes when leaving internal edit mode 
(part of #4669).


git-svn-id: svn://localhost/ardour2/branches/3.0@12471 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-28 21:01:37 +00:00
David Robillard
6fa6514cfd Remove over 500 unnecessary includes (including 54 of session.h). 
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.


git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-24 06:09:29 +00:00
Paul Davis
a9e5c95bd2 remove unused static function 
git-svn-id: svn://localhost/ardour2/branches/3.0@10247 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-20 11:43:08 +00:00
Carl Hetherington
69da82a021 Don't draw MIDI note horizontal grid lines if they would be 
less than 3 pixels apart (#4300).


git-svn-id: svn://localhost/ardour2/branches/3.0@10080 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-14 16:07:57 +00:00
Carl Hetherington
25b4913c78 Save position of MIDI scroomers (#4140). 
git-svn-id: svn://localhost/ardour2/branches/3.0@9993 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-14 18:40:57 +00:00
Paul Davis
d4d5b30aeb remove unused and useless "src" argument for a number of Region property modifying methods 
git-svn-id: svn://localhost/ardour2/branches/3.0@9632 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-30 13:54:44 +00:00
David Robillard
3d05125a86 Increase maximum note height to 20 (10 is far too small a target for individual note editing). 
Fix broken whitespace.


git-svn-id: svn://localhost/ardour2/branches/3.0@9617 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-27 22:39:52 +00:00
Carl Hetherington
cb643ab965 Remove some calls to process_updates() which I think prevent GTK coalescing redraw requests. Remove some debugging code. Suspend update of MIDI regions during scroomer drag to speed things up (#3954). 
git-svn-id: svn://localhost/ardour2/branches/3.0@9357 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-16 13:31:27 +00:00
Paul Davis
92578ddef5 show internal edit mode status correctly on session load 
git-svn-id: svn://localhost/ardour2/branches/3.0@9101 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-08 01:49:13 +00:00
Carl Hetherington
e64486acfa Clamp output of y_to_note so that it doesn't return out-of-range values. Should fix #3823. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9096 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-07 17:17:11 +00:00
Carl Hetherington
ffebe2c3fe Slight fix to comment. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9065 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-04 03:58:17 +00:00
Carl Hetherington
7b15526750 Hack round a maybe delightful (for some values of delightful) and certainly evil confluence of small bugs causing no MIDI notes on record (#3820). 
git-svn-id: svn://localhost/ardour2/branches/3.0@9064 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-04 03:55:14 +00:00
Paul Davis
477fca0de0 deframe audio regions as well as MIDI when entering internal edit mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@9057 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-03 18:32:06 +00:00
Paul Davis
2c72f58aa1 experiment with making MIDI region boxes vanish when in note/internal edit mode ... to be continued 
git-svn-id: svn://localhost/ardour2/branches/3.0@9054 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-03 14:51:02 +00:00
Carl Hetherington
73192bc1a7 Remove all use of nframes_t. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-03 22:26:29 +00:00
Paul Davis
bb797943dd add configurable colors to stereo panner, plus keybindings for zero width (0), 1 (alt-up) or -1 (alt-down), plus M when its mono 
git-svn-id: svn://localhost/ardour2/branches/3.0@8153 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-02 15:51:42 +00:00
Carl Hetherington
a46af0460b Create a new layer if required on record to a track in stacked mode. Fixes #3391. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8026 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-14 15:01:53 +00:00
Carl Hetherington
ba0458cf1f Update recorded MIDI regions as notes arrive. Fixes one cause of infinite note-lengths during record. Fix various problems with multiple captures of MIDI during one pass. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7887 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-10-08 14:54:16 +00:00
Carl Hetherington
8222348761 Improve GUI display during MIDI record in various ways. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7875 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-10-05 00:27:26 +00:00
Paul Davis
90e73a3a6d (1) remove almost-never used block/unlock_property_changes() methods from PBD::Stateful (2) hide used and path columns from region list (3) detect mouse position within MIDI notes and thus allow move or trim from the same mouse mode (object or trim; first & last 1/4 of each note is for trimming 
git-svn-id: svn://localhost/ardour2/branches/3.0@7823 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-21 15:15:06 +00:00
Carl Hetherington
aa00dbc40e Fix MIDI streamview grid. Fixes #3460. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7806 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-19 15:50:22 +00:00
Paul Davis
10bdce85a0 megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t 
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 16:24:22 +00:00
Carl Hetherington
812e95da01 Allow drag when creating a MIDI region. Fixes #3363. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7657 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-20 12:01:13 +00:00
Paul Davis
2f9184d653 beat slicing patch #1 from lincoln spiteri 
git-svn-id: svn://localhost/ardour2/branches/3.0@7381 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-06 11:33:27 +00:00
Carl Hetherington
d680d2323c Fix crash due to uninitialised use of _note_lines. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7318 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-28 21:03:26 +00:00
Paul Davis
806a22fefe change note colors on the fly, to permit user-definition of colors more easily; remove some debug output 
git-svn-id: svn://localhost/ardour2/branches/3.0@7301 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-24 19:46:28 +00:00
Carl Hetherington
17bb05a7c0 Lincoln's patch from #3224 to colour midi stream view backgrounds properly. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7236 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-06 00:56:05 +00:00
Paul Davis
dab0dacc66 patch from lincoln to make MIDI track height changes no longer just grow note height, but instead expand the visible note range once notes hit a given height 
git-svn-id: svn://localhost/ardour2/branches/3.0@7222 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-03 16:02:49 +00:00
Paul Davis
ce78296f96 move computation of TimeAxisViewItem fixed heights into a static member function and call early in process life, because we need the values in MidiStreamview - fixes a bug with notes not aligning with note lines in a new session 
git-svn-id: svn://localhost/ardour2/branches/3.0@7220 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-03 15:57:31 +00:00
Paul Davis
b1d5a11194 lincoln's patch to make MIDI note lines go away at smaller track heights 
git-svn-id: svn://localhost/ardour2/branches/3.0@7194 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-29 12:16:13 +00:00
Carl Hetherington
88f13bbe33 Revert my rev. 7140 and fix it better. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7145 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-23 02:42:37 +00:00
Carl Hetherington
950ac6ef2b Don't try to load separate diskstreams in 3.0 session files. Fix a few uses of Diskstream outside Track. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6946 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-21 21:29:15 +00:00
Carl Hetherington
061a85191c Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-21 20:42:22 +00:00
Carl Hetherington
0cde999d87 Move toggle-waveforms-while-recording into RC options. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6935 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-19 01:40:42 +00:00
Paul Davis
14b0ca31bc handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-30 15:18:43 +00:00
Paul Davis
17088ee3ea (1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state from Region into Stateful, renamed "suspend property changes" (3) successive changes to a Property (scalar) after clear_history() do not keep resetting the old value (fixes region trim) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6720 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-02 18:05:26 +00:00
Paul Davis
ce7a5e1c9f the Properties & 64bit region commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-18 13:59:49 +00:00
Paul Davis
30dd55bccd use RegionCommand for same-track region drags 
git-svn-id: svn://localhost/ardour2/branches/3.0@6653 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-08 19:41:43 +00:00
Paul Davis
c83389b8ec cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-22 20:21:43 +00:00
Paul Davis
f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-21 18:23:07 +00:00
Paul Davis
aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters 
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-19 20:26:31 +00:00
Paul Davis
f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash 
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-17 18:24:23 +00:00
Paul Davis
64dc5427e4 make all use of bind/mem_fun be explicitly sigc:: 
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-11 23:29:48 +00:00
David Robillard
c83e48e07a Trim session.h include dependency tree. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5979 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-30 15:30:22 +00:00
David Robillard
01b761bbaa Remove Session dependency from BeatsFramesConverter. 
More constey TempoMap accessors.


git-svn-id: svn://localhost/ardour2/branches/3.0@5916 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-25 21:13:02 +00:00
David Robillard
86a09c58e3 Fix O(n) search on MIDI rec region update (now O(log(n)) per update, but could be O(1) with caching...) 
git-svn-id: svn://localhost/ardour2/branches/3.0@5843 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-21 16:39:39 +00:00