13
0
Commit Graph

5611 Commits

Author SHA1 Message Date
8685d8eb47 remove use of jack_get_time() from ARDOUR::get_microseconds(), use clock_gettime() instead since this function is never used in reference to a backend clock 2013-08-09 15:40:46 -04:00
ca76496ef3 more purging of JACK as an explicit name from libardour 2013-08-09 13:56:23 -04:00
d0381b902c remove more naming that refers to JACK 2013-08-09 13:39:33 -04:00
55e52bcbd5 remove another naming that refers to JACK 2013-08-09 13:38:09 -04:00
8960ebcdf9 remove another naming that refers to JACK 2013-08-09 13:27:05 -04:00
521f8eb776 more sensible ALSA device names now in use 2013-08-09 13:26:40 -04:00
fc040a72e9 use original names for ARDOUR MIDI "persistent" ports (MMC, MTC, etc) 2013-08-09 13:03:57 -04:00
5abeb799cf try new code from rui/qjackctl for names of ALSA PCM devices 2013-08-09 13:03:21 -04:00
a34d707175 split up session code that uses parts of the JACK API (timebase + session event handling) and connect it directly to the jack audiobackend
i've made the audiobackend call the session directly so that only one object (ARDOUR::Session) has a need for the JACK types
and only one .cc file (session_jack.cc) needs jack.h. having ARDOUR::AudioEngine act as an intermediary would be cleaner
conceptually but would end up causing two different ARDOUR objects to have jack types in their own API.
2013-08-09 12:15:37 -04:00
c9f6b0dab5 the JACK audio backend shared object depends on libasound (ALSA) on linux, so it requires explicit linkage 2013-08-09 11:04:04 -04:00
fcb76c8c05 fix freewheeling 2013-08-08 22:12:52 -04:00
3070cd723b fix crashes, clean up session code warmup and other details in audioengine 2013-08-08 19:32:56 -04:00
111d35c9c7 add methods to queue full MTC and SPP messages, now that they are synchronous 2013-08-08 19:31:10 -04:00
d90e2b4221 rationalize (a bit) engine start/stop/restart so that it is possible to start up, disconnect from JACK and then reconnect 2013-08-08 16:31:08 -04:00
741154e691 debugging various canvas event issues 2013-08-08 15:26:42 -04:00
c779f7b1b5 fix compiler warning 2013-08-08 15:26:42 -04:00
7744037c86 Timecode: fix subframe rounding
if sub-frames are used, frames are rounded up for the later half of
a sub-frame.  e.g. @48KSPS, 25fps, 100 subframes per frame
audio-samples >=1910 already yield 00:00:00:01
2013-08-08 15:26:41 -04:00
fd6223854d fix no-roll LTC encoder, honor locates when transport is stopped 2013-08-08 15:26:41 -04:00
9ff32d1b52 make master-meter in toolbar optional 2013-08-08 15:26:41 -04:00
ee610da977 advance track's play-position even if processing is locked
fixes
  * http://tracker.ardour.org/view.php?id=5628
  * http://tracker.ardour.org/view.php?id=5561
2013-08-08 15:26:19 -04:00
35703cb3fc properly handle port removal in route.
bug:
 - add midi track
 - add additional midi port
 - remove additional midi port
 - press play
 -> crash

because..

ARDOUR::MidiTrack::roll's route_buffer still has 2 midi-channels. This is
because processor_max_streams was not updated (no plugins added/removed)
fill_buffers_with_input() eventually asserts when trying to get the 2nd
(nonexistant) midi port via ARDOUR::PortSet::nth_midi_port() in
 ARDOUR::PortSet::port().
2013-08-08 15:26:19 -04:00
Michael Fisher
5155a36002 Send and Read MIDI Positions the right way 2013-08-08 15:26:19 -04:00
5e1cfcc7ed on session-load: skip output-change-handler until IOs are restored
fixes loading a session with tracks that have more input-ports
than output-ports.

the problem:

