ardour/livetrax
13
0
Fork 0
Code
9,182 Commits 1 Branch 1 Tag 194 MiB
ad8c184218
Commit Graph

66 Commits

Author SHA1 Message Date
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
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
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
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
Paul Davis
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
Paul Davis
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
David Robillard
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
David Robillard
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
David Robillard
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
Paul Davis
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
Paul Davis
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
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