13
0
Commit Graph

1956 Commits

Author SHA1 Message Date
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
162020e312 remove debugging text
git-svn-id: svn://localhost/ardour2/branches/3.0@6242 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 13:20:47 +00:00
73fe0a3135 make text to describe timecode-source-is-synced option hopelessly more verbose
git-svn-id: svn://localhost/ardour2/branches/3.0@6241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 13:20:36 +00:00
28d7542d23 don't bother doing port stuff if session is being deleted
git-svn-id: svn://localhost/ardour2/branches/3.0@6240 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 13:19:50 +00:00
Carl Hetherington
1e4280c9cd Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar.
git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 04:10:06 +00:00
Carl Hetherington
8128ffdf05 Fix #2933.
git-svn-id: svn://localhost/ardour2/branches/3.0@6238 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 03:51:02 +00:00
Carl Hetherington
cf6f83146a Clean up confusion wrt showing the bundle manager. Fixes #2930.
git-svn-id: svn://localhost/ardour2/branches/3.0@6230 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 00:34:45 +00:00
Carl Hetherington
fddc11f556 Various optimisations to speed up rec-enable.
git-svn-id: svn://localhost/ardour2/branches/3.0@6227 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:16:28 +00:00
Carl Hetherington
4497db3f1a Speed up some track state operations (e.g. mute etc.) that affect the editor route list; should help with #2941
git-svn-id: svn://localhost/ardour2/branches/3.0@6226 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 19:48:50 +00:00
d404b9fc58 move some debug trace support code around to a more sane location
git-svn-id: svn://localhost/ardour2/branches/3.0@6214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 13:38:38 +00:00
acdc88f279 attempt to remove confusion and errors caused by unclear semantics of _is_embedded for FileSources; member renamed _within_session, and is now ALWAYS determined by the _path of the FileSource, never by the creator
git-svn-id: svn://localhost/ardour2/branches/3.0@6213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 13:16:38 +00:00
395efbc32d as 6211, but include menu template file
git-svn-id: svn://localhost/ardour2/branches/3.0@6212 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 13:14:29 +00:00
3b4beb03b2 remove "New Return" menu option from processor box; make return toggle processor active status, and / do A/B of plugins; add A/B plugins to processor box menu
git-svn-id: svn://localhost/ardour2/branches/3.0@6211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 13:13:57 +00:00
afd9fc30e5 new rc config param, try-link-for-embed, controls whether we try hard linking for embedding files into a session
git-svn-id: svn://localhost/ardour2/branches/3.0@6210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 13:12:41 +00:00
b7341e0026 debug flag for MTC; make ardour/timecode.h simply include the "authoritative" one in libs/surfaces/control_protocol
git-svn-id: svn://localhost/ardour2/branches/3.0@6209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-29 22:08:18 +00:00
Carl Hetherington
515d19c745 Implement 2532: option to show tracks with regions under the playhead.
git-svn-id: svn://localhost/ardour2/branches/3.0@6207 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-29 12:47:59 +00:00
Carl Hetherington
60d367cfc6 Tweak checkbutton size in the processor box.
git-svn-id: svn://localhost/ardour2/branches/3.0@6205 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 03:03:45 +00:00
Carl Hetherington
acf6c35072 Remove what I believe are erroneous set_size_request calls in the panner UI. This stops the panner box taking up more space than it needs.
git-svn-id: svn://localhost/ardour2/branches/3.0@6204 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 02:55:17 +00:00
31b8f64319 add ctrl-a to select all processors in a processor box
git-svn-id: svn://localhost/ardour2/branches/3.0@6201 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 02:18:41 +00:00
1a2ced7a4a fully remove per-processor activate/deactivate from processor box (sorry carl :)
git-svn-id: svn://localhost/ardour2/branches/3.0@6200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 01:57:26 +00:00
2e8d37776e restore editor with leftmost frame preserved
git-svn-id: svn://localhost/ardour2/branches/3.0@6199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 01:53:41 +00:00
bcd77018b1 fix silly unending window dialog logic bug if you fail to open the first session
git-svn-id: svn://localhost/ardour2/branches/3.0@6198 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 01:53:18 +00:00
dfe46da169 add back activate/deactivate menu options for processor box
git-svn-id: svn://localhost/ardour2/branches/3.0@6197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 01:51:47 +00:00
c5db9a21b9 another fix for binding shared_ptr's into signals
git-svn-id: svn://localhost/ardour2/branches/3.0@6194 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 00:48:35 +00:00
8724caeee8 add MMC/MIDI feedback options to rc prefs dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@6193 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 00:48:09 +00:00
7c83541a11 use older gtkmm API to give key focus ability to the processor box
git-svn-id: svn://localhost/ardour2/branches/3.0@6188 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-27 17:28:19 +00:00
Carl Hetherington
a876ccff9c Allow processor box to get a vertical scrollbar. Make processor name text a bit smaller.
git-svn-id: svn://localhost/ardour2/branches/3.0@6187 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-26 15:04:34 +00:00
Carl Hetherington
b3d86acf38 Fix various crashes on session close.
git-svn-id: svn://localhost/ardour2/branches/3.0@6186 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-26 13:26:30 +00:00
Carl Hetherington
966e09677d Fix #2926 and #2927; presence and behaviour of solo/mute icons in the editor list.
git-svn-id: svn://localhost/ardour2/branches/3.0@6185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-26 03:02:16 +00:00
Carl Hetherington
7664d86dc5 Fix #2931; redundant menu items on main clocks.
git-svn-id: svn://localhost/ardour2/branches/3.0@6184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-26 02:15:44 +00:00
Carl Hetherington
c07f42b9f4 Fix #2932; arrange the view more carefully when going to start / end / wallclock.
git-svn-id: svn://localhost/ardour2/branches/3.0@6183 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-26 01:51:50 +00:00
Carl Hetherington
fe59ade874 Seconds out, the people vs. the port matrix, round 7.
Some spacing adjustments.  Remove the hacky RouteBundle which caused more problems
than it solved.  Put notebook tabs close to the headings in the matrix.  Some other
minor tweaks.


