ardour/livetrax
13
0
Fork 0
Code
11,014 Commits 1 Branch 1 Tag 197 MiB
c779f7b1b5
Commit Graph

124 Commits

Author SHA1 Message Date
Robin Gareus
6ae4f10437 Merge branch 'master' into cairocanvas 
Conflicts:
	gtk2_ardour/editor.h
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/wscript
 2013-04-11 22:24:05 +02:00
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04: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
72393f101b allow region list selection of whole file regions to select every instance of a region that has any source relationship with that whole file region (from a logic feature that came up while writing the manual) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13779 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-04 22:46:51 +00:00
Paul Davis
76d85fb411 add Delete button to patch change dialog when editing it 
git-svn-id: svn://localhost/ardour2/branches/3.0@13710 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-22 18:27:33 +00:00
Ben Loftis
f77763020b edit operations should depend on the existence of an explicit range, NOT the mouse mode. this produces less confusion to the user. For an edit (such as delete) the selection should be based on this priority: explicit range selection, ojbect (region) selection, and then implicit range ( i.e. mouse-to-marker) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13563 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-28 17:07:35 +00:00
Ben Loftis
62c8963170 region selections and moves should have optional preroll when playhead follows edits 
git-svn-id: svn://localhost/ardour2/branches/3.0@13552 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-26 23:07:21 +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
Paul Davis
adbb47fae7 change semantics for select-all operation: if no track is selected, use the current entered track, or if there is no entered track, use all tracks; if in internal edit mode, check first to see if any MIDI tracks are among those to be operated on, and only do the internal edit version of select-all if there are 
git-svn-id: svn://localhost/ardour2/branches/3.0@13508 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-15 17:20:38 +00:00
Paul Davis
97d920593f drastic rethink of the relationship between remote control ID and route order keys. unless the user explicitly switches to UserOrdered, Route::_remote_control_id is an unallocated pointer, and Route::remote_control_id() simply returns a value based on the relevant order_key() value. Also, change the key used in the Route::order_keys std::map<> from a string to an enum, since there is no evidence that we are benefitting from the theoretical benefit of using a string. Generally tidy up allocation of order keys so that the master and monitor busses always get a "special" MixerSort key value, based on the MMC ID for master (already defined within Ardour), and all other tracks/busses start at zero. Syncing keys between editor and mixer will leave the MixerSort key for the master and monitor bus alone, reflecting the fact that we display these in their own distinct parts of the GUI and they are not orderable like other tracks or busses within the mixer window 
git-svn-id: svn://localhost/ardour2/branches/3.0@12923 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-25 12:46:13 +00:00
Carl Hetherington
e8cb671956 Patch from colinf to sensitize region-related actions even in non-object mode (#4896). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12601 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-08 12:33:50 +00:00
Carl Hetherington
fc77252d51 Slightly unpleasant hack to stop control points being 
unselected when you ctrl-drag a selected point in order to
do a push drag.


git-svn-id: svn://localhost/ardour2/branches/3.0@12502 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-31 14:39:48 +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
Carl Hetherington
1f318fb5a2 Fix region context menu fade items to reflect reality. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12197 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-07 12:03:26 +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
a2897ecef6 Fairly major change to the way in which crossfades are handled; 
they are now done with region fades, rather than separate objects.
After this commit, Ardour will try to convert your session files
to the new crossfade format, but will make a backup in your
session folder first.

If you have works in progress using Ardour 3 it is
***STRONGLY RECOMMENDED*** that you back up session files before
updating to this commit.


git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 16:32:22 +00:00
Paul Davis
62620122a9 propagate GUI track selection to control protocols; make MCP update when GUI track selection changes 
git-svn-id: svn://localhost/ardour2/branches/3.0@11941 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 14:34:03 +00:00
Carl Hetherington
947c698b0e Finish off fix for crash on region context menu (#4766). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11683 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-14 16:58:11 +00:00
Paul Davis
372f90ec61 look for RegionMenuMIDI action in the right action group 
git-svn-id: svn://localhost/ardour2/branches/3.0@11679 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-14 12:05:53 +00:00
Paul Davis
8c5b4ba062 remove reference to removed envelope-visible action 
git-svn-id: svn://localhost/ardour2/branches/3.0@11494 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-15 17:19:38 +00:00
Paul Davis
b02e95f201 make region gain line visibility global, not per-region 
git-svn-id: svn://localhost/ardour2/branches/3.0@11492 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-15 14:03:19 +00:00
Carl Hetherington
452672f78f Make crossfade convert-to-full and activate/deactivate work across edit groups (#4658). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11413 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-01 01:07:52 +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
24978033ef tweak up the region context menu quite a bit 
git-svn-id: svn://localhost/ardour2/branches/3.0@11285 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-20 15:53:41 +00:00
Paul Davis
d23a6de077 fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id() 
git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-10 19:20:15 +00:00
Carl Hetherington
5ef06dd439 Fix setup of gain envelope visible menu item. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10939 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-07 18:18:46 +00:00
Paul Davis
5423c45788 desensitize make-mono-regions as appropriate 
git-svn-id: svn://localhost/ardour2/branches/3.0@10855 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-02 02:07:13 +00:00
Paul Davis
782c9383fc revert previous changes to region selection and action sensitivity handling 
git-svn-id: svn://localhost/ardour2/branches/3.0@10613 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-15 14:13:33 +00:00
Paul Davis
638378ada2 flip a coin for a difficult GUI design question, and leave 4 region edit actions sensitive even when edit_point is EditAtMouse, to allow the kbd binding to still be active 
git-svn-id: svn://localhost/ardour2/branches/3.0@10609 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-15 03:21:59 +00:00
Paul Davis
c0ec12c5bc try using sensitize_the_right_region_actions() when region selection changes, rather than sensitize_all, following a mixbus2 change 
git-svn-id: svn://localhost/ardour2/branches/3.0@10608 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-15 02:14:45 +00:00
David Robillard
8be2e11c65 Implement range selecting for MIDI notes (#4087). 
git-svn-id: svn://localhost/ardour2/branches/3.0@10199 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-07 21:11:19 +00:00
David Robillard
1567d362ad Implement invert selection for MIDI notes (#4087). 
git-svn-id: svn://localhost/ardour2/branches/3.0@10198 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-07 20:27:12 +00:00
David Robillard
bbcb8125b7 Fix spacey tabs. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10197 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-07 20:09:01 +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
David Robillard
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
Paul Davis
c937a67f6e do not offer combine operation for MIDI (see comment in libs/ardour/midi_playlist_source.cc for an explanation) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9630 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-30 11:57:12 +00:00
Paul Davis
f38db9a4e3 move session file storage of nested sources from playlist into region, and reload them within Session::XMLRegionFactory, just before we create the region that uses the nested source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9595 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-26 12:24:04 +00:00
Paul Davis
9c733915a0 basic uncombining (no post-facto region trimming) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9566 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-22 16:11:00 +00:00
Paul Davis
99aa8c6338 rename join regions op as combine regions; save and restore nested playlists, sources, regions; add undo/redo for combine; fixup peakfile use/discovery 
git-svn-id: svn://localhost/ardour2/branches/3.0@9528 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-16 20:16:57 +00:00
Carl Hetherington
e8c8befb87 Differentiate between pitch-shift (for audio) and transpose (for MIDI). Fixes #3940. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9299 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-06 02:04:37 +00:00
Paul Davis
07e607ebad reinstate (de)selection operations that should happen on mouse button release 
git-svn-id: svn://localhost/ardour2/branches/3.0@9104 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-08 12:45:23 +00:00
Paul Davis
36f764167b make select-all in internal edit (MIDI note) edit mode operate on the region selection, not the set of regions with MIDI notes selected 
git-svn-id: svn://localhost/ardour2/branches/3.0@9051 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-03 03:53:46 +00:00
Paul Davis
15b5fce904 merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally). 
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-27 01:31:03 +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
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
15b5aae173 Allow split in range mode. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7977 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-07 01:42:14 +00:00
Carl Hetherington
4441f5008d Heinous hack to fix region menu sensitivity setup. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7958 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-04 02:05:08 +00:00
Carl Hetherington
b5ab2e030b Tidy up the region menu a bit, and hopefully clarify what regions will be 
operated on in different circumstances.  Make the main menubar Region menu
the same as the context one, and use the same logic to sensitize/desensitize
actions for them.


git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-03 22:19:29 +00:00