input -ports are added first, when added, IO::ensure_port() emits
IOChange::ConfigurationChanged which in turn triggers the route to
allocate corresponding output ports.

Due to this callback the output-ports were created before the actual
output-port-configuration and plugin-configuration from the
session-state was parsed and set.
2013-08-08 15:26:19 -04:00
f84504222e disallow invalid port-removal
do not allow port-removal if the port would be re-added immediately
after that again because the main-delivery actually needs it.

As a side effect this prevents this crash:

 * create a stereo-track, then remove one output
  -> unhandled exception "AudioEngine::PortRegistrationFailure&"

 The problem:
 - the port is removed from the RCU ports list,
   but Port::drop() (which calls jack_port_unregister) is only called
   from the Port's destructor at some later time.
   (because a reference to the port still exists elsewhere)
 - the jack-port is not yet removed.
 - meanwhile Delivery::configure_io comes along and notices that
   there are more audio-buffers than ports and tries to re-register the port.
 - but the port still exists in jack, so it fails and throws an exception
   ...which is not handled.
2013-08-08 15:26:19 -04:00
d7382d613c fix typos in display of error message about an LV2 plugin preset 2013-08-08 15:26:19 -04:00
Michael Fisher
71e2fbbcff Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
2013-08-08 15:26:19 -04:00
Michael Fisher
f4101b8c53 Midi clock housekeeping 2013-08-08 15:26:19 -04:00
Michael Fisher
f6ec3c42fc Make Session::send_song_position_pointer a no-op 2013-08-08 15:26:19 -04:00
Michael Fisher
ce85a4d847 Revamp clock processing so it uses an internal frame reference.
MidiClockTicker::Position managed by boost::scoped_ptr
2013-08-08 15:26:19 -04:00
Michael Fisher
46ee815459 WIP - Experimenting with an alternative clock generating algo
- Transport debug output (tracing where transport_frame
      is updated
2013-08-08 15:26:19 -04:00
Michael Fisher
d6480f15f9 - Send position data from internal position class
- Proper midi beat conversions for all time signatures
- Disable responding to Session::PositionChanged in place
  of Session::Located.
2013-08-08 15:26:18 -04:00
Michael Fisher
7d5102543c Test code removal... 2013-08-08 15:26:18 -04:00
Michael Fisher
0ed083730a MIDI Clock - Shuffling locate code (not actually used yet)
- Subscribe to Session::Locate to detect seeks
- Shuffle Mclk locating computations into a separate private class
2013-08-08 15:26:18 -04:00
Michael Fisher
9afb71eb5a Stop compiler warning about NSURL 2013-08-08 15:26:18 -04:00
9284835580 rework MIDI [processor|plugin] chain
* forward midi-data around plugins that have no MIDI-out
* allow to insert plugins with no MIDI-input at a point with one MIDI-channel

This works because excess ports (both plugin and route) remain
unconnected and use scratch-buffers.

Tested with LV2, LXVST and LADSPA.
(AU plugins with variable in/out retain the old behavior, no bypass)

fixes http://tracker.ardour.org/view.php?id=5630
2013-08-08 15:26:18 -04:00
36623b7b0a remove an identical odd namespacing typo 2013-08-08 15:26:18 -04:00
9376e436cd remove odd namespacing typo 2013-08-08 15:26:18 -04:00
3e411ec4f6 use zeroed scratch buffers for "silent" plugin runs
Plugins rewrite the buffer data in-place and some plugins
can produce output even when fed with silence.

Hence, during a PluginInsert::silence() run a plugin can
inject data into the "silent" buffers which causes side-effects.

Kudos to Chris 'oofus' Goddard for finding this issue.
2013-08-08 15:26:18 -04:00
6b02d50d5e clean up some valgrid "Uninitialised value was created by a heap allocation" wanings 2013-08-08 15:26:18 -04:00
cc6a31c972 fix typo in c212c16eb 2013-08-08 15:26:18 -04:00
69c6ef1aa1 initialize some uninitialized values 2013-08-08 15:26:18 -04:00
ddf6029c86 catch assert() 2013-08-08 15:26:18 -04:00
a7c80c808d LV2 - use scratch buffers to scratch :) 2013-08-08 15:26:18 -04:00
9a8deb6ab4 another amend to 00f26394a9 2013-08-08 15:26:18 -04:00
9ef2a89ccd fix stupid copy/paste error in 00f26394a9 2013-08-08 15:26:18 -04:00
b6b614acac minimize meter-peak re-draw area 2013-08-08 15:26:18 -04:00
becee15370 RMS meter: remove unused peak-detection 2013-08-08 15:26:18 -04:00
f6ac5cadea use dedicated buffers for route (and track)
"scratch buffers are by definition scratch and their contents are undefined at all times"
"silent buffers are by definition all-zero and should not be used for real data"

