ardour/livetrax
13
0
Fork 0
Code
911 Commits 1 Branch 1 Tag 199 MiB
f7ccc404b3
Commit Graph

399 Commits

Author SHA1 Message Date
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
Tim Mayberry
c1e5842565 Moved test for jack_port_ensure_monitor from SConstruct into 
libs/ardour/SConscript.

Renamed define WITH_JACK_PORT_ENSURE_MONITOR to HAVE_etc to 
be more consistant.

Added a test in libs/ardour/SConscript for jack video support and 
ifdef'd the small code blocks in audioengine.cc and session_time.cc
where it was used.


git-svn-id: svn://localhost/ardour2/trunk@882 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-09-01 02:58:33 +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
Tim Mayberry
dde980289a Add a check for for jack function jack_port_ensure_monitor to 
allow building successfully with older versions of jack.


git-svn-id: svn://localhost/ardour2/trunk@876 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-31 03:44:44 +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
Paul Davis
3d1c0d729a new file 
git-svn-id: svn://localhost/ardour2/trunk@854 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-25 01:34:33 +00:00
Paul Davis
1b8af985b5 fix last minute code change 
git-svn-id: svn://localhost/ardour2/trunk@853 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-25 01:14:16 +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
Tim Mayberry
7e95f29ce9 Just some whitespace fixes from where it looks like I've been working 
without my editor configured correctly and haven't noticed. Sorry about
that.


git-svn-id: svn://localhost/ardour2/trunk@849 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-24 11:55:23 +00:00
Tim Mayberry
3bba45c773 * [Modified] audioengine.cc 
Connect to jack before we start the metering thread in case 
the connect fails and an exception is thrown.

* [Modified] SConstruct

Change back the pkg-config argument for the SoundTouch library
to the name used in the upstream tarball. Sorry drobilla, perhaps
there is a way to handle both.



git-svn-id: svn://localhost/ardour2/trunk@848 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-24 11:44:06 +00:00
Paul Davis
4273f94813 fix for type error on 64 bit systems 
git-svn-id: svn://localhost/ardour2/trunk@837 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-17 16:56:23 +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
Taybin Rutkin
279128c81e Merged fix from cocoa branch -r 831. 
git-svn-id: svn://localhost/ardour2/trunk@832 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-16 15:58:40 +00:00
Paul Davis
3ea92ec324 new file 
git-svn-id: svn://localhost/ardour2/trunk@831 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-16 14:07:58 +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
Taybin Rutkin
c5619a0f98 Renamed id to _id for ObjC compatibility. 
git-svn-id: svn://localhost/ardour2/trunk@826 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-15 12:07:56 +00:00
Hans Fugal
81bec39eb0 less annoying debug 
git-svn-id: svn://localhost/ardour2/trunk@816 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 23:30:59 +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
e0d1b7cb4b r338@gandalf: fugalh | 2006-08-12 16:30:19 -0600 
Oops, forgot one


git-svn-id: svn://localhost/ardour2/branches/undo@813 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 22:33:48 +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
8e1c9186cb r329@gandalf: fugalh | 2006-08-12 15:54:49 -0600 
Cleaning up some printf debugging


git-svn-id: svn://localhost/ardour2/branches/undo@801 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-12 21:55:04 +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
Hans Fugal
af0680d49b r308@gandalf: fugalh | 2006-08-11 08:49:54 -0600 
OS X MacTypes.h/libgnomecanvasmm Rect problem workaround when COREAUDIO=0


git-svn-id: svn://localhost/ardour2/branches/undo@788 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-08-11 15:24:49 +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
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
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
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
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
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
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
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
72168803ee r183@gandalf: fugalh | 2006-07-17 19:01:39 -0600 
Use XMLNode instead of templating memento types.


