ardour/livetrax
13
0
Fork 0
Code
22,884 Commits 1 Branch 1 Tag 194 MiB
4c4061359c
Commit Graph

89 Commits

Author SHA1 Message Date
nick_m
3a0a628a75 Rework duration clock and TempoMap::insert_time to include meter at offset. 
- should fix 7072

	- also fixes scroll behavior over multiple tempi.
 2016-10-16 02:33:49 +11:00
nick_m
3f2a8fe81d Tempo ramps - display bbt in audio clock correctly when dragging tempos/meters. 2016-05-27 23:38:12 +10:00
Robin Gareus
f02db9b04e NO-OP whitespace 2016-04-24 14:43:18 +02:00
Robin Gareus
e025c45cda fix crash when loading a session with non-default clock modes. 
set_mode() emits ModeChanged which results in save_extra_xml().
If this happens during session-load, the XML iterator is invalidated.
 2016-04-24 14:43:18 +02:00
Robin Gareus
22b07e0233 NOOP, remove trailing tabs/whitespace. 2015-10-05 16:17:49 +02:00
Paul Davis
4dc63966f0 globally remove all trailing whitespace from ardour code base. 
Paul Davis was responsible for introducing almost all of this.
 2015-10-04 14:51:05 -04:00
Colin Fletcher
3cb2f25d89 Add 'accept on focus out' parameter (default false) to AudioClock 
If this parameter is passed as 'true', then edits to the clock will be
accepted when the user clicks away from the clock, rather than
unconditionally discarded as hitherto.
 2015-06-17 17:15:21 +01:00
Ben Loftis
91fac4c96d merge fix for tempo branch 2015-04-21 08:35:20 -05:00
Robin Gareus
2d8aa1d2ff simplify coaxing clock value out of ardour 2015-04-14 12:09:45 +02:00
Colin Fletcher
99e15d9402 Make left-click on tempo/meter in main clock edit current tempo/meter 2015-03-09 19:17:52 +00:00
Colin Fletcher
ecd265222a Add/edit tempo/meter change at right position with 'delta to edit cursor' 
Find the absolute position of the main clock when 'display delta to edit
cursor' is set when adding/editing tempo/meter changes from the context
menu.
 2015-02-12 18:06:16 +00:00
Paul Davis
d8405e2ebe add the ability to use cairo scaling to warp the rendering of the main clock text 2014-12-31 07:20:48 -05:00
Paul Davis
64fa63212f move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration 2014-12-22 13:39:46 -05:00
Paul Davis
eab61cbafe break out AudioClock::print_minsec() so that AudioClock and VerboseCursor can use the same formatting code. 2014-07-09 19:13:18 -04:00
Robin Gareus
ab44e41dfd change the meters into CairoWidget, add expose_area to CairoWidget::render() 2014-03-20 23:50:40 +01:00
Paul Davis
8f9a854b28 used fixed width for the big clock and remove all code in AudioClock associated with variable width, since it just really doesn't work very well, and probably cannot be made to work very well 
git-svn-id: svn://localhost/ardour2/branches/3.0@13744 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-29 15:59:38 +00:00
Paul Davis
fe1796fd6f allow big block to be shrunk in size as well as expanded (suprisingly complex!) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13740 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-27 18:49:12 +00:00
Robin Gareus
a5f5572159 update BPM and Meter when changed, also change back labels for it. 
git-svn-id: svn://localhost/ardour2/branches/3.0@13486 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-13 23:29:57 +00:00
Paul Davis
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
Robin Gareus
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
Robin Gareus
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
Robin Gareus
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
Paul Davis
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
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
Paul Davis
20aeb5af0a move CairoWidget into gtkmm2ext, add CairoPacker, made the time info box use CairoPacker, make the info status "bar" use CairoPacker 
git-svn-id: svn://localhost/ardour2/branches/3.0@10933 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-07 13:57:45 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
David Robillard
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
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