ardour/livetrax
13
0
Fork 0
Code
914 Commits 1 Branch 1 Tag 157 MiB
f2772f270e
Commit Graph

575 Commits

Author SHA1 Message Date
Paul Davis
ea6de825fa better fix for duplicate regions, fix nasty side-effects from recent directory structure changes, debug info for d-n-d issue 
git-svn-id: svn://localhost/ardour2/trunk@919 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-18 15:16:29 +00:00
David Robillard
2b2a51b4a3 Re-fix multi present problem (without breaking cmdline session loading). 
git-svn-id: svn://localhost/ardour2/trunk@918 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-16 23:43:51 +00:00
David Robillard
b9b736899c Fixed multiple presenting of session window (very annoying when the error dialog comes up). 
git-svn-id: svn://localhost/ardour2/trunk@917 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-16 04:09:13 +00:00
David Robillard
5cbce5b762 Fix for the persistent rec-region problem. 
git-svn-id: svn://localhost/ardour2/trunk@916 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-16 02:58:22 +00:00
Nick Mainsbridge
dc9484d144 more fiddling about with placing bits of the scroll/zoom operation in the idle callback. fix some ruler bugs. overall this should be smoother. 
git-svn-id: svn://localhost/ardour2/trunk@912 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-10 17:49:03 +00:00
Paul Davis
3c45ab0846 never remove tape track source files even if empty, reconnect editor mute/solo buttons 
git-svn-id: svn://localhost/ardour2/trunk@911 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-08 17:12:14 +00:00
Paul Davis
f2c8ae66c0 remove all duplicated _id members from children of PBD::Stateful. 
Sources now know about Session.
rearrange session directory heirarchy. remove tape_dir stuff. 
NSD allows absolute/relative paths to be typed straight into the text entry.
Session history reloaded after all 3rd party registrations done.
Editor restores its ID; other objects still need this.
use g_mkdir_with_parents() instead of mkdir()
one example of using g_file_test() instead of access.




git-svn-id: svn://localhost/ardour2/trunk@908 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-07 15:07:14 +00:00
Nick Mainsbridge
e513d106d7 lower zoom step slightly, speed up autoscrolling when snapping to sub-beats (esp 32), make grid lines disappear when on coarse zoom, put grid lines in the idle thread (called from the idle thread.. interesting..), make current_bbt_points coarser so the bbt_ruler and grid lines can use it instead of making their own list, clean up bbt ruler. 
git-svn-id: svn://localhost/ardour2/trunk@905 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-04 16:04:09 +00:00
Nick Mainsbridge
cb17e3cc81 make autoscroll a bit easier to use, fix missing measure lines when moving the editor pane, slight optimisation(?) of canvas-simplerect (seems to make a difference to me), fix dirty pixels when moving regions across tracks sometimes. some code cleanup. 
git-svn-id: svn://localhost/ardour2/trunk@885 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-02 02:54:04 +00:00
Doug McLain
9b578bfff2 If you rename a session directory, it will no longer open from the recent sessions treeview, since child nodes are not created for sessions with only one snapshot. This change creates child nodes for all sessions, allowing you to rename a sessions directoy without breaking the recent sessions. 
git-svn-id: svn://localhost/ardour2/trunk@884 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-01 09:28:41 +00:00
Taybin Rutkin
78e13c37f4 Synced string array in sfdb_ui.cc with ImportMode enum. 
Cleaned up CoreAudioSource by using CAAudioFile.


git-svn-id: svn://localhost/ardour2/trunk@881 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-01 01:59:41 +00:00
Taybin Rutkin
9bc22f6f86 Fixed compilation of CoreAudioSource 
Seperated AUDIOUNITS support from COREAUDIO support.
Fixed metadata saving in SfdbUI.