git-svn-id: svn://localhost/ardour2/branches/undo@683 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-18 17:46:20 +00:00
Hans Fugal
0bd3b0b670 r168@gandalf: fugalh | 2006-07-11 16:29:22 -0600 
I just had an epiphany. I tried so many ways to make saving function name and
 args work, it never occured to me that you could just as easily save undo
 information as a pair of mementos, even in the Command-based structure we
 agreed on.
 
 Since many (read: almost all) existing undo commands take this form:
 
     begin_reversible_command (_("change fade in length"));
     session->add_undo (arv->region.get_memento());
     arv->region.set_fade_in_length (fade_length);
     session->add_redo_no_execute (arv->region.get_memento());
     commit_reversible_command ();
 
 We are already doing the save a memento before and after work. All we need to
 do is instantiate an appropriate instance of MementoCommand. So the above
 becomes:
 
 
     begin_reversible_command (_("change fade in length"));
     MementoCommand<arv_region_t, arv_region_memento_t>  before, after;
     before = arv->region.get_memento();
     arv->region.set_fade_in_length (fade_length);
     after = arv->region.get_memento();
     session->add_command(arv->region, before, after);
     commit_reversible_command ();
 
 (With apologies for being too lazy to go look up what arv_region_t and
 arv_region_memento_t are)
 
 Note that the true command approach is still possible, and encouraged (both by
 dictate and design). 
 


git-svn-id: svn://localhost/ardour2/branches/undo@680 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-11 22:29:39 +00:00
Hans Fugal
ab1b29bcb2 r162@gandalf: fugalh | 2006-06-30 19:30:58 -0600 
some macros for MementoCommand()


git-svn-id: svn://localhost/ardour2/branches/undo@666 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-07-06 18:25:58 +00:00
Hans Fugal
a5386f8d59 r155@gandalf: fugalh | 2006-06-30 11:21:45 -0600 
MementoCommand - for the lazy at heart


git-svn-id: svn://localhost/ardour2/branches/undo@661 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-30 17:24:16 +00:00
Hans Fugal
21af0d4ae2 r154@gandalf: fugalh | 2006-06-30 11:16:27 -0600 
fixed guard defines


git-svn-id: svn://localhost/ardour2/branches/undo@660 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-30 17:23:12 +00:00
Hans Fugal
6337a1894c r132@gandalf: fugalh | 2006-06-29 12:45:16 -0600 
Coding for undo/redo starts in earnest. Paul and I decided to go with a
 standard gang of four Command pattern, with serialization. This overcomes the
 terrible difficulties we were having with static type checking and the sigc++
 approach.  I'm adding the requirement that each command support undo,
 simplifying undo/redo. NOTE that an important fallout here is that
 Command::operator()() is the opposite of the old UndoAction::operator()(), i.e.
 Command::operator()() is execute/redo, and Command::undo() is undo.
 
 This commit is a reworking of the infrastructure, and won't compile until
 creating Command subclasses for the various commands being performed. That is
 primarily where you find get_memento and/or calls to add_(undo|redo.*).


git-svn-id: svn://localhost/ardour2/branches/undo@655 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-29 18:49:03 +00:00
Hans Fugal
5b289d3006 r115@gandalf: fugalh | 2006-06-23 12:36:05 -0600 
pass the object instead of an id


git-svn-id: svn://localhost/ardour2/branches/undo@654 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-29 18:45:41 +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
fd742b30fa r111@gandalf: fugalh | 2006-06-22 17:38:14 -0600 
progress on UndoCommand constructors


git-svn-id: svn://localhost/ardour2/branches/undo@637 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-22 23:38:19 +00:00
Hans Fugal
4078b9ec64 r80@gandalf: fugalh | 2006-06-22 16:37:01 -0600 
reworked templatization of UndoCommand


git-svn-id: svn://localhost/ardour2/branches/undo@636 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-22 22:37:08 +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
Hans Fugal
3038d8ce4a r42@gandalf: fugalh | 2006-06-07 17:08:39 -0600 
Memento skeleton. RFC
 Compiles, but obviously somewhat unimplemented.


git-svn-id: svn://localhost/ardour2/branches/undo@572 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-07 23:08:56 +00:00
Hans Fugal
6c2d2a3a04 r20@gandalf: fugalh | 2006-06-02 18:14:26 -0600 
change_bit bounds check


git-svn-id: svn://localhost/ardour2/trunk@561 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-03 00:14:53 +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
Hans Fugal
d96bda7dae Run autogen.sh based on the existence of configure instead of the existence of 
.svn or CVS.

