Paul Davis
bc89fe0147
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 14:43:24 +00:00
Paul Davis
42db44c193
merge 3870-3890 from 2.0-ongoing into 3.X (compiles, runs, no other promises
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 18:16:12 +00:00
Paul Davis
752d8d4b6f
revert the only real change in that last commit,which was based on a bogus merge
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 17:20:02 +00:00
Paul Davis
23294003f0
merge 3170-3180 of 2.X into 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4301 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 17:09:57 +00:00
b1c48972f2
Handle changed session duration & resizing canvas better wrt end marker, remove unused last_canvas_frame, don't redraw the entire mixer every time its presented, consistent space between rightmost horizontal scroller position and end marker when zooming, possible fix for gaps in tempo lines.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3982 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-19 07:55:42 +00:00
a8baa20be8
Make tempo lines physical_screen_height high, add xml null check, Use clicked_regionview directly to calculate region movement. Using drag_info.data may result in the wrong regionbiew being used, don't use canvas coords for region_drag_finished_callback x calculation (eliminates speed adjustment), prevent incorrect updates on dropped regions by updating canvas before placing region copies.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3965 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-14 13:35:17 +00:00
62c9bce040
Fix annoying mouse pointer offset when dragging regions to the left of the canvas.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-13 02:22:01 +00:00
David Robillard
1f765c2ae2
Fix warning (unused variable).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3928 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-11 16:59:26 +00:00
Paul Davis
354790d754
fix dragging of region gain line, affected by coordinate system change caused by canvas merge (don't convert delta motion-computed coordinates back into item space)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3917 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-11 11:27:50 +00:00
David Robillard
7b5dbd5f2b
Move panic button to MIDI toolbar (reduce required horizontal space).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3864 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-05 03:22:29 +00:00
David Robillard
ad4919ce92
Assortment of minor changes from 2.0-ongoing.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-03 18:24:38 +00:00
80608f7594
Relayer punch/loop range rects, fix display of punch-in with no punch-out, ensure range selection rect is hidden after single click.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-29 20:35:44 +00:00
David Robillard
abf64beac6
Fix audio region copy-drag, partially fix MIDI region copy-drag (thanks torbenh).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3809 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-26 17:18:22 +00:00
9e4f8633f4
Don't defer Editor::track_canvas_size_allocated () (defer the timebar redrawing instead) + some performance improvements to said function, fix puzzling ineffective thinko wrt region movement, show/hide playhead more sensibly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-20 09:06:49 +00:00
David Robillard
b87ca000f8
Merge all the (disconcertingly missing) track/region/etc height changes from 2.0.
...
Fix track y positioning and initial region size/location.
Fix automation click-to-add-points (i.e. points actually show up where you click).
Fancy whiz-bang dynamic resize 2.0 professional edition support for MIDI/CC/Automation tracks/regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@3769 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-19 19:32:10 +00:00
Paul Davis
6f8cd63450
chris goddard's region list patch; port 2.X marker drag/move changes to 3.0; compilation fixes-post-evoral
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3760 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-19 14:38:46 +00:00
David Robillard
cb19d9cb1e
More gracefully handle type mismatch errors when doing playlist things (just ignore regions with the wrong type for this playlist).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3726 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-14 19:01:08 +00:00
David Robillard
5befe85218
Fix stacking of MIDI stream views to match that of audio.
...
Make copy and brush operations type generic (i.e. fix brushing for MIDI regions).
git-svn-id: svn://localhost/ardour2/branches/3.0@3724 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-14 18:08:58 +00:00
Paul Davis
c86210a9d5
merge 2.0-ongoing into 3.0 @ 3581 - 3710
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 21:27:39 +00:00
Paul Davis
68e943265e
merge from 2.0-ongoing @ 3581
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 15:03:30 +00:00
David Robillard
da45f489dd
Fixes for GCC 4.3.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 18:35:05 +00:00
Paul Davis
cb41314642
merge 3.0 from 2.0-ongoing@3243
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 14:06:50 +00:00
Paul Davis
6554200e66
hans' patches for MIDI note resizing++
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-26 11:11:47 +00:00
Paul Davis
997e4b1f9c
merge with 2.0-ongoing @ rev 3147
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:03 +00:00
David Robillard
8fed7470f5
Merge with 2.0-ongoing R3077.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3078 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-17 17:49:38 +00:00
David Robillard
8aa9508c82
Merge with 2.0-ongoing R3071.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 22:43:18 +00:00
David Robillard
80c3677c83
Merge with 2.0-ongoing R2988
...
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 17:22:04 +00:00
David Robillard
48ed9dc2c4
MIDI region stretching.
...
git-svn-id: svn://localhost/ardour2/trunk@2927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-17 00:37:46 +00:00
David Robillard
ac1a255706
Merge with trunk R2920.
...
git-svn-id: svn://localhost/ardour2/trunk@2921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 17:23:57 +00:00
David Robillard
e92c1669c1
Merge with 2.0-ongoing R2885.
...
Fix loading of 2.0 sessions.
git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 23:45:50 +00:00
David Robillard
bb457bb960
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
...
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 21:20:59 +00:00
David Robillard
73dd9d37e7
Merge with 2.0-ongoing R2653.
...
git-svn-id: svn://localhost/ardour2/trunk@2837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-07 21:12:29 +00:00
fde04925f1
Apply colinf's fix for bug #1913
...
git-svn-id: svn://localhost/ardour2/trunk@2689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-17 21:02:05 +00:00
Paul Davis
b01bdb7e70
merged with trunk revs 2605-2627
...
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 22:23:01 +00:00
Paul Davis
badc087263
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session)
...
git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-08 01:40:25 +00:00
Paul Davis
8e73c9ee80
patch to prevent (mostly) CD marker being set for the start of the session
...
git-svn-id: svn://localhost/ardour2/trunk@2601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 02:42:27 +00:00
3069423106
Patch from jdavisp3 to further improve region gain line behaviour, as discussed in bug #1841
...
git-svn-id: svn://localhost/ardour2/trunk@2599 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-06 13:33:39 +00:00
53d072a6d7
Patch from jdavisp3 to fix bug #1841 .
...
git-svn-id: svn://localhost/ardour2/trunk@2590 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-05 15:38:19 +00:00
cc862d31bd
use filechooser widget in export dialog, selected files set format combos, hide progress bar until use in export dialog, speed up 'separate regions in range' operation on larger sessions, ruler scale now calculated separately to mark generation, fix for non-stacked layering regression, try not to generate 'buried' crossfades, use playlist->freeze() to speed up copying/moving regions on large playlists (not done for undo), width dependent items now reset on regionview init, get rid of jack_port_ensure_monitor check, remove audiosourse _length (only source has a length.. i think), make overlapend differ to overlapexternal where start points coincide.
...
git-svn-id: svn://localhost/ardour2/trunk@2576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-26 13:32:24 +00:00
David Robillard
14dcc3f017
Fix displaying of notes in auto-created MIDI region when it's the first region in the track.
...
Fix crash after recording long phrases of MIDI.
Fix MIDI looping (kinda).
Add note-off exposure to MidiModel::iterator.
Fix first-note-is-stuck-note problem.
Fix resolving long notes while recording.
Fix several other things I forget now. MIDI works pretty well.....
git-svn-id: svn://localhost/ardour2/trunk@2555 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-14 05:45:31 +00:00
Paul Davis
f7f9d6fdc4
merge from 2.0-ongoing by hand, minus key binding editor
...
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 22:07:47 +00:00
David Robillard
5156998e6e
Saving of edited MIDI data to disk (on session save).
...
Seems to be a pretty random problem with note duration restoring though...
git-svn-id: svn://localhost/ardour2/trunk@2290 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-11 06:17:42 +00:00
David Robillard
f32a6d0f04
Fix some evil "tabs".
...
Switch canvas cursor for MIDI tools.
Fix delete tool bug (touch delete always on).
git-svn-id: svn://localhost/ardour2/trunk@2287 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-10 20:55:27 +00:00
David Robillard
8eded9b7bc
Make MIDI tools actually do something. Sorta. Sometimes.
...
When the moon is right.
Cosmic radiation may be a factor.
Prayer may not be an entirely bad idea, just in case.
git-svn-id: svn://localhost/ardour2/trunk@2283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-09 20:50:56 +00:00
David Robillard
430bc18ba2
First appearance of MIDI edit tool bar. Toggles when delete held, but otherwise still useless, pending some UI figuring out...
...
git-svn-id: svn://localhost/ardour2/trunk@2275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-08 19:13:36 +00:00
David Robillard
332a3d9813
Selection of visible note range (full range vs fit contents, selectable from midi track menu).
...
Added note pencil tool, mock note adding (notes can be added visually but don't yet play).
Reworked MidiModel to be notes w/ duration instead of realtime style MIDI events.
Moved layering (stacked/overlaid) from auto time axis down to route time axis since it applies
to MIDI tracks as well.
git-svn-id: svn://localhost/ardour2/trunk@2128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-15 01:56:11 +00:00
David Robillard
68653307e6
Note modes: note, percussion.
...
Percussion tracks display diamonds.
Separated/fixed MIDI and audio mode menus.
CC automation modes: discrete, line.
Bar controllers follow setting (hard steps or line) on playback.
Sent CC data is always discrete (line not implemented yet).
Discrete tracks show no lines, and always show control points.
Separated ControlPoint from AutomationLine.
Added some basic information (range) to Parameter (to be fleshed out..).
git-svn-id: svn://localhost/ardour2/trunk@2123 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-07 03:19:04 +00:00
David Robillard
b57510a3a9
Display correct value for verbose control point cursor for Midi CC (int) and plugin automation (map to parameter range).
...
Use double throughout for automation control point y coordinate instead of casting to this and that losing precision.
Fix crash bug in route automation menu.
git-svn-id: svn://localhost/ardour2/trunk@2107 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-04 22:57:13 +00:00
David Robillard
bbf4175713
Another not-quite-there-but-better commit.
...
Brought plugin automation into the fold of new automation system.
Fixed plugin automation, broke panner automation :] (pending Panner work).
Made AutomationController better at automatically following it's controller value (mimic what gain meter does).
Fixed some visible automation track bugs (but still broken WRT serialization).
git-svn-id: svn://localhost/ardour2/trunk@2092 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-30 18:41:50 +00:00
4c000c13ee
Moved canvas colors and theme file selection into new ui specific config system
...
git-svn-id: svn://localhost/ardour2/trunk@2086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-29 17:13:09 +00:00
Paul Davis
Nick Mainsbridge
David Robillard
Carl Hetherington
Doug McLain