Torben Hohn
51ad790745
add -P flag blocking port connections while loading session
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 16:21:02 +00:00
Torben Hohn
9317a32179
fix missing break in options parsing.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:40 +00:00
Torben Hohn
ef505452a2
basic -T <load_template> option
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7208 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:10 +00:00
816232cd97
zero-pad seconds field of verbose canvas cursor, fixes #3216
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 13:01:22 +00:00
c51d6a1582
build fix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7198 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 15:55:30 +00:00
265e26c2db
final use of "stop_signal.h" removed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 15:49:38 +00:00
a01dc9b6f2
remove almost-unusued stop_signal.h and clean up the one (unused) place where it was present (VisualTimeAxis, not used in current ardour)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7196 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 14:21:43 +00:00
9b5f357490
make trimming in region name (colored) highlight work even in internal edit mode; change enter/leave handler to return true by default (MIGHT HAVE UNINTENDED EFFECTS on mouse response), thus avoiding multiple stacked canvas items fighting over enter/leave
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-30 20:13:29 +00:00
b1d5a11194
lincoln's patch to make MIDI note lines go away at smaller track heights
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7194 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-29 12:16:13 +00:00
890afb2128
create new MIDI regions on streamitem click in "note draw" mode as well as object mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7193 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-29 11:28:27 +00:00
a04b1fee6a
heavy-handed and crude way to stop WM-stolen-alt keys from causing MidiRegionView from losing track of SelectTouchDraggingMode (may not be optimal or in the right place, but it works for now); add primary-click-on-MRV-blank-space and tertiary-click-on-MRV-blank-space to select all notes above or below the click, using recently committed methods for Sequence
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7192 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 21:39:12 +00:00
8932625869
change color of note velocity text (and don't set it or justification repeatedly); make pianoroll button2 clicks select correctly rather than always being additive; hide note velocity text as soon as the mouse moves. the color change will require remvoing ~/.config/ardour2/ardour3_ui.conf to become effective
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7187 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 17:39:28 +00:00
3e966771d0
clean up item event handling in MidiRegionViews by removing unnecessary InteractiveItem inheritance, and keep child->parent event handling order consistent as much as possible
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7186 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 16:37:04 +00:00
fdf0db02a0
replace use of gdk_pixmap_unref() with g_object_unref
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 15:20:39 +00:00
8689ae88f7
refactor MidiRegionView event handling to avoid too much spaghetti as we move along
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7182 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 15:07:15 +00:00
Carl Hetherington
d0d160e566
Fix crash on clear option for automation tracks ( #3195 ). Also fix state change signalling so that lines reappear on undoing a clear.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 12:26:00 +00:00
Carl Hetherington
5a58f4381b
Fix crash on export selection range.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7177 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 02:20:22 +00:00
Carl Hetherington
dc13054674
Always show region properties menu item, and offer the list editor even outside of internal edit mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7176 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:32:01 +00:00
Carl Hetherington
e2b48e90df
Fix hang on closing the editor.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7175 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:31:49 +00:00
Carl Hetherington
494f53059e
Fix show existing automation for audio tracks (part of #3193 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7174 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:08:53 +00:00
Carl Hetherington
40d280d7b2
Allow the region gain automation tool to create standard automation events. Fixes #3192 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7173 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 01:08:37 +00:00
Carl Hetherington
d47161b9ee
Use bbt_add and bbt_subtract to do proper BBT maths in round_to_beat_subdivision.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 00:26:32 +00:00
Carl Hetherington
933388e7dc
On resizing an unselected MIDI note, make it the only one to be resized during that drag. Fixes #3188 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 23:17:10 +00:00
Carl Hetherington
6fbaa5403b
Restore Fader and Pan options to audio track automation menus. Hide the Amp processor from the plugin list. Fixes #3184 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7170 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 23:16:53 +00:00
Carl Hetherington
61a4655551
Disable ghost note on note creation drag.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7168 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 19:08:49 +00:00
b91e1f3605
generate knob pixbufs at run time but draw from the pixbufs; remove mfimg utility and existing knob icon png files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 15:18:04 +00:00
Carl Hetherington
696837ec7a
Show the verbose canvas cursor with the ghost note.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7165 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 11:54:49 +00:00
Carl Hetherington
c8376522b1
Fix disappearing plugin menu ( #3182 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7163 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 23:39:44 +00:00
Carl Hetherington
f7bff95fbc
Rudimentary ghost note when adding MIDI notes to a region, as per #3180 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 23:14:41 +00:00
6b19aee3b5
split out sndfile manager code into its own file; move a couple of utility functions into gtkmm2ext ; add knob PNG generating tool ; break appearance of monitor section for now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 16:45:21 +00:00
Carl Hetherington
2881a495ef
Make discrete mode work for MIDI automation views. Fixes #3178 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 16:40:35 +00:00
Carl Hetherington
a57b9cdd99
Allow region-based automation axes to report whether they
...
have automation data or not. Should fix #3177 .
git-svn-id: svn://localhost/ardour2/branches/3.0@7158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 15:51:32 +00:00
Carl Hetherington
ef94fbf11c
Remove some dead code. Clean up storage of automation axis menu
...
items. Fixes #3174 .
git-svn-id: svn://localhost/ardour2/branches/3.0@7157 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 14:50:45 +00:00
d95d6ca719
remove forward decl of non-existent ARDOUR::Menu
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 12:49:30 +00:00
Carl Hetherington
ee61c5c9ea
Implement shift-right-click to delete MIDI note ( #3170 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7155 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 01:39:45 +00:00
97721226a4
stop range mode stuff from showing up when in internal edit mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 01:13:45 +00:00
Carl Hetherington
7b82cb754e
Fix bug in a previous commit of mine; AutomationStreamViews create their own canvas background *and* display groups. Should fix #3173 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7153 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 01:03:07 +00:00
Carl Hetherington
e3b0cb086d
Clean up snap-to code in various places. Fix a couple of typos. Should fix #3165 and #3172 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 00:35:53 +00:00
Carl Hetherington
bd2cbe9e76
Ensure a create note drag rectangle starts with both ends snapped,
...
otherwise it is possible to drag a note with a size large enough to
be considered valid and smaller than half the grid distance. These
get snapped to zero length and thus appear infinitely long in the view.
A second try at fixing #3159 .
git-svn-id: svn://localhost/ardour2/branches/3.0@7151 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 00:00:11 +00:00
Carl Hetherington
a4664d68c0
Prevent note creation drags with no movement of the pointer. May fix #3159 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 14:45:10 +00:00
Carl Hetherington
88f13bbe33
Revert my rev. 7140 and fix it better.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7145 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 02:42:37 +00:00
Carl Hetherington
5779060c7f
Possibly fix non-appearing MIDI controls ( #3143 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7144 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 02:41:08 +00:00
Carl Hetherington
1d0abbdcd9
Fix behaviour of route group list's visible checkbutton.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7143 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 01:51:17 +00:00
Carl Hetherington
ec4cb52685
Make track Hide option work again.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 01:50:59 +00:00
Carl Hetherington
3b594f8046
Prevent brief, spurious `importing 2 of 1' type messages.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7141 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 01:08:41 +00:00
Carl Hetherington
def7f68f26
Fix canvas_rect positioning with automation tracks. May fix #3145 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7140 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-23 00:53:14 +00:00
Carl Hetherington
29b80c0d0a
Add missing file.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7139 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-22 12:18:32 +00:00
Carl Hetherington
f33b1d1900
Handle automation modes better with region-based (MIDI) automation. Should fix #3135 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7138 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-22 01:33:13 +00:00
Carl Hetherington
8d048aa472
Fix, or at least improve, automation line drawing behaviour with MIDI regions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7137 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-22 00:56:39 +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
b1c3a22498
fix from 2.X for automation line clear command using the wrong object in the memento command
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7134 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-21 15:08:57 +00:00
df3996991c
update mute display when solo state changes, to keep things in sync
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7133 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-21 14:43:47 +00:00
Carl Hetherington
4c8aa95c69
Set the select button tooltip in just one place rather than two. Hopefully fixes #3158 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7129 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-21 12:45:55 +00:00
a196405da9
various minor MIDI fixes: prevent duplicate note entry with mouse, show note info more often with verbose cursor, fix some crashes from click+move on notes ... lots more where this comes from
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 22:38:12 +00:00
e58f6752af
fix visible version number to use the one defined in the top level wscript
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7127 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 15:34:23 +00:00
d443688c92
(1) make quantize actually use the main grid setting and not just default to beats (2) apply quantize to all notes if none are selected
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7126 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 15:06:30 +00:00
Carl Hetherington
c1e6410619
Remove debug output.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7123 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 01:36:27 +00:00
Carl Hetherington
84a801a791
A few cleanups and rearrangements in the RC options. Add options for default mute-affects-* settings, and make routes obey them.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7122 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 01:30:35 +00:00
Carl Hetherington
ed74a89820
Give a better message to warn of unsupported MIDI file audition.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7121 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 23:36:40 +00:00
Carl Hetherington
03bed9a8cb
Use SMFSource static method to look for MIDI file extensions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 23:36:18 +00:00
e258b2622a
MIDI region forking, plus Playlist::regions_to_read() fix forward ported from 2.X. region forking requires a few cleanups
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 03:03:28 +00:00
c25c7598c1
change tooltip of mouse select button to indicate MIDI note editing role or range role, fixes #3147
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7117 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-18 19:08:39 +00:00
Carl Hetherington
b36d91bb2b
Fix crash on attempting a TimeFX drag but not clicking on a region.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7111 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-17 19:28:34 +00:00
Carl Hetherington
dfa39a2a90
Number controllers in the MIDI automation menu, as per #3138 . Also use 0-index numbers for the parent menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7110 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-17 12:01:53 +00:00
Carl Hetherington
54edd7b466
When inserting new notes with the pencil tool, make them the length of the grid subvidision. Bug #3132 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7109 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-16 23:43:14 +00:00
Carl Hetherington
20724294c2
Detach submenu before its parent is destroyed. Fixes #3134 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7106 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-16 18:04:47 +00:00
Carl Hetherington
2deba15863
Allow right-click on region list to select the region. Fixes #3129 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7105 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-16 14:20:14 +00:00
Carl Hetherington
0e0beef90f
Fix some excessive search-and-replaces.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7104 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-15 23:57:41 +00:00
ec01a25ec1
add 8 more beat subdivisions, as per #3126
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7099 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-13 18:51:59 +00:00
Carl Hetherington
73c717c6fc
Copy-edit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-11 23:47:24 +00:00
Carl Hetherington
6f3de51ed3
Copy-edit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7094 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-11 00:34:29 +00:00
Carl Hetherington
7e6014a077
Fix track height menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-11 00:09:41 +00:00
37a34bb8b0
use a static per-class signal to notify the selection object in each MidiRegionView when note items are deleted. fixes crash on cut/undo/reselect and related operations
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7092 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-10 16:05:24 +00:00
Carl Hetherington
05b99bf8da
Remove some debug code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7091 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-10 10:22:38 +00:00
Carl Hetherington
c899ba4368
Remove some dead code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-10 01:37:35 +00:00
Carl Hetherington
ce1316a907
Make zoom to session zoom to slightly more than the session (an extra 1% of session length either way)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7089 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-10 00:48:42 +00:00
Carl Hetherington
8e76b4944c
Fix programming error on removing marker.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 23:31:07 +00:00
Carl Hetherington
792e3de1d4
Create the session range location as and when the session first gets some content. Allows both the beginning and end of the range to expand to contain the actual session contents.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7087 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 20:48:21 +00:00
Carl Hetherington
acfc44f388
Remove some hang-overs of the old horizontal scrollbar. Hence allow most things to happen beyond the session end marker.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 01:33:11 +00:00
78b8eaf565
save global state when quitting BEFORE we stop the engine, so that global MIDI ports are still connected and thus will re-establish their connections on session reload
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7082 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-08 16:47:57 +00:00
Carl Hetherington
8d0581a720
Remove use of i18n macros in headers. Prevents our gettext.h being included before libintl.h, which causes failures when ENABLE_NLS is not defined (bug #3111 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-08 01:20:33 +00:00
Carl Hetherington
129ace60e2
Fix warning.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7080 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-08 01:18:36 +00:00
133aaeaf58
tweak knob drawing, add angular/radial control on button3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7078 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-07 16:33:25 +00:00
Carl Hetherington
d044036297
Copy-edit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7075 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-07 00:18:47 +00:00
b0a59ba6da
show half-lit state for !self-soloed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-06 20:41:53 +00:00
f2ceb5c340
lots of odds and ends to do with solo isolate and its GUI
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7072 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-06 18:40:37 +00:00
e1ed9467dc
draw LED background with same style as parent window; less debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7070 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-06 02:48:59 +00:00
c52a0d1efc
relayout solo led stuff, as per the boss' requests :)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7069 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-06 01:31:48 +00:00
Carl Hetherington
8c423ea228
Small cleanups to dragging code. Fix assertion failure on dragging a regions' parent entry from the region list to the canvas (which may be #2811 ). Fixes to drags of regions onto and then back off canvas; should fix #3109 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7068 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 22:09:07 +00:00
b092cfc216
half-fix logic issue with solo-isolate controls
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7067 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 21:10:09 +00:00
1ae1eeb257
led\'s for solo-safe and solo-isolate, rather than a context menu (mixer strip only). not finished and some logic errors in terms of turning things on and off
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7066 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 20:29:46 +00:00
3fa522e5df
make "exclusive solo" apply to listen as well as SiP
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7064 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 15:47:51 +00:00
25704da321
remove some debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7061 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 14:17:43 +00:00
5c144432ad
light theme needs monitor section style info
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7060 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 14:14:19 +00:00
896a0a991c
rename latched solo option and reverse its meaning; add exclusive solo button functionality in monitor section; add solo/mute override control in monitor section
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7059 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 14:09:58 +00:00
Carl Hetherington
056ceba16a
Fix SNAFU on region trimming with grid enabled caused by my recent supposed fix.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7055 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 01:54:16 +00:00
bf6de6da77
remove muted-by-others, a concept that turns out to have been a red herring; add auditioning alert button to monitor section; start adding exclusive solo button to monitor section
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7052 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-04 16:39:03 +00:00
dda0622957
the great solo model simplification (without much code removal)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-03 22:07:47 +00:00
e33d4553b2
more solo model work, including a GUI fix for mute button state when the route is self-soloed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-03 18:58:38 +00:00
Carl Hetherington
1b9bf21aa4
A little copy-editing.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7046 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 23:54:25 +00:00
Carl Hetherington
c2da4ec8f9
Prevent multiple tempo / meter changes being inserted at the same point
...
on the timeline; adding a new change at the same time as an existing one
will replace the existing one. Should prevent #769 from happening.
Some cleanups and tweaks to tempo / meter dialogues. Desensitize Remove
menu option for those changes that can't be removed.
git-svn-id: svn://localhost/ardour2/branches/3.0@7045 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 23:14:43 +00:00
Carl Hetherington
ceb1025c2c
Small cleanup: add constructor to InterThreadInfo.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7044 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 19:08:30 +00:00
Carl Hetherington
4f94ab5c39
Set mixer strip widths when the configuration option is changed. Fixes #2855 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7041 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 14:28:09 +00:00
Carl Hetherington
7fc2e8da30
Fix toggling behaviour of glue region to bars & beats option. Fixes #2588 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7040 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 14:08:37 +00:00
Carl Hetherington
614514dad3
Clarify labels in export dialog to explain how options affect use of region gain when exporting.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7039 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 13:48:06 +00:00
Carl Hetherington
0d0e32d8b3
Various fixes to multiple-2D panner signal handling. Should fix some or all of #1632 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7037 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 01:33:25 +00:00
Carl Hetherington
13003cd9d9
Remove unnecessary snap in Editor::single_*_trim, as the passed-in delta is already snapped. Should fix #1279 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7036 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-01 23:36:15 +00:00
Carl Hetherington
c5e4e8fdd9
Remove some unused variables.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7035 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-01 23:35:33 +00:00
576cdb08b5
perhaps, just possibly, a working solo model. needs to be fixed so that connections to other JACK clients count as "physical" connections, so don't use this with ardour connected to other JACK apps just yet. Oh, this also invalidates existing a3 sessions again
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7033 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-01 15:09:19 +00:00
Carl Hetherington
e99cf351f5
Improve normalize dialogue spacing slightly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7031 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 15:00:00 +00:00
Carl Hetherington
ea21e628e0
Use rectified log waveform in strip silence dialogue. Add threshold graphical indication. Update dialogue on open ( fixes #3102 ). Various other small cleanups.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7030 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 14:50:25 +00:00
Carl Hetherington
7df6278865
Tidy up rhythm ferret dialogue a bit and move its menu option into the Region menu.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7029 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 13:29:14 +00:00
Carl Hetherington
30aad22680
More copy-edit tweaks.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7026 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 01:29:52 +00:00
Carl Hetherington
8cff9049b1
Some more copy-editing. Make 'make mono regions' option sensitive to the region it is dealing with.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7025 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 01:21:43 +00:00
Carl Hetherington
115c4a7b54
A little gentle copy-editing of dialogue titles.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7024 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-30 00:16:45 +00:00
Carl Hetherington
73b67f16d4
Make primary-modifier+scroll wheel zoom respect zoom focus setting. Fixes #2515 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7023 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-29 23:15:09 +00:00
Carl Hetherington
09f856c1a1
Partial fix for #3092 ; make time FX still work if internal editing is enabled and we drag an audio region.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7016 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-28 23:16:07 +00:00
9c51553588
remove "ardourBuffering" file creation (it was useless, sadly); editor region list now responds to bounds changes; tweak opton in RC config editor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7013 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-28 14:51:17 +00:00
6dac4da983
more solo/mute architecture work. NOTE: changes to mute points are ignored right now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7009 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-28 01:29:06 +00:00
Carl Hetherington
f0db054a07
Don't report an error when the user cancels a time stretch operation.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7008 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 23:34:22 +00:00
Carl Hetherington
a54d090992
Some dead code removal and const fixes. Also fix #2361 : incorrect sensitivity of pan linkage buttons.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7007 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 22:38:19 +00:00
Carl Hetherington
0bc6a319f1
Don't close the plugin manager when an incompatible plugin is selected. Fixes #1194 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7006 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 19:58:31 +00:00
47de938e99
add muted-by-other concept to solo support infrastructure
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7005 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 17:10:04 +00:00
a8e354ed7b
yet more work on Ye Fabled Solo Architecture. now do forward and backward propagation of solo status from a soloed track. tweak GUI appearance
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7001 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 03:10:53 +00:00
Carl Hetherington
581376e0ed
Make Session::audible_frame() return a (more) correct answer when the transport has changed direction since it last started rolling. Fixes some playhead anomolies when reversing the transport.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 00:57:46 +00:00
Carl Hetherington
e55f93ff61
Fix #3077 properly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-26 00:57:35 +00:00
Carl Hetherington
6d98cd23b0
Reword gain-reduce-during-fast-wind option.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6992 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-26 00:39:49 +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
299951a5ee
Some menu and dialogue polishing.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6987 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-25 19:38:04 +00:00
Carl Hetherington
993595ceff
Fix slider appearance for solo mute cut.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-25 19:23:54 +00:00
Carl Hetherington
990f3391ad
Make attenutation during fast forward/rewind configurable again. Fixes #3089 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6985 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-25 15:30:14 +00:00
Carl Hetherington
64a7e9b0a9
Tidy up region properties editor a bit. Fixes #3085 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6982 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-24 00:29:28 +00:00
Carl Hetherington
4a9971ad83
When a track context menu is opened, select the track it was opened in (only). Should fix #3078 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6971 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-23 02:06:07 +00:00
Carl Hetherington
6de6812a7e
Copy-edit menu item.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6970 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-23 01:49:06 +00:00
Carl Hetherington
44b639b475
Add missing string to disposition_map. Fixes #3077 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6969 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-23 01:41:44 +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
950ac6ef2b
Don't try to load separate diskstreams in 3.0 session files. Fix a few uses of Diskstream outside Track.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6946 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 21:29:15 +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
d9cebc2edf
commits 6001-6525 inclusive from 2.X applied to 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6942 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 02:24:38 +00:00
cf77196698
no solo button for master bus; add alternate solo button state to light theme too
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6940 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-20 13:09:13 +00:00
f119387d76
indicate "soloed-by-others" state on solo button via a "half-lit" state
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6939 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-20 12:38:37 +00:00
Carl Hetherington
0cde999d87
Move toggle-waveforms-while-recording into RC options.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6935 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-19 01:40:42 +00:00
Carl Hetherington
4493d639e6
Fix menu item text corrupted by search & replace.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-19 00:05:06 +00:00
Carl Hetherington
1fb2cc7ab1
Display shuttle speed in percentage rather than fraction. Fixes #1939 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6931 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 23:57:54 +00:00
Carl Hetherington
813037f5da
Let the selection handle selecting tracks (or not) when other things are selected on them, so as to respect the configuration option of linking region to track selection. Fixes #2153 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6930 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 22:12:01 +00:00
Carl Hetherington
895bad1dcd
Make the session start/end location a single location (with start and end) rather than two separate ones. Fixes #1298 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6929 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 21:29:48 +00:00
Carl Hetherington
d9cac66b5d
Fix some i18n bugs; hopefully most if not all of #2999 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 00:25:03 +00:00
Carl Hetherington
eb61a6fd58
Disallow rename for plugin inserts. Fixes #3048 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6926 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-17 23:28:57 +00:00
Carl Hetherington
aed349f45b
Rename panner member to twod_panner to avoid having _panner and panner member variables in the same class. Be sure to reconnect everything dropped at the top of set_panner() ( fixes #3066 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6925 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-17 22:51:22 +00:00
Carl Hetherington
0ec8383428
No-op: Formatting tweak.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-17 22:50:17 +00:00
7c3367c543
put mixer strip track name button context menu back on button3 ONLY, and make button1 press revert the display to the track if it was displaying a send
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6918 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-16 19:31:57 +00:00
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
Carl Hetherington
18f2af10ae
Display details of which import file we are currently on.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6895 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-14 23:17:34 +00:00
Carl Hetherington
3d3e889dd6
Separate interthread progress window out into its own class and HIG-ify it a bit. Make the import progress bar report on the whole import rather than individual files.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6894 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-14 22:16:46 +00:00
ac8c7e427f
use session start rather than edit position for import-at-timestamp if there is no timestamp
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-12 22:34:34 +00:00
Carl Hetherington
33028f4d6d
Fix import dialogue to correctly report (x of N) with multiple files, and slightly prettify it. Partially fixes #3064 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6882 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-10 01:35:11 +00:00
Carl Hetherington
2a4f4e2763
Make record button appear in MIDI mixer strips. Fixes part of #2740 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6881 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-10 00:24:27 +00:00
Carl Hetherington
556af5afa1
Fix pan updates for routes with single panners. Fixes #3066 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-10 00:18:01 +00:00
Carl Hetherington
0130c1e821
No-op: copy-edit comments, remove duplicate comments, coding style.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 11:03:00 +00:00
Carl Hetherington
2148c34c6a
Update phase invert button on reload, and stop inserting phi into route names to signify invert.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6869 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 01:22:58 +00:00
Carl Hetherington
8057a34778
Fix crossfade height in stacked mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6868 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 01:11:31 +00:00
Carl Hetherington
8e22163b6f
Keep track of where a RegionView used to be before it was reparented for a drag. Fixes wayward drag-moves in stacked region mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6867 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 00:17:54 +00:00
e69aca2842
MIDI/Controllables for monitor section, and related fixes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-06 16:57:35 +00:00
Carl Hetherington
3ff2396b4a
Add solo safe control to editor route list, as per #3063 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6861 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-05 20:08:37 +00:00
Carl Hetherington
ad5bcfaa0b
Save and restore the selected tab and its width in the editor list.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6860 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-05 17:38:54 +00:00
Carl Hetherington
6e49c73bb0
Make port matrix notice when connections are changed outside of ardour.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-05 15:23:54 +00:00
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
3104041e67
meter point restore handling, and related matters
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6854 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-03 13:40:34 +00:00
Sakari Bergen
6ae418e5f5
Fix ordering issue with loading engine settings to the startup dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6850 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 22:58:05 +00:00
Sakari Bergen
48dd5afaa5
Make audiographer SndfileWriter use PBD::Signal and use it properly. Also make export graph stuff use boost::ptr_list (because of ScopedConnection non-copyability)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6844 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 20:49:02 +00:00
7e590cf96c
not-yet-complete JACK session management patch (TODO: get program name, vary snapshot name, arrange quit when necessary)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6840 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 18:48:50 +00:00
a48742043b
remove PBD::Connection (replace use with PBD::ScopedConnection); remove limitation on transport roll after session end
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 15:24:53 +00:00
Carl Hetherington
b68256a8ff
Fix up route group state signal handling. Make the PropertyList version
...
of Stateful::set_properties emit a changed signal after it has done its work.
git-svn-id: svn://localhost/ardour2/branches/3.0@6826 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 00:21:08 +00:00
c0c617902e
revisit setting up processors during route construction; remove several more XML-based constructors; don't put () parens around inactive plugin names (we have a checkbox); improve management of send, return and insert bitslot IDs; clean up Diskstream construction a bit more
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6819 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-01 01:24:13 +00:00
Carl Hetherington
50dd880d7e
No-op: rename a few variables and add/fix some comments.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-01 01:07:24 +00:00
Carl Hetherington
d1624f9ed2
Take away the Remove option from the region list, and add Show to re-show hidden regions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6814 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-31 01:11:48 +00:00
f7a9434034
functioning invert (polarity) button; menu item removed and track name button no longer relablled when inverted
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6813 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-31 00:59:09 +00:00
Carl Hetherington
e3dd8cc3ee
Move region naming stuff from Session into RegionFactory, cleaning up some vestiges of when Session had a list of regions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6812 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 23:40:28 +00:00
6721d997b1
add (non-functional) invert (phase/polarity switch) button
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6811 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 17:44:02 +00:00
a6dcf49333
stop crash when existing a session/quitting without a monitor section
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6810 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 17:19:39 +00:00
Sakari Bergen
455058835e
Remove the realtime export button from the export dialog, as it's not really functional atm
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6809 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 15:46:17 +00:00
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
52e6bf873c
color changes for monitor section
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6800 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-27 00:57:06 +00:00
316fca72db
lots of work to hide prelight from most buttons, etc. etc. etc; increase range of solo boost knob; theme RC files changes need propagating to the light theme, sigh
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6799 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-26 21:24:17 +00:00
ac5bbf4b99
use correct (RCConfig-based) name for MIDI port in generic MIDI control stuff; make monitor section track configuration params that apply to it; add use-monitor-bus option to rc option editor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6797 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-25 16:03:31 +00:00
f1b0f30cd5
make solo button2 click function as momentary even when in listen mode; tweak auditioner so that we know if its using the monitor bus
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-25 14:51:32 +00:00
2726184f42
remove XML-based constructors for several types of Processors; less debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-24 14:01:31 +00:00
Carl Hetherington
eb6ae56faf
Fix track mode options to appear only once on audio tracks rather than twice. Fix event handling logic for these options. HIG-ify some menu items.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-23 13:11:14 +00:00
b5c21e65fc
finish commit from yesterday ... sorry folks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-23 12:19:21 +00:00
0015553c4a
tweak startup dialog a bit to correctly save ardour.rc when need; get PROGRAM_NAME into window title bars
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6781 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-22 03:46:09 +00:00
7689d72875
put the issue of using a monitor section into ~/.config/ardour.rc, not the session file. probably not totally right yet. provide startup dialog choice page to let first time users make the decision when first trying ardour (needs rewording)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6780 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-22 03:22:28 +00:00
814f2fbd8f
change session construction so that the the monitor bus config is derived (once) from the master bus config
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-21 17:02:30 +00:00
692987ee2e
shift-click MotionFeedback widgets to reset to default, and monitor section SiP cut now does something (but doesn't pay attention to changes from elsewhere yet
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6778 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-19 21:40:23 +00:00
d163021950
lots of tricks & tweaks related to the monitor section and All That It Uses
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6777 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-19 20:53:22 +00:00
f0748535a5
save tearoff state; restore monitor section state reasonably well; fixup access control to parts of editor.h (needs more work); extend CrossThread just a little
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-19 02:49:01 +00:00
8caed20c97
fixes for various consistency/settings issues in monitor section; minor edit to PACKAGER_README
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-17 16:01:58 +00:00
45ff98fcc3
fix previous patch from lucus
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6766 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 20:16:13 +00:00
ced9274fce
patch from lucus for long names in trackbus inspector
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6765 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 19:21:09 +00:00
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
44f4b84551
finalize PROGRAM_NAME change for ardour3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6759 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-15 02:31:27 +00:00
Carl Hetherington
b56ad64ee3
Use checkbuttons rather than togglebuttons the midi tracer as it seems more logical to me.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6758 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-15 01:41:01 +00:00
f85161c5d0
"Ardour" -> PROGRAM_NAME change for libardour and setup for gtk2_ardour
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6757 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-13 19:22:34 +00:00
e10f59f96c
map most (all?) monitor processor state into/onto monitor section GUI
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6749 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-12 00:19:46 +00:00
c5dab0e2a8
save/restore monitor processor state; key handling in torn off monitor section window
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6748 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-11 22:51:24 +00:00
100d7c0f82
monitor section: make sip/afl/pfl buttons work, add rude solo, mono function, rearrange
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-11 14:33:21 +00:00
b95a70ea87
missing files added
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6745 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-10 17:31:35 +00:00
325671e20a
how about that ... a monitor/main section .. GUI is still unfinished .. several small fixes to processor loading/listen mgmt and a few debug output lines rmeoved. knob images are provisional, and can be found in icons/knob.png and related files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-10 17:31:16 +00:00
b6b68881b2
remove the session region list; GUI now represents (a relatively unfiltered view of) the raw region list that always contains every single region ever created
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6739 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-06 15:40:42 +00:00
4ffcec7b79
move big clock size variables into ARDOUR_UI; save&restore big clock size + position
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6738 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 21:51:31 +00:00
2d3e8ac20b
working big clock resizing, i think; still needs removal of global vars to ardour_ui.h
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6737 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 15:43:58 +00:00
cd12fdf447
better acid trip big clock - do not use with any other medication
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6736 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 12:51:05 +00:00
05fb76e653
acid trip big clock - do not use with any other medication
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6735 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 12:43:40 +00:00
ec047d8981
more strip silence dialog changes, to use audio clocks, show smallest silence/audible segments, etc.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6734 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 02:09:37 +00:00
4cb9014de2
likely fix for strip silence dialog GUI lockup
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 02:05:20 +00:00
26cf5551a5
possible big clock sizing fix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6732 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 01:44:03 +00:00
fcb83c97ce
debug output for big clock resizing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6731 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-04 23:55:09 +00:00
df5081c4c0
get "sequence files" import working, and fix quite a bit of missing newer logic from 2.X for import in general
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6730 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-04 23:03:04 +00:00
93dac756a2
prevent relaying during an undo/redo operation; remove some debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6728 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-04 15:55:08 +00:00
6dde6c5a8f
goodbye to MementoCommand for playlists
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6726 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-04 13:15:04 +00:00
a7eb8f4733
fixes and improvements for strip silence, with lots of thread debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6724 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-03 23:38:42 +00:00
fba09a3d19
fix (or mostly fix) ctrl-drag (copy drag) for regions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6723 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-02 21:34:06 +00:00
3e013e45b3
fix up start-in-source values from regions created as sections of another region (semantics changed as plists were introducted); remove some "optimizations" from Playlist::set_state() added to help with MementoCommand but that made undo not work correctly; make sure that Playlist::clear() notifies about regions being removed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6722 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-02 21:08:37 +00:00
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
db8b575c30
the mega-properties/SequenceProperty patch. split is broken at present (right hand starts has start-in-source of zero)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6718 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-02 00:00:00 +00:00
3540594dc5
colinf's vertical double arrow track resize cursor patch
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6717 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-01 23:57:25 +00:00
1101cd2714
make JACK->Latency->256 actually do something
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-01 23:55:15 +00:00
f0e16a09f7
try (unsuccessfully) to fix gcc complaints about function-pointer/object-pointer mixing (its much deeper than this change suggests)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6715 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-01 23:54:40 +00:00
0c20d48e7d
finish getting rid of RegionCommand
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-22 18:03:34 +00:00
d9d1a4a5cf
add begin/end undo/redo signals so that playlist can freeze/thaw itself around potentially NxM region property changes; clean up debug output; don't connect streamview to Playlist::ContentsChanged because there appears to be no need for it - we catch add/remove region, and region property changes are handled by RegionView
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6702 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-19 21:49:56 +00:00
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
728bedf9b9
connect Streamview to Playlist::ContentsChanged signal so that it updates after a Playlist::set_state() call
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6700 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-18 16:34:57 +00:00
993af4468b
do not save editor state in every reversible commands
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6698 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-18 14:44:08 +00:00
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
a1e0dc13df
tweak Stateful/StatefulDiffCommand changes so that SessionObject's actually get a name; make StatefulDiffCommand use a weak_ptr, not a raw ptr; use .val() rather than .get() to avoid confusion with boost:: smart ptr method of the same name
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-11 23:10:29 +00:00
Carl Hetherington
3a27410dcb
More tinkering with State<>. Use some StateDiffCommands instead of
...
MementoCommand<Region>. More use of State<> for Region members.
git-svn-id: svn://localhost/ardour2/branches/3.0@6675 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-11 17:08:34 +00:00
Carl Hetherington
3c00a7ca2a
Move ARDOUR::Change into PBD so that Stateful can be aware of
...
what Change a State reflects. Hence allow Stateful to do some
of the work of set/get_state in Region.
git-svn-id: svn://localhost/ardour2/branches/3.0@6671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-10 01:38:20 +00:00
Carl Hetherington
a78ad5441c
Fix cross-track region drags.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 22:27:30 +00:00
Carl Hetherington
a5c59175eb
Modify Stateful to allow undo to be done using differences in state.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6664 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 14:44:01 +00:00
76ad2dfea0
Shrink zoom buttons.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6663 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 04:54:10 +00:00
3b01f732ac
Fix rulers on intial display (fix item 1 of ticket #2740 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 04:43:48 +00:00
e6033ea2f9
Center port matrix if IO selector window is too large.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6661 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 03:43:06 +00:00
cf32bf81b8
Move object+range button up with the rest of the tool buttons (bringing edit toolbar back to correct height).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 03:17:02 +00:00
f6c30de0cc
Add --args so ardbg obeys ardour options.
...
Not sure if someone reverted this on purpose, but switching it for every commit is entirely too annoying :)
git-svn-id: svn://localhost/ardour2/branches/3.0@6659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 03:16:16 +00:00
157c2a866c
Fix crash when setting loop or punch range after creating a new session (and probably any scenario where the session changes).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 01:51:04 +00:00
b5148d93d5
Add keyboard shortcut to tooltip text where possible.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-09 00:50:24 +00:00
b48e221484
Add tooltips for link buttons.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-08 21:20:51 +00:00
30dd55bccd
use RegionCommand for same-track region drags
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6653 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-08 19:41:43 +00:00
Carl Hetherington
c3b5e572df
Preserve and restore x and y origin of editor viewport in Editor state.
...
Clean up Editor's update of various things by:
1. merging Editor's handlers of SuperRapidScreenUpdate.
2. separating out work to be done on this update and work to be done
on a locate.
Hopefully easier to understand this way.
git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-08 01:25:06 +00:00
Carl Hetherington
2c16f7aa7f
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 23:11:17 +00:00
Carl Hetherington
34ea7bb5c7
Make Editor::set_state work again.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6646 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 23:05:39 +00:00
Carl Hetherington
3ae1bd3723
Remove my attempts to autoscroll based on dragged region edges (rather than just pointer position); too many corner cases and not really worth the bother.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6645 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 03:23:20 +00:00
Carl Hetherington
a0598953d9
Fix pan value update so that modifier-click on the panner correctly returns to centre.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6643 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 02:48:43 +00:00
8d64ce26c4
Remove weird/pointless Automatable::data().
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6637 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-05 20:03:57 +00:00
249bc2f744
Move i18n stuff into autowaf.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-03 19:02:09 +00:00
0a508ffb5d
ifdef'd out deferred plugin selector load (-DDEFER_PLUGIN_SELECTOR_LOAD will improve startup time significantly).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6629 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-03 19:00:58 +00:00
Carl Hetherington
d89b7897f0
Allow buss names to be edited in the track/bus list.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6627 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-03 01:23:38 +00:00
Carl Hetherington
c3bfc3ec4e
Stop crash on deleting a plugin when its generic UI window is open.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6626 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-03 00:52:45 +00:00
faa2b3a3ad
fixup some issues with the miditracer
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6625 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-02 17:47:05 +00:00
18087e555d
Fix NULL dereference.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6616 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-01 20:06:45 +00:00
74c03b9fc0
mixing monospace font thing for miditrace window
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-01 04:08:06 +00:00
85eb944c83
improve efficiency of MIDI tracer window with a lock-free FIFO and lock-free msg pool and buffered queing; use a monospace font too
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-01 03:33:52 +00:00
0abe5b84a0
add control for sending MTC (or not)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6578 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-27 18:50:43 +00:00
832aa18a81
a boatload of minor and middle-sized changes to try to speed up undo. imperfect, unfinished, but probably right to commit now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6561 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-25 20:34:09 +00:00
Carl Hetherington
10395d2fee
Allow drag of region fade in/out in object mode with link enabled (part of #2983 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6555 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-25 02:24:44 +00:00
Carl Hetherington
eb6b142c02
Tweaks to prevent flicker in the treeview when changing record / solo isolate state.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6554 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-25 02:03:24 +00:00
b1180c3a7e
lincoln's revised patch for editor route list, to get column widths better etc.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-22 17:23:58 +00:00
7e74f18a03
avoid num-tracks repeat call EditorRegions::set_selected() when a region is selected/unselected
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6512 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-17 23:11:22 +00:00
Carl Hetherington
a992cd5574
Fix bug when dragging regions in PT-edit mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6505 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-16 01:08:15 +00:00
Carl Hetherington
5bdc03ab5c
When dragging the summary viewbox with a click outside the viewbox, clamp x and y
...
if the drag started below/above or to the left/right of the box, respectively.
Also scale maximum track height in the summary according to the summary's height.
git-svn-id: svn://localhost/ardour2/branches/3.0@6504 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-16 00:44:56 +00:00
Carl Hetherington
d73d3f3652
Restore old behaviour when updating the view when the playhead goes off it during roll.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6502 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 23:50:40 +00:00
Carl Hetherington
0c04eb8d83
Temporarily fix segfault on show/hide all automation, pending a proper fix.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6501 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 23:40:49 +00:00
Carl Hetherington
c22c3fc31e
Hopefully further improve the autoscroll on trim drag.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6500 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 23:19:46 +00:00
Carl Hetherington
722a489fd1
Reconnect region name signalling so that trim drags can be started over a region's name.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6499 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 23:05:17 +00:00
Carl Hetherington
e33d7a56b4
Stop surprising autoscroll when trimming regions; hopefully addresses #2993 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6498 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 22:47:56 +00:00
11edfd035e
dynamically resize text in the big clock, first version
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 14:42:19 +00:00
Carl Hetherington
81fd8dd960
Centre playhead on zoom when it is the zoom focus. Myself and oofus think it better this way; it could be made optional if there is the will...
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6492 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 01:06:13 +00:00
Carl Hetherington
43e8e880dc
Escape underscores in port matrix menus correctly so that track names etc. with underscores get displayed properly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6491 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 00:52:22 +00:00
Carl Hetherington
519869c4a6
Fix #2992 : mute/solo state in tracks/busses tab not set up correctly on session load.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6488 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 00:06:11 +00:00
Carl Hetherington
cb8bc93ea3
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-14 01:04:27 +00:00
Carl Hetherington
9e0d03020f
assert() to help find some possible causes of #2991 . Fix some confusion with GTK signal emission from RadioMenuElems as applied to route group selection.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 01:40:07 +00:00
Carl Hetherington
92fbcd021d
Hopefully fix segfault.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 23:50:57 +00:00
Carl Hetherington
11bd4eed89
Allow multiple simulataneous Drags to be active, and hence set up and drag time ranges when moving regions in PT-edit mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 16:14:49 +00:00
Carl Hetherington
642f41b82f
Remove non-working attempt to make time selection changes undo-able. Cleanup use of _have_transaction.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 13:17:57 +00:00
Carl Hetherington
b691c32bc6
Tiny cleanup.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6476 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 02:12:15 +00:00
Carl Hetherington
c5b78e120a
Remove unnecessary checks from Drag subclasses now that superclass does them.#
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 01:05:27 +00:00
Carl Hetherington
37dd777c9a
Fix confusion about last_pointer_* variables under snap.
...
Update verbose canvas cursor correctly when automation point drags are clamped.
Clamp multi-point automation drags horizontally.
git-svn-id: svn://localhost/ardour2/branches/3.0@6474 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-11 19:36:29 +00:00
dbff8105ab
mo' better fixes for managing MIDI CC/automation lanes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6473 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-10 18:11:02 +00:00
935eba7979
remove a bunch of debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6472 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-09 14:40:25 +00:00
ca2f505ec1
lots of debug code still in place, but get a much improved structure for MIDI automation menus actually working. tweaks to follow
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6470 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-09 02:36:47 +00:00
Carl Hetherington
c115b3d71c
Update verbose cursor correctly when y drags are clamped.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6469 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-08 19:55:37 +00:00
Carl Hetherington
b408ec00fa
Fix a few more cases of aborting drags.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-08 01:53:50 +00:00
Carl Hetherington
1a1edc9ca1
Make a new action "escape", bound to the Escape key, and make it
...
abort a drag (if one is in progress) or clear the selection.
Fix breaking of drags in a few cases; some still to do.
git-svn-id: svn://localhost/ardour2/branches/3.0@6467 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-08 01:28:15 +00:00
2e30bdba9f
select-by-pitch from the piano roll header (inspired by Rosegarden); some improvements underway to controller/automation menu, but still broken there
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-07 19:15:33 +00:00
ed6545eb5b
screw up MIDI control "automation" tracks quite a bit while trying to improve menu structure BUT add a MIDI tracer window and fix a crashing bug caused by regions prematurely being destroyed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6465 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-06 21:56:23 +00:00
Carl Hetherington
285e4c648a
Stop crossfades disappearing on region view drags.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6464 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-06 16:28:45 +00:00
Carl Hetherington
04bb3de7a5
Fix segfault on startup caused by previous patch.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-06 02:07:00 +00:00
Carl Hetherington
8418f8cea6
Clean up the idle_visual_changer a bit, fixing a bug where the playhead would jump around when zooming a lot with playhead zoom focus.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6462 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-06 01:37:38 +00:00
Carl Hetherington
ea7cb51ed8
When moving around using nudge / move to next region etc., arrange the canvas so that the playhead is either a quarter of the way from the left (when moving right) or a quarter of the way from the right (when moving left).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6461 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-06 01:36:20 +00:00
Carl Hetherington
e2981526ea
Fix some bugs in autoscroll when dragging regions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6460 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-06 01:14:56 +00:00
b66dfe0eea
make system tab show up as default (most of the time) in port matrix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 18:40:50 +00:00
Carl Hetherington
46534f2f59
Refix yesterday's patch; ignore motion events that haven't moved anywhere, and don't try to autoscroll vertically when dragging range markers.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6457 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 15:51:13 +00:00
27eb926d3f
fix some issues with context menu management
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6456 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 14:57:01 +00:00
d93fc512ed
more nudges to the MIDI list editor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6454 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 14:56:42 +00:00
51aec9a331
get the MIDI list editor working a little better and a little more
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6453 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 03:52:30 +00:00
Carl Hetherington
a23811502c
Cleanup of previous two commits.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6452 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 03:15:28 +00:00
Carl Hetherington
0d5ce8d939
Make a note of some confusion in the previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6451 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 02:30:28 +00:00
Carl Hetherington
5f8f481172
Fixes to permit drags of multiply-selected automation control points.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6450 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 02:22:58 +00:00
Carl Hetherington
14e32ba075
Fix various confusions about move threshold when snapping. Fixes non-appearing range rectangles when defining ranges with snap enabled.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6449 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 01:10:53 +00:00
Carl Hetherington
1bb2a92d8e
No-op: few minor bits of coding style.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 00:48:00 +00:00
ea6770bca3
move config button in about dialog to the right spot; add GPL license text to license subwindow of about dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6446 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-04 19:39:11 +00:00
18c5d24951
don't double-call methods via UICallback::call_slot() when they are already connected via the event loop call_slot() method
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6444 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-04 18:15:05 +00:00
Carl Hetherington
8eb081e546
Move a couple of connect() calls up the class hierarchy.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6442 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-04 14:54:08 +00:00
14c363f0bc
remove old paypal cruft from about dialog source, and delete config info window if/when about dialog is deleted
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6440 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-04 02:38:37 +00:00
6ddcd8f0b9
add a way to see (most of) the waf config used to build ardour at run time (from the about dialog). buttons still need reordering there
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-04 02:04:05 +00:00
Carl Hetherington
b1af21dae7
Fix some bugs in set_selected_control_point_from_click.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6438 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-03 12:04:29 +00:00
Carl Hetherington
0f79f67398
Some cleanups to drawing of automation line control points. Drag all selected automation points if one selected point is dragged.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-03 00:08:58 +00:00
Carl Hetherington
c88716665a
Fix confusion between model and view points when dragging ranges. Clamp both top and bottom when dragging vertically. Fix some wacky formatting.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6436 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-02 02:10:49 +00:00
Carl Hetherington
0daf21cec1
Fix warnings.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6435 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-02 01:36:19 +00:00
Carl Hetherington
9a6532def2
Stop automation drags when they hit their lowest point, so as to prevent automation curves being lost by dragging things too far downwards.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-02 01:32:14 +00:00
Carl Hetherington
85d0894475
Don't allow drag of automation range unless the mouse is inside the range.
...
Add a fade in/out on automation range drags.
Allow trim of selected range even when in linked object mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@6433 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-02 01:19:47 +00:00
Carl Hetherington
4d927a495c
Add missing files.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6432 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-01 22:57:22 +00:00
Carl Hetherington
f5acf93672
First cut of some Pro-tools inspired editing features; linked play/play range
...
and linked object/range modes.
git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-01 22:11:15 +00:00
Carl Hetherington
732ac7756a
Prevent vertical autoscroll when dragging markers. Fixes #2980 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6429 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-01 17:39:28 +00:00
74933f5865
restore excess calls to sync-order stuff (for now); allow MIDI controllers to use the same non-linear fader response as the gui; add various flags to PBD::Controllable and remove URI from that class
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6414 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-30 16:48:58 +00:00
8a17b0fb90
make generic MIDI control track remote control ID changes; fixup messes in the editor+mixer that caused excessive calls to SyncOrderKey stuff. generic MIDI still doesn't track editor/mixer order changes if we're not syncing both windows
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6413 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-30 12:41:10 +00:00
77cc0f7cc8
editors for control protocols (generalized); editor for Generic MIDI that allows choosing a MIDI binding map (or none); support banking in binding URLs, and other miscellany related to generic MIDI; save+restore JACK_MidiPort connection state (but cause a crash at shutdown time)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-29 21:31:14 +00:00
Carl Hetherington
cba3ca64b3
Some HIG and wording improvements to the right-click region context menu. Closes #2968 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6407 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-28 03:20:23 +00:00
Sakari Bergen
dde0848a98
Re-integrate export-optimization branch.
...
Export now happens directly to file (unless normalizing is required), and can be easily optimized even further.
The Session process connection is still broken during export (as it was before this commit also).
git-svn-id: svn://localhost/ardour2/branches/3.0@6401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-27 14:46:23 +00:00
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
f53cbaede8
clean up editor mixer strip when session is going away; slightly improved boost debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6397 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-24 04:04:01 +00:00
Carl Hetherington
defa1fad94
Give titles to Gtkmm2ext::Choice prompts, and do some minor cleanups to prompt text.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-23 01:26:33 +00:00
Carl Hetherington
24c0654fd5
Prevent a crash in the situation where:
...
1. session teardown starts
2. editor responds by removing and destroying all TimeAxisViews
3. session then asks all routes to drop refs
4. the editor is called by each route's drop refs handler to remove the associated TimeAxisView
5. that TimeAxisView has already been destroyed in (2)
git-svn-id: svn://localhost/ardour2/branches/3.0@6392 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-23 00:33:03 +00:00
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
Carl Hetherington
87fb46859c
Fix crash on session close.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6388 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:14:02 +00:00
Carl Hetherington
df7a3cc30c
Fix compile.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6386 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:13:22 +00:00
Carl Hetherington
e8e63d8eac
Fix show/hide of editor summary.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:13:06 +00:00
Carl Hetherington
ca602cf216
Refactor and clean up some confusion in dragging code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6384 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:12:41 +00:00
Carl Hetherington
9243298a7c
Fix comments.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:11:25 +00:00
Carl Hetherington
de4c9d4750
Small refactoring of determine_visible_control_points.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6382 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:11:06 +00:00
Carl Hetherington
8e59a26ccf
Add remove all and disconnect all to port matrix menu. Hide bundles whose channels are already represented by other, larger bundles.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:10:25 +00:00
Carl Hetherington
06f094d4b6
Fix crash when going from >2 outputs (2D panner) to <= 2 outputs.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6380 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 01:09:50 +00:00
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
738387f9a4
remove a couple of boost::signals2 trouble spots; fix some --strict compile time warnings
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-20 16:50:41 +00:00
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
67460c2af4
fix deadlock in protocol manager startup; fix some other ::set_session() SNAFUs; remove last boost::signals2::connection member from libardour
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6375 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 23:36:52 +00:00
cddb08393a
make private (non-usable) copy constructor for Selection compile, to follow changes to TrackSelection constructors
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6373 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:56:29 +00:00
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
Carl Hetherington
da762129f1
Offer all of a bundle's ports for disconnection / removal when opening a menu over a bundle's name in the port matrix.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-14 16:44:20 +00:00
Carl Hetherington
60cc81ea1a
Restore port group tabs.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6363 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 22:21:04 +00:00
Carl Hetherington
04c7158a41
Remove confusing track / group members in TimeSelection struct; time selection
...
applies to the selected tracks. Some tinkering with how tracks are selected
during time selections.
git-svn-id: svn://localhost/ardour2/branches/3.0@6360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 21:27:19 +00:00
Carl Hetherington
3db46ba30f
Add missing files.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6359 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 19:37:55 +00:00
Carl Hetherington
034db5fb1c
Apply Select property of route groups at the Selection object level. Accordingly
...
simplify code related to selecting tracks. Add a TrackViewList object rather than
"abusing" TrackSelection in lots of places.
git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 19:09:52 +00:00
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
Nick Mainsbridge
0c80b01f47
Fix canvas region layering in non-Stacked modes. Remove unused and confusing TimeAxisViewItem::selected .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6356 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-12 12:33:36 +00:00
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
Nick Mainsbridge
3367e41278
Remove unused pre_drag_region_selection, fix ugly regions when drag-copying (TimeAxisViewItem constructor), fix broken drag threshold, don't reset _grab_frame etc. when move threshold passed, fix region selection during region copy drag.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6348 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 12:13:59 +00:00
53bbac4eb6
fix compilation breakages from the last commit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6347 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 03:18:17 +00:00
29a8238e4d
second part of: fix up scrolling of pixfaders by making them grab keyboard magic focus when the mouse pointer is within them
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6345 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-10 23:02:04 +00:00
6ab765e8fa
add solo isolate indicator in editor route list
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-10 20:51:35 +00:00
90d6916ca3
restore rec-enable, solo & mute functionality; remove all Global*Command cruft; reimplement momentary solo&mute; refactor session RT event stuff to be even cleaner and finally compatible with everything-is-a-UI idea ; make all UIs derive from a primitive type that pprovides only void call_slot (sigc::slot<void>) as a way to execute arbitrary code in the UI thread
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6338 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-10 17:45:18 +00:00
Nick Mainsbridge
b5ca5713fb
Fix layering while dragging regions over higher ordered tracks, fix for drags that forget which region we dragged from, make selection after move/copy more useable.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-10 17:23:56 +00:00
61cade6d59
drastic, deep and wide changes to make RouteGroup use boost::shared_ptr<Route> and boost::shared_ptr<RouteList> to better fit into emerging framework for "RT operations" ; torben's changes to MTC slaving code (sorry for bundling)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6334 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-10 03:25:32 +00:00
f18bcf0cc8
small fixlet for region push/pull op, from lincoln
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6330 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 19:00:28 +00:00
b8b55ef003
OSC is now driven by an event loop; fix up lifetime mgmt of Glib::Source to workaround bug in Glib
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 18:37:06 +00:00
c38e02285f
major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI and AbstractUI; solo & mute are both temporarily broken; OSC control up next; may segfault during exit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 03:05:14 +00:00
90f95df207
closing in on a genuinely general scheme for handling route RT changes, now accomodating per-track, route-group override, natural route group and "all" rec-enable operations. still no sight of solo or mute ops
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-08 01:52:49 +00:00
8faf95b9bd
better, cleaner, more generic version of real-time ping pong, still just for one case of rec-enable but more coming soon
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6325 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-07 23:51:46 +00:00
9686f8097d
first pass at end-to-end RT operation request (GUI->session->RT thread->GUI), just for rec-enable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6324 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-07 21:37:35 +00:00
Carl Hetherington
dc86434283
Redraw the matrix correctly when available ports change in the currently visible tab.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6322 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-07 18:35:42 +00:00
Carl Hetherington
71f1b360a0
Give just one system tab rather than mono / stereo. Fix bundles-only mode of the port matrix.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6321 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-07 17:39:13 +00:00
Carl Hetherington
1a44701643
Fix a couple of crashes with empty matrices. Some small optimisations.
...
Correctly handle descenders on text when plotting labels. Minor layout
improvements. Add some drawings of what's going on in the port matrix
so that I don't keep losing them.
git-svn-id: svn://localhost/ardour2/branches/3.0@6319 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-07 00:41:50 +00:00
Sampo Savolainen
b9876aa1d0
Eliminate double reversible commit from time stretch, and make the stretch operation lengthen / shorten the region as per operation.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6318 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-06 21:00:43 +00:00
Taybin Rutkin
52b4b464f9
Merged revisions 6292,6294-6295,6311,6314 via svnmerge from
...
svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes
........
r6292 | trutkin | 2009-12-05 08:31:25 -0500 (Sat, 05 Dec 2009) | 1 line
remove scons build files
........
r6294 | trutkin | 2009-12-05 09:11:17 -0500 (Sat, 05 Dec 2009) | 2 lines
cairomm
remove unnecessary vendor libraries as we now rely on the developer to install them
........
r6295 | trutkin | 2009-12-05 09:12:54 -0500 (Sat, 05 Dec 2009) | 2 lines
soundtouch
remove unnecessary vendor libraries as we now rely on the developer to install them
........
r6311 | trutkin | 2009-12-05 23:38:49 -0500 (Sat, 05 Dec 2009) | 2 lines
glibmm2, gtkmm2, libgnomecanvasmm, sigc++2
remove unnecessary vendor libraries as we now rely on the developer to install them
........
r6314 | trutkin | 2009-12-06 09:15:49 -0500 (Sun, 06 Dec 2009) | 4 lines
remove scons referencing from Makefile
- TODO: should move cscope stuff to waf and get rid of the Makefile
........
git-svn-id: svn://localhost/ardour2/branches/3.0@6315 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-06 14:21:46 +00:00
Taybin Rutkin
3fdcba1859
Merged revisions 6293,6296-6306,6308 via svnmerge from
...
svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes
........
r6293 | trutkin | 2009-12-05 08:49:37 -0500 (Sat, 05 Dec 2009) | 2 lines
fix if-statement in build script
........
r6296 | trutkin | 2009-12-05 09:30:19 -0500 (Sat, 05 Dec 2009) | 5 lines
rearrange GTKOSX and darwin dependencies
- moved some GTKOSX include paths to generic darwin
- made GTKOSX dependent on being on darwin anyways
........
r6297 | trutkin | 2009-12-05 09:35:09 -0500 (Sat, 05 Dec 2009) | 2 lines
move coreaudio and audiounit handling to darwin section
........
r6298 | trutkin | 2009-12-05 09:53:40 -0500 (Sat, 05 Dec 2009) | 3 lines
use True/False instead of 1/0
fix another if-statement where it should be an elif-statement
........
r6299 | trutkin | 2009-12-05 14:11:09 -0500 (Sat, 05 Dec 2009) | 10 lines
fixes to get libardour building
- can't cast away volatile, so copy _transport_frame before emitting it.
- const_reverse_iterator::operator!=() isn't defined in this version of gcc.
- removed annoying HERE WE ARE CAAudioFile.h #warning.
- removed unnecessary include of sndfile.h in session.h.
- we don't want to set -march=i686 on the mac, so indent this if-statement so
it's only run on linux.
- DEBUG_STR() fails in the NDEBUG case, so wrap its use in an #ifndef NDEBUG
........
r6300 | trutkin | 2009-12-05 15:48:29 -0500 (Sat, 05 Dec 2009) | 2 lines
remove old scons-style CXXFLAGS_FOO in favor of just CXXFLAGS
........
r6301 | trutkin | 2009-12-05 16:01:10 -0500 (Sat, 05 Dec 2009) | 8 lines
clean up configure flags
- removed useless --aubio and --syslibs flags. The syslibs value is ignored
as we don't bring our own libraries with us anymoreand we use aubio
automatically if it's available
- added ways to turn off fpu_optimization and NLS
- fixed compiling on the mac without fpu_optimization
........
r6302 | trutkin | 2009-12-05 18:12:46 -0500 (Sat, 05 Dec 2009) | 5 lines
go back to prior uselib method for COREAUDIO, AUDIOUNIT, and GTKOSX
- fixed compile of CoreAudioSource
- re-did inclusion of coremidi_midiport.cc to depend on COREAUDIO presence
........
r6303 | trutkin | 2009-12-05 18:59:02 -0500 (Sat, 05 Dec 2009) | 5 lines
fixed compiler warnings about classes with virtual member functions, but no virtual destructor.
- Changed Metering to not use foo() = 0; to indicate it shouldn't be instantiated, but
private: Metering(), which is more idiomatic.
........
r6304 | trutkin | 2009-12-05 19:25:41 -0500 (Sat, 05 Dec 2009) | 2 lines
TOP_MENUBAR isn't used when building ardour.menus. Removed.
........
r6305 | trutkin | 2009-12-05 19:46:11 -0500 (Sat, 05 Dec 2009) | 5 lines
fix some AudioUnit compile errors
- update AudioUnit to use ChanCount
- fix some namespacing issues in audio_unit.h
........
r6306 | trutkin | 2009-12-05 20:08:48 -0500 (Sat, 05 Dec 2009) | 2 lines
make --extra-warn useful
........
r6308 | trutkin | 2009-12-05 22:59:42 -0500 (Sat, 05 Dec 2009) | 10 lines
fix compiling/linking with --coreaudio
- rearrange ardour_ui.h header in editor.cc to avoid conflict
- midi++ depends on OSX as well as COREAUDIO
- fixed including frameworks
- tweaked --extra-warn again. it's kinda redundent with --strict
- improved indentation in wscript
- use #ifdef HAVE_COREMIDI, not #if HAVE_COREMIDI. #if isn't interchangable
with #ifdef and won't work if HAVE_COREMIDI is defined with no value.
........
git-svn-id: svn://localhost/ardour2/branches/3.0@6310 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-06 04:35:48 +00:00
Carl Hetherington
abd80d0f64
Clean up and comment PortMatrix event handling a bit.
...
Fix problems with attempts to access Session after it has been
destroyed.
git-svn-id: svn://localhost/ardour2/branches/3.0@6290 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-05 03:04:54 +00:00
7703f0a76a
move generic parts of Keyboard into gtkmm2ext. imperfectly done, but makes modifiers available in libgtkmm2ext now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 22:51:32 +00:00
Carl Hetherington
a4203e01ac
Some tweaks to fix bug with the tab handling when rescanning or when ports disappear.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6287 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 22:37:52 +00:00
Carl Hetherington
a1c28e4535
Save some unnecessary updates of the processor box.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 21:45:07 +00:00
0fe48475db
switch ActionManager to a namespace; move generic part into libgtkmm2ext
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6285 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 20:52:04 +00:00
3293f957bd
handle left/right scroll in editor summary, and use secondary & tertiary modifiers to change scrolling distances
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6284 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 20:17:38 +00:00
4a3d7877f6
cross-thread handling of SessionEvent allocation/deallocation, with widespread consequences
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 19:24:09 +00:00
Carl Hetherington
478fd92039
Use a shared_ptr for SessionPlaylists so that it can be explicitly destroyed in ~Session to ease debugging.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6282 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 19:09:08 +00:00
Carl Hetherington
681e7baa89
Fix crash that I introduced with a recent bug fix.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 18:13:25 +00:00
Carl Hetherington
12c9728530
Make processor box send faders adjust their size correctly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 17:45:11 +00:00
Carl Hetherington
4a836618f3
Hide port matrix notebook tabs if there's only one.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6279 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 13:06:13 +00:00
Carl Hetherington
be79bc7916
Tweak mouseover on port matrix.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6278 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 12:49:58 +00:00
Carl Hetherington
24f0f5ecbc
Arrange port insert matrix horizontally.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 12:32:33 +00:00
Carl Hetherington
ee9455af40
Move some (most) playlist-related code and data into a separate object
...
(SessionPlaylists). Main point being to ensure that, when a Session
is destroyed (especially as a result of its constructor throwing an
exception) SessionPlaylists::track is disconnected from its signal
at the same time as the list of playlists is destroyed. Otherwise
problems abound.
git-svn-id: svn://localhost/ardour2/branches/3.0@6270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-03 21:52:10 +00:00
Carl Hetherington
c9dda81a69
Move region name slightly to partially fix #2948 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-03 02:34:24 +00:00
Carl Hetherington
00617d5494
Fix previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-03 02:22:36 +00:00
Carl Hetherington
3538c47d25
Fix #2947 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6266 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-03 00:14:24 +00:00
Carl Hetherington
57699743df
Patch from lincoln to fix #1601 : strange behaviour when duplicating multiple regions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6262 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 23:56:29 +00:00
Carl Hetherington
8b9b4308e0
Clean up some confusion about zoom focus and the edit point.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6261 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 23:31:02 +00:00
Carl Hetherington
798b5a7d6e
Repair marker and region names that I broke.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6260 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 22:26:44 +00:00
Carl Hetherington
7eb3cb0bed
Fix scrollwheel operation in editor.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 18:38:24 +00:00
Carl Hetherington
ce2d9cb4aa
Stop editor summary viewbox being moved too far down in y.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 18:25:36 +00:00
Carl Hetherington
759267af15
Various tweaks to group tabs, the main upshot of which is that you can start
...
a drag in an empty part of the group tab display and drag out a new route
group.
git-svn-id: svn://localhost/ardour2/branches/3.0@6249 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 15:32:42 +00:00
Carl Hetherington
63484d5c9a
Reset the dialog when it is closed with partial (incomplete) changes to clocks. Fixes part of #254 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 13:25:07 +00:00
ea08bbe621
fix logic problems with startup assistant; make initial page buttons of startup activatable to save mousing; grow recent sessions scrolled window if there are more than 4 recent sessions to display
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6244 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 13:23:27 +00:00
23531b0fa5
now that MTC can cause a timecode format change, make sure that our handling of the change is threadsafe
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 13:21:41 +00:00