ardour/livetrax
13
0
Fork 0
Code
15,414 Commits 1 Branch 1 Tag 194 MiB
38c2bdc856
Commit Graph

142 Commits

Author SHA1 Message Date
Paul Davis
cff174b541 move rate_as_string() from EngineControl to utils.cc 2013-09-23 21:35:17 -04:00
Paul Davis
b362ff220c major rearrangement of startup/session loading code 
first-time user code remains in ArdourStartup
session selection/setup moved to SessionDialog
many other cleanups, logic improvements, and so forth to the overall session loading process.
Not 100% finished yet.
 2013-09-23 14:41:52 -04:00
Paul Davis
d2ca0665bf reallow changing bufsize AND sample rate when we are in control, because this is cool 2013-09-19 16:48:05 -04:00
Paul Davis
3f56abe099 missing initialization 2013-09-19 16:17:47 -04:00
Paul Davis
57d24608e7 show a different audio/MIDI option screen if JACK is already running. try to fix problem with using AudioBackend::<property-value>() functions before anything has been set. 2013-09-19 15:03:20 -04:00
Paul Davis
402d92889a minor code changes 2013-09-17 21:22:22 -04:00
Paul Davis
f51537b71d substantive changes to allow the audio/MIDI setup dialog to change settings as intended 
So far only tested with JACK backend, but expected to be more correct for other backends too
 2013-09-17 21:09:13 -04:00