git-svn-id: svn://localhost/ardour2/trunk@879 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-31 16:34:42 +00:00
Paul Davis
21d85f1854 merge changes from harrison branch back into trunk, by hand 
git-svn-id: svn://localhost/ardour2/trunk@878 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-31 13:23:43 +00:00
Nick Mainsbridge
a61f25dfe9 ** requires svn jack ** Hardware monitoring should work, some canvas scrolling speed improvement, don't disconcertingly churn the disk if jack auto-start fails, mixer visibility state is saved per session, slow down meters a bit (too much?), zoom cleanups, remove some unused variables, use rwlock for tempo state for no reason other than that it might be useful one day, fix compiler warning. 
git-svn-id: svn://localhost/ardour2/trunk@873 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-30 20:48:16 +00:00
Paul Davis
6535cd1b1d used shared_ptr<Source>, somewhat successfully 
git-svn-id: svn://localhost/ardour2/trunk@861 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-29 00:23:45 +00:00
Sampo Savolainen
c871ca6d98 shared_ptr<Region> fixes 
git-svn-id: svn://localhost/ardour2/trunk@857 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-25 20:23:58 +00:00
Paul Davis
ce234f363e use shared_ptr<> for all region handling 
git-svn-id: svn://localhost/ardour2/trunk@852 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-25 01:07:15 +00:00
Sampo Savolainen
29d58af438 .. and make autoscrolling a bit faster. 
git-svn-id: svn://localhost/ardour2/trunk@846 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-23 18:34:57 +00:00
Sampo Savolainen
ba09117dfa Make canvas autoscroll work properly. 
git-svn-id: svn://localhost/ardour2/trunk@845 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-23 18:29:22 +00:00
Paul Davis
3c3a204ad3 further optimizations for multiple-track-at-once addition. as in "whoah!" 
git-svn-id: svn://localhost/ardour2/trunk@836 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-17 02:12:20 +00:00
Paul Davis
199dce57f3 make adding multiple tracks more efficient (a *lot* more efficient) 
git-svn-id: svn://localhost/ardour2/trunk@834 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-16 20:22:44 +00:00
Paul Davis
1ae0948138 RCU-ification of AudioEngine port list, and DiskStreams. not well tested, but basically functional. better to get this in now rather than later. 
git-svn-id: svn://localhost/ardour2/trunk@828 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-16 01:19:06 +00:00
Sampo Savolainen
e706680e3d Make bar lines on the canvas draw from top to bottom no matter how few 
tracks are visible.

Make tracks toggle when ctrl-clicked


git-svn-id: svn://localhost/ardour2/trunk@824 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-14 19:19:06 +00:00
Sampo Savolainen
b5c9a0cfc2 Make track selection visible in track headers. 
git-svn-id: svn://localhost/ardour2/trunk@823 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-14 16:19:54 +00:00
David Robillard
5dae75555e Fix initial displayed state of zoom focus selector dropbox 
git-svn-id: svn://localhost/ardour2/trunk@820 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-14 00:26:54 +00:00
Hans Fugal
cf3b3205f9 Fixed ./ar{dev,dbg} 
git-svn-id: svn://localhost/ardour2/trunk@817 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-13 01:51:38 +00:00
Hans Fugal
b13dc9884e r268@gwythaint (orig r808): fugalh | 2006-08-12 16:31:45 -0600 
r269@gwythaint (orig r809):  fugalh | 2006-08-12 16:33:00 -0600
  r321@gandalf:  fugalh | 2006-08-12 15:48:28 -0600
  Behold serialized undo.
 
 r270@gwythaint (orig r810):  fugalh | 2006-08-12 16:33:10 -0600
  r322@gandalf:  fugalh | 2006-08-12 15:49:05 -0600
  A few ardev and ardbg enhancements.
 
 r271@gwythaint (orig r811):  fugalh | 2006-08-12 16:33:20 -0600
  r329@gandalf:  fugalh | 2006-08-12 15:54:49 -0600
  Cleaning up some printf debugging
 
 r272@gwythaint (orig r812):  fugalh | 2006-08-12 16:33:38 -0600
 
 r273@gwythaint (orig r813):  fugalh | 2006-08-12 16:33:48 -0600
  r338@gandalf:  fugalh | 2006-08-12 16:30:19 -0600
  Oops, forgot one
 
 r274@gwythaint (orig r814):  fugalh | 2006-08-12 17:19:56 -0600
 Remove -x from ardbg, fix bug in memento command factory


git-svn-id: svn://localhost/ardour2/trunk@815 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 23:20:11 +00:00
Hans Fugal
92ab112480 Remove -x from ardbg, fix bug in memento command factory 
git-svn-id: svn://localhost/ardour2/branches/undo@814 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 23:19:56 +00:00
Hans Fugal
0cde6a54ed git-svn-id: svn://localhost/ardour2/branches/undo@812 d708f5d6-7413-0410-9779-e7cbd77b26cf 2006-08-12 22:33:38 +00:00
Hans Fugal
8ee6045cf4 r321@gandalf: fugalh | 2006-08-12 15:48:28 -0600 
Behold serialized undo.


git-svn-id: svn://localhost/ardour2/branches/undo@809 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 22:33:00 +00:00
Hans Fugal
f6347b205c r260@gwythaint (orig r800): fugalh | 2006-08-12 15:53:10 -0600 
r322@gandalf:  fugalh | 2006-08-12 15:49:05 -0600
  A few ardev and ardbg enhancements.
 


git-svn-id: svn://localhost/ardour2/trunk@806 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 22:01:08 +00:00
Hans Fugal
461b4326a1 r259@gwythaint (orig r799): fugalh | 2006-08-12 15:52:56 -0600 
r321@gandalf:  fugalh | 2006-08-12 15:48:28 -0600
  Behold serialized undo.
 


git-svn-id: svn://localhost/ardour2/trunk@805 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 22:00:57 +00:00
Hans Fugal
37bfd8900c r257@gwythaint (orig r797): fugalh | 2006-08-12 15:49:20 -0600 
r316@gandalf:  fugalh | 2006-08-11 17:06:48 -0600
  Reconstitution. Comiples, untested.
 