But track & route were using those for actual data; plugins (which may run
in the same thread and may get the same buffers) use them for scratch thereby
overwriting real data.

In particular get_silent_buffers() (used by LadspaPlugin::connect_and_run)
clears the buffer which can holds real data:
e.g. via  Route::passthru_silence() -> plugin1 -> plugin2 (clears output of plugin1)
2013-08-08 15:26:17 -04:00
e92306459d Revert "fix issue with generator plugins and no-roll disk monitoring"
This reverts commit bd34ab04cd.
2013-08-08 15:26:17 -04:00
05ed31a980 fix issue with generator plugins and no-roll disk monitoring 2013-08-08 15:26:17 -04:00
Michael Fisher
406e69c57d Return an empty string instead of a bool 2013-08-08 15:26:17 -04:00
Michael Fisher
af148ff130 Cast param for std::time to a pointer of time_t
- bleeding clang (trunk 186535 v3.4) fails here
2013-08-08 15:26:17 -04:00
Michael Fisher
bfbc55a673 Proper OSX/CLANG/CXX11 support in stl_delete.h
- replaces fix in 066df0d218
- Check if _LIBCPP_VECTOR is defined for vector_delete.
  This is defined in libc++'s headers which Apple is using
  instead of libstdc++
2013-08-08 15:26:17 -04:00
Michael Fisher
14a7941b5d Housekeeping, code style 2013-08-08 15:26:17 -04:00
Michael Fisher
8541b81e31 Moving Mclk locating code to ticker.cc. Housekeeping 2013-08-08 15:26:17 -04:00
Michael Fisher
4f1085aa08 Add method to send a song position pointer message 2013-08-08 15:26:17 -04:00
c8a26faa97 use K-20 meter as default master bus 2013-08-08 15:26:17 -04:00
84f20367cc add option to resize meterbridge track-labels 2013-08-08 15:26:17 -04:00
5a187cb650 change default meter-fall-off to 13.3 dB/sec 2013-08-08 15:26:17 -04:00
82e1d9655f use 3px for peak-hold in LED mode -> display 2 bright lines 2013-08-08 15:26:16 -04:00
59a3b797d7 fix compiler warnings. 2013-08-08 15:26:16 -04:00
3098e5963c tweak meter-LED style 2013-08-08 15:26:01 -04:00
Edgar Aichinger
c5d930b6b8 update german translation for libardour
fixes x42's screwup with prev commit.
2013-08-08 15:26:01 -04:00
Edgar Aichinger
89cf7c1248 update german translation 2013-08-08 15:26:01 -04:00
ff9296e17c add dedicated line-up level for IEC1/DIN meter (15dbFS) 2013-08-08 15:26:01 -04:00
d4c864d803 make LED meter style optional 2013-08-08 15:26:01 -04:00
11c49ab8d1 cache shaded meter-background regardless of color
previously, shaded patterns were assumed to have different colors as well.
2013-08-08 15:26:01 -04:00
2bdd29d3ac fix meter background redraw issue #5601 2013-08-08 15:26:01 -04:00
12c9055659 [re]implement horizontal meter 2013-08-08 15:26:01 -04:00
26c4ae14cb Don't allow to deactivate meter.
before this change:

1) switch to 'custom' meter point,
2) deactivate meter processor.

