13
0
Commit Graph

106 Commits

Author SHA1 Message Date
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
3ae28868ff remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route
git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-28 20:51:28 +00:00
Carl Hetherington
b65f8073ba Fix some unused parameter warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 15:55:17 +00:00
Carl Hetherington
402cc384ce Back out big shared_ptr change. Moving to a branch. Apologies all.
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 17:58:13 +00:00
Carl Hetherington
4297071b3f Use shared_ptr for the TimeAxisView hierarchy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5339 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:39:45 +00:00
Carl Hetherington
b233455b3f Split route group list out of Editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:37:15 +00:00
Carl Hetherington
5b97b13766 Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better.
git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 23:20:18 +00:00
Carl Hetherington
ece809f1db Fix sizing problems with edit group tabs.
git-svn-id: svn://localhost/ardour2/branches/3.0@5224 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-20 14:13:34 +00:00
daf0e333a9 pack zoom controls into upper right of editor table/packer
git-svn-id: svn://localhost/ardour2/branches/3.0@5209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:11:04 +00:00
Carl Hetherington
34930fc8cf Add a playhead marker to the summary.
git-svn-id: svn://localhost/ardour2/branches/3.0@5206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 00:29:56 +00:00
Carl Hetherington
478bab5380 Prevent vertical autoscroll when dragging the playhead.
git-svn-id: svn://localhost/ardour2/branches/3.0@5186 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-14 13:32:17 +00:00
Carl Hetherington
b192de88b6 Some cleanups to ruler drags.
git-svn-id: svn://localhost/ardour2/branches/3.0@5185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-14 13:31:46 +00:00
Carl Hetherington
804da56531 Various fixes and improvements to editor summary widget.
git-svn-id: svn://localhost/ardour2/branches/3.0@5179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-13 17:52:51 +00:00
Carl Hetherington
8eb17211b5 Hopefully fix assertion failures in gnomecanvas when dragging track heights.
git-svn-id: svn://localhost/ardour2/branches/3.0@5175 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-12 19:05:16 +00:00
Carl Hetherington
c99ae648f0 Add a widget giving an overview of the editor, as (what I think is being) suggested in #2714. Many caveats: most notably that it looks quite ugly and you can't (yet) turn it off.
git-svn-id: svn://localhost/ardour2/branches/3.0@5162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-11 01:05:01 +00:00
6e9b9294e1 nick m's fix for markers etc ; several tweaks for mute/solo ; rename run_in_place() as run()
git-svn-id: svn://localhost/ardour2/branches/3.0@5155 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-10 18:10:07 +00:00
Carl Hetherington
0874426a5b Further refactoring of drag code. Changes so that drags from the region list display a region view during the drag.
git-svn-id: svn://localhost/ardour2/branches/3.0@5127 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-08 19:28:51 +00:00
Carl Hetherington
962efaf05e Pull dragging code out of the Editor class into its own hierarchy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-30 18:25:59 +00:00
Nick Mainsbridge
882e3a690a A different fix for record crash, use pixfufs instead of canvas text in markers, use leftmost_frame instead of querying canvas coords when scrolling (speeds up canvas scrolling somewhat), remove old include, remove first_action_message and some other unused methods.
git-svn-id: svn://localhost/ardour2/branches/3.0@5108 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-21 17:30:45 +00:00
ace07c80a8 a gadzillion changes all over the place. nothing is finished, but all is better than it was. more to come on all almost everything touched by this commit, this is purely a sync-to-repository. compiles and runs, but now incompatible with all previous 3.0 session files (probably)
git-svn-id: svn://localhost/ardour2/branches/3.0@5084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-16 02:51:17 +00:00
e0aaed6d65 *** NEW CODING POLICY ***
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:26:51 +00:00
64bf6f004a Fix a bunch of the ol' trivial audio-specific-for-no-particular-reason things.
Re-addition of this sort of thing is now officially punishable by death ;)


git-svn-id: svn://localhost/ardour2/branches/3.0@4603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 07:04:27 +00:00
Carl Hetherington
f2058a3f87 Comment and (hopefully) simplify Editor::region_drag_motion_callback, fixing problems with dragging regions
to and from tracks in "stacked" display mode.  As a side-effect, enable dragging of regions between layers,
though I'm not entirely sure where this is useful or desirable just yet; dragging regions between layers
currently works in the GUI but has no effect on the model.


git-svn-id: svn://localhost/ardour2/branches/3.0@4389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-06 03:18:09 +00:00
Carl Hetherington
042997e5ed Cleanups and a few comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@4374 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-02 00:17:55 +00:00
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