ardour/livetrax
13
0
Fork 0
Code
9,068 Commits 1 Branch 1 Tag 157 MiB
40d8d1d985
Commit Graph

277 Commits

Author SHA1 Message Date
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
Paul Davis
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
David Robillard
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
David Robillard
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
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
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
Paul Davis
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
Paul Davis
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
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
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
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
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
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
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
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
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
Paul Davis
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
Paul Davis
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
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
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
Paul Davis
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
Carl Hetherington
e33d7a56b4 Stop surprising autoscroll when trimming regions; hopefully addresses #2993. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6498 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-15 22:47:56 +00:00
Carl Hetherington
11bd4eed89 Allow multiple simulataneous Drags to be active, and hence set up and drag time ranges when moving regions in PT-edit mode. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6478 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-12 16:14:49 +00:00
Carl Hetherington
642f41b82f Remove non-working attempt to make time selection changes undo-able. Cleanup use of _have_transaction. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6477 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-12 13:17:57 +00:00
Carl Hetherington
b691c32bc6 Tiny cleanup. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6476 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-12 02:12:15 +00:00
Carl Hetherington
c5b78e120a Remove unnecessary checks from Drag subclasses now that superclass does them.# 
git-svn-id: svn://localhost/ardour2/branches/3.0@6475 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-12 01:05:27 +00:00
Carl Hetherington
37dd777c9a Fix confusion about last_pointer_* variables under snap. 
Update verbose canvas cursor correctly when automation point drags are clamped.
Clamp multi-point automation drags horizontally.


git-svn-id: svn://localhost/ardour2/branches/3.0@6474 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-11 19:36:29 +00:00
Carl Hetherington
c115b3d71c Update verbose cursor correctly when y drags are clamped. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6469 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-08 19:55:37 +00:00
Carl Hetherington
b408ec00fa Fix a few more cases of aborting drags. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6468 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-08 01:53:50 +00:00
Carl Hetherington
1a1edc9ca1 Make a new action "escape", bound to the Escape key, and make it 
abort a drag (if one is in progress) or clear the selection.
Fix breaking of drags in a few cases; some still to do.


git-svn-id: svn://localhost/ardour2/branches/3.0@6467 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-08 01:28:15 +00:00
Carl Hetherington
285e4c648a Stop crossfades disappearing on region view drags. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6464 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-06 16:28:45 +00:00
Carl Hetherington
e2981526ea Fix some bugs in autoscroll when dragging regions. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6460 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-06 01:14:56 +00:00
Carl Hetherington
46534f2f59 Refix yesterday's patch; ignore motion events that haven't moved anywhere, and don't try to autoscroll vertically when dragging range markers. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6457 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-05 15:51:13 +00:00
Carl Hetherington
14e32ba075 Fix various confusions about move threshold when snapping. Fixes non-appearing range rectangles when defining ranges with snap enabled. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6449 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-05 01:10:53 +00:00
Carl Hetherington
c88716665a Fix confusion between model and view points when dragging ranges. Clamp both top and bottom when dragging vertically. Fix some wacky formatting. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6436 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-02 02:10:49 +00:00
Carl Hetherington
85d0894475 Don't allow drag of automation range unless the mouse is inside the range. 
Add a fade in/out on automation range drags.
Allow trim of selected range even when in linked object mode.


git-svn-id: svn://localhost/ardour2/branches/3.0@6433 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-02 01:19:47 +00:00
Carl Hetherington
f5acf93672 First cut of some Pro-tools inspired editing features; linked play/play range 
and linked object/range modes.


git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-01 22:11:15 +00:00
Paul Davis
b6f4cdaea2 rationalize destruction pathway (some more); tidy-ify some ImageFrame code 
git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-25 21:06:52 +00:00
Carl Hetherington
ca602cf216 Refactor and clean up some confusion in dragging code. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6384 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-22 01:12:41 +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
Carl Hetherington
04c7158a41 Remove confusing track / group members in TimeSelection struct; time selection 
applies to the selected tracks.  Some tinkering with how tracks are selected
during time selections.


git-svn-id: svn://localhost/ardour2/branches/3.0@6360 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-13 21:27:19 +00:00
Carl Hetherington
034db5fb1c Apply Select property of route groups at the Selection object level. Accordingly 
simplify code related to selecting tracks.  Add a TrackViewList object rather than
"abusing" TrackSelection in lots of places.