git-svn-id: svn://localhost/ardour2/trunk@803 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 22:00:34 +00:00
Hans Fugal
1f20fbbad8 merge from trunk 
git-svn-id: svn://localhost/ardour2/branches/undo@802 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 21:57:07 +00:00
Hans Fugal
9ff901b1e7 r322@gandalf: fugalh | 2006-08-12 15:49:05 -0600 
A few ardev and ardbg enhancements.


git-svn-id: svn://localhost/ardour2/branches/undo@800 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 21:53:10 +00:00
Hans Fugal
81b9700c14 r321@gandalf: fugalh | 2006-08-12 15:48:28 -0600 
Behold serialized undo.


git-svn-id: svn://localhost/ardour2/branches/undo@799 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 21:52:56 +00:00
Hans Fugal
57f7f71ce3 r316@gandalf: fugalh | 2006-08-11 17:06:48 -0600 
Reconstitution. Comiples, untested.


git-svn-id: svn://localhost/ardour2/branches/undo@797 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 21:49:20 +00:00
Hans Fugal
f995ac3786 merge from trunk 
git-svn-id: svn://localhost/ardour2/branches/undo@794 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 01:36:34 +00:00
Paul Davis
66054fe5d6 new RCU implementation, using an extra layer of indirection allowing us to use g_atomic_pointer_compare_and_exchange(); bug fix for tape tracks, not sure why this never manifested before 
git-svn-id: svn://localhost/ardour2/trunk@793 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-11 23:02:08 +00:00
Taybin Rutkin
b099d2aa87 Remove unnecessary header usage. 
AUPluginUI displays an empty window.


git-svn-id: svn://localhost/ardour2/trunk@792 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-11 20:35:55 +00:00
Hans Fugal
1a03f9440d Rect fix 
git-svn-id: svn://localhost/ardour2/trunk@789 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-11 15:27:51 +00:00
Taybin Rutkin
5596fe35df Removed unnecessary AudioEngine argument to FooPluginUIs. 
git-svn-id: svn://localhost/ardour2/trunk@785 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 17:35:58 +00:00
Hans Fugal
a1aa6d2ae1 history snapshot name 
git-svn-id: svn://localhost/ardour2/branches/undo@784 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 14:56:20 +00:00
Sampo Savolainen
00bf20c236 Plugin selector keyboard focus should now stay in the plugin list. More 
sensible defaults for the NSD and accelerators will work in plugin 
windows (plus keyboard will not affect the plugin window itself).


git-svn-id: svn://localhost/ardour2/trunk@783 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 14:41:53 +00:00
Taybin Rutkin
77a13df5bd Moved PluginInfo::Type to ARDOUR::PluginType in ardour/types.h. 
Figured out (mostly) AUPluginUI hierarchy.
Moved LadspaPluginUI to its own ladspa_pluginui.cc file.


git-svn-id: svn://localhost/ardour2/trunk@782 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 04:01:15 +00:00
David Robillard
d4dd338beb - Fixed a buffer size bug when ~/.ardour2 doesn't exist (can't load configuration), if in a hacky way 
- Removed useless workbuf/conversion_buffers (same thing), uneeded with libsndfile


git-svn-id: svn://localhost/ardour2/trunk@781 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 03:04:13 +00:00
Hans Fugal
ae95684d22 merging to trunk, bugfix 
git-svn-id: svn://localhost/ardour2/trunk@780 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 01:46:55 +00:00
Hans Fugal
74b19eadfa Can pass a core to ardbg now. Fixed sometimes crash on saving history by 
creating a memory leak(?) that will go away with the transition of XMLNode* to
shared_ptr<>. A few bits toward restoring history from XML.


