13
0
Commit Graph

171 Commits

Author SHA1 Message Date
07a505b1b2 lots of tweaking and adding debug output including operator<</dump(ostream&) methods to help visualize canvas structure 2013-04-05 11:27:26 -04:00
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04:00
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
197e75ab80 allow Drag-n-Drop onto the empty canvas (again); always import MIDI files since we consider them writable and so embedding isn't a safe option 2013-03-29 14:09:03 -04:00
613678233a minor fix for misleading comment 2013-03-28 16:18:08 -04:00
268553ecd4 honor CTRL modifier when drag/drop importing files (copy vs embed) 2013-03-21 21:33:02 +01:00
7b998ceba1 fix an old bug introduced when cth tried (valiantly) to make region-list -> DnD -> canvas behave like a regular region drag. this doesnt' work because the RegionInsertDrag() grabs the mouse and breaks the DnD. in addition, the code failed to correctly indicate when a drop was possible (over a Track) and when it was not (over a Bus) - this has also been fixed. the actual code in Editor::drop_regions() could and should be simplified - no reason to use a RegionInsertDrag here, but it was fast 2013-03-20 17:33:25 -04:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
00e1b1410c fix reversion of keyboard focus from gain display editing widget in both mixer and editor windows
git-svn-id: svn://localhost/ardour2/branches/3.0@13628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-10 02:03:45 +00:00
Carl Hetherington
2e71cb2e26 Add option to disable autoscroll of editor (#4721).
git-svn-id: svn://localhost/ardour2/branches/3.0@12744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-17 12:38:59 +00:00
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
2b7d17e904 reorder editor route list columns to put visible and active first (from joern)
git-svn-id: svn://localhost/ardour2/branches/3.0@11732 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-20 17:08:07 +00:00
1b19db251b debug tracking mouse presence in track canvas
git-svn-id: svn://localhost/ardour2/branches/3.0@11650 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-12 14:29:48 +00:00
6c1000070b fix cut-n-pastie relating to tracking mouse presence in track canvas
git-svn-id: svn://localhost/ardour2/branches/3.0@11649 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-12 13:40:51 +00:00
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
Carl Hetherington
664cec2135 Don't autoscroll right if we are moving left, and vice versa; should fix #4676.
git-svn-id: svn://localhost/ardour2/branches/3.0@11393 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 21:33:32 +00:00
f758ed0f41 more fixups of various things including cursors when note editing. in particular, don't needlessly reset the cursor during a drag. note insertion with ctrl pressed now only works if in MouseObject mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@11270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19 22:23:28 +00:00
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
Carl Hetherington
b78cb4d41a Fix autoscroll fudge calculations. Remove some unused
code.  Should help with #4501.


git-svn-id: svn://localhost/ardour2/branches/3.0@10767 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-22 12:22:46 +00:00
Carl Hetherington
fe145ce380 Start autoscroll in from the right-hand edge of the screen if the editor list is not in view, so that autoscroll kind-of works in this situation (#4473 and #4216).
git-svn-id: svn://localhost/ardour2/branches/3.0@10718 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 19:38:37 +00:00
Carl Hetherington
adfce3b762 Trim includes.
git-svn-id: svn://localhost/ardour2/branches/3.0@10666 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 00:04:49 +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
Carl Hetherington
86d2afaf4e colinf's patch for #4223.
git-svn-id: svn://localhost/ardour2/branches/3.0@9952 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-03 13:27:48 +00:00
af7ba3347c when tabbing between track/bus name entries, attempt to scroll appropriately (#4223)
git-svn-id: svn://localhost/ardour2/branches/3.0@9924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-25 20:28:51 +00:00
65c2782e6e fix up horizontal sizing of the track controls area in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@9797 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-07 13:15:53 +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
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
4f73aabc13 remove unused signal
git-svn-id: svn://localhost/ardour2/branches/3.0@9058 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 18:51:54 +00:00
Carl Hetherington
2ffc0cbe25 Fix incorrect mouse cursors after zoom mode clicks.
git-svn-id: svn://localhost/ardour2/branches/3.0@8895 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 22:35:34 +00:00
314f0d91d3 a radically new approach to sizing the track header layout that now allows ardour to shrink dramatically in vertical height. current lower limit is about 763 pixels WITH the editor mixer strip, and something much, much smaller without it
git-svn-id: svn://localhost/ardour2/branches/3.0@8608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 14:48:59 +00:00
Carl Hetherington
b6b0bce678 Use lines between marker bars from the SAE profile.
git-svn-id: svn://localhost/ardour2/branches/3.0@8517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-16 19:33:04 +00:00
bb797943dd add configurable colors to stereo panner, plus keybindings for zero width (0), 1 (alt-up) or -1 (alt-down), plus M when its mono
git-svn-id: svn://localhost/ardour2/branches/3.0@8153 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-02 15:51:42 +00:00
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
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
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
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
40ca64c659 Slight improvement to autoscroll behaviour when expanding tracks.
git-svn-id: svn://localhost/ardour2/branches/3.0@8008 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-11 13:36:20 +00:00
Carl Hetherington
ba8b84eed1 Option to show lines below markers (#3529).
git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 18:29:32 +00:00
Carl Hetherington
156f5e4a42 Only compute and render the visible portion of crossfades. Fixes #3498.
git-svn-id: svn://localhost/ardour2/branches/3.0@7901 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-17 23:35:05 +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
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
ede4ecbb00 megaopus patch #2 for today: remove nframes64_t and sframes_t from source
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 18:20:37 +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
4d112a8e6b remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 15:45:21 +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
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
a54f107d4f Make summary zoom happen based on where the drag is started, rather than
needing a modifier.  Change mouse pointer shape in the summary to indicate
what will happen on a drag.  Allow vertical zoom in the summary, which modifies
track heights accordingly.


git-svn-id: svn://localhost/ardour2/branches/3.0@7275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-18 00:05:44 +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
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