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
fd23ebd088
Merge branch 'master' into cairocanvas
2013-09-17 21:23:30 -04:00
302b08c059
Merge branch 'master' into windows
2013-09-17 21:22:56 -04:00
402d92889a
minor code changes
2013-09-17 21:22:22 -04:00
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
7eda429155
remove JACK related action definitions (audio/MIDI setup is where this happens now)
2013-09-17 21:07:44 -04:00
c698ada035
change return type on {disconnect_from,reconnect_to}_engine() and make public so that we can use these when doing intentional disconnects without popping up the "HALTED" dialog
2013-09-17 21:07:14 -04:00
b7c15bc9fd
remove JACK related menu items (audio/MIDI setup is where this happens now)
2013-09-17 21:06:15 -04:00
7381390565
add basic display of existing MIDI ports to audio/MIDI setup
2013-09-17 10:01:24 -04:00
1740bbb966
correctly restore zoom focus state after restart (from nick mainsbridge)
2013-09-16 22:32:55 -04:00
5e0e41e068
Merge branch 'master' into cairocanvas
2013-09-16 22:11:50 -04:00
fb45fdc052
fix conflicts and merge with master
2013-09-16 22:11:06 -04:00
c8b32e2f8b
minor fixups for audio/MIDI setup spin buttons (now editable, as they should be)
2013-09-16 22:03:59 -04:00
61b98d3e9f
check for an existing PublicEditor instance AFTER attempting to handle a key press in a window that has called relay_key_press(), so that normal key handling works there (e.g. audio/MIDI setup)
2013-09-16 22:03:27 -04:00
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
2a3dfb5e82
various bits of polish for the latency tab of audio/midi setup dialog
2013-09-16 15:21:32 -04:00
ed61a9ebbd
update buffer size duration (msecs) while displaying saved audio/MIDI setup state
2013-09-16 11:10:05 -04:00
4d503c2053
commit some logic problems with the EngineDialog when change the driver/device name combos
2013-09-16 10:18:25 -04:00
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
4861eca974
Merge branch 'master' into windows
2013-09-13 11:55:56 -04:00
ccc81f05be
remove some debug output messages
2013-09-12 17:25:01 -04:00
8432f78346
vtl: export selected range
2013-09-12 22:46:11 +02:00
026a30a3b4
tweak narrow-mixer-strip meters: nettings vs the_CLA. Round 3.
2013-09-12 22:46:00 +02:00
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
9a884535c3
prevent key press in pre-main-window dialog(s) from crashing the program because there is no editor window to forward key presses to
2013-09-12 14:39:17 -04:00
6b3907d57f
change names, add comment, improve return type to avoid extra call to get EngineControl::State*
2013-09-12 12:26:59 -04:00
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
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
bede012727
remove unused members and code from EngineControl dialog (related to different devices for input+output)
2013-09-11 12:05:51 -04:00
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
676ff80697
basic functionality for hardware latency measurement
2013-09-10 22:58:33 -04:00
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
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
29c9d94dbe
fix control app breakage
2013-09-09 18:06:44 -04:00
3633892eaa
fix crash when unconditionally using null env var; tweak packing of control app button
2013-09-09 17:10:58 -04:00
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
f06187735d
initial work on adding access to h/w control apps when ardour starts JACK
2013-09-09 15:17:43 -04:00
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
cd6a9cfe38
hide tick-marks on narrow mixer-meters
2013-09-09 19:33:30 +02:00
93b3433de2
widen narrow mixer-meters,hide metric display instead
2013-09-09 18:31:50 +02:00
79b8a3c736
meterbridge: don't display metrics of invisible tracks
2013-09-09 17:32:33 +02:00
25cd52b392
vtl: update to ffmpeg v1.2.1 [lib]x264 option.
2013-09-08 18:27:41 +02:00
f4cf283f26
move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work)
2013-09-07 11:03:57 -04:00
e435f22793
add input/output channel counts and reorganize table somewhat
2013-09-06 21:00:01 -04:00
0467231d6e
save/restore I/O latency values in audio/midi setup
2013-09-06 16:43:02 -04:00
4729bbde5f
fix merge conflicts with audioengine
2013-09-06 13:39:26 -04:00
8c5cff6091
Merge branch 'master' into windows
2013-09-06 10:56:36 -04:00
d76efc97a3
Use Glib::usleep for portability
2013-09-06 14:31:31 +10:00
8ddd12a60d
Rename SearchPath class Searchpath
...
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
94efddd240
fix a problem creating and displaying connected status for ports not owned by ardour (e.g. system:....)
...
This was caused by using jack_port_get_connections() which will
not return the correct status for ports owned by another JACK
client. Because of the potential for deadlock by calling
jack_port_get_all_connections(), an extra argument was added
to several PortEngine:: API calls to specify whether the call
is in a process-callback context, which defaults to true.
The only place where false is passed is within the GlobalPortMatrix
when we need to determine whether two non-ardour ports are
connected.
2013-09-05 21:39:43 -04:00