Paul Davis
66559cd795
Add AudioBackend::info() method to retrieve AudioBackendInfo object
...
Goal is to be able to call AudioBackendInfo::already_configured() from the right place.
2014-05-01 09:14:25 -04:00
Paul Davis
058986f77b
finish unfinished work at basing all install paths on the program name
2014-04-28 21:11:08 -04:00
Robin Gareus
e6b56f3447
fix undefined value, support netjack2
2014-03-23 02:26:37 +01:00
Paul Davis
9dbdac2a19
remove unused and unimplementable audio engine sample format code
2014-02-24 14:46:19 -05:00
Paul Davis
658bb3ccd4
finished merge of cairocanvas with windows and windows+cc branches
2014-01-10 17:11:10 -05:00
Paul Davis
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
Paul Davis
36c233fe6c
Merge branch 'master' into cairocanvas
2014-01-07 21:37:48 -05:00
Paul Davis
2163467d31
add M-Audio 2496 as a recognized card for the mudita24 control panel/app.
...
(Yes, this hard coding thing is awful)
2014-01-06 11:35:57 -05:00
Paul Davis
1676789907
fix merge conflicts from master
2013-12-12 10:06:59 -05:00
Nils Philippsen
a86b66181a
ignore "unofficial" states in jack_sync_callback()
2013-12-09 17:56:06 +01:00
Paul Davis
59da788793
Merge branch 'master' into cairocanvas
2013-12-05 17:50:28 -05:00
Paul Davis
2ba2a50dec
Merge branch 'master' into windows
2013-12-04 11:50:36 -05:00
Paul Davis
ce7bfb489c
change "cpu" in cpu load backend functions
2013-12-04 11:48:31 -05:00
Paul Davis
0258f2958b
switch from using Sleep/usleep to Glib::usleep()
2013-12-03 10:24:05 -05:00
Tim Mayberry
a420328354
Reinstate call to package config for JACK backend
...
Not sure how this got lost, merge perhaps.
2013-12-03 20:28:17 +10:00
Tim Mayberry
0f6a65e405
Use Sleep instead of usleep on windows in JACK backend
2013-12-03 20:28:10 +10:00
Tim Mayberry
f74521b0cd
Remove command line string quoting when forming jack command line on windows
...
This used to be necessary when we started the JACK server but now that we
write a .jackdrc it only causes problems.
I have fixed this before in some branch, must have been lost in a merge.
2013-12-02 21:28:19 +10:00
Tim Mayberry
a9fc076d2e
Waf options are not valid during build stage so use environment variable
2013-12-02 21:26:28 +10:00
Tim Mayberry
18a59dd7fa
Include pbd/localtime_r.h in session_jack.cc for MinGW
2013-12-02 21:22:14 +10:00
Paul Davis
3c98de9ce4
fix merge with master
2013-11-29 22:31:29 -05:00
Paul Davis
15cee60021
merge and resolve conflict with master
2013-11-29 22:29:25 -05:00
Paul Davis
1190f1d0e0
make JACK backend return the right set of values when asked for buffer sizes or sample rate of a device other than the one in use
2013-11-27 17:41:54 -05:00
Paul Davis
680c64246e
Merge branch 'master' into cairocanvas
2013-11-27 16:19:01 -05:00
Paul Davis
d63e8ba0e8
Merge branch 'master' into windows
2013-11-27 16:18:22 -05:00
Paul Davis
611d93830a
add 0.5 second sleep after closing JACK connection so that next startup/connect is likely to work (allowing JACK time to shutdown). Ugh
2013-11-27 15:25:10 -05:00
Paul Davis
56716a1f28
add error check to call to PortManager::reestablish_ports
2013-11-27 15:24:24 -05:00
Paul Davis
dc4a984cd6
move AudioBackend::_start() into protected, and expand a bit on documenting ::start() vs ::_start()
2013-11-27 14:27:27 -05:00
Paul Davis
08371ae2cf
resolve merge with master (?)
2013-11-26 10:24:51 -05:00
Paul Davis
0cca272431
try to fix various warnings from gcc when optimization flags are enabled
2013-11-04 21:32:41 -05:00
Paul Davis
ea1ccb869a
fix merge with master
2013-10-31 13:16:51 -04:00
Paul Davis
7fec991077
fix thinko in declaration of ARDOUR::PortEngine::get_port_by_name()
2013-10-28 09:46:59 -04:00
Colin Fletcher
a18db90264
Report an error to stderr if creation of jack command line fails.
...
Output a simple message to stderr if get_jack_command_line_string() still
fails for any reason.
2013-10-23 19:32:54 +01:00
Colin Fletcher
70f0cfdb3b
Don't ever pass -d for device name to dummy jackd driver
2013-10-23 19:32:54 +01:00
Colin Fletcher
903d728b9c
Fix setting playback & capture channel counts for jackd dummy backend.
...
Unlike all the other jack backends which allow setting the number of inputs and
outputs with -i & -o, the dummy backend uses -P & -C for this. Make the jackd
command line use these options when the dummy backend is requested with a
specified input or output channel count.
2013-10-23 19:29:57 +01:00
Colin Fletcher
ac81ea642e
Don't fail jackd command line creation for jack dummy backend.
...
The dummy jackd backend doesn't require a device to be specified, so much
of the error checking in get_jack_command_line_string() is irrelevant, if
not actively wrong, when the dummy backend is specified.
Only perform the checks if the chosen jack backend is not the dummy.
2013-10-23 19:27:09 +01:00
Paul Davis
d135c4dc3a
fix merge conflicts with master
2013-10-23 08:47:57 -04:00
Paul Davis
664e715a00
merge from master
2013-10-22 15:29:44 -04:00
Paul Davis
cfe42bc4ea
fix issues with recording while synced to JACK (non-pure-virtual method added to AudioBackend) and remove pause() from AudioEngine/AudioBackend APIs
2013-10-21 16:24:24 -04:00
John Emmas
b855e5f322
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
Paul Davis
61c1956ef9
add -fvisibility=hidden to evoral, and make things work
2013-10-17 15:02:20 -04:00
Paul Davis
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
Paul Davis
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -04:00
John Emmas
75b933eadb
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
2013-10-16 15:55:59 +01:00
Paul Davis
9a630003ff
fix up issues with MIDI I/O option when using jack1 or jack2's most recent options for this
2013-10-15 15:22:25 -04:00
Paul Davis
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
John Emmas
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
Paul Davis
7444ac128e
fix inability to export twice
2013-10-12 11:07:57 -04:00
Paul Davis
589ef168c1
adapt JACK audiobackend to pay attention to new _start() API related to latency measurement
2013-10-12 10:03:15 -04:00
John Emmas
fa71d82dda
Merge branch 'windows' into windows+cc
2013-10-11 18:23:53 +01:00
Paul Davis
cf3d8d15f0
some slightly hackish changes to make it possible to use the new internal ALSA midi client (soon to become a driver, however)
2013-10-10 16:54:46 -04:00