-> meters does not run regardless of meter-point
-> meter can only be re-nabled in 'custom' mode
2013-08-08 15:25:40 -04:00
d327ab43cf reset meters only when *really* necessary
..and continue to calculate fall-off in
audio-cycle (rather than UI thread)

TODO: check if this works properly when switching
between audio/midi meter modes on a midi-track.

One of the motivations to always reset meters when the
meter-point changes was to resolve peak-hold & fall-off
issues when a midi-meter replaces an audio-meter and vice
versa.
2013-08-08 15:25:40 -04:00
d39d296ff8 fix compiler warning 2013-08-08 15:25:40 -04:00
ba8742edd1 align gradient with meter-metrics 2013-08-08 15:25:40 -04:00
d10b712897 increase saturation of meter-shader 2013-08-08 15:24:49 -04:00
bc66985710 allow to en/disable shade and LED meter style 2013-08-08 15:24:49 -04:00
2c9484fe14 add "0VU = +8dBu" VU meter config 2013-08-08 15:24:15 -04:00
b713fceed0 change default VU mode to "0VU = +4dBu (standard)" 2013-08-08 15:24:15 -04:00
2faf401fea implement meter-lineup and VU standard preferences 2013-08-08 15:24:15 -04:00
3ec7a620a3 use fixed fall-off time for k-meter 2013-08-08 15:24:15 -04:00
1da655c2eb Fix special handling of 'zoom vertical' scroll wheel modifier key.
gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of
the modifier key used to adjust track heights in conjunction with the
scroll wheel, so that the same track continues to be resized even when
it's shrunk to no longer be under the mouse cursor. However, this code
assumed that the modifier key for this was <Shift>.

Fix it to use the event->state bit corresponding to
ScrollZoomVerticalModifier instead, and rename the relevant functions to
clarify that it's the 'zoom vertical' modifier key they're dealing with.

Partially fixes #5610.
2013-08-08 15:24:15 -04:00
d31c0f759c restore session backwards compatibility to 3.3 2013-08-08 15:24:15 -04:00
553d393d30 implement new meter types 2013-08-08 15:24:15 -04:00
bd2ddc09ab Revert "Revert new meter types (postponed until after 3.3 release)"
This reverts commit d80f672e84.
2013-08-08 15:23:11 -04:00
67c5652edb reset meter when meter-point changes 2013-08-08 15:23:10 -04:00
dbe31bcf22 add a stripe-pattern to the meters 2013-08-08 15:23:10 -04:00
ec99830110 meter-state 17 and 49 + code-comment 2013-08-08 15:23:10 -04:00
a4edd1ed7a possible fix for http://tracker.ardour.org/view.php?id=5586 2013-08-08 15:23:10 -04:00
b0a239d9f8 rework metering states 2, 6, 18 and 22 2013-08-08 15:23:10 -04:00
7157fc1bdd revert functionality of f842e8af2 (meter display in DISK mode) 2013-08-08 15:23:10 -04:00
b5da0c852f Revert "C++11 Building - Use new style struct field inititializing" (this code
change breaks gcc on several platforms).

This reverts commit bf153e58a5.
2013-08-08 15:23:10 -04:00
33ecb22e87 yet another meter+monitoring detail:
"explicit Monitor DISK" + "Transport Stop" + "not track rec-en"
 -> meter is always zero