Paul Davis
7381390565 add basic display of existing MIDI ports to audio/MIDI setup 2013-09-17 10:01:24 -04:00
Paul Davis
c8b32e2f8b minor fixups for audio/MIDI setup spin buttons (now editable, as they should be) 2013-09-16 22:03:59 -04:00
Paul Davis
cb31e34a5c end latency detection if AMS window closed while running detection (plus some non-functioning changes to try to get spinbutton text entry to work 2013-09-16 18:47:30 -04:00
Paul Davis
2a3dfb5e82 various bits of polish for the latency tab of audio/midi setup dialog 2013-09-16 15:21:32 -04:00
Paul Davis
ed61a9ebbd update buffer size duration (msecs) while displaying saved audio/MIDI setup state 2013-09-16 11:10:05 -04:00
Paul Davis
4d503c2053 commit some logic problems with the EngineDialog when change the driver/device name combos 2013-09-16 10:18:25 -04:00
Paul Davis
7c88670680 lots of changes to auto-start (and stop) the backend for latency measurements, and continuing work on the session construction/engine configuration flow 2013-09-12 16:28:51 -04:00
Paul Davis
6b3907d57f change names, add comment, improve return type to avoid extra call to get EngineControl::State* 2013-09-12 12:26:59 -04:00
Paul Davis
91e2eab01a make use of measured latency values to set dialog controls, and use actual port latency to compute extra delay 2013-09-11 13:02:32 -04:00
Paul Davis
bede012727 remove unused members and code from EngineControl dialog (related to different devices for input+output) 2013-09-11 12:05:51 -04:00
Paul Davis
d305dc1e0c more tweaks to latency measurement 
don't open ports till absolutely necessary (store names for future use).

tidy up parts of the dialog (tab)
 2013-09-10 23:25:15 -04:00
Paul Davis
676ff80697 basic functionality for hardware latency measurement 2013-09-10 22:58:33 -04:00
Paul Davis
209e4bdcae many changes relating to session construction and audioengine interaction 
every session member is now initialized using C++ constructor syntax

session construction reordered to clarify the split(s) between work
where the engine is not relevant and work where is it is. this
split is still not 100% obvious, but is enormously clearer than
previously.

if engine/backend are not running as session is created, and the SR
of the sample rate is known, attempt to force backend to that value.
 2013-09-10 15:41:19 -04:00
Paul Davis
2a89234027 move control app launching back into audio backend to allow ASIO/CoreAudio model to work; push initial state of AMS dialog to backend 
Issues remain with the basic model of the AMS dialog - when is
newly chosen state pushed into the backend (which can then
modify the control app button sensitivity. This is a special
problem for this button because APIs like ASIO and CoreAudio
probably don't allow us to launch a control app for an arbitrary
device, but only one actually in use. In this sense it is
different from properties like available buffer size etc, where
we can typically query without actually using the device.
 2013-09-09 21:23:12 -04:00
Paul Davis
29c9d94dbe fix control app breakage 2013-09-09 18:06:44 -04:00
Paul Davis
3633892eaa fix crash when unconditionally using null env var; tweak packing of control app button 2013-09-09 17:10:58 -04:00
Paul Davis
ecfeeda4b8 launching control app is now responsibility of ardour GUI, not audio backend; use ARDOUR_DEVICE_CONTROL_APP if set in the environment 2013-09-09 16:48:27 -04:00
Paul Davis
f06187735d initial work on adding access to h/w control apps when ardour starts JACK 2013-09-09 15:17:43 -04:00
Paul Davis
56465fda10 move engine dialog from a widget to an actual dialog; emit Session::AudioEngineSetupRequired when loading a session if it is necessary 2013-09-09 15:17:42 -04:00
Paul Davis
e435f22793 add input/output channel counts and reorganize table somewhat 2013-09-06 21:00:01 -04:00
Paul Davis
0467231d6e save/restore I/O latency values in audio/midi setup 2013-09-06 16:43:02 -04:00
Paul Davis
bc1cc154dc always save/keep audio/MIDI setup states so that they are available for use *after* instances where JACK was already running 2013-09-05 14:21:25 -04:00
Paul Davis
fee626c386 shorten tab labels on audio/midi setup notebook 2013-09-05 13:21:13 -04:00
Paul Davis
5a3cf3363b save and restore the selected engine state at startup 2013-09-04 22:58:56 -04:00
Paul Davis
0cc4ee7b79 fix up restoration of saved state from disk, still incomplete 2013-09-04 22:22:18 -04:00
Paul Davis
418f2ff20a save and restore audio/MIDI setup states to disk (in ardour.rc) 
Not finished because the buffer size value will not always stick during restore
 2013-09-04 19:34:43 -04:00
Paul Davis
58dd0198e6 save and restore settings for different backend/driver/device combinations 
So far, this is only internal - never saved to disk
 2013-09-04 15:45:54 -04:00
Paul Davis
35cc3245db rename interface_ stuff in the engine dialog to device_, since that feels a bit clearer terminology 2013-09-04 12:37:44 -04:00
Paul Davis
f44e0f33af a few more visual tweaks and simplifications for audio/midi setup 2013-08-09 00:50:41 -04:00
Paul Davis
743bb5066e some rearrangements and details for the engine dialog 2013-08-08 23:31:35 -04:00
Paul Davis
616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -04:00
Paul Davis
a5f69910e4 add notion of unavailable devices to ARDOUR::AudioBackend 2013-08-05 13:19:23 -04:00
Paul Davis
a66e3859e1 can now start JACK based on config dialog 2013-08-05 12:51:51 -04:00
Paul Davis
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
Paul Davis
c2e7c32c53 add tim's jack_utils code to rationalize setup of JACK config 2013-08-03 16:37:10 -04:00
Paul Davis
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
Michael Fisher
20189330d1 Add relavent OSX midi options in the startup dialog 
- MIDI driver options are now "None" and "coremidi" on OSX
- If coremidi is selected, jack will start with midi activated
- Requires Jack OSX version 0.90 beta 15 (or another version that
  supports midi
 2013-07-29 20:05:10 +02:00
Paul Davis
241a9edd3e replace final(?) incidences of program name (ardour, Ardour) with PROGRAM_NAME (thanks to edgar for tracking them all down) 
git-svn-id: svn://localhost/ardour2/branches/3.0@14050 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-02-05 18:18:35 +00:00
Colin Fletcher
81153dd394 Fix case of strings in comparisions in engine_dialog.cc 
git-svn-id: svn://localhost/ardour2/branches/3.0@13800 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-07 19:17:07 +00:00
Robin Gareus
e2711af723 more fixups regarding FreeBSD support 
git-svn-id: svn://localhost/ardour2/branches/3.0@13776 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-04 18:33:10 +00:00
Robin Gareus
bb3690db58 merge Marcel Bonnet's patches for Free-BSD 
(may need further cleanup:
 compare with timbyr's windows patch,
 verify fst/vsti + ALSA)

git-svn-id: svn://localhost/ardour2/branches/3.0@13774 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-04 17:36:52 +00:00
Paul Davis
12bd87b6cc Fix typos in use of __APPLE__ macro 
git-svn-id: svn://localhost/ardour2/branches/3.0@13771 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-04 16:49:09 +00:00
Paul Davis
98834c0532 remove a bunch of cerr output and/or convert to use error<< 
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-13 15:11:07 +00:00
Paul Davis
44e88a2d54 notably modify the design and logic of the startup dialog, so that we can handle the requirements in the 3.0-SG branch reasonably. the two major changes concern the idea that we may need to run the audio setup tab at all times, and that the startup dialog could potentially be "ready" without actually needing to be displayed on-screen. this allows us to ALWAYS use a startup dialog, even if we don't actually need any information from the user. as usual with this kind of change, expect a few logic/workflow glitches 
git-svn-id: svn://localhost/ardour2/branches/3.0@13397 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-08 15:54:16 +00:00
Paul Davis
70e8933151 handle failure to start audioengine correctly 
git-svn-id: svn://localhost/ardour2/branches/3.0@13033 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-11 19:36:01 +00:00
Carl Hetherington
c7ebac12b1 Don't specify real-time priority when starting JACK (#4946). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12924 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-25 14:41:03 +00:00
Carl Hetherington
eaf58fdd50 Marginal cleanup. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12565 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-05 01:03:36 +00:00
David Robillard
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
Carl Hetherington
9e67e1f1f0 Fix possible deref of 0 pointer (#4815). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11793 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-05 01:22:51 +00:00
Paul Davis
da13032eda fixes for 64 bit OS X build (c/o david robillard); tested on Lion & Tiger 
git-svn-id: svn://localhost/ardour2/branches/3.0@11585 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-02 22:53:00 +00:00
Paul Davis
3db29c3a8c minor tweaks for engine dialog (remove channel counts, tweak sensitivity) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11281 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-20 15:35:24 +00:00
Paul Davis
a4578d02b0 heuristic to workaround over-eager translation of NN000Hz as NN kHz 
git-svn-id: svn://localhost/ardour2/branches/3.0@11279 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-20 15:08:44 +00:00
Carl Hetherington
39442ef386 Separate visual and audio interfaces for translation. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10765 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-22 12:04:21 +00:00
Paul Davis
74330533b8 remove needless message from log window when a system has no ALSA-capable devices 
git-svn-id: svn://localhost/ardour2/branches/3.0@10032 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-30 13:41:36 +00:00
Carl Hetherington
cd17e05e3a Fix some set-but-not-used variable warnings from gcc 4.6 
git-svn-id: svn://localhost/ardour2/branches/3.0@9783 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-02 17:16:46 +00:00
David Robillard
ed626628b5 Delete trailing whitespace 
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-06-01 17:00:29 +00:00
Paul Davis
603d07a80b forward port EPA changes from 2.X 
git-svn-id: svn://localhost/ardour2/branches/3.0@8473 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-07 16:25:57 +00:00
Paul Davis
8e228bf344 lincoln's patch to fix audio setup dialog/jack startup when used with FFADO (#3485) 
git-svn-id: svn://localhost/ardour2/branches/3.0@7964 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-04 18:07:58 +00:00
Carl Hetherington
157895dc3b Provide both FreeBoB and FFADO options in the engine dialogue. Fixes #3457. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7799 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-18 20:01:54 +00:00
Paul Davis
4400489f15 patch from Johan Mattson to make -I/-O options in engine dialog actually work (fixes #2975 
git-svn-id: svn://localhost/ardour2/branches/3.0@7795 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 20:43:38 +00:00
Paul Davis
da8eec7a83 remove Glib::ustring from gtk2_ardour 
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-14 16:51:02 +00:00
Carl Hetherington
ecb5201332 Save and restore MIDI driver option state, and tidy up a couple of things. Fixes #3349. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7497 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-26 01:54:51 +00:00
Carl Hetherington
6a61c1d3ff HIG-ify engine dialogue and add midi driver option. Fixes #3349. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7479 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-23 23:29:19 +00:00
Paul Davis
fde289fe36 use -r argument with JACK if realtime is not requested in engine dialog (also applied to 2.X) 
git-svn-id: svn://localhost/ardour2/branches/3.0@7476 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-23 01:04:47 +00:00
Carl Hetherington
9a6042dbc8 Speculative tweak to offer non-duplex as well as full-duplex ALSA cards in the engine dialogue. Should fix #3327. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7447 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-20 00:57:43 +00:00
Sakari Bergen
6ae418e5f5 Fix ordering issue with loading engine settings to the startup dialog 
git-svn-id: svn://localhost/ardour2/branches/3.0@6850 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-02 22:58:05 +00:00
Paul Davis
6ef5d85ae1 changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-16 15:33:04 +00:00
Paul Davis
44f4b84551 finalize PROGRAM_NAME change for ardour3 
git-svn-id: svn://localhost/ardour2/branches/3.0@6759 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-15 02:31:27 +00:00
Paul Davis
64dc5427e4 make all use of bind/mem_fun be explicitly sigc:: 
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-11 23:29:48 +00:00
Paul Davis
e98b3c1ec6 make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged) 
git-svn-id: svn://localhost/ardour2/branches/3.0@5989 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-30 18:14:25 +00:00
David Robillard
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. 
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-14 16:10:01 +00:00
Paul Davis
b893b9a2be three recent fixes from 2.0-ongoing (RT on by default, Mackie port name nonsense; processor box no-redisplay flag reset on set_route() 
git-svn-id: svn://localhost/ardour2/branches/3.0@5762 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-08 21:56:16 +00:00
Carl Hetherington
b65f8073ba Fix some unused parameter warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-21 15:55:17 +00:00
Paul Davis
0513474072 farewell NSD, we loved you sometimes, almost never 
git-svn-id: svn://localhost/ardour2/branches/3.0@4992 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-04-20 18:41:46 +00:00
David Robillard
e0aaed6d65 *** NEW CODING POLICY *** 
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-25 18:26:51 +00:00
Paul Davis
b12bedfe8a initialize jack timeout parameter correctly (not doing this breaks JackOSX, maybe JACK too) 
git-svn-id: svn://localhost/ardour2/branches/3.0@4077 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-11-01 12:26:53 +00:00
Paul Davis
68e943265e merge from 2.0-ongoing @ 3581 
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-09-10 15:03:30 +00:00
David Robillard
8aa9508c82 Merge with 2.0-ongoing R3071. 
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-02-16 22:43:18 +00:00
David Robillard
80c3677c83 Merge with 2.0-ongoing R2988 
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-02-02 17:22:04 +00:00
David Robillard
9f63ab9931 Merge with trunk R2978. 
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-02-02 03:57:35 +00:00
David Robillard
ac1a255706 Merge with trunk R2920. 
git-svn-id: svn://localhost/ardour2/trunk@2921 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-01-15 17:23:57 +00:00
David Robillard
e92c1669c1 Merge with 2.0-ongoing R2885. 
Fix loading of 2.0 sessions.


git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-01-12 23:45:50 +00:00
David Robillard
8a2e30816e Merge with 2.0-ongoing R2883. 
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-01-10 22:22:29 +00:00
Carl Hetherington
a29a10c02a Patch from mantis user 'lincoln'; add support for FreeBoB in the audio settings, and pass the correct flag to JACK for using FFADO. 
git-svn-id: svn://localhost/ardour2/trunk@2562 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-10-19 13:58:48 +00:00
Paul Davis
f7f9d6fdc4 merge from 2.0-ongoing by hand, minus key binding editor 
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2007-10-11 22:07:47 +00:00