13
0
Commit Graph

183 Commits

Author SHA1 Message Date
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
102081a389 fix crash reported by colinf when editing via >1 click on an audioclock. this caused pre_edit_string to be reset to an empty string on the non-first clicks, and then string::at() was used on it. both aspects fixed
git-svn-id: svn://localhost/ardour2/branches/3.0@13682 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-19 17:07:27 +00:00
Ben Loftis
92e5a13fd4 several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults
git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 20:48:44 +00:00
a6968f8d2c hotfix negative TC editing - problem was introduced in r13491
git-svn-id: svn://localhost/ardour2/branches/3.0@13506 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-15 13:19:07 +00:00
4322fcec23 indicate negative TC when edit is positive.
git-svn-id: svn://localhost/ardour2/branches/3.0@13491 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-14 03:35:23 +00:00
6055190094 improve negative [offset] TC entry
* make mouse interaction work with negative TC
  * show minus-sign when edit is negative

TODO: ?minus? sign indicator when text editing a negative TC.

git-svn-id: svn://localhost/ardour2/branches/3.0@13488 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-14 00:15:54 +00:00
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
e1581242ca implement TC offset for slave&generator.
Many related changes that require atomic update, mostly
because ClockOption slots changed:

  * change offset config format to std:string (backwards compat - reads 0)
  * make Timecode offset independent from fps
  * sample_to_timecode() handle negative sample-num
  * audio-clock fix entry and edit of negative numbers
  * option editor:
    - remove old global internal offset
    - add slave & generator TC entry
    - still needs UI cleanup, tooltops, maybe sep. tab..
  * LTC & MTC slave& generator:
    - cache offset
    - subscribe to parameter changes

git-svn-id: svn://localhost/ardour2/branches/3.0@13485 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 20:29:28 +00:00
f761de0d70 clock: pull-up/down display update
git-svn-id: svn://localhost/ardour2/branches/3.0@13484 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 20:29:24 +00:00
1f1cba3814 oiling the audio clock
git-svn-id: svn://localhost/ardour2/branches/3.0@13478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 16:14:22 +00:00
06fa1b73e5 parse keyboard entered drop-frame timecode delta
git-svn-id: svn://localhost/ardour2/branches/3.0@13476 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 02:25:59 +00:00
cf55921aea make audio clock fill vertical space
git-svn-id: svn://localhost/ardour2/branches/3.0@13474 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 02:00:51 +00:00
ba54b9583b shorten Metrum & Tempo label
git-svn-id: svn://localhost/ardour2/branches/3.0@13472 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 02:00:47 +00:00
2508f3ba94 add labels for BBT clock info
git-svn-id: svn://localhost/ardour2/branches/3.0@13463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 18:18:15 +00:00
d546c20bed display slave initial before slave timecode
git-svn-id: svn://localhost/ardour2/branches/3.0@13462 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 17:54:55 +00:00
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