2013-08-08 15:23:10 -04:00
a3d5ba3397 fix metering states 34, 38, 49, 50, 53 and 54
for state descriptions see
http://www.oofus.co.uk/ardour/Ardour3MonitorModesV3.pdf
2013-08-08 15:23:10 -04:00
15aa2a224e zero meters for inactive tracks 2013-08-08 15:23:10 -04:00
7b3968bf5f RMS meter - reset after calculating new data 2013-08-08 15:23:10 -04:00
ae544dc6c7 fix "monitor mode 11"
see http://www.oofus.co.uk/ardour/Ardour3MonitorModesV2.pdf
the overall logic can probably be simplified somewhat
track-rec-enable on -> always monitor input
2013-08-08 15:23:10 -04:00
a29dcc5a47 fix input metering:
if meter==input, meter depends on In/Disk
see also 29108187ed
2013-08-08 15:23:10 -04:00
Michael R. Fisher
ea08feec48 Temporary OSX/Clang/C++11 workaround
- Adds a directive that includes <vector> upon specific conditions
- WIP
2013-08-08 15:23:10 -04:00
Michael R. Fisher
0c23314e3f C++11 Building - Use new style struct field inititializing
- clang with std=c++11 enabled was failing here
2013-08-08 15:23:09 -04:00
Michael R. Fisher
5a97ae6bd6 Include evoral/Note.hpp before pbd/compose.h
- This workaround prevents a clang compiler error about template
  visibility
2013-08-08 15:23:09 -04:00
Michael R. Fisher
8f33b7101f Allow compiling with c++11 enabled 2013-08-08 15:23:09 -04:00
Michael R. Fisher
270edc18ad Typo fixed: call class method instead of trying to use as a variable 2013-08-08 15:23:09 -04:00
6602c6659e finally get to the bottom of where NO_PLUGIN_STATE needs to be in order to be useful 2013-08-08 15:23:09 -04:00
dc0ee761d2 more plugin state debugging 2013-08-08 15:23:09 -04:00
25cbd8fb40 tweaks to NO_PLUGIN_STATE logic 2013-08-08 15:23:09 -04:00
e3978edabb add option to disable cairo-RGBA overlays for meters. 2013-08-08 15:23:09 -04:00
233426a069 Revert new meter types (postponed until after 3.3 release)
This reverts commit ce621d1c8a.
This reverts commit 80aa257481.
2013-08-08 15:23:09 -04:00
d2171c25eb add new meter-type enums (amend 80aa2574) 2013-08-08 15:23:09 -04:00
d1f45e9b3d add VU and IEC meter DSP (from jmeters) 2013-08-08 15:23:09 -04:00
Michael R. Fisher
02f5acbdc1 Housekeeping 2013-08-08 15:23:09 -04:00
Michael R. Fisher
65f970f0ca set the flag true 2013-08-08 15:23:09 -04:00
Michael R. Fisher
04a1ebbf46 Lazily load bundled LV2 plugins in LV2PluginInfo::discover()
- Do this instead of finding them in the static ctor of LV2World
- Prevents usage of ARDOUR_DLL_PATH environment variable before
  it is set in main(...)
