ardour/livetrax
13
0
Fork 0
Code
10,446 Commits 1 Branch 1 Tag 194 MiB
2b0fef5933
Commit Graph

113 Commits

Author SHA1 Message Date
Colin Fletcher
21914c884e Make scroll-wheel modifier keys consistent in main editor window. 
Add constants for the keyboard modifiers that should be used for vertical
zoom, horizontal zoom, and horizontal scrolling in the main editor window,
and use these where appropriate rather than using Keyboard::PrimaryModifier
and friends directly.
 2013-06-21 20:13:44 +01:00
Paul Davis
35842fd5ee forward port recent mixbus change so that side-scroll is now shift-wheel and height adjustment is alt-wheel, rather than vice versa, to match OS X convention 2013-04-30 16:38:48 -04:00
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Paul Davis
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
Robin Gareus
268553ecd4 honor CTRL modifier when drag/drop importing files (copy vs embed) 2013-03-21 21:33:02 +01:00
Paul Davis
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
Robin Gareus
0c3e840700 videotimline 
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
 2013-03-13 20:28:15 +01:00
Ben Loftis
e5776d1a69 mousing in a fade-out should fall through to the region, for now (this was already done for fade-ins 
git-svn-id: svn://localhost/ardour2/branches/3.0@13668 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-14 17:02: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
Ben Loftis
f23490bd37 mousehweel zoom should always operate like ZoomFocusMouse 
git-svn-id: svn://localhost/ardour2/branches/3.0@13557 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-27 17:04:42 +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
Carl Hetherington
df6222b3b4 Fix another place where regions can be inserted into a 
playlist without also getting put into the master list.


git-svn-id: svn://localhost/ardour2/branches/3.0@12646 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-10 14:42:22 +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
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
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
2cc255ac08 fix possible logic error and make logic line up with comment 
git-svn-id: svn://localhost/ardour2/branches/3.0@11424 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-02 16:23:02 +00:00
Paul Davis
33c61757fc promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-27 16:29:01 +00:00
Carl Hetherington
b9a9d8d047 Use a few shared_ptrs to make things slightly neater. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11156 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-04 13:56:09 +00:00
Carl Hetherington
084fc8b327 Slightly improve proxying of events by crossfade views; doesn't really have any positive effect, unfortunately. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11127 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-31 13:25:56 +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
Paul Davis
b500497812 Delete key can now be used to remove tempo/meter markers 
git-svn-id: svn://localhost/ardour2/branches/3.0@9996 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-15 15:08:37 +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
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
6117b74bb9 Make sense of parameter to tav_zoom_step match up with coarser as used for temporal zoom. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8896 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-17 22:35:42 +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
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
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
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
98d994f29c fix a variety of unused argument errors noted by gcc 4.3.2 on x86 
git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-02 17:01:36 +00:00
Paul Davis
884ee2a3cc check dependents in Playlist after moving a region to a specific layer; make region layering editor appear reliably; click on xfade sets clicked_routeview 
git-svn-id: svn://localhost/ardour2/branches/3.0@7692 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-25 22:42:35 +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
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
c686dee0ce Set entered_regionview on entry into region view canvas item children. Should fix #3300. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7372 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-05 01:55:07 +00:00
Carl Hetherington
d489009af7 Remove debug output. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7331 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-30 00:08:49 +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
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
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
Paul Davis
8932625869 change color of note velocity text (and don't set it or justification repeatedly); make pianoroll button2 clicks select correctly rather than always being additive; hide note velocity text as soon as the mouse moves. the color change will require remvoing ~/.config/ardour2/ardour3_ui.conf to become effective 
git-svn-id: svn://localhost/ardour2/branches/3.0@7187 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-28 17:39:28 +00:00
Paul Davis
3e966771d0 clean up item event handling in MidiRegionViews by removing unnecessary InteractiveItem inheritance, and keep child->parent event handling order consistent as much as possible 
git-svn-id: svn://localhost/ardour2/branches/3.0@7186 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-28 16:37:04 +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
c5e4e8fdd9 Remove some unused variables. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7035 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-01 23:35:33 +00:00
Carl Hetherington
73b67f16d4 Make primary-modifier+scroll wheel zoom respect zoom focus setting. Fixes #2515. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7023 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-29 23:15:09 +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
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
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
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
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
1474b10d39 avoid .h pollution in last commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@6110 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-17 14:14:26 +00:00