ardour/livetrax
13
0
Fork 0
Code
27,766 Commits 1 Branch 1 Tag 194 MiB
50786b3e5c
Commit Graph

286 Commits

Author SHA1 Message Date
Paul Davis
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
Paul Davis
395c3d35d1 tweak up pixel-level positioning 2014-01-10 11:54:32 -05:00
Paul Davis
33cf341381 avoid 1 pixel overlap of end xfade 2014-01-07 22:51:41 -05:00
Paul Davis
c22459d1b5 fix a whole set of errors in the placement of xfade visual elements (not 100% finished) 2014-01-07 20:55:04 -05:00
Paul Davis
68af0fdc07 fix up visibility control for automation lines 2013-12-31 13:28:20 -05:00
Paul Davis
e7059e5a16 remove use of canvas property_foo() since it did nothing (and has now been removed) 2013-12-31 11:54:38 -05:00
Paul Davis
28759617c4 Revert "switch fade in/out lines to ArdourCanvas::Curve rather than ArdourCanvas::PolyLine, though for no apparent benefit" 
This reverts commit e169f5c17f.
 2013-12-27 11:24:56 -05:00
Paul Davis
9fb3247350 rationalize color handling for fade in/out handles 2013-12-09 22:04:13 -05:00
Paul Davis
e169f5c17f switch fade in/out lines to ArdourCanvas::Curve rather than ArdourCanvas::PolyLine, though for no apparent benefit 2013-12-09 21:02:42 -05:00
Paul Davis
ba26316857 make region fade in/out curve shapes into PolyLines not Polygons so that they don't close the stroke path at the top/bottom 2013-10-31 15:39:29 -04:00
Paul Davis
ff560fa361 remove debug output 2013-10-31 11:48:36 -04:00
Paul Davis
7bbd28aa08 notable changes to try to improve most of enter/leave handling for canvas items 2013-10-30 23:36:30 -04:00
John Emmas
d7a16f7de6 'gtk2_ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC) 2013-10-03 09:12:02 +01:00
Paul Davis
af3056769c changes to waveform clipping display 
* clip level is now -0.9dbFS
   * display of clipping is optional (see Theme Manager window)
   * clipping is based on disk data, unscaled by region gain
 2013-06-28 20:21:30 -04:00
Paul Davis
7a7e937d8e more waveform drawing/coloring changes 
* move color-regions-using-track color into UI config, not RC config
   * consolidate all waveform coloring into AudioRegionView::set_one_waveform_color()
 2013-06-28 11:31:26 -04:00
Paul Davis
a1f858d3b2 an awful lot of tweaks to drawing details 2013-06-24 16:28:53 -04:00
Paul Davis
1c74a3ab2d waveform drawing improvements 
* handle logscaled and rectified
    * put dark tips in right places
    * improve color selection algorithm
 2013-06-21 13:17:37 -04:00
Paul Davis
594a8c1221 set waveform color to a V-reduced version of the frame fill color. 2013-06-20 23:11:40 -04:00
Paul Davis
a0c5de281a fix crash when recording, because the audioregion view has no frame handles 2013-06-18 08:22:25 -04:00
Paul Davis
e2f0c5f91e merge resolution with master 2013-05-02 20:21:54 -04:00
Paul Davis
3973ce81b3 remove all of Gtk::Window::set_position (WIN_POS_MOUSE) for anything deriving from ArdourDialog or ArdourWindow; move the set_position() call into those classes' constructors, so that they are called before the windows are realized, and thus it actually works 2013-05-02 18:13:35 -04:00
Paul Davis
47f9d7fa12 do not lower waveforms to the bottom of their group - they are supposed to be above the time axis view item frame, not below it 2013-04-27 09:23:08 -04:00
Paul Davis
6f664c1f67 many pervasive changes primarily related to waveform drawing, particular content-dragging, colors, and more 2013-04-24 15:42:14 -04:00
Paul Davis
9fdf60b637 change widths of fade lines 2013-04-20 16:11:40 -04:00
Paul Davis
41abef90d0 fix up "other" fade line colors in xfades, and switch to using canvas var "CrossfadeLine" for crossfade "lines" rather than "GainLine" 2013-04-18 21:30:12 -04:00
Paul Davis
55d7e8da19 reset xfade colors after theme change 2013-04-18 14:21:53 -04:00
Paul Davis
19b6b45a2a get xfade drawing back to pre-cc days 2013-04-18 11:18:18 -04:00
Paul Davis
ec8d521e98 semi-fix xfade display, and reduce number of calls to Curve::get_vector() by a factor of two 2013-04-18 09:56:01 -04:00
Paul Davis
ec102f94e1 various work waveview amplitude mgmt; fix playhead cursor drag from timebar click 2013-04-17 15:22:09 -04:00
Paul Davis
b9c94f6dbf remove all calls to Outline::set_outline_width (1) because this is "wrong" when using Cairo - the default is 0.5 and it can remain that way 2013-04-17 10:56:04 -04:00
Paul Davis
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
Paul Davis
a0044e5f71 add back various functionality to waveviews such as zero line, amplitude scaling 2013-04-16 10:07:52 -04:00
Paul Davis
7e19053b88 Fix dragging objects on the canvas and remove redundant canvas groups 
Delivery of fake motion events to the editor needed the event coordinates to be
in canvas space, as they are with "real" events. Editor and other objects had
many redundant groups from timbyr's work on gnomecanvas to scroll by moving
groups. We don't need this anymore with cairo-canvas (though possibly a
stationay background group for the canvas might be useful again one day as in
the SAE logo. Its implementation would be fairly different though, since we
would have to explicitly move the group on every scroll, since nothing else
ever moves on scroll).