git-svn-id: svn://localhost/ardour2/branches/undo@779 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 01:45:49 +00:00
David Robillard
60e9d9c3df A few minor warning fixes 
git-svn-id: svn://localhost/ardour2/trunk@776 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-10 00:56:04 +00:00
Hans Fugal
a160eb92db merge from trunk 
git-svn-id: svn://localhost/ardour2/branches/undo@773 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-09 21:31:36 +00:00
Hans Fugal
5863128553 r229@gwythaint (orig r769): fugalh | 2006-08-09 08:15:05 -0600 
r283@gandalf:  fugalh | 2006-08-09 08:13:37 -0600
  Save state basics, including adding PBD::ID to the delinquents. Compiles but needs to be tested (because I can't get the whole thing to compile on OSX due to the Rect problem).
 


git-svn-id: svn://localhost/ardour2/trunk@772 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-09 21:29:43 +00:00
Hans Fugal
514daa01ec r227@gwythaint (orig r767): fugalh | 2006-08-09 08:14:17 -0600 
r274@gandalf:  fugalh | 2006-08-07 19:53:48 -0600
  Nuke Serializable in favor of Stateful. Got rid of some warnings with stub
  code.
 


git-svn-id: svn://localhost/ardour2/trunk@770 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-09 21:29:18 +00:00
Hans Fugal
c26215c1e5 r283@gandalf: fugalh | 2006-08-09 08:13:37 -0600 
Save state basics, including adding PBD::ID to the delinquents. Compiles but needs to be tested (because I can't get the whole thing to compile on OSX due to the Rect problem).


git-svn-id: svn://localhost/ardour2/branches/undo@769 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-09 14:15:05 +00:00
Hans Fugal
a32175bd41 r274@gandalf: fugalh | 2006-08-07 19:53:48 -0600 
Nuke Serializable in favor of Stateful. Got rid of some warnings with stub
 code.


git-svn-id: svn://localhost/ardour2/branches/undo@767 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-09 14:14:17 +00:00
Taybin Rutkin
7cda434904 Renamed PluginUI to LadspaPluginUI to make things more clear. 
git-svn-id: svn://localhost/ardour2/trunk@766 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-09 04:53:12 +00:00
Sampo Savolainen
3220684ade New session dialog fixups: 
- The name specified on the command line for the new
   session comes up in the dialog
 - The editor will not appear below the NSD at startup

Command line parameter fixups:
 - You can't specify both a new session and a old
   session to load at the same time.
 - Ardour will abort if command line parameters are
   incorrect

Declick faster. Fixes audible and annoying volume ramps 
when running ardour at large buffer sizes.

Make it impossible to arm tracks which have un-connected
inputs.




git-svn-id: svn://localhost/ardour2/trunk@765 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-08 21:27:41 +00:00
Hans Fugal
f07cb624c0 pull from trunk 
git-svn-id: svn://localhost/ardour2/branches/undo@764 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-08 21:11:23 +00:00
Taybin Rutkin
fb8903e443 AudioUnit work. 
Filled in some stub functions.
Started AUPluginUI class.


git-svn-id: svn://localhost/ardour2/trunk@762 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-08 04:17:26 +00:00
Sampo Savolainen
0eb03e1afe shraed_ptr<> etc. fixes for VST's. VST support now compiles, but doesn't 
run for some reason.


git-svn-id: svn://localhost/ardour2/trunk@759 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-05 11:46:13 +00:00
Hans Fugal
5756373841 Really fixed conflicts. Ready to merge into trunk. 
git-svn-id: svn://localhost/ardour2/branches/undo@757 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-04 03:42:34 +00:00
Hans Fugal
79986643c0 r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600 
Trunk merge conflicts resolved


git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-04 02:18:45 +00:00
Hans Fugal
b0b7234458 r260@gandalf: fugalh | 2006-08-03 15:53:50 -0600 
It compiles and runs and seems to still work. Still needed is the actual
 serialization. Time to merge back to trunk so things can be tested by all.


git-svn-id: svn://localhost/ardour2/branches/undo@754 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-03 21:54:14 +00:00
Hans Fugal
1f1c4981de Compiles, but doesn't link. The link errors are mostly expected and are 
tomorrow's task.

git-svn-id: svn://localhost/ardour2/branches/undo@719 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-29 03:17:11 +00:00
Hans Fugal
277b771a97 r209@gandalf: fugalh | 2006-07-28 17:38:21 -0600 
global {solo,mute,record enable,metering} state commands. Same philosophy as
 the MementoCommand but using only the appropriate state and not the entire
 state of the session.
 


git-svn-id: svn://localhost/ardour2/branches/undo@718 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-28 23:38:30 +00:00
Hans Fugal
6aeb09062f r206@gandalf: fugalh | 2006-07-26 18:19:07 -0600 
A couple more Command conversions. Now all that's left are the half dozen
 or so global mementos.


git-svn-id: svn://localhost/ardour2/branches/undo@698 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-27 00:19:27 +00:00
Hans Fugal
656d56b12d r205@gandalf: fugalh | 2006-07-26 18:11:47 -0600 
More Command conversions


git-svn-id: svn://localhost/ardour2/branches/undo@697 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-27 00:19:12 +00:00
Hans Fugal
ed31a9a262 r200@gandalf: fugalh | 2006-07-26 17:28:46 -0600 
Oops, missed one.


git-svn-id: svn://localhost/ardour2/branches/undo@696 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-26 23:29:20 +00:00
Hans Fugal
8e301e875a r199@gandalf: fugalh | 2006-07-26 17:22:38 -0600 
Memento(Redo|Undo)Command has a noop for the undo or redo respectively, and
 we don't need both before and after state. This is primarily useful for
 drag start/finish callbacks, and really only makes sense where wrapped by
 (begin|commit)_reversible_command (a composite command).
 
 Also a few more "normal" MementoCommands.


git-svn-id: svn://localhost/ardour2/branches/undo@695 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-26 23:28:54 +00:00
Hans Fugal
b7bffbe7a2 r191@gandalf: fugalh | 2006-07-24 19:50:10 -0600 
All the obvious MementoCommand grunt work. Now there's some
 add_undo/add_redo_no_execute sprinkled around where one is separated from the
 other (e.g. in different callbacks) or perhaps even where there's only an undo
 and no redo. Also some sigc-based undo/redo pairs that probably need their own
 Command class.


git-svn-id: svn://localhost/ardour2/branches/undo@692 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-25 01:50:20 +00:00
Hans Fugal
55159005b9 r189@gandalf: fugalh | 2006-07-18 17:54:25 -0600 
This is the first swath of changes, replacing add_undo with MementoCommand
 pattern, through most of the editor_mouse.cc file. However there were a few
 places that weren't symmetrical that I need to think about. The question is
 whether to tweak things so that they are symmetrical (add_undo paired with
 add_redo*), or to allow Commands to not be undoable or not be redoable. Your
 thoughts are welcome.


git-svn-id: svn://localhost/ardour2/branches/undo@685 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-18 23:54:31 +00:00
Hans Fugal
d819b922e1 r184@gandalf: fugalh | 2006-07-17 19:02:10 -0600 
(begin|commit)_reversible_command in Editor and Session


git-svn-id: svn://localhost/ardour2/branches/undo@684 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-18 17:47:12 +00:00
Hans Fugal
7968974c01 merging trunk 
git-svn-id: svn://localhost/ardour2/branches/undo@652 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-29 14:19:37 +00:00
Hans Fugal
7ff370e798 Merging from trunk 
git-svn-id: svn://localhost/ardour2/branches/undo@638 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-22 23:40:55 +00:00
Hans Fugal
7c9361b865 r59@gandalf: fugalh | 2006-06-15 12:16:20 -0600 
renamed UndoCommand to UndoTransaction, and created new UndoCommand class and
 its templated subclass SlotCommand. Those two are still in considerable flux.


git-svn-id: svn://localhost/ardour2/branches/undo@606 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-15 18:21:31 +00:00
Hans Fugal
eb3f77df57 pulling trunk 
git-svn-id: svn://localhost/ardour2/branches/undo@586 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-14 18:37:57 +00:00
Nick Mainsbridge
8b320ba5c6 Remove needless hbox in panner, get rid of some warnings in editor_rulers.cc, vst_pluginui.cc should compile, updated shuttle patch from Reuben Martin, get rid of extra include in ardour/vst_plugin.h 
git-svn-id: svn://localhost/ardour2/trunk@559 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-02 12:48:35 +00:00
Paul Davis
415d3a5018 unfinished work on selection/HiG details, restore range ops destroyed by autoscroll changes 
git-svn-id: svn://localhost/trunk/ardour2@544 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-31 02:46:04 +00:00
Doug McLain
0354401e00 Added cerr output informing where ardour2_ui.rc is being loaded from, and add clearlooks engine as default 
git-svn-id: svn://localhost/trunk/ardour2@543 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-27 02:19:30 +00:00
Doug McLain
6d07483a78 Changes to the Configuration object to properly handle radio actions as well as toggleactions. Then add Monitoring, Meter falloff, and Meter Hold under the options menu to the Configuration object, so that they will now be saved and recalled between ardour startups as non session specific items. Also, ardour.rc will be saved now on exit of ardour, wether or not session is saved. Also some text and color tweaks 
git-svn-id: svn://localhost/trunk/ardour2@542 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-27 01:41:59 +00:00
Paul Davis
b7757ddd70 changes to autoscroll behaviour. not perfect, but probably better 
git-svn-id: svn://localhost/trunk/ardour2@533 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-25 20:30:32 +00:00
Sampo Savolainen
ce6c41c060 Fixed some valgrind errors from using uninitialized variables in 
conditionals.


git-svn-id: svn://localhost/trunk/ardour2@532 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-24 22:43:15 +00:00
Paul Davis
a7bc5ca92f a silly change to test the commit hook script 
git-svn-id: svn://localhost/trunk/ardour2@529 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-24 19:19:19 +00:00
Paul Davis
ff237fb64b cleaned up main(), but partly to test the commit hook script 
git-svn-id: svn://localhost/trunk/ardour2@528 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-24 18:41:52 +00:00
Paul Davis
11a9ea1c80 fix up formatting of SMPTE time printing in tranzport control code 
git-svn-id: svn://localhost/trunk/ardour2@526 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-24 03:45:32 +00:00
Paul Davis
2fba6d0925 breakout control protocol code into LGPL library; fix panner buttons even more than nick did, plus some other bits and pieces 
git-svn-id: svn://localhost/trunk/ardour2@522 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-23 19:54:52 +00:00
Nick Mainsbridge
a222c19737 Mixer pane can be collapsed again, some cleanup, give up and go back to 'Off' for no automation playback state. 
git-svn-id: svn://localhost/trunk/ardour2@521 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-22 11:12:26 +00:00
Nick Mainsbridge
60f5fc321b This should fix the options editor crasher i just made.. thanks Nostar 
git-svn-id: svn://localhost/trunk/ardour2@520 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-21 13:21:25 +00:00
Nick Mainsbridge
479ee9cc00 Mixer strip layout, emsure correct column expands on treeviews, 'Manual' automation mode labels. 
git-svn-id: svn://localhost/trunk/ardour2@519 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-21 10:11:59 +00:00
Nick Mainsbridge
f88cf52970 Fix bus rec enable bug introduced in last commit 
git-svn-id: svn://localhost/trunk/ardour2@518 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-20 09:10:13 +00:00
Paul Davis
62b491362c fix timestretch dialog/progress etc; make tranzport protocol non-mandatory 
git-svn-id: svn://localhost/trunk/ardour2@517 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-20 02:57:38 +00:00
Paul Davis
9c6984dbbb allow for mandatory control protocols, plus some ongoing work on automation control point selection (unfinished) 
git-svn-id: svn://localhost/trunk/ardour2@516 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-19 20:10:35 +00:00
Nick Mainsbridge
c33d0ad760 Mixer strip & ui layout changes 
git-svn-id: svn://localhost/trunk/ardour2@514 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-19 17:29:05 +00:00
Paul Davis
06654aa7f1 fix for edit & mix group names getting lost at session load 
git-svn-id: svn://localhost/trunk/ardour2@513 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-19 01:54:00 +00:00
Paul Davis
9a8df38ce6 add new file 
git-svn-id: svn://localhost/trunk/ardour2@507 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-18 02:19:44 +00:00
Paul Davis
60fbeedb5f a) basic prototype of OSC control 
b) various changes to ControlProtocol model/implementation
c) more attempts to get autoscroll to work nicely (unfinished)
d) move editor item types into their own header


