Paul Davis [Fri, 9 Aug 2013 20:29:23 +0000 (16:29 -0400)]
Merge branch 'master' into audioengine
Paul Davis [Fri, 9 Aug 2013 20:01:14 +0000 (16:01 -0400)]
revert font sizing on audio/midi setup dialog
Paul Davis [Fri, 9 Aug 2013 19:40:46 +0000 (15:40 -0400)]
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
Paul Davis [Fri, 9 Aug 2013 17:56:23 +0000 (13:56 -0400)]
more purging of JACK as an explicit name from libardour
Paul Davis [Fri, 9 Aug 2013 17:39:33 +0000 (13:39 -0400)]
remove more naming that refers to JACK
Paul Davis [Fri, 9 Aug 2013 17:38:09 +0000 (13:38 -0400)]
remove another naming that refers to JACK
Robin Gareus [Fri, 9 Aug 2013 17:35:27 +0000 (19:35 +0200)]
fix typos
Robin Gareus [Fri, 9 Aug 2013 17:34:32 +0000 (19:34 +0200)]
updated monitor modes doc (new version from Chris with IDs)
Paul Davis [Fri, 9 Aug 2013 17:27:05 +0000 (13:27 -0400)]
remove another naming that refers to JACK
Paul Davis [Fri, 9 Aug 2013 17:26:40 +0000 (13:26 -0400)]
more sensible ALSA device names now in use
Paul Davis [Fri, 9 Aug 2013 17:03:57 +0000 (13:03 -0400)]
use original names for ARDOUR MIDI "persistent" ports (MMC, MTC, etc)
Paul Davis [Fri, 9 Aug 2013 17:03:21 +0000 (13:03 -0400)]
try new code from rui/qjackctl for names of ALSA PCM devices
Paul Davis [Fri, 9 Aug 2013 16:15:37 +0000 (12:15 -0400)]
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.
Paul Davis [Fri, 9 Aug 2013 15:23:15 +0000 (11:23 -0400)]
fix display of latency
Paul Davis [Fri, 9 Aug 2013 15:04:04 +0000 (11:04 -0400)]
the JACK audio backend shared object depends on libasound (ALSA) on linux, so it requires explicit linkage
Paul Davis [Fri, 9 Aug 2013 04:50:41 +0000 (00:50 -0400)]
a few more visual tweaks and simplifications for audio/midi setup
Paul Davis [Fri, 9 Aug 2013 03:31:35 +0000 (23:31 -0400)]
some rearrangements and details for the engine dialog
Paul Davis [Fri, 9 Aug 2013 02:28:31 +0000 (22:28 -0400)]
temporarily ignore AudioEngine::Halted when GUI asks to disconnect from JACK, to avoid warning dialog
Paul Davis [Fri, 9 Aug 2013 02:12:52 +0000 (22:12 -0400)]
fix freewheeling
Paul Davis [Thu, 8 Aug 2013 23:32:56 +0000 (19:32 -0400)]
fix crashes, clean up session code warmup and other details in audioengine
Paul Davis [Thu, 8 Aug 2013 23:31:10 +0000 (19:31 -0400)]
add methods to queue full MTC and SPP messages, now that they are synchronous
Paul Davis [Thu, 8 Aug 2013 20:31:08 +0000 (16:31 -0400)]
rationalize (a bit) engine start/stop/restart so that it is possible to start up, disconnect from JACK and then reconnect
Robin Gareus [Thu, 8 Aug 2013 18:08:20 +0000 (20:08 +0200)]
remove --no-freesound option. fixes #5640
Paul Davis [Thu, 8 Aug 2013 15:23:13 +0000 (11:23 -0400)]
remove reference to non-existent header
Paul Davis [Thu, 8 Aug 2013 13:10:11 +0000 (09:10 -0400)]
add new files (code based on the old midi++ JACKMidiPort)
Paul Davis [Thu, 8 Aug 2013 03:06:25 +0000 (23:06 -0400)]
new Mackie Control device file for Qcon controller (from #5634)
Paul Davis [Thu, 8 Aug 2013 02:24:30 +0000 (22:24 -0400)]
change wording in audio status when disconnected from engine
Paul Davis [Thu, 8 Aug 2013 02:22:11 +0000 (22:22 -0400)]
major redesign of MIDI port heirarchy and management (part 2)
Paul Davis [Thu, 8 Aug 2013 02:21:36 +0000 (22:21 -0400)]
major redesign of MIDI port heirarchy and management
basic, very flaky functionality is back. program unstable at present
Robin Gareus [Wed, 7 Aug 2013 13:57:29 +0000 (15:57 +0200)]
fix compiler warning
Paul Davis [Mon, 5 Aug 2013 18:22:32 +0000 (14:22 -0400)]
fix conflicts after merge with master
Paul Davis [Mon, 5 Aug 2013 17:55:50 +0000 (13:55 -0400)]
document PortEngine API
Paul Davis [Mon, 5 Aug 2013 17:19:23 +0000 (13:19 -0400)]
add notion of unavailable devices to ARDOUR::AudioBackend
Paul Davis [Mon, 5 Aug 2013 16:51:51 +0000 (12:51 -0400)]
can now start JACK based on config dialog
Paul Davis [Sun, 4 Aug 2013 18:03:19 +0000 (14:03 -0400)]
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
Robin Gareus [Sun, 4 Aug 2013 16:50:51 +0000 (18:50 +0200)]
fix meter-background highlight when peaking. (> vs >=)
Robin Gareus [Sun, 4 Aug 2013 16:49:28 +0000 (18:49 +0200)]
fix rounding issue when dragging video with fractional fps
Robin Gareus [Sun, 4 Aug 2013 15:23:58 +0000 (17:23 +0200)]
vtl: import audio at video-offset, forget offset on "Remove Video"
Robin Gareus [Sun, 4 Aug 2013 14:22:00 +0000 (16:22 +0200)]
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
Robin Gareus [Sun, 4 Aug 2013 14:13:43 +0000 (16:13 +0200)]
fix no-roll LTC encoder, honor locates when transport is stopped
Robin Gareus [Sat, 3 Aug 2013 22:06:29 +0000 (00:06 +0200)]
make master-meter in toolbar optional
Paul Davis [Sat, 3 Aug 2013 21:49:19 +0000 (17:49 -0400)]
cleanup more dangling members of AudioEngine
Paul Davis [Sat, 3 Aug 2013 21:47:26 +0000 (17:47 -0400)]
fix undeclared use of cerr
Paul Davis [Sat, 3 Aug 2013 20:45:07 +0000 (16:45 -0400)]
fix problem with session exit caused by dangling unused members in AudioEngine
Paul Davis [Sat, 3 Aug 2013 20:44:13 +0000 (16:44 -0400)]
add file
Paul Davis [Sat, 3 Aug 2013 20:37:10 +0000 (16:37 -0400)]
add tim's jack_utils code to rationalize setup of JACK config
Robin Gareus [Sat, 3 Aug 2013 19:35:19 +0000 (21:35 +0200)]
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
Paul Davis [Sat, 3 Aug 2013 15:57:56 +0000 (11:57 -0400)]
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
Robin Gareus [Sat, 3 Aug 2013 14:54:57 +0000 (16:54 +0200)]
dedicated namespace for video-utils
conflicting symbol prophylaxis
Robin Gareus [Sat, 3 Aug 2013 14:41:25 +0000 (16:41 +0200)]
remove strtok_r() from video_query_info()
for minGW compatibility
Robin Gareus [Sat, 3 Aug 2013 11:59:22 +0000 (13:59 +0200)]
add a peak reset button to the editor meter
see http://tracker.ardour.org/view.php?id=5601
Robin Gareus [Sat, 3 Aug 2013 11:45:27 +0000 (13:45 +0200)]
fix gtk "child->parent == NULL" asserts
Robin Gareus [Sat, 3 Aug 2013 01:44:51 +0000 (03:44 +0200)]
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().
Robin Gareus [Sat, 3 Aug 2013 00:46:08 +0000 (02:46 +0200)]
fix "other" port-group tab
Separate port-bundles for each jack client in the connection manager.
Previously, apps were only listed as separate bundles if the
ports were gathered at different times. ie one app shows up after
the other (and if no complete re-scan was triggered)
Fixes issue reported by Fons Adriaensen.
Robin Gareus [Fri, 2 Aug 2013 23:37:25 +0000 (01:37 +0200)]
Merge branch 'midiclock' of https://github.com/axetota/ardour
Michael Fisher [Fri, 2 Aug 2013 23:23:36 +0000 (18:23 -0500)]
Send and Read MIDI Positions the right way
Robin Gareus [Fri, 2 Aug 2013 22:50:09 +0000 (00:50 +0200)]
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.
Robin Gareus [Fri, 2 Aug 2013 21:02:13 +0000 (23:02 +0200)]
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.
Paul Davis [Fri, 2 Aug 2013 16:50:52 +0000 (12:50 -0400)]
fix typos in display of error message about an LV2 plugin preset
Michael Fisher [Fri, 2 Aug 2013 15:29:12 +0000 (10:29 -0500)]
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.
Robin Gareus [Fri, 2 Aug 2013 15:40:58 +0000 (17:40 +0200)]
keep port-matrix in sync when deleting ports. and fix segfault on session close with io-matrix visible
Michael Fisher [Thu, 1 Aug 2013 19:14:01 +0000 (14:14 -0500)]
Midi clock housekeeping
Michael Fisher [Thu, 1 Aug 2013 18:54:58 +0000 (13:54 -0500)]
Make Session::send_song_position_pointer a no-op
Michael Fisher [Thu, 1 Aug 2013 18:47:22 +0000 (13:47 -0500)]
Revamp clock processing so it uses an internal frame reference.
MidiClockTicker::Position managed by boost::scoped_ptr
Michael Fisher [Thu, 1 Aug 2013 15:07:18 +0000 (10:07 -0500)]
WIP - Experimenting with an alternative clock generating algo
- Transport debug output (tracing where transport_frame
is updated
Michael Fisher [Thu, 1 Aug 2013 05:55:58 +0000 (00:55 -0500)]
Human readable printing of MIDI Position messages
Michael Fisher [Thu, 1 Aug 2013 05:09:42 +0000 (00:09 -0500)]
- 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.
Michael Fisher [Wed, 31 Jul 2013 12:15:52 +0000 (07:15 -0500)]
Test code removal...
Michael Fisher [Wed, 31 Jul 2013 12:02:28 +0000 (07:02 -0500)]
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
Michael Fisher [Mon, 29 Jul 2013 21:15:04 +0000 (16:15 -0500)]
Stop compiler warning about NSURL
Robin Gareus [Fri, 2 Aug 2013 01:39:00 +0000 (03:39 +0200)]
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
Paul Davis [Thu, 1 Aug 2013 22:49:40 +0000 (18:49 -0400)]
start code reorganization needed to deal with backend choices. compiles, links and runs as far as the startup screen now
Paul Davis [Thu, 1 Aug 2013 18:43:12 +0000 (14:43 -0400)]
full compilation and linking (coding not finished, will not run)
Paul Davis [Thu, 1 Aug 2013 14:46:22 +0000 (10:46 -0400)]
remove an identical odd namespacing typo
Paul Davis [Thu, 1 Aug 2013 14:44:34 +0000 (10:44 -0400)]
remove odd namespacing typo
Paul Davis [Thu, 1 Aug 2013 14:10:21 +0000 (10:10 -0400)]
add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs()
Robin Gareus [Thu, 1 Aug 2013 01:17:49 +0000 (03:17 +0200)]
re-check meterbridge metric-area on route deletion
fixes http://tracker.ardour.org/view.php?id=5616#c15204
Paul Davis [Wed, 31 Jul 2013 23:55:44 +0000 (19:55 -0400)]
even more stuff compiles
Paul Davis [Wed, 31 Jul 2013 23:47:20 +0000 (19:47 -0400)]
more stuff compiles
Robin Gareus [Wed, 31 Jul 2013 22:35:24 +0000 (00:35 +0200)]
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.
Robin Gareus [Wed, 31 Jul 2013 18:19:57 +0000 (20:19 +0200)]
tiny detail.. GUI-callback may try to check vmonitor->is_started() or issue a periodic seek update while it's going away
Robin Gareus [Wed, 31 Jul 2013 17:24:26 +0000 (19:24 +0200)]
clean up some valgrid "Uninitialised value was created by a heap allocation" wanings
Robin Gareus [Wed, 31 Jul 2013 17:22:58 +0000 (19:22 +0200)]
correct error message
Robin Gareus [Wed, 31 Jul 2013 17:29:06 +0000 (19:29 +0200)]
fix close_allv() sentinel
Robin Gareus [Wed, 31 Jul 2013 16:30:09 +0000 (18:30 +0200)]
valgrind ignore glib UTF8 warnings
Robin Gareus [Wed, 31 Jul 2013 13:52:41 +0000 (15:52 +0200)]
initialize two more uninitialized vars..
Robin Gareus [Wed, 31 Jul 2013 13:24:46 +0000 (15:24 +0200)]
Robin Gareus [Wed, 31 Jul 2013 13:22:51 +0000 (15:22 +0200)]
initialize some uninitialized values
Robin Gareus [Wed, 31 Jul 2013 13:17:22 +0000 (15:17 +0200)]
catch assert()
Robin Gareus [Wed, 31 Jul 2013 12:45:02 +0000 (14:45 +0200)]
LV2 - use scratch buffers to scratch :)
Robin Gareus [Wed, 31 Jul 2013 12:21:40 +0000 (14:21 +0200)]
another amend to
00f26394a9
Paul Davis [Wed, 31 Jul 2013 03:26:46 +0000 (23:26 -0400)]
remove compile errors (still will not link and JACKPortEngine is not close to done)
Robin Gareus [Wed, 31 Jul 2013 00:00:31 +0000 (02:00 +0200)]
fix stupid copy/paste error in
00f26394a9
Robin Gareus [Tue, 30 Jul 2013 23:59:50 +0000 (01:59 +0200)]
minimize meter-peak re-draw area
Paul Davis [Tue, 30 Jul 2013 21:48:57 +0000 (17:48 -0400)]
jack_audiobackend.cc finally compiles
Robin Gareus [Tue, 30 Jul 2013 18:22:31 +0000 (20:22 +0200)]
RMS meter: remove unused peak-detection
Robin Gareus [Tue, 30 Jul 2013 18:21:02 +0000 (20:21 +0200)]
adjust meterbridge label-heigh options
Robin Gareus [Tue, 30 Jul 2013 16:28:06 +0000 (18:28 +0200)]
add name-tooltips to the meterbridge meters
Robin Gareus [Tue, 30 Jul 2013 15:54:52 +0000 (17:54 +0200)]
clean up
44fc92c3 (not a threading issue but sigc++ problem)
RouteUI is not sigc::trackable itself (only derived classes are)
RouteUI::~RouteUI() does not disconnect from signals on destruction.
Robin Gareus [Tue, 30 Jul 2013 14:55:33 +0000 (16:55 +0200)]
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)