300b484cf6
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
2d5e605bf1
Merge branch 'audiothreads' of https://github.com/mojofunk/ardour
2013-10-04 14:00:20 -04:00
3aee160b19
provide PBD::demangle() even on platforms without HAVE_EXECINFO
2013-10-04 12:22:00 -04:00
f3a22fb880
Implement JACKAudioBackend::in_process_thread
2013-10-04 18:54:54 +10:00
53ad2d187f
Move processing thread list from ARDOUR::Graph into AudioBackend implementation
2013-10-04 18:53:37 +10:00
df363a4fb3
Add AudioBackendThread class to support different thread type on windows
2013-10-04 18:51:47 +10:00
82f0f3a9a7
fix up crash caused by changes in object creation order and setting the state of the click IO object
2013-10-02 16:17:22 -04:00
c736d88a5f
don't ping JACK server 4 times to see if it is already up when ardour starts
2013-09-25 22:56:28 -04:00
d6274d5c3e
fix up enum mess caused by switching from JACK to Engine as the name for jack-related transport sync
...
This will allow older versions of Ardour to continue to startup when the user sync preference is "JACK",
because the string used by enum_2_string() will still be "JACK".
Versions of ardour3 from git after the enum change until this commit will leave ardour.rc unloaded by old
versions of Ardour ***if*** the user sync choice was "JACK".
2013-09-25 18:24:32 -04:00
e43a8dac1c
make information extraction from session file options list robust against some old badly formatted session files
...
Fixes crash experienced by GillesM, where a rogue XML entry caused a segfault
2013-09-25 17:59:10 -04:00
17ad0a0b61
Merge branch 'cairocanvas' into windows+cc
2013-09-25 15:52:11 +01:00
18850253e9
only generate some current canvas debug output when CANVAS_DEBUG is defined, to quieten things down
2013-09-25 10:38:04 -04:00
67bb9a732a
add casting for MSVC sqrt
2013-09-25 10:36:42 -04:00
3ba0ef7192
fix a typo in canvas-debug.h
2013-09-25 10:36:21 -04:00
f5cd838afc
start explicitly linking against libtimecode (this needs to happen elsewhere too)
2013-09-24 22:22:43 -04:00
4209e8a834
add new static functions to get SR and disk sample format from session XML
2013-09-23 21:35:51 -04:00
20f28c82ec
make session creation from a template work again
2013-09-22 11:19:34 -04:00
f7586f3a0d
likely fix for creating new sessions from templates
2013-09-21 12:50:45 -04:00
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
3e5c1e3fc1
Revert "actually load new state after creating a session."
...
This reverts commit 914ba475de
2013-09-20 16:16:30 -04:00
eb3cc04eff
Merge branch 'master' of https://github.com/nmains/ardour
2013-09-20 15:21:14 -04:00
b188033bf7
rather hacky fix for the change of the SyncSource > JACK enum to SyncSource > Engine
...
This is needed in order to get ardour started if ardour.rc names "JACK" as the sync source
2013-09-20 14:30:50 -04:00
960a47330a
switch from JACK_Slave to Engine_Slave
2013-09-19 17:34:23 -04:00
66aa6dfc8e
remove file (this moved to libs/backends/jack as part of the audioengine changes)
2013-09-19 16:27:03 -04:00
7b96fab60e
move configure-time dependency on PortAudio out of libs/ardour and into libs/backends/jack
...
PortAudio is currently used to get a list of device names for use with JACK on Windows.
We should find a better way to do this that avoids this kind of dependency.
2013-09-19 16:24:51 -04:00
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
cb18f914bd
'libs/ardour' - Further compiler specific changes
2013-09-18 12:28:08 +01:00
4f8c30de02
'libs/ardour' - Further platform specific changes
2013-09-18 12:27:39 +01:00
b5da5a1af0
'libs/ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC)
2013-09-18 12:25:36 +01:00
e5c426ed41
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
2013-09-18 10:16:40 +01:00
dc3288565b
'libs/ardour' - Clarify ambiguous symbols (needs to be checked)
2013-09-18 10:11:54 +01:00
10047037be
'libs/ardour/async_midi_port.cc' - Add a missing header file
2013-09-18 10:03:41 +01:00
6b1261ed30
'libs/gtkmm2ext/idle_adjustment.cc' - Add a missing header file
2013-09-18 10:02:20 +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
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
nick_m
914ba475de
actually load new state after creating a session.
2013-09-18 02:02:31 +10:00
32452bb3b3
fix crash caused by trying to unregister null ports
2013-09-17 10:01:02 -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
710ee36eaa
a few DEBUG_TRACE improvements
2013-09-16 22:02:36 -04:00
39ee88b3f9
more session construction order changes, and removal of n_physical_{inputs,outputs} members which were (a) not initialized early enough (b) not used anywhere except monitor bus connection.
...
Things almost make sense now.
2013-09-16 12:08:19 -04:00
910755b51b
fix missing initialization of two Session members, which fixes a crash during quit-without-finished-session
2013-09-16 10:23:37 -04:00
7cc451d81d
fix language issue
2013-09-16 10:07:52 -04:00
7c8f3adc75
allow waf to handle inconsistent case where cwiid.h is present but not the pkg-config file
2013-09-16 10:07:27 -04:00
31157cb343
fix ordering in session construction so that new sessions and existing ones both work
2013-09-16 09:57:22 -04:00
045ef69ac3
Merge branch 'master' into cairocanvas
2013-09-14 16:43:02 -04:00
a1a5c779c6
fix change in waf uselib name for libardour vs. master
2013-09-14 16:42:42 -04:00
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
bde50d5396
really fix build issues after removal of "using" directives
2013-09-14 16:34:08 -04:00
