ardour/livetrax
13
0
Fork 0
Code
14,562 Commits 1 Branch 1 Tag 194 MiB
a942493565
Commit Graph

57 Commits

Author SHA1 Message Date
Robin Gareus
4da2fadb9e fix LTC slave delta formatting (long long) 2014-06-25 21:47:54 +02:00
John Emmas
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
 2013-09-21 09:17:25 +01:00
John Emmas
dc3288565b 'libs/ardour' - Clarify ambiguous symbols (needs to be checked) 2013-09-18 10:11:54 +01:00
Paul Davis
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
Paul Davis
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
Paul Davis
d0381b902c remove more naming that refers to JACK 2013-08-09 13:39:33 -04:00
John Emmas
490311bc08 'libs/ardour' - Main body of changes required for building with MSVC 2013-08-04 15:36:07 +01:00
Paul Davis
20b1a7d9d8 most of libardour now actually compiles 2013-07-25 12:36:54 -04:00
Paul Davis
9ac6bb9bef part-way through getting the audioengine changes to compile 2013-07-24 19:29:45 -04:00
Paul Davis
57066732ca Use pthread_name instead of pthread_self for portability 2013-07-13 16:43:50 -04:00
Paul Davis
4e84bc3a39 changes to get cairocanvas branch to build on OS X, with its stupid nil and Rect macros, plus some const_cast<> and unused variable fixes that should really be in master but will have to wait till we rebase master 2013-04-12 21:46:44 -04:00
Robin Gareus
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
Robin Gareus
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
Paul Davis
0599fafe76 fix a couple of unused parameters 
git-svn-id: svn://localhost/ardour2/branches/3.0@13843 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-15 15:00:00 +00:00
Robin Gareus
5da4e2be2d remove timecode subframe configuration 
There is no actual use-case to set it to anything else than 100.
timecode subframes are only used for ruler marks and the snap to grid.
libtimecode is still /aware/ of the subframe setting.

git-svn-id: svn://localhost/ardour2/branches/3.0@13817 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-09 15:47:19 +00:00
Robin Gareus
89fa20bb75 fix LTC frame TVstandard offset 
<pre>
       Ardour-
      transport
     01:00:00:01
          |
          |
    5   5 |           NTSC Line
    2   2 |                                     1
    4   5 v 1   2   3   4   5   6   7   8   9   0
  ____________________             ________________    TV
  |   |   | | | | | | |_|_|_|_|_|_| | | | | | |   |

                          ^
                          |
                          v

    +-+ +-+ + + +-+   +-+ +---+   +---+
  | | | | | | | | |   | | |   |   |   |   |            LTC
  +-+ +-+ +-+ +-+ +---+ +-+   +---+   +---+

           SYNC-WORD      |
              LTC       B | B       LTC
          01:00:00:00   I | I   01:00:00:01
                        T   T
                        7
                        9   0
</pre>

git-svn-id: svn://localhost/ardour2/branches/3.0@13524 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-18 09:53:13 +00:00
Robin Gareus
1624f1d714 fix LTC frame offset for video standards 
git-svn-id: svn://localhost/ardour2/branches/3.0@13517 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-18 00:29:50 +00:00
Robin Gareus
fe11de4381 fix LTC frame alignment 
git-svn-id: svn://localhost/ardour2/branches/3.0@13516 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-18 00:24:06 +00:00
Robin Gareus
3b63eae41d update to libltc-1.1.0 
add support for TV standard specific offset and
binary-group-flags

git-svn-id: svn://localhost/ardour2/branches/3.0@13514 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-17 20:15:41 +00:00
Robin Gareus
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
Robin Gareus
2c1b2256b6 slave delta: move sign next to the digit 
git-svn-id: svn://localhost/ardour2/branches/3.0@13457 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-12 16:49:18 +00:00
Robin Gareus
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
Robin Gareus
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
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
Robin Gareus
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
Robin Gareus
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
Robin Gareus
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
Robin Gareus
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
Robin Gareus
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
Robin Gareus
8eae3009e1 fix LTC slave initial TC track values 
git-svn-id: svn://localhost/ardour2/branches/3.0@13399 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-09 07:47:54 +00:00
Robin Gareus
8c9c0836a3 experimental option to support LTC 29.97000 fps generators. 
also change 29.97ndf frame-rate to 30000/1001.

