|
|
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 |
|