2013-08-08 15:23:09 -04:00
Michael R. Fisher
a096461c5c Formatting only. 2013-08-08 15:23:09 -04:00
Michael R. Fisher
bc4fe5e56a Use a static string variable for dll path.
Making this consistent with all other funtions in this file.
2013-08-08 15:23:09 -04:00
a0ac0dca85 implement visual-sensitivity (gray out) for faders
Note: bar-controller sensitivity state is not yet set if
automation-mode changes to/from play, but the widget now
supports that.
2013-08-08 15:23:08 -04:00
443c0a2240 minor peak-meter performance tweak
* redraw only missing parts of the outside rectangle,
* don't redraw RMS meter if value has not changed
2013-08-08 15:23:08 -04:00
c209078c12 fix compiler warning 2013-08-08 15:23:08 -04:00
daad42dd6c Revert "Remove non-portable and unnused header includes"
This reverts commit 7ef79d3f4b.
2013-08-08 15:23:08 -04:00
cebd189239 Remove non-portable and unnused header includes 2013-08-08 15:23:08 -04:00
6db9411c94 Fix portability of test and use temporary test 2013-08-08 15:23:08 -04:00
9b73b3c7dc Use common test function to create temporary session 2013-08-08 15:23:08 -04:00
8c28b3ad07 add new files from test changes by timbyr 2013-08-08 15:23:08 -04:00
3cf4c56a89 theoretically: "Add new_test_output_dir to common libardour test" but actually features addition of new files, thus losing git history for these two which came from tim mayberry 2013-08-08 15:23:08 -04:00
6074fbf9e9 Use test_search_path function in ardour test 2013-08-08 15:23:08 -04:00
52aced73ad Add test_search_path function in libardour testsuite 2013-08-08 15:23:08 -04:00
20311ed2f3 Use test_search_path to find test data in xpath test 2013-08-08 15:23:08 -04:00
cdaa32d2c6 Add test_search_path function in PBD testsuite 2013-08-08 15:23:08 -04:00
d9862364be Add --single-tests option to also build each libardour test as a separate program 2013-08-08 15:23:08 -04:00
a06e5f4b3b disable libardour unit tests that do not function correctly (for windows, at least) 2013-08-08 15:23:08 -04:00
917aed0da0 add new files (code based on the old midi++ JACKMidiPort) 2013-08-08 09:10:11 -04:00
1ab61b8564 major redesign of MIDI port heirarchy and management (part 2) 2013-08-07 22:22:11 -04:00
83a0c30c24 major redesign of MIDI port heirarchy and management
basic, very flaky functionality is back. program unstable at present
2013-08-07 22:21:36 -04:00
a1370f83db fix compiler warning 2013-08-07 15:57:29 +02:00
616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -04:00
499b7fcfa9 document PortEngine API 2013-08-05 13:55:50 -04:00
a5f69910e4 add notion of unavailable devices to ARDOUR::AudioBackend 2013-08-05 13:19:23 -04:00
a66e3859e1 can now start JACK based on config dialog 2013-08-05 12:51:51 -04:00
7218bd91de start work on the changes to EngineControl (dialog) to integrate with new backend design, and add "requires-driver" concept to AudioBackend to handle JACK specifically 2013-08-04 14:03:19 -04:00
f5c52f500a Timecode: fix subframe rounding
if sub-frames are used, frames are rounded up for the later half of
a sub-frame.  e.g. @48KSPS, 25fps, 100 subframes per frame
audio-samples >=1910 already yield 00:00:00:01
2013-08-04 16:22:00 +02:00
976fc86811 fix no-roll LTC encoder, honor locates when transport is stopped 2013-08-04 16:13:43 +02:00
efc46f1553 make master-meter in toolbar optional 2013-08-04 00:06:29 +02:00
333a3c9d02 cleanup more dangling members of AudioEngine 2013-08-03 17:49:19 -04:00
a64908af7f fix undeclared use of cerr 2013-08-03 17:47:26 -04:00
1d50d041c9 fix problem with session exit caused by dangling unused members in AudioEngine 2013-08-03 16:45:07 -04:00
f2ca3ecf0c add file 2013-08-03 16:44:13 -04:00
c2e7c32c53 add tim's jack_utils code to rationalize setup of JACK config 2013-08-03 16:37:10 -04:00
91e0e0f9f8 advance track's play-position even if processing is locked
fixes
  * http://tracker.ardour.org/view.php?id=5628
  * http://tracker.ardour.org/view.php?id=5561
2013-08-03 21:35:19 +02:00
1c4d00e8b7 audioengine branch can now load and run at least one test session.
currently hard-coded to deal only with the situation where JACK is already running
2013-08-03 11:57:56 -04:00
b14d9a6451 properly handle port removal in route.
bug:
 - add midi track
 - add additional midi port
 - remove additional midi port
 - press play
 -> crash

because..

ARDOUR::MidiTrack::roll's route_buffer still has 2 midi-channels. This is
because processor_max_streams was not updated (no plugins added/removed)
fill_buffers_with_input() eventually asserts when trying to get the 2nd
(nonexistant) midi port via ARDOUR::PortSet::nth_midi_port() in
 ARDOUR::PortSet::port().
2013-08-03 13:44:37 +02:00
0eb5b7d1ab Merge branch 'midiclock' of https://github.com/axetota/ardour 2013-08-03 01:37:25 +02:00
Michael Fisher
e82574de05 Send and Read MIDI Positions the right way 2013-08-02 18:23:36 -05:00