git-svn-id: svn://localhost/trunk/ardour2@506 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-18 02:19:27 +00:00
Nick Mainsbridge
b3b383faa5 Remove CannotRecordNoInput signal (allowing recording without input connections), provide visual indication of phase reverse, change e.g. 'gain automation' to 'fader automation', enforce mouse button 1 use in mixer strip, make button labels more consistent in mixer strip, disable io change/record enable when disconnected from jack on mixer strip, remove duplicated signal connections and typo in audio_time_axis.cc. 
git-svn-id: svn://localhost/trunk/ardour2@505 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-17 12:07:16 +00:00
Nick Mainsbridge
1242d9595c Mixer strip uses button 1 where possible, make mouse click behaviour more consistent wrt popup menus. 
git-svn-id: svn://localhost/trunk/ardour2@504 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-14 19:02:14 +00:00
Nick Mainsbridge
a0f60f6dd0 Don't show comments editor on the taskbar, position & resize it more sensibly and use word wrap. 
git-svn-id: svn://localhost/trunk/ardour2@503 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-14 16:01:36 +00:00
Nick Mainsbridge
3bf5ac33c5 Misc layout and useability fixes for NSD. 
git-svn-id: svn://localhost/trunk/ardour2@502 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-14 08:53:28 +00:00
Nick Mainsbridge
6df830a0be NSD bug fixes.. align text, default open and session folder directories, naming clarifications. 
git-svn-id: svn://localhost/trunk/ardour2@501 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-12 19:51:40 +00:00
Nick Mainsbridge
2c087c2811 NSD cleanups (again). 
git-svn-id: svn://localhost/trunk/ardour2@500 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-12 12:41:43 +00:00
Doug McLain
a0fd9fa7a0 Convert NSD from glade to gtkmm object 
git-svn-id: svn://localhost/trunk/ardour2@499 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-12 00:30:13 +00:00
Doug McLain
f0c0ecf3b1 Convert NSD from glade to gtkmm object 
git-svn-id: svn://localhost/trunk/ardour2@498 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-11 23:44:20 +00:00
Nick Mainsbridge
1268a8ab5f Be more sane about finding default template path. 
git-svn-id: svn://localhost/trunk/ardour2@497 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-11 18:37:40 +00:00
Nick Mainsbridge
62198e9c27 New session dialog defaults to the 'best' templates directory, clearing template file now works. 
git-svn-id: svn://localhost/trunk/ardour2@496 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-11 09:25:51 +00:00
Nick Mainsbridge
3732decd72 Some fixes to the new session dialog. 
git-svn-id: svn://localhost/trunk/ardour2@495 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-10 10:22:38 +00:00
Taybin Rutkin
c67a576d61 Improved sfdb API. 
Eliminated some warnings on Darwin.
Added libxslt to scons.