git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-13 19:09:52 +00:00
Paul Davis
8687895abb remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime 
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-12 15:02:15 +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
Nick Mainsbridge
3367e41278 Remove unused pre_drag_region_selection, fix ugly regions when drag-copying (TimeAxisViewItem constructor), fix broken drag threshold, don't reset _grab_frame etc. when move threshold passed, fix region selection during region copy drag. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6348 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-11 12:13:59 +00:00
Nick Mainsbridge
b5ca5713fb Fix layering while dragging regions over higher ordered tracks, fix for drags that forget which region we dragged from, make selection after move/copy more useable. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6337 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-10 17:23:56 +00:00
Sampo Savolainen
b9876aa1d0 Eliminate double reversible commit from time stretch, and make the stretch operation lengthen / shorten the region as per operation. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6318 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-06 21:00:43 +00:00
Paul Davis
7703f0a76a move generic parts of Keyboard into gtkmm2ext. imperfectly done, but makes modifiers available in libgtkmm2ext now 
git-svn-id: svn://localhost/ardour2/branches/3.0@6288 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-04 22:51:32 +00:00
Paul Davis
ff9ddf5100 tidy up (a bit) locations editing widget ; use pixbuf/string code from 2.0;remove edit point clock 
git-svn-id: svn://localhost/ardour2/branches/3.0@6074 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-12 20:39:53 +00:00
Paul Davis
d7faaf7b02 fix 2 action group registrations, and reorder initialization 
git-svn-id: svn://localhost/ardour2/branches/3.0@6037 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-08 18:02:03 +00:00
Paul Davis
ff122d0fe8 monster commit: transport mgmt changes from 2.X (omnibus edition); make slave use nframes64_t ; avoid crashes in Drags when commiting reversible transactions that do not exist 
git-svn-id: svn://localhost/ardour2/branches/3.0@6034 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-08 16:28:21 +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
Carl Hetherington
dc95a690e0 Patch from oofus to fix mantis 1867. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5964 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-28 22:00:45 +00:00
Paul Davis
0cc0c13444 provide accessors to Editor::snap_{type,mode} ; when nudging notes, use grid in preference to nudge clock 
git-svn-id: svn://localhost/ardour2/branches/3.0@5934 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-26 23:43:04 +00:00
Carl Hetherington
1f2a518ee2 Clean up and simplify code to find marks before and after a position, and hence improve snap to markers so that both start and end positions of a range marker are taken into account. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5897 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-23 22:28:27 +00:00
David Robillard
abe1834724 Fix whitespace. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5862 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-22 18:55:39 +00:00
Carl Hetherington
960efd79a3 Fixes to pointer constraints when copying in lock edit mode; make them behave the same as when just dragging regions. Fixes some or all of mantis 2573. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5825 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-20 20:43:23 +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
aefcce1c99 ogg/flac support bits and pieces; fix up MIDI note dragging and front-edge trims; BROKEN IN PERCUSSIVE MODE FOR NOW 
git-svn-id: svn://localhost/ardour2/branches/3.0@5745 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-06 22:07:10 +00:00
Carl Hetherington
7b14a4230b Fix some warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5663 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-15 15:23:59 +00:00
Paul Davis
93bc6e5b58 fix note selection behaviour, hopefully ... perhaps 
git-svn-id: svn://localhost/ardour2/branches/3.0@5657 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-12 16:46:19 +00:00
Paul Davis
7b8adc78b6 more MIDI editing cleanups, mostly fixing subtleties. Will break loading the history file for older sessions with MIDI editing present - we warned you :) 
git-svn-id: svn://localhost/ardour2/branches/3.0@5651 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-10 20:41:08 +00:00
Paul Davis
5f319d0a08 re-use canvas note items when the model changes ; slightly more efficient (probably) and avoids invalidating references to said items in, for example, ResizeData in a copied region 
git-svn-id: svn://localhost/ardour2/branches/3.0@5650 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-09 16:46:18 +00:00
Paul Davis
5328a114c9 time line items now have 64 bit location + duration; start making note resize apply across regions 
git-svn-id: svn://localhost/ardour2/branches/3.0@5642 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-09 02:09:04 +00:00
Paul Davis
1bf79fa885 move note drag & note resize mouse handling up into the Drag/Editor infrastructure/level 
git-svn-id: svn://localhost/ardour2/branches/3.0@5641 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-08 21:45:44 +00:00
Paul Davis
b0b584c2a5 the basics of step editing, more details to follow 
git-svn-id: svn://localhost/ardour2/branches/3.0@5629 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-09-03 12:39:50 +00:00
Carl Hetherington
5cbfdb8bed Remove some unnecessary code. Preserve selection when regions are dragged to new tracks. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5602 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-28 23:50:42 +00:00
Carl Hetherington
28af0265b5 When a track is in "stacked" mode, allow regions to be moved to different layers by dragging 
and dropping.  In stacked mode, the relayering by "recently added / moved etc. is higher" setting
is ignored, and regions are put on the layer that they are dropped to, unless:

1. they are dropped so that they overlap another region on the same layer, in which case they
are put on the layer above that one.
2. they are dropped such that they could be put on a lower layer with no audible difference, in
which case they are put on the lower layer.



git-svn-id: svn://localhost/ardour2/branches/3.0@5590 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-26 00:06:21 +00:00
Carl Hetherington
bc18abeba9 Slightly modified patch from lincoln to fix mantis 1636. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5588 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-24 23:52:33 +00:00
Carl Hetherington
df71243d6c Alter snap modifier so that it turns the grid on when it's off as well as vice-versa. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5584 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-24 20:26:34 +00:00