13
0
Commit Graph

273 Commits

Author SHA1 Message Date
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
0a05c08a1a alter menu name for processor automation and hide extra separator in menu when not needed 2013-03-30 09:23:12 -04:00
4abbabdcf9 Squashed commit of the following:
commit fdbae82077db53add90df7448a06869dac89acc6
Author: Paul Davis <paul@linuxaudiosystems.com>
Date:   Wed Mar 27 21:45:28 2013 -0400

    mammoth changes in basic signal flow, total redesign of MIDI channel filtering and more.

commit 59343a8283698e02bc0f622313b29e98f449e4c8
Author: Paul Davis <paul@linuxaudiosystems.com>
Date:   Wed Mar 27 01:58:53 2013 -0400

    initial working version after changes to MIDI channel filtering. may affect metering input too. testing not yet finished

this commit merges many deep changes in ardour's internal architecture,
combined with a total redesign of how MIDI channel filtering works.

data in a track used to flow from JACK port buffers to diskstream's ringbuffers
and was then copied from the ringbuffers into a BufferSet for use during
Route::process_output_buffers(). The butler thread would handle the movement of
data between the ringbuffers and disk.

with this commit, data now flows from JACK port buffers into the BufferSet used
for Route processing, and is copied from the BufferSet into the diskstream's
ringbuffers (the butler thread continues to handle interactions with disk as
usual).

this change allowed a dramatic consolidation of code and simplification of most
aspects of Track/Route::roll() and Track/Route::no_roll(). in particular, see
Route::fill_buffers_with_input() which now concisely describes how we move data
from JACK port buffers into the BufferSet for all Route types (including Tracks).

this work was initially motivated by changing MIDI channel filtering so that we
can process capture and playback independently. there is now a very clean
pathway for this - see MidiTrack::roll() (NOTE: This needs implementing in the
no-roll case too - a TODO item).