git-svn-id: svn://localhost/trunk/ardour2@494 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-07 17:17:38 +00:00
Jesse Chappell
c091b877cf brought the track/bus inspector back to life 
git-svn-id: svn://localhost/trunk/ardour2@493 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-06 21:01:18 +00:00
Paul Davis
5e6703c481 dmalloc link support 
git-svn-id: svn://localhost/trunk/ardour2@491 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-03 20:51:08 +00:00
Paul Davis
979b95a56e enable use of arrow keys, fix hscroller issues, start work on smoother auto-scroll 
git-svn-id: svn://localhost/trunk/ardour2@490 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-02 01:08:34 +00:00
Doug McLain
433c518dc7 Another GTK2 fix for timefx dialog. 
git-svn-id: svn://localhost/trunk/ardour2@489 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-30 19:37:48 +00:00
Paul Davis
e22a48723e more tranzport lowlevel fixes and rebinding 
git-svn-id: svn://localhost/trunk/ardour2@488 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-29 15:40:52 +00:00
Tim Mayberry
3129b822b0 make new session dialog modal. 
git-svn-id: svn://localhost/trunk/ardour2@487 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-28 06:10:27 +00:00
Paul Davis
982d639d44 "The In-Flight Hack, 2006" 
a) measure lines extend the full height of the canvas
b) region name color bars and text positioning now adjusted to match
     font size for different display resolutions
