13
0
Commit Graph

82 Commits

Author SHA1 Message Date
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
Nick Mainsbridge
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
3d47c31d8f fix crash at startup caused by use of null session ptr to set end marker (from 2.0)
git-svn-id: svn://localhost/ardour2/branches/3.0@3975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-16 11:16:41 +00:00
Nick Mainsbridge
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
Nick Mainsbridge
61b3131303 Fix non-disappearing transport range bar drag rects, use physical_screen_height for some canvas items.
git-svn-id: svn://localhost/ardour2/branches/3.0@3930 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-11 17:51:15 +00:00
Nick Mainsbridge
e17e94e55f Fix the nostar ruler hiding bug, rejig ruler bars again, this time making them physical_screen_width wide - preventing artefacts while hiding.
git-svn-id: svn://localhost/ardour2/branches/3.0@3912 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-11 00:04:33 +00:00
c64e96b6a8 add toggles for region fade in/out/both active, plus toggle for region fades visibility
git-svn-id: svn://localhost/ardour2/branches/3.0@3904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-09 21:55:05 +00:00
Nick Mainsbridge
12cbe6d502 Improve scrolling performance for sessions containing hundreds of regions over many tracks by hiding offscreen tracks (scroll faster by making tracks larger, exposing fewer of them). Use distance from screen edges to drive autoscrolling distance. Avoid using canvas coordinates for displacement calculations where possible. Don't redisplay tempo in the colour handler.
git-svn-id: svn://localhost/ardour2/branches/3.0@3854 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-04 10:38:20 +00:00
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
Nick Mainsbridge
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
Nick Mainsbridge
8d3d196440 fix feedback loop while track resizing
git-svn-id: svn://localhost/ardour2/branches/3.0@3803 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-24 19:23:43 +00:00
Nick Mainsbridge
8b0e9befb9 fix headers not resizing properly when all tracks set to minimum height, then expanded again, no need to redisplay tempo when altering ruler visibility (allocation takes care of that)
git-svn-id: svn://localhost/ardour2/branches/3.0@3801 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-24 09:59:17 +00:00
95d82d7a16 An actual tempo line cache (not quite perfect when scrolling left, but miles ahead of the previous one didn't really help at all).
Tempo line updating done immediately/directly rather than in an idle handler.
Looking for feedback how this works for other people, performance wise...
Feel-wise, the obvious lag between scrolling and tempo lines being drawn is now gone.


git-svn-id: svn://localhost/ardour2/branches/3.0@3799 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-23 22:23:39 +00:00
Nick Mainsbridge
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
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
Nick Mainsbridge
dca4543c13 Fix track height, partial merge of recent 2.0 updates (speed up track resizing, fix disappearing automation controls), rework layers and groups on canvas.
git-svn-id: svn://localhost/ardour2/branches/3.0@3744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-17 19:04:16 +00:00
cca19c11d4 Prevent tempo lines from stealing events, but break marker bars visually when scrolled down...
git-svn-id: svn://localhost/ardour2/branches/3.0@3730 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-14 23:08:19 +00:00
92b249074a Show tempo lines above marker bars.
git-svn-id: svn://localhost/ardour2/branches/3.0@3729 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-14 21:15:08 +00:00
3bcc2896b6 more GUI tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@3728 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-14 19:52:34 +00:00
da6e0a95bb get the notebook back again (or rather, realize that it can now be toggled and that the default is to hide it)
git-svn-id: svn://localhost/ardour2/branches/3.0@3720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-12 11:03:51 +00:00
4b27094a39 make link (rubberband) work
git-svn-id: svn://localhost/ardour2/branches/3.0@3715 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-11 06:24:57 +00:00
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
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
e7e75e78c8 Fix range marker bar separator (colour is still off though, for some reason...).
git-svn-id: svn://localhost/ardour2/branches/3.0@3305 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 19:28:25 +00:00
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
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
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
1b65758557 Committed underlay support (from Audun).
git-svn-id: svn://localhost/ardour2/branches/3.0@3037 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-10 18:16:25 +00:00
9f63ab9931 Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 03:57:35 +00:00
23f25ad808 Fix track controls width.
git-svn-id: svn://localhost/ardour2/trunk@2915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 00:35:55 +00:00
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
8a2e30816e Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 22:22:29 +00:00
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
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
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
Nick Mainsbridge
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
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
7c950f279b Pulled tempo line stuff out into it's own relatively self-contained class.
Draw tempo lines on time canvas and connect them up all pretty-like to the ruler ticks.
Still needs some visual tweaking, but... they draw!  Finally!


git-svn-id: svn://localhost/ardour2/trunk@2247 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-05 21:31:02 +00:00
9decb3e027 remove static Pango::FontDescriptions, they cause glib errors because of initialization before Glib::thread_init() has been called
git-svn-id: svn://localhost/ardour2/trunk@2100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-03 21:02:29 +00:00
Doug McLain
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
a7ad624392 Fix time canvas separator lines.
git-svn-id: svn://localhost/ardour2/trunk@1994 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-16 23:55:23 +00:00
Doug McLain
789cbb2181 Major Theme Manager changes, see ardour-dev
git-svn-id: svn://localhost/ardour2/trunk@1987 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-15 22:08:27 +00:00
cd9fdb935f Use boost::shared_ptr instead of raw pointers for RouteUI track (etc) accessors (fix FIXME in route_ui.h).
git-svn-id: svn://localhost/ardour2/trunk@1986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-15 22:05:07 +00:00
5ee4677900 Moved some colours from hardcoded to ardour.colour (hopefully for canvas themeing?).
Fixed marker canvas separator lines (didn't work, use rect outlines instead).
Fiddle with separator line colours.


git-svn-id: svn://localhost/ardour2/trunk@1948 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-03 21:53:40 +00:00
da285fc57d Conditionally compile CMT additions, enabled by default.
git-svn-id: svn://localhost/ardour2/trunk@1833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-11 02:54:43 +00:00
959a7909c1 Merged with trunk R1705.
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).


git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-12 23:20:37 +00:00
0e705129fd Merged with trunk R1622.
git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 07:07:38 +00:00
99904735e0 Merged with trunk R1612.
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-18 06:07:08 +00:00
32f3a4ae3e Merged with trunk R1311.
git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 20:36:35 +00:00
532f6aad4a Merged with trunk R1283.
NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 23:24:54 +00:00