13
0
Commit Graph

4931 Commits

Author SHA1 Message Date
db67064296 switch Evoral::Sequence debugging to use DEBUG_TRACE(); Sequence uses multiset<...,EarlierNoteComparator> for _write_notes, does FIFO note resolution for overlapping notes in SMF file; implement Sequence::overlaps() ... current use is uncertain; ARDOUR::coverage() uses 64bit framepos_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 19:47:15 +00:00
c51d6a1582 build fix
git-svn-id: svn://localhost/ardour2/branches/3.0@7198 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 15:55:30 +00:00
265e26c2db final use of "stop_signal.h" removed
git-svn-id: svn://localhost/ardour2/branches/3.0@7197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 15:49:38 +00:00
a01dc9b6f2 remove almost-unusued stop_signal.h and clean up the one (unused) place where it was present (VisualTimeAxis, not used in current ardour)
git-svn-id: svn://localhost/ardour2/branches/3.0@7196 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 14:21:43 +00:00
9b5f357490 make trimming in region name (colored) highlight work even in internal edit mode; change enter/leave handler to return true by default (MIGHT HAVE UNINTENDED EFFECTS on mouse response), thus avoiding multiple stacked canvas items fighting over enter/leave
git-svn-id: svn://localhost/ardour2/branches/3.0@7195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-30 20:13:29 +00:00
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
890afb2128 create new MIDI regions on streamitem click in "note draw" mode as well as object mode
git-svn-id: svn://localhost/ardour2/branches/3.0@7193 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-29 11:28:27 +00:00
a04b1fee6a heavy-handed and crude way to stop WM-stolen-alt keys from causing MidiRegionView from losing track of SelectTouchDraggingMode (may not be optimal or in the right place, but it works for now); add primary-click-on-MRV-blank-space and tertiary-click-on-MRV-blank-space to select all notes above or below the click, using recently committed methods for Sequence
git-svn-id: svn://localhost/ardour2/branches/3.0@7192 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 21:39:12 +00:00
60ec5dd339 provide a generalized Sequence::get_notes()-by-predicate method, and prototypes for 2 future methods
git-svn-id: svn://localhost/ardour2/branches/3.0@7191 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 21:36:38 +00:00
8932625869 change color of note velocity text (and don't set it or justification repeatedly); make pianoroll button2 clicks select correctly rather than always being additive; hide note velocity text as soon as the mouse moves. the color change will require remvoing ~/.config/ardour2/ardour3_ui.conf to become effective
git-svn-id: svn://localhost/ardour2/branches/3.0@7187 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 17:39:28 +00:00
3e966771d0 clean up item event handling in MidiRegionViews by removing unnecessary InteractiveItem inheritance, and keep child->parent event handling order consistent as much as possible
git-svn-id: svn://localhost/ardour2/branches/3.0@7186 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 16:37:04 +00:00
3d6493abc9 replaced gtk_idle_add() with g_idle_add()
git-svn-id: svn://localhost/ardour2/branches/3.0@7185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 16:33:18 +00:00
fdf0db02a0 replace use of gdk_pixmap_unref() with g_object_unref
git-svn-id: svn://localhost/ardour2/branches/3.0@7184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 15:20:39 +00:00
Carl Hetherington
36538ed3df Take route's processor lock for things called by the process thread. Prevents problems when processors are being reconfigured and a process callback occurs.
git-svn-id: svn://localhost/ardour2/branches/3.0@7183 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 17:10:08 +00:00
8689ae88f7 refactor MidiRegionView event handling to avoid too much spaghetti as we move along
git-svn-id: svn://localhost/ardour2/branches/3.0@7182 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 15:07:15 +00:00
d15082d828 remove commented debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@7181 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 15:06:39 +00:00
Carl Hetherington
d0d160e566 Fix crash on clear option for automation tracks (#3195). Also fix state change signalling so that lines reappear on undoing a clear.
git-svn-id: svn://localhost/ardour2/branches/3.0@7178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 12:26:00 +00:00
Carl Hetherington
5a58f4381b Fix crash on export selection range.
git-svn-id: svn://localhost/ardour2/branches/3.0@7177 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 02:20:22 +00:00
Carl Hetherington
dc13054674 Always show region properties menu item, and offer the list editor even outside of internal edit mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@7176 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:32:01 +00:00
Carl Hetherington
e2b48e90df Fix hang on closing the editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@7175 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:31:49 +00:00
Carl Hetherington
494f53059e Fix show existing automation for audio tracks (part of #3193)
git-svn-id: svn://localhost/ardour2/branches/3.0@7174 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:08:53 +00:00
Carl Hetherington
40d280d7b2 Allow the region gain automation tool to create standard automation events. Fixes #3192.
git-svn-id: svn://localhost/ardour2/branches/3.0@7173 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:08:37 +00:00
Carl Hetherington
d47161b9ee Use bbt_add and bbt_subtract to do proper BBT maths in round_to_beat_subdivision.
git-svn-id: svn://localhost/ardour2/branches/3.0@7172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 00:26:32 +00:00
Carl Hetherington
933388e7dc On resizing an unselected MIDI note, make it the only one to be resized during that drag. Fixes #3188.
git-svn-id: svn://localhost/ardour2/branches/3.0@7171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 23:17:10 +00:00
Carl Hetherington
6fbaa5403b Restore Fader and Pan options to audio track automation menus. Hide the Amp processor from the plugin list. Fixes #3184.
git-svn-id: svn://localhost/ardour2/branches/3.0@7170 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 23:16:53 +00:00
Carl Hetherington
61a4655551 Disable ghost note on note creation drag.
git-svn-id: svn://localhost/ardour2/branches/3.0@7168 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 19:08:49 +00:00
Carl Hetherington
102f64f94c Remove empty MIDI regions which result from recordings made when no MIDI data is received.
git-svn-id: svn://localhost/ardour2/branches/3.0@7167 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 16:03:47 +00:00
b91e1f3605 generate knob pixbufs at run time but draw from the pixbufs; remove mfimg utility and existing knob icon png files
git-svn-id: svn://localhost/ardour2/branches/3.0@7166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 15:18:04 +00:00
Carl Hetherington
696837ec7a Show the verbose canvas cursor with the ghost note.
git-svn-id: svn://localhost/ardour2/branches/3.0@7165 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 11:54:49 +00:00
Carl Hetherington
7b8f584167 Remove some unused methods.
git-svn-id: svn://localhost/ardour2/branches/3.0@7164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 11:54:25 +00:00
Carl Hetherington
c8376522b1 Fix disappearing plugin menu (#3182)
git-svn-id: svn://localhost/ardour2/branches/3.0@7163 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 23:39:44 +00:00
Carl Hetherington
f7bff95fbc Rudimentary ghost note when adding MIDI notes to a region, as per #3180.
git-svn-id: svn://localhost/ardour2/branches/3.0@7162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 23:14:41 +00:00
6b19aee3b5 split out sndfile manager code into its own file; move a couple of utility functions into gtkmm2ext ; add knob PNG generating tool ; break appearance of monitor section for now
git-svn-id: svn://localhost/ardour2/branches/3.0@7160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 16:45:21 +00:00
Carl Hetherington
2881a495ef Make discrete mode work for MIDI automation views. Fixes #3178.
git-svn-id: svn://localhost/ardour2/branches/3.0@7159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 16:40:35 +00:00
Carl Hetherington
a57b9cdd99 Allow region-based automation axes to report whether they
have automation data or not.  Should fix #3177.


git-svn-id: svn://localhost/ardour2/branches/3.0@7158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 15:51:32 +00:00
Carl Hetherington
ef94fbf11c Remove some dead code. Clean up storage of automation axis menu
items.  Fixes #3174.


git-svn-id: svn://localhost/ardour2/branches/3.0@7157 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 14:50:45 +00:00
d95d6ca719 remove forward decl of non-existent ARDOUR::Menu
git-svn-id: svn://localhost/ardour2/branches/3.0@7156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 12:49:30 +00:00
Carl Hetherington
ee61c5c9ea Implement shift-right-click to delete MIDI note (#3170)
git-svn-id: svn://localhost/ardour2/branches/3.0@7155 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 01:39:45 +00:00
97721226a4 stop range mode stuff from showing up when in internal edit mode
git-svn-id: svn://localhost/ardour2/branches/3.0@7154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 01:13:45 +00:00
Carl Hetherington
7b82cb754e Fix bug in a previous commit of mine; AutomationStreamViews create their own canvas background *and* display groups. Should fix #3173.
git-svn-id: svn://localhost/ardour2/branches/3.0@7153 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 01:03:07 +00:00
Carl Hetherington
e3b0cb086d Clean up snap-to code in various places. Fix a couple of typos. Should fix #3165 and #3172.
git-svn-id: svn://localhost/ardour2/branches/3.0@7152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 00:35:53 +00:00
Carl Hetherington
bd2cbe9e76 Ensure a create note drag rectangle starts with both ends snapped,
otherwise it is possible to drag a note with a size large enough to
be considered valid and smaller than half the grid distance.  These
get snapped to zero length and thus appear infinitely long in the view.
A second try at fixing #3159.


git-svn-id: svn://localhost/ardour2/branches/3.0@7151 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 00:00:11 +00:00
Carl Hetherington
943edf1b5d Use debug macros for SMFSource.
git-svn-id: svn://localhost/ardour2/branches/3.0@7150 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 22:39:36 +00:00
Carl Hetherington
32d2e2eaac Preserve source's model on clone() if it is not rebuilt. Should fix #3155.
git-svn-id: svn://localhost/ardour2/branches/3.0@7149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 21:45:50 +00:00
Carl Hetherington
dd134d8afb Note the time of the last event that was read by read_unlocked, so that the current time can be reset on a subsequent call.
git-svn-id: svn://localhost/ardour2/branches/3.0@7148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 15:42:27 +00:00
Carl Hetherington
a4664d68c0 Prevent note creation drags with no movement of the pointer. May fix #3159.
git-svn-id: svn://localhost/ardour2/branches/3.0@7146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 14:45:10 +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
5779060c7f Possibly fix non-appearing MIDI controls (#3143)
git-svn-id: svn://localhost/ardour2/branches/3.0@7144 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 02:41:08 +00:00
Carl Hetherington
1d0abbdcd9 Fix behaviour of route group list's visible checkbutton.
git-svn-id: svn://localhost/ardour2/branches/3.0@7143 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 01:51:17 +00:00
Carl Hetherington
ec4cb52685 Make track Hide option work again.
git-svn-id: svn://localhost/ardour2/branches/3.0@7142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 01:50:59 +00:00