git-svn-id: svn://localhost/ardour2/branches/3.0@6179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 23:24:02 +00:00
Carl Hetherington
e81ee94d47 Fix crash on opening return UI.
git-svn-id: svn://localhost/ardour2/branches/3.0@6177 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 16:16:54 +00:00
Carl Hetherington
9f68797e82 Fix hotkeys in the processor box.
git-svn-id: svn://localhost/ardour2/branches/3.0@6176 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 16:16:27 +00:00
926f53244d carl's wondrous DnD VBox patch - processor boxes are now vboxes and not listviews - which included a couple of minor marker/time axis view patches for opaqueness etc.
git-svn-id: svn://localhost/ardour2/branches/3.0@6174 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 14:37:20 +00:00
f41f078323 don't resort routelists during session destruction (mixer)
git-svn-id: svn://localhost/ardour2/branches/3.0@6173 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 14:35:52 +00:00
5f5ecdbfc3 don't resort routelists during session destruction
git-svn-id: svn://localhost/ardour2/branches/3.0@6172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 14:34:42 +00:00
b0e41486f3 debug flag for session destruction and waf option for boost SP debug
git-svn-id: svn://localhost/ardour2/branches/3.0@6171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 14:34:17 +00:00
Carl Hetherington
40c4655793 Make the editor summary extend a little way beyond the start and end markers for the session. Fix up some small problems.
git-svn-id: svn://localhost/ardour2/branches/3.0@6170 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 13:44:57 +00:00
Carl Hetherington
1c5d13938a Fix problems with summary when the session start marker is not at zero (#2924)
git-svn-id: svn://localhost/ardour2/branches/3.0@6169 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 01:39:25 +00:00
Carl Hetherington
c2a7ad0724 Make marker etc. rulers opaque to fix #2921
git-svn-id: svn://localhost/ardour2/branches/3.0@6168 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 01:13:17 +00:00
Carl Hetherington
0f45eed58c Fix #2922.
git-svn-id: svn://localhost/ardour2/branches/3.0@6167 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 00:13:58 +00:00
Carl Hetherington
2f1c664e4e Fix for routes being renamed if you start editing their names but then change your mind. Don't allow name edit if rec-enabled (part of #2920)
git-svn-id: svn://localhost/ardour2/branches/3.0@6166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-24 23:59:15 +00:00
Carl Hetherington
9be0f1c4ed Fix #2923.
git-svn-id: svn://localhost/ardour2/branches/3.0@6165 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-24 23:56:26 +00:00