ardour/livetrax
13
0
Fork 0
Code
10,245 Commits 1 Branch 1 Tag 145 MiB
d54a35a671
Commit Graph

339 Commits

Author SHA1 Message Date
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Robin Gareus
0c3e840700 videotimline 
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
 2013-03-13 20:28:15 +01:00
Paul Davis
1e30104c47 prevent smart mode from interfering with internal edit mode (note selection, etc) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13992 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-24 21:56:03 +00:00
David Robillard
d6d7fd8ba3 Fix MIDI region create drag for the eleventy billionth time. 
Also make it work for pencil.

This is the canonical Ardour MIDI noob "I can't even create notes, this crap is
impossible to use or doesn't work at all" use case:

1) Create MIDI track
2) Click in that track, with object or pencil tool
3) ** A region is created ** - aha!
4) Click in that region, notes are created

Breaking step 3 ruins everything.  Please don't.


git-svn-id: svn://localhost/ardour2/branches/3.0@13932 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-20 19:16:58 +00:00
Paul Davis
54ce76e8fd remove "edit" property from track/bus groups; use "select" property which should force region selection to propagate, and then rely on "edit-applies-to-selection" 
git-svn-id: svn://localhost/ardour2/branches/3.0@13734 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-26 17:50:29 +00:00
Paul Davis
4471f53643 prevent cursor from changing when in smart+internal object mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@13704 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-21 21:39:36 +00:00
Paul Davis
42b59bb992 no region trimming on the region itself when in range mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@13685 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-19 18:48:29 +00:00
Paul Davis
40e9dae606 various fixes for "advanced" operations on range selections. ctrl-drags now add a new range selection, allowing discontiguous selections as in ardour2, shift-click extends an existing range selection to the clicked position, alt-drag on a range selection moves it, and to do a so-called "separation drag" now use ctrl-alt-drag (or ctrl-alt-click) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13660 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-13 19:39:36 +00:00
Ben Loftis
2292e33ee4 crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion 
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-13 16:42:05 +00:00
Paul Davis
159b8face7 allow button release events to be processed for region selection ops 
git-svn-id: svn://localhost/ardour2/branches/3.0@13591 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-02 20:56:33 +00:00
Ben Loftis
e63da83c53 tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. 
git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-26 22:43:10 +00:00
Ben Loftis
beb3ec2d7a Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly 
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-20 19:43:43 +00:00
Paul Davis
2409f9ee5b reset default transport speed when leaving audition mouse mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@13088 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-26 15:40:46 +00:00
Paul Davis
9a3d9dcb3c outline fade in/out handles in black (#3828) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13014 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-10 17:19:17 +00:00
Carl Hetherington
a766fe1fd9 Somewhat primitive implementation of allowing the edit note dialog to handle multiple notes (#4096). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12623 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-09 01:51:34 +00:00
Carl Hetherington
0ac73d8513 Extend a previous region if we click in a MIDI automation lane where there is no region (#4155). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12622 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-09 00:36:21 +00:00
Paul Davis
ba418958bf patch from dave flick to tackle a variety of cursor issues 
git-svn-id: svn://localhost/ardour2/branches/3.0@12481 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 20:29:47 +00:00
Paul Davis
9d40a072a4 arguably cleaner tweak to previous commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12479 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 18:38:54 +00:00
Paul Davis
f1505b631d substantive change to try to provide some rationality for region gain line visibility (and automation line visibility in general 
git-svn-id: svn://localhost/ardour2/branches/3.0@12478 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 18:30:10 +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
8d5065bc32 remove, convert, comment several cerr statements 
git-svn-id: svn://localhost/ardour2/branches/3.0@12378 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-22 12:57:05 +00:00
Paul Davis
a98fa4bc61 switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate 
git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-11 21:30:36 +00:00
Paul Davis
c6d983bda5 incorrect but visible context menu for xfades 
git-svn-id: svn://localhost/ardour2/branches/3.0@12243 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 19:14:11 +00:00
Paul Davis
e3a9576aed basic xfade dragging 
git-svn-id: svn://localhost/ardour2/branches/3.0@12236 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 00:46:22 +00:00
Paul Davis
25655e1a6d skeleton for crossfade edge dragging 
git-svn-id: svn://localhost/ardour2/branches/3.0@12235 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-09 23:04:18 +00:00
Paul Davis
7bc425fd0d framework for handling events on the xfade rects 
git-svn-id: svn://localhost/ardour2/branches/3.0@12213 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-08 17:13:59 +00:00
Carl Hetherington
b5a9d37cb0 Fix toggle selection for control points. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12057 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-22 23:14:27 +00:00
Carl Hetherington
3b5f017eb9 Add missing break; (#4820). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11810 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-07 01:57:11 +00:00
Carl Hetherington
3120bae8b4 Don't leave internal edit mode when clicking on an automation region view (#4747). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11749 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-22 16:41:23 +00:00
Carl Hetherington
e9bf20021e Remove unused RegionGainDrag; fix logic in adding new 
region gain points; remove unreached switch {} that may
have come from a mis-merge.


git-svn-id: svn://localhost/ardour2/branches/3.0@11631 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-09 20:47:40 +00:00
Paul Davis
c52c2b7368 forward-port some fixes from a2 
git-svn-id: svn://localhost/ardour2/branches/3.0@11630 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-09 17:15:25 +00:00
Paul Davis
671ec99bac (1) remove magic number voodoo when saving zoom focus/snap settings to instant.xml etc. (this has a minor breaking-behaviour for existing sessions etc (2) keep track of grid type/settings in and out of note edit mode and switch back and forth, thus allowing independent grids while working at the note or region level 
git-svn-id: svn://localhost/ardour2/branches/3.0@11486 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-13 14:34:21 +00:00
Paul Davis
d73815ccf2 range mode should not allow trim of MIDI notes 
git-svn-id: svn://localhost/ardour2/branches/3.0@11471 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-08 12:52:04 +00:00
Paul Davis
53cb1b6572 mouse draw mode can draw AND select (and trim) notes (but trim cursors don't appear yet) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11470 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-08 12:50:32 +00:00
Paul Davis
b3652ddc3d fix for #4689 from dave flick 
git-svn-id: svn://localhost/ardour2/branches/3.0@11467 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-07 17:51:50 +00:00
Paul Davis
c21c9e6662 use button joiner for smart mode; polish up the visuals on the joiner a bit 
git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-03 18:31:10 +00:00
Paul Davis
7629120cda many changes, large and small, related to smart mode editing, range/region selection, and behaviour of playhead when always-play-range is enabled. could be buggy, but probably in subtle (or even very subtle) ways rather than obvious 
git-svn-id: svn://localhost/ardour2/branches/3.0@11394 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-30 22:53:22 +00:00
Paul Davis
0740fab6ed leave note edit mode with a click on any track background, not just non-midi 
git-svn-id: svn://localhost/ardour2/branches/3.0@11349 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-25 19:38:14 +00:00
Paul Davis
34581e4de9 fix breakage of normal method of creating an empty MIDI region 
git-svn-id: svn://localhost/ardour2/branches/3.0@11341 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-24 22:17:24 +00:00
Paul Davis
f3624c1874 exit internal/note edit mode when clicking on anything that is not a MIDI region view or a note (or various modeless items like markers and the playhead) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11333 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-24 16:20:31 +00:00
Paul Davis
efab36a85e new mouse mode (Draw (notes)); switch into internal mode when draw is selected; notably improve use of dbl-click to enter and exist internal/note edit mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@11269 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-19 15:23:51 +00:00
Paul Davis
c43f1d22c8 enter and exit node edit mode with dbl-click in any MIDI region 
git-svn-id: svn://localhost/ardour2/branches/3.0@11268 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-19 00:14:58 +00:00
Paul Davis
7856f14c44 when a context click event occurs in the editor, store the event so we can use it to determine position later during its handling, if necessary 
git-svn-id: svn://localhost/ardour2/branches/3.0@11081 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-26 23:18:24 +00:00
Carl Hetherington
60fa99a34d Remove hopelessly inadequate attempt at last_item_entered 
and ask the canvas where we are instead.  Should fix #4532.


git-svn-id: svn://localhost/ardour2/branches/3.0@10907 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-05 20:47:53 +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
28123e436d Snap new automation points on audio lanes (part of #4297). 
git-svn-id: svn://localhost/ardour2/branches/3.0@10570 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-13 16:28:20 +00:00
Paul Davis
6449c2e5c8 more ardour-button-ization; fix transparency of selection rects; use "correct" cursors when entering and leaving selection rect handles; color tweaks for a few buttons 
git-svn-id: svn://localhost/ardour2/branches/3.0@10527 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-10 15:25:01 +00:00
Carl Hetherington
c0b59854ff Trim includes. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10357 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-31 21:16:32 +00:00
Paul Davis
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
Carl Hetherington
632c4ab264 Don't allow non-movable meter / tempo markers to be 
dragged (part of #4313).


git-svn-id: svn://localhost/ardour2/branches/3.0@10067 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-08 17:49:36 +00:00