c) vertical scrollbar limited to cover visible tracks only


git-svn-id: svn://localhost/trunk/ardour2@486 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-27 09:04:24 +00:00
Nick Mainsbridge
d2ff9e40e3 Fix vst typo 
git-svn-id: svn://localhost/trunk/ardour2@485 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-26 16:33:10 +00:00
Nick Mainsbridge
d7deda2113 Fix missing commection from last commit 
git-svn-id: svn://localhost/trunk/ardour2@484 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-26 16:15:26 +00:00
Nick Mainsbridge
1855ed57fd Plugin selector useability changes, fix mouse grab bug in plugin barcontroller, prevent alpah key entry in tempo/meter dialogs 
git-svn-id: svn://localhost/trunk/ardour2@483 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-26 16:04:04 +00:00
Paul Davis
56f0a56805 fix installation and mode of ardour2 script 
git-svn-id: svn://localhost/trunk/ardour2@482 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-26 00:58:34 +00:00
Paul Davis
1da9bb0c26 Install ardour as a binary, a script and a set of shared 
libraries. Libraries are discovered via {LD,DYLD}_LIBRARY_PATH


git-svn-id: svn://localhost/trunk/ardour2@481 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-26 00:45:27 +00:00
Taybin Rutkin
49ab3aa0b3 All included libraries now link dynamically instead of statically. 
Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.


git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 20:23:50 +00:00
Nick Mainsbridge
39f32134de Small tempo/meter dialog useability changes 
git-svn-id: svn://localhost/trunk/ardour2@469 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 00:51:30 +00:00
Paul Davis
028e1ebc4a a) completely refactor abstract UI code 
b) single-thread Tranzport implementation
c) implement BasicUI to share functionality across multiple
     controllers
d) various minor fixes here and there


git-svn-id: svn://localhost/trunk/ardour2@468 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-24 22:45:19 +00:00
Nick Mainsbridge
484debb45c New session dialog now opens as well as makes new sessions. Avoid seeing an ugly blank editor. Some dialog tweaks. 
git-svn-id: svn://localhost/trunk/ardour2@467 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-24 21:34:23 +00:00
Sampo Savolainen
d9343ed8bd Fix font size getter 
git-svn-id: svn://localhost/trunk/ardour2@466 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-24 15:06:20 +00:00
Nick Mainsbridge
f221ee5813 Fix my bogus glade file. sorry about that 
git-svn-id: svn://localhost/trunk/ardour2@465 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-22 17:03:28 +00:00
Nick Mainsbridge
d3a573bf3e Set button labels sanely. 
git-svn-id: svn://localhost/trunk/ardour2@464 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-22 16:49:51 +00:00
Nick Mainsbridge
dcd4c89f34 Prompter now prevents blank strings or unaltered names & now has a horizontal orientation. Rename marker now uses the ArdourPrompter. 
git-svn-id: svn://localhost/trunk/ardour2@463 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-22 15:28:59 +00:00
Nick Mainsbridge
f81f877adf Fixup for comments editor blocking presses to its button 
git-svn-id: svn://localhost/trunk/ardour2@462 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-21 16:29:02 +00:00
Nick Mainsbridge
2ce07f34e2 Comments button now indicates when comments are present, more dialog work (ask about saving, comments box etc.), code cleanups in mixer_strip.cc. 
git-svn-id: svn://localhost/trunk/ardour2@461 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-20 20:41:05 +00:00
Paul Davis
17b18acda3 a) use ink extents in most places where we used to use logical extents 
for text sizing

b) add back scroll-wheel functionality to plugin parameter controls


