2ba2a50dec
Merge branch 'master' into windows
2013-12-04 11:50:36 -05:00
ce7bfb489c
change "cpu" in cpu load backend functions
2013-12-04 11:48:31 -05:00
69df7763a1
switch from using Sleep/usleep to Glib::usleep() (and remember that we need to make Glib::usleep() actually work on windows one day)
2013-12-03 10:24:34 -05:00
0258f2958b
switch from using Sleep/usleep to Glib::usleep()
2013-12-03 10:24:05 -05:00
22175630bb
Merge branch 'windowspush' of https://github.com/mojofunk/ardour into windows
2013-12-03 10:01:26 -05:00
848e75aaea
Merge branch 'master' into windows
2013-12-03 10:01:13 -05:00
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
0f6a65e405
Use Sleep instead of usleep on windows in JACK backend
2013-12-03 20:28:10 +10:00
ae6b0b9f1a
minor tweaks to MIDI clock support, including delivery of position events/messages when stopped
2013-12-02 23:34:12 -05:00
76ea055b85
don't run MIDI clock "tick" if session is silent (e.g. due to a locate)
2013-12-02 23:33:33 -05:00
4a1b43b9d5
Replace non-portable printf format specifier
...
This caused Diskstream state to be restored incorrectly
2013-12-02 21:28:49 +10:00
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
ad906794b8
Fix pattern used to search for audio backends on windows
...
The audio backend dlls have a number postfix after the library/module name
2013-12-02 21:28:05 +10:00
a9fc076d2e
Waf options are not valid during build stage so use environment variable
2013-12-02 21:26:28 +10:00
c3d2b1ea18
Use PBD::canonical_path instead of ::realpath
...
This is a previous change that seems to have been lost in master -> windows merge
2013-12-02 21:25:47 +10:00
18a59dd7fa
Include pbd/localtime_r.h in session_jack.cc for MinGW
2013-12-02 21:22:14 +10:00
9b5440ec03
Use PBD::pthread_name in MTC_Slave for portability
2013-12-02 21:21:54 +10:00
30da95b609
Remove duplicate ALSA pkgconfig
2013-12-02 21:21:25 +10:00
e80d18b0b3
Revert unfinished export visibility commits by John Emmas
...
These break the mingw build and the visibility work will make this
code redundant
2013-12-02 21:18:29 +10:00
796f39b967
Fix compilation on linux now that libardour no longer links to libjack
...
Similar change has already been made in master branch
2013-12-02 21:17:47 +10:00
c19f9f8a47
fix continuous send of MIDI start/position/stop messages introduced by mistake
2013-12-01 12:18:57 -05:00
15cee60021
merge and resolve conflict with master
2013-11-29 22:29:25 -05:00
d1cc7e5a50
fix up a bunch of confusion regarding the size/capacity/allocation of audio & midi buffers
2013-11-29 22:26:33 -05:00
0c4457fa83
drop capacity argument from Buffer constructor, since the abstract class cannot (and should not) do anything with it
2013-11-29 22:25:36 -05:00
146734526c
fix indentation
2013-11-29 22:24:59 -05:00
074b0c4dca
add explicit linkage to libtimecode
2013-11-29 22:24:37 -05:00
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
4c0a274b43
do not push new state to backend from audio/MIDI setup until OK or Apply are clicked (i.e. do not do this when device is changed)
2013-11-27 17:41:22 -05:00
d63e8ba0e8
Merge branch 'master' into windows
2013-11-27 16:18:22 -05:00
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
56716a1f28
add error check to call to PortManager::reestablish_ports
2013-11-27 15:24:24 -05:00
dc4a984cd6
move AudioBackend::_start() into protected, and expand a bit on documenting ::start() vs ::_start()
2013-11-27 14:27:27 -05:00
4d0caa6ddd
add yet more missing parts of previous commit re: libmidi++ and JACK (files not saved in emacs, sigh)
2013-11-27 14:08:22 -05:00
4a71e6f28f
add missing parts of previous commit re: libmidi++ and JACK (files not saved in emacs, sigh)
2013-11-27 13:53:58 -05:00
b550a6e85b
Merge branch 'master' into windows
2013-11-27 12:58:43 -05:00
ac4d691fe9
remove unintended linkage between libmidipp and jack
2013-11-27 12:44:23 -05:00
3ea7529c14
fix broken situation with respect to taglib on windows where we used to use symlinks to fix up taglib's insane header/directory structure
...
Symlinks don't work correctly with git on windows, so instead we now copy the required "public" headers into the build tree as part of the build. Works on Linux.
2013-11-26 21:54:48 -05:00
e5f13d2b94
reorder child dirs to make optionally external dirs more obvious and only test USE_EXTERNAL_LIBS once
2013-11-26 21:53:38 -05:00
efff843f05
Merge branch 'master' into windows
2013-11-26 10:25:55 -05:00
08371ae2cf
resolve merge with master (?)
2013-11-26 10:24:51 -05:00
Sakari Bergen
f1db14923e
Hande export initialization exceptions gracefully
2013-11-23 19:11:31 +02:00
Sakari Bergen
52309c0c4f
Fix invalid assertions in AudioGrapher SampleFormatConverter
...
This fixes an export crash with e.g. 8-bit export
2013-11-23 18:43:54 +02:00
af9ac37b60
fix for toolbar master-meter w/o master bus and/or detached toolbar
2013-11-23 16:48:26 +01:00
5cbd4ce759
fix crash @ session-restore of plugins windows
...
The question is: why is _owner not set [yet], when the
window is restored. This rather smells like a race condition.
2013-11-22 18:22:55 +01:00
9a50b56930
reset time-axis peak when meter-point changes - fixes #5771
2013-11-20 18:54:34 +01:00
c1e8da2e60
Distinguish Save-as and Snapshot dialog window
2013-11-19 15:51:27 +01:00
2eb79acefd
lv2: increase scratch buffer size to request port minimum size
2013-11-17 00:33:32 +01:00
2da67fb99f
fix audio-clock sample entry, handle empty entry as NOOP
2013-11-11 02:33:57 +01:00
65a62bf514
correct information on waf updates
2013-11-10 17:44:50 -05:00
982c38dda1
allow to include In/Disk button on Meterbridge
2013-11-09 13:16:08 +01:00