git-svn-id: svn://localhost/ardour2/trunk@550 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-06-02 03:33:38 +00:00
Paul Davis
cf644c0c97 remove debugging output in a hidden corner of Route::process_output_buffers() 
git-svn-id: svn://localhost/ardour2/trunk@546 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-31 11:55:53 +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
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
c335c0b23b make OS X flags OS X only 
git-svn-id: svn://localhost/trunk/ardour2@536 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-26 20:34:12 +00:00
Paul Davis
0bde9c1331 removed libtool from pre-build process 
git-svn-id: svn://localhost/trunk/ardour2@535 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-26 12:41:38 +00:00
Hans Fugal
64f8efdce0 OS X Compile fix to work around the circular dependency of libardour and 
libardour_cp, using -undefined suppress -flat_namespace.


git-svn-id: svn://localhost/trunk/ardour2@534 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-25 22:37:11 +00:00
Paul Davis
21704435b1 provide interface to PBD::ThreadCreated() in BasicUI; remove/clean DOCUMENTATION files 
git-svn-id: svn://localhost/trunk/ardour2@531 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-24 20:40:11 +00:00
Paul Davis
69ac78fea2 added conditionals to detect SVN build conditions where we used to use CVS 
git-svn-id: svn://localhost/trunk/ardour2@527 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-24 18:00:40 +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
5dd853378c ensure that libardour_cp and libardour SMPTE structs are same type, hackishly 
git-svn-id: svn://localhost/trunk/ardour2@525 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-24 01:00:08 +00:00
Paul Davis
5c7d8cd288 install libardour_cp to the correct place 
git-svn-id: svn://localhost/trunk/ardour2@523 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-23 21:00:03 +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
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
Paul Davis
50ee09e80f fix naming of destructive track audio files 
git-svn-id: svn://localhost/trunk/ardour2@515 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-19 19:13:26 +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
f6da2b13f9 fix egregious bug regarding setting native file header+data formats 
git-svn-id: svn://localhost/trunk/ardour2@512 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-18 21:16:39 +00:00
Paul Davis
70ab1cce42 add new files 
git-svn-id: svn://localhost/trunk/ardour2@511 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-18 19:35:57 +00:00
Paul Davis
00a106197a moved OSC into libardour 
git-svn-id: svn://localhost/trunk/ardour2@510 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-18 16:44:07 +00:00
Paul Davis
69aef2cd91 moved OSC into libardour 
git-svn-id: svn://localhost/trunk/ardour2@509 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-18 13:20:07 +00:00
Paul Davis
cb9686acdb catch up on last minute OSC changes 
git-svn-id: svn://localhost/trunk/ardour2@508 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-18 02:47:35 +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
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
Sampo Savolainen
5299f6ae79 Fixed text relocation issues 
git-svn-id: svn://localhost/trunk/ardour2@492 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-05-06 18:28:34 +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
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
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
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
Doug McLain
3c34cb7111 added std:: to atoi and atof to fix namespace problem in convert.cc 
git-svn-id: svn://localhost/trunk/ardour2@480 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-26 00:18:06 +00:00
Taybin Rutkin
9e88813d8f Fixed linking for tranzport on MacOSX. 
git-svn-id: svn://localhost/trunk/ardour2@479 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 21:45:04 +00:00
Jesse Chappell
7704591a4d added stdint for compilation 
git-svn-id: svn://localhost/trunk/ardour2@478 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 20:41:43 +00:00
Taybin Rutkin
5f21dc5a47 Added missing .cvsignore file. 
git-svn-id: svn://localhost/trunk/ardour2@477 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 20:30:16 +00:00
Taybin Rutkin
632f44eeeb Missing .cvsignore file. 
git-svn-id: svn://localhost/trunk/ardour2@476 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 20:24:43 +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
Paul Davis
bc46c6e5d4 remove unintentional addition of PortInsert::silence() 
git-svn-id: svn://localhost/trunk/ardour2@474 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 20:21:15 +00:00
Paul Davis
81c7452615 a) fixed pseudo-grab-retention in plugin UIs 
b) inserts are properly silenced when route is muted