git-svn-id: svn://localhost/ardour2/branches/3.0@13395 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-07 23:02:11 +00:00
Robin Gareus
9943fffdf8 LTC slave: suppress warning during shutdown 
git-svn-id: svn://localhost/ardour2/branches/3.0@13390 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-05 22:55:19 +00:00
Robin Gareus
a3a398242b tigten LTC Slave resolution. 
The reason for this is that the LTC generator uses the slave's
resolution as watermark for max-drift, resync. A possible drawback:
session-process will force silent rolls if the delta is larger
than the resolution. LTC has a carrier freq of ~2kHz, choosing
half of that seems a good compromise.

git-svn-id: svn://localhost/ardour2/branches/3.0@13380 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-05 11:26:27 +00:00
Robin Gareus
e344f57a30 fix LTC slave latency compensation typo 
git-svn-id: svn://localhost/ardour2/branches/3.0@13374 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-02 14:04:13 +00:00
Robin Gareus
a2de07a48f LTC slave speed deadzone works, remove #if 1 
git-svn-id: svn://localhost/ardour2/branches/3.0@13369 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-30 09:50:37 +00:00
Robin Gareus
e7cc4d19ba LTC slave/gen latency compensation: jack2 got fixed, remove #ifdef 
git-svn-id: svn://localhost/ardour2/branches/3.0@13368 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-30 09:50:35 +00:00
Robin Gareus
5253283911 LTC: break out xrun and latency callbacks. 
prepare to call get_connected_latency_range() only if needed.

git-svn-id: svn://localhost/ardour2/branches/3.0@13366 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-29 17:29:34 +00:00
Robin Gareus
52423fa8c3 LTC (slave&gen): no reset on graph-change 
fixes issues with transport stop/start
when making connections with jack1 while slaved to LTC

git-svn-id: svn://localhost/ardour2/branches/3.0@13356 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-28 10:48:06 +00:00
Robin Gareus
0047b87e3d LTC Slave - re-init on xrun or graph change 
git-svn-id: svn://localhost/ardour2/branches/3.0@13350 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-26 11:39:10 +00:00
Robin Gareus
c8d9895c68 LTC slave; consolidate FPS detection 
git-svn-id: svn://localhost/ardour2/branches/3.0@13347 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-26 03:11:14 +00:00
Paul Davis
974085807e fix some issues with previous commit that were not properly tested because HAVE_LTC was undefined in my test build 
git-svn-id: svn://localhost/ardour2/branches/3.0@13342 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-25 20:21:17 +00:00
Robin Gareus
8cff3d0e60 LTC Slave: improve fps detection 
and fix a few minor typos in the related doc

git-svn-id: svn://localhost/ardour2/branches/3.0@13338 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-25 17:07:59 +00:00
Robin Gareus
4c13d205d4 LTC Slave cleanup 
initialize audioengine's ltc_port - if HAVE_LTC is not set
trying to connect it would segfault.

LTC frameno is < 40 by (two bit frame-ten's)

git-svn-id: svn://localhost/ardour2/branches/3.0@13314 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-21 14:07:07 +00:00
Robin Gareus
7f8d2e32da LTC slave rewrite #2 
git-svn-id: svn://localhost/ardour2/branches/3.0@13313 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-20 18:14:13 +00:00
Robin Gareus
fbc5571133 disable LTC,MTC speed deadzone for now. 
wrong threshold causes jumps.

git-svn-id: svn://localhost/ardour2/branches/3.0@13302 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-17 17:11:32 +00:00
Robin Gareus
cf23bf29e7 decrease LTC flywheel time and adjust DLL settings 
git-svn-id: svn://localhost/ardour2/branches/3.0@13301 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-17 15:57:55 +00:00
Robin Gareus
f6eeb47482 Add a 1% speed deadzone around speed=1.0 for LTC, MTC slaves 
trade-off constant re-sampling to achieve sample-delta ~0,
with trying to avoid resampling if the delta is within
1% of the sample-rate.

git-svn-id: svn://localhost/ardour2/branches/3.0@13300 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-17 15:57:53 +00:00
Robin Gareus
c4cb4fa141 slave delta display 
impl MClk slave, update format for LTC, MTC

negative delta: Ardour is behind,
positive delta: Ardour is ahead of ext clock.

git-svn-id: svn://localhost/ardour2/branches/3.0@13299 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-17 15:57:51 +00:00
Robin Gareus
f4ae7cc709 LTC remove debug out, delta-time: flywheel display 
git-svn-id: svn://localhost/ardour2/branches/3.0@13294 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-16 23:04:02 +00:00
Robin Gareus
99a177da84 LTC slave reworked 
* detect LTC framerate
* detect LTC discontinuities
* use a DLL for flywheel sync (engine rate)
* don't use seekahead - internal resync

git-svn-id: svn://localhost/ardour2/branches/3.0@13291 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-16 20:53:15 +00:00