13
0
Commit Graph

9586 Commits

Author SHA1 Message Date
c528c1178a prevent changing slave while slave is active
fix potential segfault: clock asking for slave's timecode
when the slave is not a Timecode-slave.

git-svn-id: svn://localhost/ardour2/branches/3.0@13455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 16:49:11 +00:00
ad4d781477 make pull-up/down truly exclusive with JACK
git-svn-id: svn://localhost/ardour2/branches/3.0@13454 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 16:49:05 +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
7253e8ff84 fix for #5078 - not considering unused playlists when computing region use count
git-svn-id: svn://localhost/ardour2/branches/3.0@13452 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 15:50:38 +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
0c9943cdbb brighten up main clock color, and change font size to be closer to the old sans font size even though we now use monospace
git-svn-id: svn://localhost/ardour2/branches/3.0@13450 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 14:03:51 +00:00
86e16e723e Revert "fix small screen mode width"
This reverts commit e963a8dbc1d71aa78bed9407bafd7f8948db9712.

git-svn-id: svn://localhost/ardour2/branches/3.0@13449 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 13:43:12 +00:00
e3a010ff69 fix small screen mode width
git-svn-id: svn://localhost/ardour2/branches/3.0@13448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 13:31:13 +00:00
086e2613c4 slightly gray clock background - consistent with punch/nudge clk
git-svn-id: svn://localhost/ardour2/branches/3.0@13447 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 12:49:53 +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
50158b8bf1 restore bg color of status bar in main window
git-svn-id: svn://localhost/ardour2/branches/3.0@13444 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 22:36:00 +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
8872844a60 add slave and generator Timecode offset (no UI yet)
So far only LTC slave, LTC generator and MTC slave.
MTC generator remains to be done.

git-svn-id: svn://localhost/ardour2/branches/3.0@13441 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 20:43:53 +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
09194dcf88 clock-delta mode restore: anticipate toggling set_active callback
git-svn-id: svn://localhost/ardour2/branches/3.0@13439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 18:15:13 +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
e1166e3266 reintroduce space before delta "sample" lable
git-svn-id: svn://localhost/ardour2/branches/3.0@13435 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 16:27:27 +00:00
57ce855053 specify time info box bg in style file(s), and make nudge clock use the same bg color (not in style file, but the UI conf file, naturally)
git-svn-id: svn://localhost/ardour2/branches/3.0@13434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 16:04:30 +00:00
a57f4ead2d make Cairo{HV}Packer fetch bg information from a style file, rather than hard-code it
git-svn-id: svn://localhost/ardour2/branches/3.0@13433 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 16:03:37 +00:00
78e092e0a3 make nudge clock use same font as punch clocks
git-svn-id: svn://localhost/ardour2/branches/3.0@13432 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 15:23:29 +00:00
258154bc7d punch clocks: fix up center-dotted zeros in at least some fonts
git-svn-id: svn://localhost/ardour2/branches/3.0@13431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 15:19:00 +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
17b46e2304 add missing font definition for punch clock.
git-svn-id: svn://localhost/ardour2/branches/3.0@13427 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 09:41:04 +00:00
8ac4fa35e8 use bold mono font for delta mode in clocks
git-svn-id: svn://localhost/ardour2/branches/3.0@13426 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-11 03:57:35 +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
2bc4b879b6 use bold variant of monospace font for big clock to avoid the ugly dots at the center of zeroes which show up on several different linux distributions with the non-bold variant
git-svn-id: svn://localhost/ardour2/branches/3.0@13424 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-10 20:12:06 +00:00
8216e35c5b add a delta sign to the slave delta display.
git-svn-id: svn://localhost/ardour2/branches/3.0@13423 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-10 20:00:24 +00:00
cbc8c6b7cf update slave clocks -- to use long minus
git-svn-id: svn://localhost/ardour2/branches/3.0@13422 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-10 19:48:50 +00:00
0cfd5a12de use (potentially ugly) monospace font for big clock too
git-svn-id: svn://localhost/ardour2/branches/3.0@13421 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-10 19:42:30 +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
412d5c3b2b use mono font for transport clocks
git-svn-id: svn://localhost/ardour2/branches/3.0@13419 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-10 19:22:37 +00:00
c27dde889c make timecode offset work
git-svn-id: svn://localhost/ardour2/branches/3.0@13418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 17:27:30 +00:00
ca7e72db62 move auditioner output configuration params from session to global config vars
git-svn-id: svn://localhost/ardour2/branches/3.0@13414 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 15:05:02 +00:00
5eeefbb3a5 Don't notify user if fps changes only affect speed but not counting.
also unify labels for 29..97XX and simplify fps display.

git-svn-id: svn://localhost/ardour2/branches/3.0@13412 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 14:24:31 +00:00
8dc98a2935 copy ardour_system.rc into OS X bundle from (new) correct location
git-svn-id: svn://localhost/ardour2/branches/3.0@13411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 13:36:22 +00:00
aad35ec182 clean up stupid confusion over ardour_system.rc and its contents. this file does not require substitution anymore, and besides, it was being subst'ed incorrectly because of changes to waf that were addressed in gtk2_ardour/wscript but not the top level wscript
git-svn-id: svn://localhost/ardour2/branches/3.0@13408 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 13:27:14 +00:00
Hans Baier
684121c951 patchfiles/Yamaha-PSR-S900.midnam: Add Patchbanks by voice type
git-svn-id: svn://localhost/ardour2/branches/3.0@13407 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 09:37:49 +00:00
d4140367a3 LTC encoder: relax alignment constraint under some circumstances.
git-svn-id: svn://localhost/ardour2/branches/3.0@13406 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 07:48:11 +00:00
f2009ea777 LTC slave fix fps detection with 29.97000 option
git-svn-id: svn://localhost/ardour2/branches/3.0@13405 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 07:48:08 +00:00
e38ac84184 use double for timecode fps.
git-svn-id: svn://localhost/ardour2/branches/3.0@13404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 07:48:06 +00:00
838a8a0137 LTC encoder: fix signal polarity
git-svn-id: svn://localhost/ardour2/branches/3.0@13403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 07:48:04 +00:00
9d4974ede9 fix option-editor tooltips
git-svn-id: svn://localhost/ardour2/branches/3.0@13402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 07:48:01 +00:00
e0012e1b88 LTC encoder: clear user-bits
requires libltc >=1.0.3

git-svn-id: svn://localhost/ardour2/branches/3.0@13401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 07:47:59 +00:00
67b836e6a3 MTC slave: 2997fudge option
git-svn-id: svn://localhost/ardour2/branches/3.0@13400 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 07:47:57 +00:00