git-svn-id: svn://localhost/trunk/ardour2@473 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 20:10:42 +00:00
Paul Davis
bb7b3ec1a6 add missing file, remove unnecessary qualifier 
git-svn-id: svn://localhost/trunk/ardour2@472 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 11:10:52 +00:00
Paul Davis
c2e1917f44 add missing file 
git-svn-id: svn://localhost/trunk/ardour2@471 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 10:41:50 +00:00
Paul Davis
4aa14bd682 add missing file 
git-svn-id: svn://localhost/trunk/ardour2@470 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-25 01:21:22 +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
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
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
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
Sampo Savolainen
099c4c8d06 Make sure region fades don't get messed up when regions are split. 
git-svn-id: svn://localhost/trunk/ardour2@454 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-17 18:43:51 +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
06764a3b07 fixes for tranzport print routine 
git-svn-id: svn://localhost/trunk/ardour2@447 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-06 02:17:58 +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
Paul Davis
6728ea8d25 further extensions to Tranzport support and control surface interface design 
git-svn-id: svn://localhost/trunk/ardour2@444 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-05 03:05:30 +00:00
Paul Davis
c412d81969 add new control protocol related files 
git-svn-id: svn://localhost/trunk/ardour2@443 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-04-05 00:24:57 +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
Sampo Savolainen
1bde5eabc6 Splitting a region doesn't affect layering: the two remaining pieces 
will stay in the same place as the original one when compared to other
regions on the playlist.


git-svn-id: svn://localhost/trunk/ardour2@436 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-31 22:31:59 +00:00
Sampo Savolainen
7755c2dbfe Splitting a regon now retains crossfades, even if the split happens 
within a crossfade.


git-svn-id: svn://localhost/trunk/ardour2@435 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-31 21:34:22 +00:00
Paul Davis
9643eb4b23 a) persist whether the end marker should move at first capture in the session file 
b) prevent transport motion if stop-at-session-end is true
c) ensure that (more) menu items that provide control over Configuration object options are in the correct state at startup
d) Configuration options removed from "have a session" sensitivity toggling
e) removed functionally empty default_keys.cc


git-svn-id: svn://localhost/trunk/ardour2@433 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-31 15:51:03 +00:00
Taybin Rutkin
f6167b8723 Removed unused header files. 
git-svn-id: svn://localhost/trunk/ardour2@426 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-29 20:11:03 +00:00
Paul Davis
066a68699a install into ardour2 dirs, not ardour (translations not included, yet) 
git-svn-id: svn://localhost/trunk/ardour2@425 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-29 19:29:15 +00:00
Paul Davis
2f53112e83 a) fix special button press handling for solo+mute buttons 
b) buttons for "restore pending state" dialog had reversed semantics
c) logic for checking a pending source file header was wrong
d) fixed file unlink from within real-time context


git-svn-id: svn://localhost/trunk/ardour2@424 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-29 18:52:55 +00:00
Paul Davis
e27ac3278b a) fix problems with multichannel tape tracks 
b) separate data format and header format for native audio files
 c) expose data/header selections in GUI
 d) fix error in file naming for multichannel tape tracks
 e) remove blocks on GTK rc files during startup


