ab44e41dfd
change the meters into CairoWidget, add expose_area to CairoWidget::render()
2014-03-20 23:50:40 +01:00
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
2da67fb99f
fix audio-clock sample entry, handle empty entry as NOOP
2013-11-11 02:33:57 +01:00
300b484cf6
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
8bf59e88e5
'gtk2_ardour' - Use 'floor / floorf' instead of 'trunc / truncf'
2013-10-03 09:32:08 +01:00
f8574fc39d
'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy
2013-10-03 09:06:56 +01:00
960a47330a
switch from JACK_Slave to Engine_Slave
2013-09-19 17:34:23 -04:00
c7fcba77b8
correct error message
2013-07-31 19:29:15 +02:00
Michael R. Fisher
3e11c80ac3
C++11 Building - Add space between macros and quoted strings
2013-07-15 22:57:34 -05:00
0b5e546340
remove a couple of unused font style names, remove SAE style files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14151 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-05 13:24:04 +00:00
ae85663fa7
use default (not monospace) font for clock text
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14137 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 20:00:51 +00:00
2884ac6346
clock info-box: fix alignment and spacing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14123 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-03 11:36:47 +00:00
82be348d42
replace unicode dash with (monospace) minus.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14122 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-03 11:36:42 +00:00
72393f101b
allow region list selection of whole file regions to select every instance of a region that has any source relationship with that whole file region (from a logic feature that came up while writing the manual)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 22:46:51 +00:00
8512947687
make 2 audio clock strings translatable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13746 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-30 21:33:16 +00:00
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
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
