3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
fa22520fd2
Merge branch 'master' into cairocanvas
2013-11-25 09:26:35 -05:00
9a50b56930
reset time-axis peak when meter-point changes - fixes #5771
2013-11-20 18:54:34 +01:00
08b485db75
send enter events to EVERY newly entered item (ignore the bool return from the event handler); other canvas debugging aids;switch items_at_point() to use canvas coordinates
2013-11-03 10:07:00 -05:00
19bb2b33a8
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
...
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
c08b336292
Fix ambiguous type CheckMenuItem that is also defined via windows.h
2013-07-11 15:32:31 -04:00
580520b12f
fix conflicts caused by meterbridge merge
2013-07-11 09:11:53 -04:00
2b53ac2e31
amend cb7bcb6d - locked-solo button style
2013-07-11 02:31:30 +02:00
92494b8965
queue axis resize if port-config changes
2013-07-10 20:48:42 +02:00
fbc324ee81
adjust-width/redraw track-header when meter changes
2013-07-10 15:27:09 +02:00
6d69567676
fix track-header: show meters the first time 'round.
2013-07-10 15:27:06 +02:00
aabe526df2
update track-header layout - proper padding around meters
2013-07-10 15:27:06 +02:00
2a534de272
double width of mono-meters in track-header
2013-07-10 15:27:04 +02:00
066b385c68
adjust padding of meters in time-axis view (still using border bg color)
2013-07-10 15:27:03 +02:00
363b646de9
add margin around meters in editor track header
2013-07-10 15:27:03 +02:00
1c24a847dd
remove no-op "horizontal_position_changed()" method from StreamView and RouteTimeAxisView
2013-06-16 22:15:32 -04:00
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
ce0aa96838
NOOP - use PBD's std::string to number functions
2013-06-08 09:03:26 +02:00
96eee9e7a1
change UIConfig to use accessor/setter methods like RCConfig so that ParameterChanged methods can actually be emitted; add variable (over a small range) background shading for all TimeAxisViewItems
2013-04-16 23:46:22 -04:00
b05968fb4e
change frames_per_pixel to samples_per_pixel
2013-04-12 11:31:50 -04:00
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
cd6cbba299
rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit
2013-04-06 16:04:02 -04:00
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
096fe04e61
Make track header faders insensitive to vertical scroll-wheel events again.
...
This effectively reverts d235a27a
2013-04-05 10:08:36 +01:00
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