the channel selector for MIDI tracks has been moved out of the track header and
is now accessible via the context menu. more work is likely here, to make it
(more) obvious to the user when filtering is going on.
2013-03-27 21:50:18 -04:00
f4f0dd6637 completely revisit how track name editing works in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@13898 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 15:27:04 +00:00
00cba5aa3b more substantive reworkings of TimeAxisView::name_(entry|label) and name editing. better, but i can still (somehow) trigger occasional misbehaviour
git-svn-id: svn://localhost/ardour2/branches/3.0@13840 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-14 21:46:32 +00:00
f269d7c56e various tweaks to get 80% Of the way to proper use of TimeAxisView::name_label and TimeAxisView::name_entry. Not done yet, since the entry sometimes loses focus and cannot be hidden.
git-svn-id: svn://localhost/ardour2/branches/3.0@13836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-12 04:07:29 +00:00
2b58d51e50 rework pixfader design again: remove texture, draw entire (double-sized) pattern ahead of time and render appropriate part of it at expose (this may turn out to be the wrong idea if/when we use a "real" fader design); fix up color(s) in track headers for these things
git-svn-id: svn://localhost/ardour2/branches/3.0@13833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-12 01:37:27 +00:00
9fcf40c94b substantive changes to pixfaders and derived classes. now fully dynamically sizable and have an added texture that currently just emulates the ardour2 belt pattern. mild color changes, not finalized yet.
git-svn-id: svn://localhost/ardour2/branches/3.0@13830 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-11 18:33:57 +00:00
b1029a3caf goodbye pixmaps and pixbufs (no longer) used by Gtkmm2ext::PixFader
git-svn-id: svn://localhost/ardour2/branches/3.0@13827 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-10 15:25:11 +00:00
d235a27aaf allow vertical scroll events on track faders to do their job
git-svn-id: svn://localhost/ardour2/branches/3.0@13756 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-03 00:52:39 +00:00
4481cca74a do not start editing track/bus names on a single click in the name entry of the track header - require double click; show name label rather than name entry when rec-enabled, to allow using the name area for track selection (name entry would have been visually still available for editing, which is misleading
git-svn-id: svn://localhost/ardour2/branches/3.0@13738 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-27 14:08:38 +00:00
54ce76e8fd remove "edit" property from track/bus groups; use "select" property which should force region selection to propagate, and then rely on "edit-applies-to-selection"
git-svn-id: svn://localhost/ardour2/branches/3.0@13734 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 17:50:29 +00:00
Ben Loftis
5249f82603 more theming and layout tweaks. new faders that pre-light. fixed some spacing around mixer buttons. tweaked some colors (returned mutes to yellow). removed group button at bottom of mixer strip and replaced it with fader automation mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@13617 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-07 22:38:49 +00:00
7d95e5de9e fix double escape in r13530
git-svn-id: svn://localhost/ardour2/branches/3.0@13538 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 21:17:03 +00:00
0e2396cd78 markup-escape track/playlist titles in tooltips.
git-svn-id: svn://localhost/ardour2/branches/3.0@13530 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-19 16:18:03 +00:00
fc14ecb93b do not attach plugin automation submenu to automation menu if the route has no plugins (avoid common user confusion) - thanks thorsten
git-svn-id: svn://localhost/ardour2/branches/3.0@13468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 20:03:57 +00:00
Carl Hetherington
6a778added Nudge the time axis view gain slider up a bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@12941 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 17:03:38 +00:00
Carl Hetherington
2b559c41ae Try slightly narrower faders in the track controls area
(#4445).


git-svn-id: svn://localhost/ardour2/branches/3.0@12928 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 20:32:14 +00:00
Carl Hetherington
c785552d8f Uninitialised variable.
git-svn-id: svn://localhost/ardour2/branches/3.0@12712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 20:58:07 +00:00
Carl Hetherington
5c60eea32a Don't recompute child heights when building the route time axis view menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@12709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 20:37:07 +00:00
Carl Hetherington
d7551a8f08 Escape angled brackets in playlist names for tooltips.
git-svn-id: svn://localhost/ardour2/branches/3.0@12672 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 14:19:35 +00:00
Carl Hetherington
cf0753a4bd Patch from colinf to put the playlist / take name in the playlist button tooltip (#4833).
git-svn-id: svn://localhost/ardour2/branches/3.0@12666 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-11 23:15:17 +00:00
Carl Hetherington
80afb6e08b Don't change playlists of frozen tracks when changing the
playlist of a route group (#4864).


git-svn-id: svn://localhost/ardour2/branches/3.0@12651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-11 11:26:42 +00:00
Carl Hetherington
e39a8fc968 Make faders visually desensitised when their tracks are in automation-play.
git-svn-id: svn://localhost/ardour2/branches/3.0@12518 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 00:41:28 +00:00
Carl Hetherington
f722858e43 Patch from tophatdave to improve display of timestretch in
stacked layers mode (#4379).


git-svn-id: svn://localhost/ardour2/branches/3.0@12460 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 20:07:13 +00:00
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
Carl Hetherington
27e64c1439 Rename Route Group -> Group in the GUI, and give busses
route group and automation menu items in their right-click
menus, not just tracks.


git-svn-id: svn://localhost/ardour2/branches/3.0@12399 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 19:01:28 +00:00
Carl Hetherington
c977b157bc Update tooltips for AFL/PFL.
git-svn-id: svn://localhost/ardour2/branches/3.0@12146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-02 01:24:26 +00:00
ec1ef5d6b5 remove the apparently unnecessary "ui_bind()" macro from entire source base
git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 12:58:19 +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
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
ea99ee68d9 change tooltip of automation button for MIDI tracks to give hint that its also about controllers
git-svn-id: svn://localhost/ardour2/branches/3.0@11221 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-10 15:53:33 +00:00
Carl Hetherington
6304261b98 Re-work layering in possibly debatable ways. Sketchy docs in doc/layering.
git-svn-id: svn://localhost/ardour2/branches/3.0@11088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 01:42:49 +00:00
Carl Hetherington
4dd7b9b34c Make TimeAxisView::remove_child virtual so that RouteTimeAxis can override it to also remove the same child from its _automation_tracks list. Prevents a shared_ptr to an out-of-date AutomationTimeAxisView hanging around; fixes #4554.
git-svn-id: svn://localhost/ardour2/branches/3.0@10985 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 02:17:17 +00:00
702cca1c93 extra track header buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10550 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-11 17:24:05 +00:00
708fb03e87 use ArdourButton for the (radio) buttons in the monitor section; fix ArdourButton, MonitorSection and CairoWidget to work with radio semantics
git-svn-id: svn://localhost/ardour2/branches/3.0@10430 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 21:35:20 +00:00
370a8ba79a remove lock icon from track header solo button when appropriate
git-svn-id: svn://localhost/ardour2/branches/3.0@10423 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 16:17:58 +00:00
5b45dc04df remove extraneous 'r' from rec-enable buttons
git-svn-id: svn://localhost/ardour2/branches/3.0@10417 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 14:52:53 +00:00
bcac4f1c96 rec-enable buttons are now ArdourButtons, but with a minor graphical glitch that will be solved/fixed soon-ish
git-svn-id: svn://localhost/ardour2/branches/3.0@10402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 19:51:59 +00:00
11fdd6cd18 solo buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 18:48:32 +00:00
592bfa3616 mute and send-alert buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10397 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 16:46:49 +00:00
51ab5ccabf new ArdourButton class, to start to provide more control over how our buttons work and appear; use ArdourButtons for monitor, solo isolate and solo safe buttons, and in the processor box; don't save UI config file (canvas colors) to the user's home dir unless one or more parameters were modified by the user
git-svn-id: svn://localhost/ardour2/branches/3.0@10311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-26 21:01:14 +00:00
32bf6003c4 Fix use of uninitialized value
git-svn-id: svn://localhost/ardour2/branches/3.0@10243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 21:52:22 +00:00
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
Carl Hetherington
0411b3b54c Colin's patch to handle scroll events on track header meters (#4029)
git-svn-id: svn://localhost/ardour2/branches/3.0@10118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-25 13:15:59 +00:00
Carl Hetherington
24a38b8b08 Add option to insert time on all a track's playlists (#4304).
git-svn-id: svn://localhost/ardour2/branches/3.0@10054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-05 23:38:18 +00:00
Carl Hetherington
881b5a43e7 Allow route groups to color their tracks (remainder of
#4064).


git-svn-id: svn://localhost/ardour2/branches/3.0@10043 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-31 19:14:12 +00:00
Carl Hetherington
3b018f6902 Tidy up route colouring a bit so that colours are the
same for both the time axis view and the mixer strip.


git-svn-id: svn://localhost/ardour2/branches/3.0@10035 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-30 15:44:00 +00:00
Carl Hetherington
89354edbbc When renaming a track to the name of an existing one,
use the same behaviour in both the editor and mixer
windows (add a number to the requested name).


git-svn-id: svn://localhost/ardour2/branches/3.0@9954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-03 13:28:54 +00:00
Carl Hetherington
61d95b0bd0 Fix erroneous check for colons in track names; clean up
the dialogue a bit and go back to the name entry if the
user wants to re-edit.


git-svn-id: svn://localhost/ardour2/branches/3.0@9953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-03 13:28:36 +00:00