13
0
Commit Graph

328 Commits

Author SHA1 Message Date
Carl Hetherington
6304261b98 Re-work layering in possibly debatable ways. Sketchy docs in doc/layering.
git-svn-id: svn://localhost/ardour2/branches/3.0@11088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 01:42:49 +00:00
5d509146c8 followup to the previous tempo-dragging commit: use argument to Drag::aborted() to know if we moved; update the frame position of tempo map metrics when we remove a tempo mark (should fix visual glitches when dragging tempo)
git-svn-id: svn://localhost/ardour2/branches/3.0@11049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 14:21:05 +00:00
5cd27a4a85 similar to treatment of meter markers, remove tempo marks from the tempo map while dragging, to avoid wierd side effects
git-svn-id: svn://localhost/ardour2/branches/3.0@11047 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 02:53:33 +00:00
b6d1fb0707 fix meter marker drags by not using a fake marker till first move, and swapping the grabbed item to the copy when we do
git-svn-id: svn://localhost/ardour2/branches/3.0@10999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 19:43:41 +00:00
e0cf3b6354 more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 02:46:36 +00:00
Carl Hetherington
692f857b83 Yet another bug in previous commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@10974 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 14:07:24 +00:00
Carl Hetherington
b4d7120a58 Fix some bugs I introduced with the last commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@10973 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 13:42:18 +00:00
Carl Hetherington
ab4e7cf472 Move note creation code into a Drag; fix snapping of note
starts when drag-created (part of #4505).


git-svn-id: svn://localhost/ardour2/branches/3.0@10972 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 12:54:54 +00:00
Carl Hetherington
f817155f20 Fix somewhat unlikely crash on doing add note; start drag to resize note; undo; finish drag to resize note.
git-svn-id: svn://localhost/ardour2/branches/3.0@10880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-03 03:05:59 +00:00
Carl Hetherington
be951eca95 Remove code to zoom on up/down mouse movement when dragging
the playhead.


git-svn-id: svn://localhost/ardour2/branches/3.0@10786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 01:17:41 +00:00
Carl Hetherington
ec90b0ceb0 Use a Drag class for midi note selection, so that it
gets autoscroll (#4474).


git-svn-id: svn://localhost/ardour2/branches/3.0@10650 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 20:11:33 +00:00
Carl Hetherington
2603cfd530 Re-show region views that we hid when dragging things on
hidden tracks (fixes the rest of #3493).


git-svn-id: svn://localhost/ardour2/branches/3.0@10571 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 19:51:30 +00:00
Carl Hetherington
ab024c7601 Fix snap of note drags when the region position is not itself snapped to the grid (#4322).
git-svn-id: svn://localhost/ardour2/branches/3.0@10288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-22 23:18:54 +00:00
Carl Hetherington
b12c890b81 Fix check on dragging MIDI notes to a point before the region position.
git-svn-id: svn://localhost/ardour2/branches/3.0@10287 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-22 23:17:08 +00:00
Carl Hetherington
e549e8f82c Cope with drags of selections that include regions on hidden tracks (#3493).
git-svn-id: svn://localhost/ardour2/branches/3.0@10283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-22 18:11:40 +00:00
0bc8832e20 Trim include tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@10244 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 21:53:09 +00:00
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
f6951c92f0 attempt to fix deep confusion in GUI code about converting between musical and audio time (should have beneficial effects on #4257); change ghost note drawing when in MIDI note draw/add mode so that its start is aligned with the mouse cursor
git-svn-id: svn://localhost/ardour2/branches/3.0@9998 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-16 14:24:41 +00:00
dd55f88d30 when showing a note value during a drag, clamp first to the actual range. note that the canvas object can still be dragged out of the region (above/below) but fixing this requires some kind of fancy auto-scroll that i'm not up for implementing at this time
git-svn-id: svn://localhost/ardour2/branches/3.0@9983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-12 14:41:11 +00:00
Carl Hetherington
7e8e8b4e72 Tie note y to mouse pointer position when dragging MIDI
notes (#4051).


git-svn-id: svn://localhost/ardour2/branches/3.0@9886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 16:02:26 +00:00
Carl Hetherington
cd17e05e3a Fix some set-but-not-used variable warnings from gcc 4.6
git-svn-id: svn://localhost/ardour2/branches/3.0@9783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-02 17:16:46 +00:00
d5e09076ca much ado about nothing when it comes to gain control
git-svn-id: svn://localhost/ardour2/branches/3.0@9748 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-19 23:02:55 +00:00
dabe57a486 alter playhead drag threshold for vertical zoom again
git-svn-id: svn://localhost/ardour2/branches/3.0@9716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-12 22:10:13 +00:00
ca1a5ef876 increase threshold for drag-playhead-does-vertical-zoom
git-svn-id: svn://localhost/ardour2/branches/3.0@9713 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-12 22:05:34 +00:00
ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
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
Carl Hetherington
fb39b47861 Zoom session when the mouse pointer is moved up and down during a playhead drag.
git-svn-id: svn://localhost/ardour2/branches/3.0@9586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 16:38:49 +00:00
Carl Hetherington
71596b002e Fix corruption of follow playhead state on quit (#4048).
git-svn-id: svn://localhost/ardour2/branches/3.0@9542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 15:28:12 +00:00
Carl Hetherington
4b848856eb Fix undo of timestretch (#3905).
git-svn-id: svn://localhost/ardour2/branches/3.0@9527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 20:13:03 +00:00
Carl Hetherington
ac23288b5d Fix update of session range location on copy-dragging regions (#4038).
git-svn-id: svn://localhost/ardour2/branches/3.0@9504 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-12 21:29:27 +00:00
Carl Hetherington
4216d201fb Fix offset of verbose cursor when dragging fade-ins (#4010).
git-svn-id: svn://localhost/ardour2/branches/3.0@9473 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 14:56:24 +00:00
Carl Hetherington
55586be83a Prevent note drags from moving a note before the start of its region.
git-svn-id: svn://localhost/ardour2/branches/3.0@9463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-03 00:45:54 +00:00
Carl Hetherington
988348185e Separate verbose cursor out into its own class and clean up the API. Fixes #4010.
git-svn-id: svn://localhost/ardour2/branches/3.0@9455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-02 13:38:16 +00:00
Carl Hetherington
884de065bd When drawing MIDI regions with grid snap enabled, make the region extent 1 frame shy of the next grid boundary. In this way, a duplicate of the new region will land on a grid snap point.
git-svn-id: svn://localhost/ardour2/branches/3.0@9398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-20 23:50:31 +00:00
Carl Hetherington
58bd627666 Fix prevention of region drags before time 0 (#3947).
git-svn-id: svn://localhost/ardour2/branches/3.0@9318 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-06 23:12:45 +00:00
Carl Hetherington
278286125c Remove unnecessary (and wrong) check for movement, as the parent does it (fixes #3850).
git-svn-id: svn://localhost/ardour2/branches/3.0@9145 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-14 19:25:41 +00:00
Carl Hetherington
82cb7c3280 Check movement threshold using the raw grab frame rather than the snapped one, which I think is right.
git-svn-id: svn://localhost/ardour2/branches/3.0@9144 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-14 19:25:18 +00:00
Carl Hetherington
3409f591db Comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@9035 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 17:00:35 +00:00
Carl Hetherington
28d3dd69de Update session range on trimming regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@9004 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 16:23:31 +00:00
Carl Hetherington
954bc598b8 Make a shift modifier do vertical zoom in zoom mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@8897 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 22:36:01 +00:00
7a5b6a5031 patches from lincoln to speed up the regionlist and provide region removal (causes dangling shared ptrs to regions, fix to come
git-svn-id: svn://localhost/ardour2/branches/3.0@8845 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-14 21:49:43 +00:00
Carl Hetherington
d9c4625ff5 Don't catch up with the playhead after drags.
git-svn-id: svn://localhost/ardour2/branches/3.0@8767 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 11:46:11 +00:00
Carl Hetherington
6ceda14cf4 Fix warning.
git-svn-id: svn://localhost/ardour2/branches/3.0@8564 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-24 12:06:12 +00:00
Carl Hetherington
7af9c8ae78 Patch from Lincoln to fix uncommitted reversible command during rubberband selection (#3729).
git-svn-id: svn://localhost/ardour2/branches/3.0@8563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-23 23:13:46 +00:00
Carl Hetherington
1e8586742e Fix session range location by hooking into the undo system. Fixes #3654.
git-svn-id: svn://localhost/ardour2/branches/3.0@8539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 17:38:56 +00:00
Carl Hetherington
113e6b505a Fix memory leak.
git-svn-id: svn://localhost/ardour2/branches/3.0@8519 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-16 19:34:00 +00:00
Carl Hetherington
85acf35337 Disable follow-playhead during drags. Fixes #3647.
git-svn-id: svn://localhost/ardour2/branches/3.0@8444 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-05 02:28:28 +00:00
8cf32fddc5 remove line parent member from Marker, part 2
git-svn-id: svn://localhost/ardour2/branches/3.0@8360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 13:47:57 +00:00
e522ed1953 remove unnecessary line for marker drags (marker has its own)
git-svn-id: svn://localhost/ardour2/branches/3.0@8352 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-28 20:37:11 +00:00
Carl Hetherington
84b4dd94e3 Remove unnecessary _have_transaction flag in TrimDrag. Fix undo when a trim of one region affects the previous or next regions too (#3632).
git-svn-id: svn://localhost/ardour2/branches/3.0@8348 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-28 19:17:37 +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
Carl Hetherington
818f2cffd7 Add menu option to insert program changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@8330 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-22 23:45:04 +00:00
Carl Hetherington
95bb346926 Refactor so that all the locate-related stuff in CursorDrag is in one method. Also, wait for timecode transmission to be suspended before sending MMC/MTC locates, rather than hoping it will be suspended in time.
git-svn-id: svn://localhost/ardour2/branches/3.0@8329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-22 23:43:04 +00:00
Carl Hetherington
d83219706f Update transport clocks on initial grab of the playhead cursor.
git-svn-id: svn://localhost/ardour2/branches/3.0@8328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-22 23:27:42 +00:00
Carl Hetherington
039adb4c6b Account for the fact that CursorDrag only ever drags the playhead. Fix playhead misbehaviour when you start a drag from outside it.
git-svn-id: svn://localhost/ardour2/branches/3.0@8327 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-22 23:16:39 +00:00
Carl Hetherington
37b680cd15 Fix region resizing with grid snapping enabled (#3620).
git-svn-id: svn://localhost/ardour2/branches/3.0@8325 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-22 01:06:18 +00:00
Carl Hetherington
570ed69d2a Allow dragging of program change flags in MIDI regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@8303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-20 03:42:59 +00:00
df5e700f90 fix some more incorrect casts to CanvasNote rather than CanvasNoteEvent (fixes crashes when a track is in perc mode
git-svn-id: svn://localhost/ardour2/branches/3.0@8273 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-14 20:01:18 +00:00
4b861e6039 Rename libmusictime libtimecode (consistent with already used namespace "Timecode").
Move BBT_Time to libtimecode.


git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-14 18:13:37 +00:00
Carl Hetherington
5c23faaa0d Allow trim of midi regions to before the start of the source (better, this time). Fixes #3156.
git-svn-id: svn://localhost/ardour2/branches/3.0@8229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-09 21:34:46 +00:00
Carl Hetherington
56554af08f Revert previous ill-thought-out patch.
git-svn-id: svn://localhost/ardour2/branches/3.0@8213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-07 19:55:43 +00:00
Carl Hetherington
f3fc6195bc Allow trim of midi regions to before the start of the source. Fixes #3156.
git-svn-id: svn://localhost/ardour2/branches/3.0@8212 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-07 19:16:23 +00:00
Carl Hetherington
6df5d5d87a Tweak some naming slightly.
git-svn-id: svn://localhost/ardour2/branches/3.0@8210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-07 17:16:59 +00:00
8b68ed57ec Fix some messed up code (spacey tabs).
(There is faar more of this... FIX YOUR EDITORS!)


git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 20:37:39 +00:00
Carl Hetherington
e131fd391d Put MIDI notes into their own canvas group, and reparent this group during start trims to stop the notes moving. Improves the visual display on start trim of a MIDI region.
git-svn-id: svn://localhost/ardour2/branches/3.0@8080 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-24 01:04:53 +00:00
Carl Hetherington
8fc660e76e Move mouse cursor stuff out of Editor into its own class.
git-svn-id: svn://localhost/ardour2/branches/3.0@8048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-16 14:53:16 +00:00
Carl Hetherington
56910429f7 Remove erroneous check.
git-svn-id: svn://localhost/ardour2/branches/3.0@8020 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 22:38:28 +00:00
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
Carl Hetherington
e6016c009c Fix build.
git-svn-id: svn://localhost/ardour2/branches/3.0@8016 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-12 23:16:59 +00:00
Carl Hetherington
fcfbd65268 Further fixes for #3529. Show marker lines the same colour as their marker; adjust height of lines.
git-svn-id: svn://localhost/ardour2/branches/3.0@8009 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-11 13:36:38 +00:00
Carl Hetherington
d29f14bf33 Fix trim of multiple regions. Fixes #3528.
git-svn-id: svn://localhost/ardour2/branches/3.0@7982 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-09 01:58:42 +00:00
Carl Hetherington
c246926e41 Move some methods out of Editor into RegionView.
git-svn-id: svn://localhost/ardour2/branches/3.0@7981 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-09 01:58:12 +00:00
aad157337c correct version of: port cairo ARGB/BGRA -> pixbuf RGBA patch from recent 2.X commit (restores text on canvas), in which i move some functions around, rename stuff and add comments
git-svn-id: svn://localhost/ardour2/branches/3.0@7846 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-26 13:33:39 +00:00
ded4a143db much craziness with canvas cursors; fix 0 beat cursor text when shortening notes; fix crash when trimming locked regions; don't show trim cursors when region is locked; partial version of enumwriter validation fix from 2.X (less necessary with 3.0; probably more ...
git-svn-id: svn://localhost/ardour2/branches/3.0@7831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-22 15:21:06 +00:00
Carl Hetherington
dbd1e1f7b8 Don't update region list during region trim. Fixes #3467.
git-svn-id: svn://localhost/ardour2/branches/3.0@7825 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-21 23:23:07 +00:00
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
3aa1f21475 Updating zoom mouse cursor on modifier press. Fixes #274.
git-svn-id: svn://localhost/ardour2/branches/3.0@7820 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-21 14:22:13 +00:00
5462d30076 restore a moved placement of the assert taken out in the previous commit
git-svn-id: svn://localhost/ardour2/branches/3.0@7818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-21 03:09:02 +00:00
2c80ff4129 lincoln's patch that makes us pay attention to region copies w.r.t the region list, PLUS make region list insert drags work again by not insisting that the list of regionviews be non-empty as the drag is constructed PLUS the start of tracking mouse cursor position in MIDI notes PLUS a bit of leftover debugging info
git-svn-id: svn://localhost/ardour2/branches/3.0@7817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-21 03:02:30 +00:00
Carl Hetherington
74d72b83a7 Disable region drags in internal edit mode. Fixes #3456.
git-svn-id: svn://localhost/ardour2/branches/3.0@7800 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-18 20:22:03 +00:00
d05a3f7305 copy edit comment
git-svn-id: svn://localhost/ardour2/branches/3.0@7797 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 23:43:23 +00:00
0ed7a99dd5 fix reversed direction of MIDI note drag preview
git-svn-id: svn://localhost/ardour2/branches/3.0@7796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 23:27:49 +00:00
9a8cd09b19 fix errors in midi note drag preview (#3446)
git-svn-id: svn://localhost/ardour2/branches/3.0@7793 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 20:32:18 +00:00
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
7eea9fac9d cleaner version of previous commit
git-svn-id: svn://localhost/ardour2/branches/3.0@7783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-15 16:54:17 +00:00
5f948f6961 (optionally) play note(s) as they are moved around on the pitch axis (finishes #3446)
git-svn-id: svn://localhost/ardour2/branches/3.0@7782 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-15 16:16:37 +00:00
bc8aeb0425 restore "add MIDI region on click in MIDI track" functionality
git-svn-id: svn://localhost/ardour2/branches/3.0@7768 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-13 19:46:28 +00:00
Carl Hetherington
86244875a4 Allow drags of automation in time ranges where the automation is on a MIDI track and may span different regions. Fixes #3366.
git-svn-id: svn://localhost/ardour2/branches/3.0@7765 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-09 21:35:28 +00:00
Carl Hetherington
7decc96544 Add some debugging code for mouse drags.
git-svn-id: svn://localhost/ardour2/branches/3.0@7763 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-09 21:34:45 +00:00
Carl Hetherington
57b362cf99 nframes64_t -> frame{pos,cnt}_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7759 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-09 01:38:21 +00:00
Carl Hetherington
613fe6353a Fix confusion with _pointer_frame_offset and snapping; makes e.g. playhead drag with grid snap to region bounds work.
git-svn-id: svn://localhost/ardour2/branches/3.0@7758 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-09 01:38:12 +00:00
Carl Hetherington
18b99c1f44 Lincoln's patch to tidy up region fade visuals. Fixes #3437.
git-svn-id: svn://localhost/ardour2/branches/3.0@7748 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-07 11:41:16 +00:00
Carl Hetherington
ea2648503b Cleanup of region drag code to be a bit more efficient and shorter. Fixes crashes when dragging regions to the wrong track type.
git-svn-id: svn://localhost/ardour2/branches/3.0@7744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-06 12:34:11 +00:00
1526735d79 some (unfinished) work on incorporating Ben's rev 6919 changes regarding track selection; make newly selected tracks show the current range selection; fix crashes related to meter display; remove "all" group from main group tab display and just put it down in its own button (totally incomplete); minor cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@7696 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-26 23:25:44 +00:00
Carl Hetherington
c243a02c99 Fix crossfade undo using the stateful diff system. Fixes #3257.
git-svn-id: svn://localhost/ardour2/branches/3.0@7694 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-26 01:44:11 +00:00
Carl Hetherington
f30402d073 clear_history -> clear_changes and some comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@7685 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 17:32:08 +00:00
Carl Hetherington
3825e3d51c Snap to grid when drawing MIDI regions. Fixes #3412.
git-svn-id: svn://localhost/ardour2/branches/3.0@7679 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 12:23:52 +00:00
Carl Hetherington
211b57b303 Tidy up region drag move code a bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@7672 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-24 01:02:40 +00:00
71a4796dc3 forward port of 7539 from 2.x
git-svn-id: svn://localhost/ardour2/branches/3.0@7667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-22 16:28:26 +00:00
Carl Hetherington
822ee79d84 Limit region-based automation to the edges of regions. Fixes #3201.
git-svn-id: svn://localhost/ardour2/branches/3.0@7662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-20 22:43:10 +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
Carl Hetherington
70597dbc0e Fix drag from region list onto track.
git-svn-id: svn://localhost/ardour2/branches/3.0@7656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-19 23:56:30 +00:00
Carl Hetherington
611c33e680 Snap to note start rather than mouse pointer when dragging MIDI notes. Fixes #3187.
git-svn-id: svn://localhost/ardour2/branches/3.0@7654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-19 22:01:10 +00:00
Carl Hetherington
a958dd0512 Set cursor to hint that you can drag automation up and down in object/range link mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@7651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-18 18:06:31 +00:00
Carl Hetherington
30bc7d4607 Fix bug whereby region could not be dragged to the start of the session.
git-svn-id: svn://localhost/ardour2/branches/3.0@7618 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-13 16:50:01 +00:00
Carl Hetherington
48063c15df Improve ctrl-click behaviour of automation points. Should fix #3385.
git-svn-id: svn://localhost/ardour2/branches/3.0@7584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-10 01:52:49 +00:00
Carl Hetherington
5b520324ce Allow markers to be glued to bar/beat time. Fixes #1815.
git-svn-id: svn://localhost/ardour2/branches/3.0@7573 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-09 16:40:31 +00:00
Carl Hetherington
aa9fd33349 Update note name correctly during drag. Fixes #3382.
git-svn-id: svn://localhost/ardour2/branches/3.0@7572 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-09 14:49:03 +00:00
Carl Hetherington
c06c6c153d Fix up selection of automation points.
git-svn-id: svn://localhost/ardour2/branches/3.0@7556 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-06 23:28:44 +00:00
Carl Hetherington
e7a2b99f3d Clean up handling of track vs region automation a bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@7544 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-05 13:35:43 +00:00
Carl Hetherington
cc6016400b Allow rubberband selection of MIDI automation points. Fixes
git-svn-id: svn://localhost/ardour2/branches/3.0@7535 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-04 15:41:55 +00:00
Carl Hetherington
8b0354f910 Suspend transport timecode transmission during playhead drag. Should fix #3324.
git-svn-id: svn://localhost/ardour2/branches/3.0@7528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-02 01:59:34 +00:00
Carl Hetherington
3549189f87 Send MTC/MMC on the initial playhead grab as well as on subsequent movement.
git-svn-id: svn://localhost/ardour2/branches/3.0@7393 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 01:26:33 +00:00
Carl Hetherington
10ef65b696 Transmit MTC on playhead drag, as per #3239.
git-svn-id: svn://localhost/ardour2/branches/3.0@7389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-07 23:48:46 +00:00
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
c36132271b Do MMC on playhead drag more efficiently by not doing an actual locate.
git-svn-id: svn://localhost/ardour2/branches/3.0@7370 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:13:36 +00:00
Carl Hetherington
cf5c707553 Locate during playhead drag, the primary motive being to get MMC to be sent during the drag, fixing #3239.
git-svn-id: svn://localhost/ardour2/branches/3.0@7365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-04 22:48:58 +00:00
Carl Hetherington
7898aabcaa Fix vertical canvas autoscroll when dragging track heights. Fixes #3240.
git-svn-id: svn://localhost/ardour2/branches/3.0@7327 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 19:08:19 +00:00
Carl Hetherington
bf7023bc7f Disable midi model updates during trim drags. Speeds the drags up at the cost of not updating notes in real-time. Fixes #3162.
git-svn-id: svn://localhost/ardour2/branches/3.0@7315 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 18:43:40 +00:00
3a048e1d6c new fade in/fade out colors from chrisg
git-svn-id: svn://localhost/ardour2/branches/3.0@7272 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 22:20:37 +00:00
1ee298a235 new fade in/out handle cursors from chrisg (maybe to be improved); show MIDI note velocities; try to show note length while dragging notes (in progress); some debugging output
git-svn-id: svn://localhost/ardour2/branches/3.0@7271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 22:09:07 +00:00
fe85a922ec new trim cursors from chrisg, fix up hotspots for said cursors, make Editor cursors public; note draw mode now trims existing notes (but without trim cursor :(
git-svn-id: svn://localhost/ardour2/branches/3.0@7270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 15:06:30 +00:00
7e3ebe1267 add left/right side trim cursors and use them for region trimming, as appropriate
git-svn-id: svn://localhost/ardour2/branches/3.0@7268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 12:45:51 +00:00
1e728e728a basically, fix all kinds of odds and ends with MIDI playback, including missed notes and applying gain
git-svn-id: svn://localhost/ardour2/branches/3.0@7247 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 13:00:54 +00:00
Carl Hetherington
8f263c239a Clean up a bit. Fix non-relative note dragging mode to fit my understanding of its correct behaviour. Fixes #3189.
git-svn-id: svn://localhost/ardour2/branches/3.0@7246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 23:45:58 +00:00
db1fa42f14 start tracking note overlaps while moving notes
git-svn-id: svn://localhost/ardour2/branches/3.0@7228 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 21:27:36 +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
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
a196405da9 various minor MIDI fixes: prevent duplicate note entry with mouse, show note info more often with verbose cursor, fix some crashes from click+move on notes ... lots more where this comes from
git-svn-id: svn://localhost/ardour2/branches/3.0@7128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 22:38:12 +00:00
Carl Hetherington
792e3de1d4 Create the session range location as and when the session first gets some content. Allows both the beginning and end of the range to expand to contain the actual session contents.
git-svn-id: svn://localhost/ardour2/branches/3.0@7087 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 20:48:21 +00:00
Carl Hetherington
acfc44f388 Remove some hang-overs of the old horizontal scrollbar. Hence allow most things to happen beyond the session end marker.
git-svn-id: svn://localhost/ardour2/branches/3.0@7086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 01:33:11 +00:00
Carl Hetherington
8c423ea228 Small cleanups to dragging code. Fix assertion failure on dragging a regions' parent entry from the region list to the canvas (which may be #2811). Fixes to drags of regions onto and then back off canvas; should fix #3109.
git-svn-id: svn://localhost/ardour2/branches/3.0@7068 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 22:09:07 +00:00
Carl Hetherington
056ceba16a Fix SNAFU on region trimming with grid enabled caused by my recent supposed fix.
git-svn-id: svn://localhost/ardour2/branches/3.0@7055 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 01:54:16 +00:00
Carl Hetherington
13003cd9d9 Remove unnecessary snap in Editor::single_*_trim, as the passed-in delta is already snapped. Should fix #1279.
git-svn-id: svn://localhost/ardour2/branches/3.0@7036 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-01 23:36:15 +00:00
Carl Hetherington
f0db054a07 Don't report an error when the user cancels a time stretch operation.
git-svn-id: svn://localhost/ardour2/branches/3.0@7008 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 23:34:22 +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
895bad1dcd Make the session start/end location a single location (with start and end) rather than two separate ones. Fixes #1298.
git-svn-id: svn://localhost/ardour2/branches/3.0@6929 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 21:29:48 +00:00
Carl Hetherington
8e22163b6f Keep track of where a RegionView used to be before it was reparented for a drag. Fixes wayward drag-moves in stacked region mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@6867 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 00:17:54 +00:00
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
fba09a3d19 fix (or mostly fix) ctrl-drag (copy drag) for regions
git-svn-id: svn://localhost/ardour2/branches/3.0@6723 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-02 21:34:06 +00:00
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
db8b575c30 the mega-properties/SequenceProperty patch. split is broken at present (right hand starts has start-in-source of zero)
git-svn-id: svn://localhost/ardour2/branches/3.0@6718 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-02 00:00:00 +00:00
0c20d48e7d finish getting rid of RegionCommand
git-svn-id: svn://localhost/ardour2/branches/3.0@6709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-22 18:03:34 +00:00
a1e0dc13df tweak Stateful/StatefulDiffCommand changes so that SessionObject's actually get a name; make StatefulDiffCommand use a weak_ptr, not a raw ptr; use .val() rather than .get() to avoid confusion with boost:: smart ptr method of the same name
git-svn-id: svn://localhost/ardour2/branches/3.0@6678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-11 23:10:29 +00:00
Carl Hetherington
a78ad5441c Fix cross-track region drags.
git-svn-id: svn://localhost/ardour2/branches/3.0@6667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 22:27:30 +00:00
Carl Hetherington
a5c59175eb Modify Stateful to allow undo to be done using differences in state.
git-svn-id: svn://localhost/ardour2/branches/3.0@6664 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 14:44:01 +00:00
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
Carl Hetherington
3ae1bd3723 Remove my attempts to autoscroll based on dragged region edges (rather than just pointer position); too many corner cases and not really worth the bother.
git-svn-id: svn://localhost/ardour2/branches/3.0@6645 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 03:23:20 +00:00
832aa18a81 a boatload of minor and middle-sized changes to try to speed up undo. imperfect, unfinished, but probably right to commit now
git-svn-id: svn://localhost/ardour2/branches/3.0@6561 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-25 20:34:09 +00:00
Carl Hetherington
c22c3fc31e Hopefully further improve the autoscroll on trim drag.
git-svn-id: svn://localhost/ardour2/branches/3.0@6500 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 23:19:46 +00:00