Also tweaks to text item placement, and switch TimeAxisViewItem from
name_pixbuf to name_text, since ArdourCanvas::Text is already "pixbuf optimized".
 2013-04-15 13:50:05 -04:00
Paul Davis
b05968fb4e change frames_per_pixel to samples_per_pixel 2013-04-12 11:31:50 -04:00
Paul Davis
4258a34912 change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample 2013-04-12 11:15:45 -04:00
Paul Davis
7caf517b27 add (bezier) curves to canvas, use for automation lines; fix issue with rectangles missing their upper line segment; more cairo canvas fixes 2013-04-11 22:54:12 -04:00
Paul Davis
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Paul Davis
d99b5dfa37 fix nasty crash when using double-nested compound (consolidated) regions caused by not (re)allocating enough mixdown buffers; fix up various warnings from valgrind about mismatching operator delete[] by using shared_array<T> rather than shared_ptr<T>, as should have been the case all along 2013-03-21 10:14:01 -04:00
Ben Loftis
63a25adb9e keep region trim handle layered on top of crossfade area 
git-svn-id: svn://localhost/ardour2/branches/3.0@13670 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-14 19:44:09 +00:00
Ben Loftis
b8a8abeb8f code cleanup; crossfade shape drawing is now more closely associated with the fade-in shape rather than a separate thing. could probably be consolidated into fewer functions, but this is an interim step for testing. Also remove the use-current-fade-shape option which is not meaningful in new model 
git-svn-id: svn://localhost/ardour2/branches/3.0@13669 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-14 17:21:44 +00:00
Ben Loftis
2292e33ee4 crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion 
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-13 16:42:05 +00:00
Ben Loftis
beb3ec2d7a Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly 
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-20 19:43:43 +00:00
Paul Davis
98834c0532 remove a bunch of cerr output and/or convert to use error<< 
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-13 15:11:07 +00:00
Paul Davis
873921b954 fix erroneous use of scoped_ptr where scoped_array should be used 
git-svn-id: svn://localhost/ardour2/branches/3.0@13353 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-27 00:14:08 +00:00
Paul Davis
9743340fa3 trying to track down why undo doesn't remove xfade rendering on OS X 
git-svn-id: svn://localhost/ardour2/branches/3.0@13102 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-29 23:50:00 +00:00
Paul Davis
9a3d9dcb3c outline fade in/out handles in black (#3828) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13014 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-10 17:19:17 +00:00
Carl Hetherington
392a7fd238 Don't show previously hidden xfades when finishing a region 
drag; should fix #4982.


git-svn-id: svn://localhost/ardour2/branches/3.0@12987 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-04 21:09:32 +00:00
Carl Hetherington
0c714fe3de Simplify management of waveform visibility / shape / scale; 
fixes #4727, I think.


git-svn-id: svn://localhost/ardour2/branches/3.0@12743 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-17 11:48:51 +00:00
Carl Hetherington
a8dd4ec805 Re-show all xfades that we hide during drags (#4933). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12729 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-15 15:01:35 +00:00
Carl Hetherington
98e28bb54b Fix non-updated ordinary fade-outs during trim drags 
(#4903).


git-svn-id: svn://localhost/ardour2/branches/3.0@12537 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-02 10:44:29 +00:00
Paul Davis
9d40a072a4 arguably cleaner tweak to previous commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12479 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 18:38:54 +00:00
Paul Davis
f1505b631d substantive change to try to provide some rationality for region gain line visibility (and automation line visibility in general 
git-svn-id: svn://localhost/ardour2/branches/3.0@12478 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 18:30:10 +00:00
Paul Davis
f9030dd220 merge new symmetric curve from mixbus, fix errors in fade out slow curve, tweak display of xfades so that the non-upper-fade is slightly less dominant (alpha) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12384 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-22 21:23:22 +00:00
Paul Davis
8d828faa64 remove some debug noise from previous commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12254 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-11 21:33:02 +00:00
Paul Davis
a98fa4bc61 switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate 
git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-11 21:30:36 +00:00
Paul Davis
eaf548f49f don't trim regions in conjunction with xfade trimming unless auto-xfade and full-overlap-xfades are selected 
git-svn-id: svn://localhost/ardour2/branches/3.0@12245 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 21:40:10 +00:00
Paul Davis
916202ea64 a number of tweaks to make xfade GUI stuff better in several different ways, notable during region trims and region drags 
git-svn-id: svn://localhost/ardour2/branches/3.0@12240 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 13:48:23 +00:00
Paul Davis
68e69a8b29 fix height of xfade rendering 
git-svn-id: svn://localhost/ardour2/branches/3.0@12239 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 12:26:49 +00:00
Paul Davis
bed955b409 fix dragging of end xfades 
git-svn-id: svn://localhost/ardour2/branches/3.0@12237 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 02:50:59 +00:00
Paul Davis
e3a9576aed basic xfade dragging 
git-svn-id: svn://localhost/ardour2/branches/3.0@12236 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 00:46:22 +00:00
Paul Davis
1b6bac8c54 correctly save & restore xfade state 
git-svn-id: svn://localhost/ardour2/branches/3.0@12231 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-09 22:14:11 +00:00
Paul Davis
7bc425fd0d framework for handling events on the xfade rects 
git-svn-id: svn://localhost/ardour2/branches/3.0@12213 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-08 17:13:59 +00:00
Paul Davis
32e8a804ce return of the visible xfade rect - doesn't do anything yet, however 
git-svn-id: svn://localhost/ardour2/branches/3.0@12203 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-07 22:56:19 +00:00
Paul Davis
18b18a45a5 hide xfades while dragging region(s) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12202 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-07 22:02:17 +00:00
Paul Davis
a47ec8ba59 mostly backup-oriented commit to preserve very initial pass at rendering fades-as-xfades in a more useful way. quite a bit of work to do here 
git-svn-id: svn://localhost/ardour2/branches/3.0@12129 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-01 03:22:04 +00:00
Carl Hetherington
73cf69791b Use shared_ptr for a region view's gain line. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11632 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-09 21:22:09 +00:00
Paul Davis
b02e95f201 make region gain line visibility global, not per-region 
git-svn-id: svn://localhost/ardour2/branches/3.0@11492 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-15 14:03:19 +00:00
David Robillard
ed626628b5 Delete trailing whitespace 
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-06-01 17:00:29 +00:00
Carl Hetherington
23f2f8f546 Copy local state in AudioRegionView copy constructor. Fixes #4047. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9533 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-16 23:10:58 +00:00
Carl Hetherington
0fa76ceb20 Remove unused constructor. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9532 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-16 23:10:45 +00:00
Paul Davis
b9113772fe restore zero line visibility; change selected region colors back to 2.X version 
git-svn-id: svn://localhost/ardour2/branches/3.0@9157 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-16 13:20:31 +00:00
Paul Davis
477fca0de0 deframe audio regions as well as MIDI when entering internal edit mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@9057 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-03 18:32:06 +00:00
Carl Hetherington
0cdf0433f7 No-op; coding style. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8910 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-20 17:30:02 +00:00
Paul Davis
7a5b6a5031 patches from lincoln to speed up the regionlist and provide region removal (causes dangling shared ptrs to regions, fix to come 
git-svn-id: svn://localhost/ardour2/branches/3.0@8845 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-14 21:49:43 +00:00
Carl Hetherington
4fca993a84 Tidy up region view colouring code slightly. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8770 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-08 14:09:20 +00:00
Carl Hetherington
ce91b0953b Remove always-true should_show_selection code. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8769 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-08 14:08:05 +00:00
Carl Hetherington
1c3d7637b5 Hopefully fix visual glitches on dragging fade ins/outs. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8298 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-18 23:53:37 +00:00
Carl Hetherington
556c627fed Further fade handle twaeks. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8297 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-18 21:34:32 +00:00
Carl Hetherington
66be0059e7 Tweak positioning of fade handles. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8296 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-18 20:43:00 +00:00
Carl Hetherington
73192bc1a7 Remove all use of nframes_t. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-03 22:26:29 +00:00
David Robillard
8b68ed57ec Fix some messed up code (spacey tabs). 
(There is faar more of this... FIX YOUR EDITORS!)


git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-25 20:37:39 +00:00
Carl Hetherington
840a81a0e4 Small cleanups. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8047 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-16 14:43:28 +00:00
Carl Hetherington
c246926e41 Move some methods out of Editor into RegionView. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7981 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-09 01:58:12 +00:00
Paul Davis
ded4a143db much craziness with canvas cursors; fix 0 beat cursor text when shortening notes; fix crash when trimming locked regions; don't show trim cursors when region is locked; partial version of enumwriter validation fix from 2.X (less necessary with 3.0; probably more ... 
git-svn-id: svn://localhost/ardour2/branches/3.0@7831 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-22 15:21:06 +00:00
Paul Davis
ede4ecbb00 megaopus patch #2 for today: remove nframes64_t and sframes_t from source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 18:20:37 +00:00
Paul Davis
da8eec7a83 remove Glib::ustring from gtk2_ardour 
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-14 16:51:02 +00:00
Carl Hetherington
23fff21f4c Further fix to #3437 from Lincoln. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7755 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-07 23:27:10 +00:00
Carl Hetherington
18b99c1f44 Lincoln's patch to tidy up region fade visuals. Fixes #3437. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7748 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-07 11:41:16 +00:00
Paul Davis
98d994f29c fix a variety of unused argument errors noted by gcc 4.3.2 on x86 
git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-02 17:01:36 +00:00
Paul Davis
b2bf4eee3d 2.X commits up to and including 7519 
git-svn-id: svn://localhost/ardour2/branches/3.0@7661 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-20 22:36:35 +00:00
Carl Hetherington
4977924a6e Make simple 2-point gain envelopes considered interesting if they are not constant gain. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7509 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-27 02:10:59 +00:00
Carl Hetherington
064c6287cd Remove fade handles from recording regions. Fixes #3322. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7444 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-19 23:26:10 +00:00
Carl Hetherington
3d7487c9be Tweak region view wave height. Fixes #3318. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7436 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-17 00:56:27 +00:00
Carl Hetherington
27dd925f42 Don't tempt the user with visual cues that they can adjust fades when they can't (in MIDI internal edit mode) 
git-svn-id: svn://localhost/ardour2/branches/3.0@7433 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-16 21:12:06 +00:00
Paul Davis
2f9184d653 beat slicing patch #1 from lincoln spiteri 
git-svn-id: svn://localhost/ardour2/branches/3.0@7381 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-06 11:33:27 +00:00
Paul Davis
3a048e1d6c new fade in/fade out colors from chrisg 
git-svn-id: svn://localhost/ardour2/branches/3.0@7272 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-17 22:20:37 +00:00
Carl Hetherington
22a2c82045 Make region properties dialogue work for MIDI regions too. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7136 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-22 00:26:26 +00:00
Carl Hetherington
ad40083d4d Display region gain automation if it is 'interesting' (ie not just the default) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6991 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-26 00:25:32 +00:00
Carl Hetherington
9213e9c909 Allow more than one peaks_ready callback to be pending for an AudioRegionView 
at any one time.  Prevents problems when there is more than 1 channel for which
peaks are not ready; before, the first peaks_ready callback would be forgotten
when the second one was requested.  Should fix #3074.


git-svn-id: svn://localhost/ardour2/branches/3.0@6951 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-22 01:40:33 +00:00
Carl Hetherington
061a85191c Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-21 20:42:22 +00:00
Paul Davis
dc815ea8e8 forward-port from 2.X commits 5827-6000 including 
git-svn-id: svn://localhost/ardour2/branches/3.0@6914 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-15 20:42:05 +00:00
Paul Davis
7c9c3b8f6c visual tweak patch from lincoln, for time axis views 
git-svn-id: svn://localhost/ardour2/branches/3.0@6857 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-03 22:35:44 +00:00
Paul Davis
14b0ca31bc handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-30 15:18:43 +00:00
Paul Davis
6ef5d85ae1 changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-16 15:33:04 +00:00
Paul Davis
17088ee3ea (1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state from Region into Stateful, renamed "suspend property changes" (3) successive changes to a Property (scalar) after clear_history() do not keep resetting the old value (fixes region trim) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6720 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-02 18:05:26 +00:00
Paul Davis
fa701b8c06 change PropertyChange from a bitfield into a real object, with all the many widespread changes that causes 
git-svn-id: svn://localhost/ardour2/branches/3.0@6701 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-19 18:09:08 +00:00
Paul Davis
ce7a5e1c9f the Properties & 64bit region commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-02-18 13:59:49 +00:00
Paul Davis
b6f4cdaea2 rationalize destruction pathway (some more); tidy-ify some ImageFrame code 
git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-25 21:06:52 +00:00
Paul Davis
c83389b8ec cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-22 20:21:43 +00:00
Paul Davis
f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-21 18:23:07 +00:00
Paul Davis
aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters 
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-19 20:26:31 +00:00
Paul Davis
f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash 
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-17 18:24:23 +00:00
Paul Davis
8687895abb remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime 
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-12 15:02:15 +00:00
Paul Davis
64dc5427e4 make all use of bind/mem_fun be explicitly sigc:: 
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-11 23:29:48 +00:00
David Robillard
c83e48e07a Trim session.h include dependency tree. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5979 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-30 15:30:22 +00:00
David Robillard
046f802662 Fix unnecessarily type specific code, tidy, fix whitespace. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5844 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-21 16:56:58 +00:00
Carl Hetherington
516048882c Tidy up region gain line drawing slightly so that it doesn't overhang its region. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5839 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-21 12:32:46 +00:00
David Robillard
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
Paul Davis
e488378d42 string_is_affirmative() fix for 3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0@5723 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-02 20:53:31 +00:00
Carl Hetherington
33328b868d Make fade edits and trim possible on stacked regions. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5589 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-25 21:53:21 +00:00
Paul Davis
0178875021 MIDI cut&paste round two (not done yet); a small region trim fix from lincoln s. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5517 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-13 01:57:03 +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
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
Carl Hetherington
52fc310cfb Make waveform show / scale / shape a global option in the prefs dialog to clean things up a bit. Options to make exceptions for individual tracks could be re-added, if people want them. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5160 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-06-10 21:58:25 +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
015fc7b39f First stage of options rework. 
- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.

- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.

- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.



git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-14 00:13:27 +00:00
Nick Mainsbridge
72f1209520 Use pixbufs as region name labels rather than Gnome::Canvas::Text. Don't set height on every regionview in non-stacked mode in StreamView::add_region_view (speeds up some playlist operations). 
git-svn-id: svn://localhost/ardour2/branches/3.0@5071 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-13 15:33:41 +00:00
Carl Hetherington
3b89d9eaa0 Remove most using declarations from header files. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-12 17:03:42 +00:00
David Robillard
03536cd399 Fix a bunch of warnings. 
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4668 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-26 00:58:35 +00:00
David Robillard
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
David Robillard
75c15679bf Only create a Curve for an AutomationList if we need it. 
Fix crash on crossfade editor show (ticket 2442).


git-svn-id: svn://localhost/ardour2/branches/3.0@4641 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-19 19:42:25 +00:00
David Robillard
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
David Robillard
5f7b4de024 Time unit translation for AutomationLine (correctly display MIDI controller data). 
git-svn-id: svn://localhost/ardour2/branches/3.0@4597 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 04:46:45 +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
Carl Hetherington
510d6d6dd3 Make region gain envelope drawing work again. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4339 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-23 10:36:06 +00:00
Carl Hetherington
4e1f451520 Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8 Apologies for the big commit. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4332 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-18 19:31:00 +00:00
Paul Davis
3be16e8afb partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase 
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-12-08 16:07:28 +00:00
Paul Davis
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
Paul Davis
6129057f86 next region list fix from chris g; more tweaks to port matrix/ioselector; remove spurious _y_position from audio_region_view 
git-svn-id: svn://localhost/ardour2/branches/3.0@3844 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-10-01 09:18:30 +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
David Robillard
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
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
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
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
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
a2a6cc0404 Merge with 2.0-ongoing R3082. 
Superficial generification of export stuff.


git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-02-19 22:10:27 +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