dc520de915
really fix vertical alignment of info text (again :) )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13461 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 17:54:52 +00:00
6cc0a4abf0
audio-clock: fix right-alignment
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13458 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 16:49:20 +00:00
bdad852b71
redraw of markup'ed sections when style/font is [re]loaded.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13456 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 16:49:15 +00:00
c214f1630a
fix for crash caused as slave is switching from non-TC source to TC-source
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13453 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 16:48:50 +00:00
f73bfef770
reduce audio clock height
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13451 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 14:05:45 +00:00
4e1a813f4d
MIDIClock is not a Timecode slave, fix segfault
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13446 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 23:11:53 +00:00
6657159ba8
clock width for 99999 bars (9999 allows 2h46m @ 240bpm)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13445 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 23:11:50 +00:00
b8b8384a26
add support for using - as prefix keys to enter a negative value in an audio clock. so far only used for session timecode offset option clock
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 22:20:40 +00:00
b36caf3b6f
highlight mismatching slave TC
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13442 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 22:06:42 +00:00
44680aa1bb
fix horiz alignment (corner-radius is added to layout)
...
and subtract alignment from mouse interaction
git-svn-id: svn://localhost/ardour2/branches/3.0@13440 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 20:43:50 +00:00
3f2e8fe305
show slave info in Min:Sec mode - fill empty space
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13438 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 17:36:31 +00:00
797ac9ef91
fix initial info color when switching to delta mode.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 16:39:54 +00:00
1f14987044
rounding off all clock corners
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13436 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 16:27:29 +00:00
5b487ca9b1
NOOP: remove trailing whitespace
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13430 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 14:31:17 +00:00
b168929005
audio clock display updates:
...
* use white text for translatable fixed info labels
* don't change colour of info in delta-display mode
* re-nice vertical alignment
git-svn-id: svn://localhost/ardour2/branches/3.0@13429 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 14:31:14 +00:00
46ba939ca0
re-nice audio clock horiz alignment.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13428 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 09:41:06 +00:00
23f00184c8
first round of audio-clock font rendering update
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13425 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 02:45:01 +00:00
296a0d7b32
remove separators from audio clocks with info blocks below the main clock display
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-10 19:23:07 +00:00
cb57b95480
fix click to start editing audio clocks that occurs right of the clock, which was previously a "dead zone". should fix part of #5160
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13391 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-06 19:30:36 +00:00
5a7e5fc8d5
clock-display: right-align slave delta, fix overflow of pull up/down info
...
also vertically center the info depending on font-size.
git-svn-id: svn://localhost/ardour2/branches/3.0@13367 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-29 17:29:36 +00:00
098e2c28d7
update audio-clock design
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-23 23:32:41 +00:00
501d870b3c
fix delta display of MClk slave.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-17 15:57:48 +00:00
4ff1cd78fb
audio-clock: use Timecode::timecode_format_time
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13278 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-15 02:46:54 +00:00
a6bc97add9
prepare reporting slave delta & MTC slave implementation
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13276 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-14 23:23:53 +00:00
3769c060f2
use translatable strings for TC info,
...
and prepare delta display
git-svn-id: svn://localhost/ardour2/branches/3.0@13275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-14 16:42:32 +00:00
eaaca760c9
tweaks to be ready for more information timecode display in Timecode clock mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-12 22:04:21 +00:00
5a8e83e0de
move TC FPS up into status bar, use lower right of timecode audioclock mode for something ... TBDiscussed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13257 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-12 16:25:57 +00:00
bce3184ff5
skeleton framework for LTC-slave
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-12 09:45:22 +00:00
9707a0e827
move the external sync source selection tobe a global config parameter, not per-session, since this is likely a reflection of studio setup, h/w etc.; starting using real tooltips in the RC option editor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13237 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-11 03:10:18 +00:00
a63d01e24a
do not add in ticks in the "at" position when computing BBT duration somewhere on the timeline (fixes issues with nudging etc.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13201 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-01 20:55:10 +00:00
Carl Hetherington
4904a20577
Don't start a clock drag if we drag to the right of the numbers.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12960 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 15:56:51 +00:00
Carl Hetherington
6624f9be37
Move delta-to-edit-point options to the main clock context menus ( #4472 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 23:14:03 +00:00
6fa6514cfd
Remove over 500 unnecessary includes (including 54 of session.h).
...
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff). I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.
This commit only targets includes of ardour/*.h. There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.
git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
4235e9a1a2
a variety of mostly unused parameter errors from OS X Lion's compiler
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-02 20:29:46 +00:00
355183f1ab
partially revert some of the recent work on tempo to reflect new understanding of the problem. behaviour is now believed to be totally correct but awaiting a bit more testing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 16:39:40 +00:00
Carl Hetherington
3239706d40
Fix mistake in error checking of audio clock BBT times ( #4589 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11089 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 02:15:28 +00:00
e9b4f14668
rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_division which is a more accurate and informative name. The number doesn't describe the smallest division of a "beat" (which is only defined contextually anyway), but rather the smallest division of the the divisions of a bar. If using a meter of 4/8, there are 4 divisions per bar, and we can divide each one into ticks_per_bar_division pieces; in a separate meter (section) of 3/8, there are 3 divisions per bar, each of which can be divided into ticks_per_bar_division_pieces.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11022 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-19 19:44:43 +00:00
e0cf3b6354
more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 02:46:36 +00:00
Carl Hetherington
42d7089c0b
Fix warning.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10825 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-27 11:44:42 +00:00
8301e6c55f
Fix stupid warning.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 07:49:59 +00:00
3a4848d055
tentative code shuffle to allow for 2 different styles of clock editing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10742 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 19:24:37 +00:00
2eeb861253
audio clocks: validate data for delta edits as well as absolute
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10741 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 18:07:42 +00:00
274a97a402
add validation checks on TC.hours, BBT.ticks and validate minsec data entry
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10740 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 17:51:15 +00:00
24a919ce6d
use correct em width to position audio clock cursor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10737 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 17:39:55 +00:00
eba4f18a92
fix a few warnings from newer versions of gcc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10734 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 17:03:06 +00:00
aef0319864
fix (?) all aspects of audio clock editing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10730 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 16:34:02 +00:00
e3a0c3dfb7
flip clock editing key entry handling from release to press; fix up delete/backspace operation - i think it really Just Works now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10724 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 03:37:22 +00:00
ff2d25a43e
audio clocks: handle keypress for minus/plus etc so that it not routed into accels on release
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 17:44:01 +00:00
ae09a5812b
audio clocks: focus-on-clock shortcut now works, scrolling and dragging know about x-offsets; cursor colors defined; click on an off clock no longer locates (time info box)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 16:38:51 +00:00
bf3091f363
audio clocks: use defined cursor color
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10707 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 15:26:43 +00:00
0eb3cbdfa1
audio clocks: big clock window now sizes itself to its current mode, all clocks pay attention to font scaling changes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10706 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 15:10:53 +00:00
eb1d3e48c8
fix up big clock aspect ratio; fix color handling in audio clocks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10704 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-19 14:27:05 +00:00
965f77aaeb
better solution to the big clock window focus issue
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10701 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-19 02:43:24 +00:00
82cd0093d6
add a signal so that if the Big Clock is closed, the edit window can grab focus back (may not be correct - should really capture close/delete signal; tweak size of audio clocks so that there is less dead space at the RHS, helps scroll wheel events to always do something
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10700 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-19 02:36:30 +00:00
6c7ca5070e
audio clocks: switch cursor to other side, thinner; half-make delete key work
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10697 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 23:46:55 +00:00
8b9118f6b7
audio clocks; better recovery after illegal data entry
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10696 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 23:37:19 +00:00
b8aa2c95ef
audio clocks: the thin red line
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 23:34:28 +00:00
0a2f4442b4
audio clocks: show external sync source when appropriate; ignore scroll & motion events when editing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10694 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 23:30:09 +00:00
b4646bb4c0
add a cursor (prototype) to audio clocks for editing, fix negative value display, and more
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10692 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 22:17:59 +00:00
ff0f6e493e
Fix warning.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10688 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 20:44:13 +00:00
000281e4d0
fix display of negative minsec values; fix handling scroll events on audioclocks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10684 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 19:28:07 +00:00
7b7b2e394c
correctly display negative delta values in audio clocks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10682 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 18:22:00 +00:00
792df333a2
fix some issues with delta clocks, while introducing a couple more since the clock can now show +ve and -ve offsets, but -ve ones computed incorrectly for timecode and BBT
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10681 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 18:06:16 +00:00
8b5d64ce9f
fix transition in and out of delta clock mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10679 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 17:06:11 +00:00
0cb55266b8
fix size of "off" state for minsec frames clock mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 16:52:13 +00:00
133bfd4b4f
don't call end_edit() when losing focus from an audio clock if we were not editing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10677 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 16:48:01 +00:00
149085ba16
fix size of "off" state for audio frames clock mode
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10676 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 16:41:26 +00:00
e3d9a971a7
correct length for BBT "off" clock state; use bold font for nudge clock
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10675 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 16:36:39 +00:00
f7c8bbc1a0
use figure dash (\u2012) for off state in clocks, and respond to color changes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10674 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 16:23:37 +00:00
8ad4133d26
don't cache width & height for CairoWidget; provide option for all CairoWidgets to not draw their backgrounds; provide a static method to allow any (Container, probably) widget to provide background color to a CairoWidget without the requirement that it have its own window; remove existing cursor from clocks; clock text no longer has background attribute set, to correct a mistake in my understanding of pango attributes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 15:35:58 +00:00
3aa7dacfdf
bad first pass at a cursor for clock editing. lots to do here. cursor is not in the right place as soon as we pass a non-digit. color is hard-coded. and more. but .. hey, look, its a cursor ..
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 05:25:22 +00:00
329a54d129
implement relative clock editing (terminated by + or - keys, which adjust the clock by the amount of time entered)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10670 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 05:04:18 +00:00
30c62b5f13
a few tweaks for audio clocks (handle loss of focus, change editing colors at the right times) and prep for relative edits
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10669 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 01:22:40 +00:00
b25fbc8a95
all new implementation of audio clocks, with entirely new editing model. not entirely finished, but lookable, and usable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-17 22:49:13 +00:00
Carl Hetherington
eb2870eee6
Allow a dialogue containing an audioclock to be
...
activated by a enter button press on the clock.
git-svn-id: svn://localhost/ardour2/branches/3.0@10580 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 13:44:01 +00:00
0938a42440
fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
b09938d29d
(maybe) rationalize display of drop status for timecode in audio clocks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9692 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-08 20:38:00 +00:00
a6517a0190
move punch in/out buttons into time info box; remove rounded corners on clocks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-08 19:48:57 +00:00
7c6b33e799
fix scrolling on clocks, and prevent attempts to edit the wrong fields
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9690 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-08 18:29:36 +00:00
b6b24d353b
more clock & time info box tweaking
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-08 17:27:26 +00:00
0311b782c8
don't use selection clocks show MIDI selection when in internal edit mode; remove "Off" as an option for all AudioClocks because it makes no sense
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9688 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-08 13:44:18 +00:00
a56555e8b2
remove "Off" as a clock mode, make it a state instead; track editor mouse mode when displaying selection (not 100% coverage of different selections yet); add extra negative field for timecode clock to help with text alignment; add clock mode = timecode option to menus
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9685 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 23:07:08 +00:00
7e2b86dc83
locate when clicking on start/end fields in time info box
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9683 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 18:20:22 +00:00
f6e67fa3dd
allow mode changes in the time info box, all synced
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9681 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 17:40:05 +00:00
be1abb12ff
more clock tweaking
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9680 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 16:42:48 +00:00
0a53bb1d42
lots of clock tweaks, but still, STILL! not done, really
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 15:23:06 +00:00
e77b5261d2
next iteration of clock work. still far from complete, and probably waiting on a rethink of text rendering+layout. but it has the info block now, and it semi-works
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9676 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-03 22:18:47 +00:00
11bcfd8429
add extended info fields to clocks; clock tweaks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9675 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 21:43:10 +00:00
f7e343b796
audio clock transition to CairoEditableText, part 1
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:47:58 +00:00
ed626628b5
Delete trailing whitespace
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
f7dae62903
OS X compilation fix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9574 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 21:09:37 +00:00
Carl Hetherington
d40ee95486
Trim some lines from AudioClock by using maps to keep the EventBoxes and Labels in.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9565 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 01:18:22 +00:00
Carl Hetherington
f7b41200c6
Separate milliseconds from seconds in the clock widget ( #4053 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9564 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 01:18:05 +00:00
b3ddcbcee4
group clocks in location UI and region editor so that they all change modes together
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 22:43:19 +00:00
Carl Hetherington
19d1132afb
Terminate RapidScreenUpdate clock updates earlier when they are not necessary. Fix set from playhead when used on the position clock in the region properties dialogue. Make clocks sample-accurate when they are set in frames and then queried in frames without an edit in-between.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8547 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 20:54:51 +00:00
75ede0dd6b
change Session::convert_to_frames_at() to Session::convert_to_frames() to reflect the fact that its argument is a position, not a duration; add Session::any_duration_to_frames(), which converts AnyTime representing a duration to frames; alter callers to use the right one of the two previously mentioned methods
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8386 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-30 15:45:48 +00:00
4b861e6039
Rename libmusictime libtimecode (consistent with already used namespace "Timecode").
...
Move BBT_Time to libtimecode.
git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-14 18:13:37 +00:00
Carl Hetherington
73192bc1a7
Remove all use of nframes_t.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-03 22:26:29 +00:00
Carl Hetherington
a5ea47ff0d
Re-expose timecode offset in the session option editor.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-01 20:49:22 +00:00
Carl Hetherington
bce9a0aee7
Revert previous incorrect patch.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8144 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-01 17:51:17 +00:00
Carl Hetherington
f500846fd4
Remove unused timecode offset stuff.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8143 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-01 17:42:18 +00:00
8b68ed57ec
Fix some messed up code (spacey tabs).
...
(There is faar more of this... FIX YOUR EDITORS!)
git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 20:37:39 +00:00
b85b4d9e54
make ardour3 build and link on OS X (tiger, at least)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:14:48 +00:00
Carl Hetherington
f0d2fec29d
Fix roll after locate from the audio clock context menu. Restore Go buttons in the location window. Fixes #3521 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7962 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-04 15:40:25 +00:00
ed5e141b71
if a clock is in delta-edit, it should be set to show a duration. this matters in BBT mode, where "zero" is 0|0|0 in duration mode and 1|1|0 otherwise. there is still a bug with the mouse tracking in delta edit mode, but that is a separate issue
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-18 22:02:12 +00:00
ede4ecbb00
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 18:20:37 +00:00
10bdce85a0
megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 16:24:22 +00:00
14b0ca31bc
handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 15:18:43 +00:00
ec047d8981
more strip silence dialog changes, to use audio clocks, show smallest silence/audible segments, etc.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6734 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-05 02:09:37 +00:00
11edfd035e
dynamically resize text in the big clock, first version
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-15 14:42:19 +00:00
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
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
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
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
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
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
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
ff9ddf5100
tidy up (a bit) locations editing widget ; use pixbuf/string code from 2.0;remove edit point clock
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6074 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-12 20:39:53 +00:00
68a3144344
new SnapBBT debug option, split out BBT_time and start work on BBT arithmetic framework. this will cause a full recompile, so find something else to do
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5936 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-27 02:24:56 +00:00
fa5aeb7892
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 14:38:58 +00:00
bb9cc45cd2
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
...
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent...
git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
Carl Hetherington
b65f8073ba
Fix some unused parameter warnings.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 15:55:17 +00:00
Carl Hetherington
86dda29be7
Move some sync-related options to being session variables.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-16 01:53:43 +00:00
e0aaed6d65
*** NEW CODING POLICY ***
...
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.
Do this:
#include "ardour/types.h"
NOT this:
#include <ardour/types.h>
Rationale:
This is best practice in general, to ensure we include the local version
and not the system version. That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.
More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly. That is:
!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!
Failure to comply is punishable by death by torture. :)
P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).
git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:26:51 +00:00
bc89fe0147
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
...
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 14:43:24 +00:00
6f8cd63450
chris goddard's region list patch; port 2.X marker drag/move changes to 3.0; compilation fixes-post-evoral
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3760 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-19 14:38:46 +00:00
c86210a9d5
merge 2.0-ongoing into 3.0 @ 3581 - 3710
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 21:27:39 +00:00
68e943265e
merge from 2.0-ongoing @ 3581
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 15:03:30 +00:00
Hans Baier
f651190162
* fixed some valgrind issues (uninitialized instance vars)
...
* Added preliminary support for program changes flags from automation lists
git-svn-id: svn://localhost/ardour2/branches/3.0@3327 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-08 09:53:19 +00:00
cb41314642
merge 3.0 from 2.0-ongoing@3243
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 14:06:50 +00:00
997e4b1f9c
merge with 2.0-ongoing @ rev 3147
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:03 +00:00
8aa9508c82
Merge with 2.0-ongoing R3071.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 22:43:18 +00:00
bb457bb960
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
...
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 21:20:59 +00:00
9e1ec9dd56
stop audio clocks from vanishing when turned off
...
git-svn-id: svn://localhost/ardour2/trunk@2149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-19 01:01:09 +00:00
376c5381ed
(merge from 2.0-ongoing -r1911:1912) fix audio clock handling of key press; fix crash bug caused by mapping over a region list selection that includes rows without regions; also merge sampo's redirect undo/state fixes from 2.0-ongoing
...
git-svn-id: svn://localhost/ardour2/trunk@1913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-23 00:06:16 +00:00
48d078b975
virtualize audioregion, make crossfade IS-A audioregion
...
git-svn-id: svn://localhost/ardour2/trunk@1889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-21 22:12:06 +00:00
Doug McLain
20cdab6416
code readability change I forgot to add before committing, and removal of debug output
...
git-svn-id: svn://localhost/ardour2/trunk@1839 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 05:09:04 +00:00
Doug McLain
9383499ce6
Add 'delta edit cursor' option to primary and secondary clocks. When in this mode, the clocks display the absolute difference between the playhead and the edit cursor
...
git-svn-id: svn://localhost/ardour2/trunk@1838 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 02:48:28 +00:00
6bcb3cde43
remove button 4/5 handling (now scroll_up/down); prevent dbl-click on xfade from locking up the mouse
...
git-svn-id: svn://localhost/ardour2/trunk@1634 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-22 15:05:50 +00:00
d6ef740e90
remove all lines to avoid recompiles after commits
...
git-svn-id: svn://localhost/ardour2/trunk@1488 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-02-22 18:36:03 +00:00
838a37a4fe
fix for height of editor hscrollbar
...
git-svn-id: svn://localhost/ardour2/trunk@1337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-17 14:53:27 +00:00
ca49f7cba7
fix audio clock restore, provide XMLNode::property (string) and speed up the property methods by not scanning the map twice. sorry about the recompile
...
git-svn-id: svn://localhost/ardour2/trunk@1286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-08 20:51:26 +00:00
57bafcd1f4
save and restore clock modes
...
git-svn-id: svn://localhost/ardour2/trunk@1283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-08 17:12:29 +00:00
Nick Mainsbridge
b529cbc5dc
Fix for SMPTE clock text entry
...
git-svn-id: svn://localhost/ardour2/trunk@1258 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-02 16:44:03 +00:00
Nick Mainsbridge
1bddf1bc88
General SMPTE fixes mostly relating to non-integer frame rates. Please Test. Fix for sometimes entering an invalid SMPTE format by CHANGING THE SESSION FILE. ****Warning. the SMPTE frame rate will be reset to 30 NDF if you load an old sessionardour2_broken/***. Calculate the HMS verbose canvas cursor properly. Fix incorrect SMPTE display in clocks/VCC. Standardise size of SMPTE display in editor clocks. Make the zoom controls smaller (anyone with some smaller icons?).
...
git-svn-id: svn://localhost/ardour2/trunk@1257 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-02 13:57:06 +00:00
9f2164b4f3
timecode clock info patch from oofus, big clock mods from oofus, rec-sensitive color in big clock, update all transport clocks when changing playhead, bounds check for automation bug
...
git-svn-id: svn://localhost/ardour2/trunk@1173 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-30 16:43:11 +00:00
5eea44c6cd
show timecode info in selected audio clocks
...
git-svn-id: svn://localhost/ardour2/trunk@1144 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-20 15:15:18 +00:00
638336eee5
new svn_revision.h build system, plus no more SMPTE, just Timecode
...
git-svn-id: svn://localhost/ardour2/trunk@1116 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-12 20:41:06 +00:00
f95d814143
fix audio clock field widths, change minsec display to include fractional seconds, add and use thorwil's new icons
...
git-svn-id: svn://localhost/ardour2/trunk@971 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-10 17:46:22 +00:00
93c7aeba04
fixes for destructive track offsets of various kinds; move from jack_nframes_t -> nframes_t
...
git-svn-id: svn://localhost/ardour2/trunk@933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-28 17:23:52 +00:00
ac1272c0d4
the BIG CONFIG patch
...
git-svn-id: svn://localhost/ardour2/trunk@926 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-25 21:24:00 +00:00
912da52a53
the return of VST support
...
git-svn-id: svn://localhost/ardour2/trunk@629 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-21 23:01:03 +00:00
6313751f75
Moved SMPTE type/functions into SMPTE namespace;
...
LGPL'd SMPTE code and moved in to libardour_cp;
Juggled control_protocol dir layout to be the same as other libs;
git-svn-id: svn://localhost/ardour2/trunk@610 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 21:54:26 +00:00
b09ab54654
use libsndfile for all audio file i/o, and rename DiskStream AudioDiskStream
...
git-svn-id: svn://localhost/ardour2/trunk@589 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-14 21:17:32 +00:00
Taybin Rutkin
9fdc36bac5
Merged timbyr's win32 branch. -r 547:566.
...
git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-07 14:54:12 +00:00
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
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
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
ed1684dce5
fix segv
...
git-svn-id: svn://localhost/trunk/ardour2@221 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-01 17:06:15 +00:00
541ff63201
button hacks and more
...
git-svn-id: svn://localhost/trunk/ardour2@200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-21 21:37:18 +00:00
3733c995c5
editor window layout changes, and lots more
...
git-svn-id: svn://localhost/trunk/ardour2@187 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-12 20:54:55 +00:00
fb45ffea71
strip keyboard.cc of noxious focus handling stuff, and cleanup
...
git-svn-id: svn://localhost/trunk/ardour2@106 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-23 04:13:32 +00:00
4b23361226
continuing fixes to get this shibboleth to compile
...
git-svn-id: svn://localhost/trunk/ardour2@43 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26 18:24:59 +00:00
08d33fcb0d
rename all GTK signals
...
git-svn-id: svn://localhost/trunk/ardour2@42 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26 15:00:36 +00:00
25ac88fcae
fix all _impl member functions to be on_ instead
...
git-svn-id: svn://localhost/trunk/ardour2@38 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26 02:48:59 +00:00
Taybin Rutkin
d38e2213d7
replaced slot() with mem_fun() and ptr_fun().
...
git-svn-id: svn://localhost/trunk/ardour2@29 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 21:19:23 +00:00
Taybin Rutkin
e493b2b7c4
Fly my pretties!
...
git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 20:33:00 +00:00
Taybin Rutkin
209d967b1b
Initial import of gtk2_ardour.
...
git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 18:42:24 +00:00