git-svn-id: svn://localhost/trunk/ardour2@423 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-28 19:22:29 +00:00
Doug McLain
34c9e917c5 set color of export dialog checkbox's to fix invisible port selectors. Set smaller button thickness. Changed ardour directories to ardour2 to avoid conflicts with legacy ardour 
git-svn-id: svn://localhost/trunk/ardour2@421 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-28 00:49:02 +00:00
Paul Davis
948caba588 total reimplementation of Configuration object internals to make adding new config vars an order of magnitude simpler. the actual path taken is a bit of a kludge, to put it mildly, but adding a new variable is now basically just one line in configuration_vars.h, and no work is required for serialization to/from ardour.rc. 
git-svn-id: svn://localhost/trunk/ardour2@420 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-27 01:04:59 +00:00
Paul Davis
f9ee71f60e gcc4 fix for new import/embed code, plus inline reject_if_rate_differs() function 
git-svn-id: svn://localhost/trunk/ardour2@417 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-22 22:18:08 +00:00
Paul Davis
3aa346b253 significant changes in code to handle import/embedding - much cleaner and less code, plus the import progress bar now works; unify response handling for Gtkmm2ext::Choice 
git-svn-id: svn://localhost/trunk/ardour2@415 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-22 17:03:00 +00:00
Paul Davis
004a49b0c7 Gtkmm2ext::Choice now inherits from Gtk::Dialog; embed/import rate mismatch dialog no longer hangs in recursive Main::run() call 
git-svn-id: svn://localhost/trunk/ardour2@414 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-21 21:08:24 +00:00
Sampo Savolainen
d63c0fa328 Various marker undo fixes. 
git-svn-id: svn://localhost/trunk/ardour2@413 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-21 18:40:17 +00:00
Paul Davis
ff5f867784 save destructive xfade length in ardour.rc; change update policy for xfade sliders 
git-svn-id: svn://localhost/trunk/ardour2@412 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-21 16:59:48 +00:00
Paul Davis
eb3fc0d966 add crossfade and layering options to menu system; add missing crossfade editor curve image; add control for destructive recording xfade; remove dead options from options editor 
git-svn-id: svn://localhost/trunk/ardour2@411 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-21 15:27:57 +00:00
Sampo Savolainen
a873bbb14e Fix for #1179. Crossfades are not lost anymore when regions are split. 
git-svn-id: svn://localhost/trunk/ardour2@410 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-20 22:14:12 +00:00
Tim Mayberry
090be08ac9 ensure .ardour directory is created, update build docs 
git-svn-id: svn://localhost/trunk/ardour2@406 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-19 12:33:15 +00:00
Paul Davis
5e836403ad lots of fidgety work to get track renaming to work correctly now that we have to rename audio files too; some GUI tweaks 
git-svn-id: svn://localhost/trunk/ardour2@404 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-17 17:39:21 +00:00
Sampo Savolainen
eea23395af Completed playlist copy constructor. Also fixed issue with layering in 
Playlist::set_state().


git-svn-id: svn://localhost/trunk/ardour2@401 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-16 21:49:44 +00:00
Paul Davis
1abcdd831c remove the pitiful Pix class 
git-svn-id: svn://localhost/trunk/ardour2@396 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-15 02:16:22 +00:00
Paul Davis
4d2afdd0f7 pixbufs instead of pixmaps; function-scope local fd's for reading from a FileSource 
git-svn-id: svn://localhost/trunk/ardour2@395 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-15 02:04:30 +00:00
Taybin Rutkin
ee873ee896 Pointer fix from essej. 
git-svn-id: svn://localhost/trunk/ardour2@394 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-14 21:35:55 +00:00
Sampo Savolainen
ec461de3a8 Crossfade copy-constructor + copy crossfades when creating a copy of a 
playlist.


git-svn-id: svn://localhost/trunk/ardour2@393 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-14 21:35:00 +00:00
Paul Davis
8d3fdc3c5b fix problems with pixmaps/xpm files 
git-svn-id: svn://localhost/trunk/ardour2@392 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-14 20:51:55 +00:00
Paul Davis
e72e0caf99 fix for restoring destructive-ness on session reload using flags, plus an edit/mix group fix to avoid gtk error msgs 
git-svn-id: svn://localhost/trunk/ardour2@391 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-14 14:32:14 +00:00
Doug McLain
84a2923794 created get_bogus_drawable() when I realized it was needed by FastMeter as well as Pix. All pixmaps are files now, located in gtk2_ardour/pixmaps and loaded by default from ~/.ardour/pixmaps at runtime 
git-svn-id: svn://localhost/trunk/ardour2@390 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-14 07:46:59 +00:00
Doug McLain
191f323957 moved gain rail and sliders to files. The previously unused 'from_files' portion of Pix::generate () had to ported to gtk2 as well. 
git-svn-id: svn://localhost/trunk/ardour2@389 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-14 05:44:35 +00:00
Paul Davis
af70789773 improvements (!) to waveform display for destructive tracks, plus a generic fix that avoid waveview attemting to read peaks before they are ready 
git-svn-id: svn://localhost/trunk/ardour2@388 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-14 03:43:54 +00:00
Paul Davis
a505e1469d remove varispeed control; shuttle controller now has a context menu with max speed options; rearrange and optimize meter metric displays 
git-svn-id: svn://localhost/trunk/ardour2@382 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2006-03-12 18:21:48 +00:00