git-svn-id: svn://localhost/trunk/ardour2@460 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-20 18:14:00 +00:00
Nick Mainsbridge
d7e728476a Add a stock question image to the choices dialog, other general dialog love.. Forgot to mention that in the last commit the default snapshot name has been modified for slightly better alphabetical sorting goodness (year is now first, weekday last). 
git-svn-id: svn://localhost/trunk/ardour2@459 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-20 11:41:45 +00:00
Nick Mainsbridge
8ca561f8d3 Change ArdourPrompter to not have an OK button by default, clean up new track/bus dialog and change 'affirmative' button on ArdourPrompter dialogs, make 'jack isn't running' dialog a MessageDialog, standardise some capitalisation, add stock buttons to plugin selector, fix layout of presets in plugin_ui. Fix 'rename range' dialog. 
git-svn-id: svn://localhost/trunk/ardour2@458 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-19 20:42:17 +00:00
Nick Mainsbridge
c1be7a630a Fix up cleanup summary dialogs a bit. 
git-svn-id: svn://localhost/trunk/ardour2@457 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-19 13:42:57 +00:00
Nick Mainsbridge
6034370f9d Clean up/Flush wastebasket work again, change recent/new/open dialog button labels to make them more Gnome HIG 
git-svn-id: svn://localhost/trunk/ardour2@456 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-19 08:14:39 +00:00
Paul Davis
74e6e37d30 a) fix editor hscroller to follow PT behaviour - scrollbar always 
covers 0...full session + 10% of current zoom page size
b) add "big meter" mode to tranzport and fix more bugs with tranzport
   support


git-svn-id: svn://localhost/trunk/ardour2@455 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-19 02:11:39 +00:00
Taybin Rutkin
dca6c6d91f Added tooltips to help explain various soundfilebrowser buttons. 
Fixed auditioning for SoundFileChooser and SoundFileOmega.


git-svn-id: svn://localhost/trunk/ardour2@453 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-12 03:09:25 +00:00
Paul Davis
bcf432184d likely fixes for problems loading templates with destructive tracks. Note that old templates with such tracks will need to be re-generated, since they are lacking information required for the session setup to succeed 
git-svn-id: svn://localhost/trunk/ardour2@452 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-11 03:15:57 +00:00
Paul Davis
474acbb9a9 remove link against libusb from gtk_ardour; allow recording beyond current end marker (bug introduced recently) 
git-svn-id: svn://localhost/trunk/ardour2@451 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-10 23:12:44 +00:00
Paul Davis
a157537898 a) moved metering and meter falloff code into libardour 
b) added initial "big meter" mode for tranzport
c) fixed some lock issues in ARDOUR::IO objects
d) generic_midi control surface module now compiles and loads


git-svn-id: svn://localhost/trunk/ardour2@450 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-10 03:54:00 +00:00
Nick Mainsbridge
7e8a982245 Reinstate mouse scroll actions (audio clocks, shuttle wheel, faders), clearing selection is undoable, fix compiler warning, add modified patch by Jon Michael Smith for mouse wheel track height adjustment and vertical canvas scrolling (thanks Jon) 
git-svn-id: svn://localhost/trunk/ardour2@449 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-10 02:14:05 +00:00
Paul Davis
e9f9ca5278 3 different data wheel modes for tranzport, plus lock on writes, and more 
git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-06 16:51:27 +00:00
Paul Davis
0f530372d2 significant extensions to tranzport support 
git-svn-id: svn://localhost/trunk/ardour2@446 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-06 01:52:45 +00:00
Doug McLain
4605736d1d set cursor to white in rc file 
git-svn-id: svn://localhost/trunk/ardour2@445 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-05 20:03:55 +00:00
Paul Davis
9ae0f6cbee a) dynamically loadable control surface support 
b) move tranzport and generic midi into separate dirs under "surfaces"


git-svn-id: svn://localhost/trunk/ardour2@442 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-05 00:21:43 +00:00
Paul Davis
f7c82c6911 a) start at creating ControlProtocol objects 
b) basic support for Frontier Design Tranzport
c) probably broke some aspect of existing generic MIDI feedback


git-svn-id: svn://localhost/trunk/ardour2@441 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-04 03:26:08 +00:00
Nick Mainsbridge
af5815e79b new region names are now based on file source names, standardise capitalisation of location right click menus 
git-svn-id: svn://localhost/trunk/ardour2@440 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-04 02:28:44 +00:00
Nick Mainsbridge
0f0c078a57 separate regions in loop/punch range with right-click.. more attempts to clarify language of right-click menus 
git-svn-id: svn://localhost/trunk/ardour2@439 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-01 11:50:44 +00:00
Nick Mainsbridge
825d7a769d fix incorrect marker/range marker right-click menus, try to clarify the text in them, select all between cursors ('u' is the shortcut) separate regions using range marker (a new right click menu on a range matker), easter egg 
git-svn-id: svn://localhost/trunk/ardour2@438 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-01 00:21:25 +00:00
Paul Davis
2aced5ff65 a) add "Add Range Markers" to region context menu 
b) add "Set Range" to region context menu


git-svn-id: svn://localhost/trunk/ardour2@437 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-31 23:00:40 +00:00
Paul Davis
6f1208036f zoom to session now uses the start marker instead of zero 
git-svn-id: svn://localhost/trunk/ardour2@434 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-31 16:16:16 +00:00