81506ea41c
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
2013-04-06 16:12:27 -04:00
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
cd6cbba299
rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit
2013-04-06 16:04:02 -04:00
433e3bda70
fix crash when using track templates caused by a recent change to the filescanner API. if the template contains no plugin states, the scanner would return a null pointer, and we would fail to notice
2013-04-06 11:21:09 -04:00
c7f4a20e89
for the Auditioner only, do not reset the buffer count for scratch buffers to the input configuration, since the input config is irrelevant (data comes only from disk, no passthru). Should fix #5427 and #5432 )
2013-04-06 09:52:11 -04:00
6e485c0fc1
fix reload of Generic MIDI binding state when the target state involves just a binding map, with no specific controller bindings at all (should fix #5210 )
2013-04-06 09:13:39 -04:00
eb40660038
fix up export formats search path to correctly locate bundled (or installed) export formats
2013-04-06 08:45:49 -04:00
486edf1680
add API to directly request access to pixbuf
2013-04-06 04:10:23 +02:00
4e378abc98
if auditioner connections are somehow wiped out in CONFIG/ardour.rc, treat them as if they are still "default"
2013-04-05 18:00:18 -04:00
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
55a1048094
Merge branch 'patches' of https://github.com/jdekozak/ardour
2013-04-05 11:54:34 -04:00
07a505b1b2
lots of tweaking and adding debug output including operator<</dump(ostream&) methods to help visualize canvas structure
2013-04-05 11:27:26 -04:00
7db5d68cdb
adjust demangling code a bit so that it can easily be used with typenames and not just functions in stacktraces
2013-04-05 11:26:39 -04:00
Hans Baier
6f47365c0d
midi_clock_slave.cc: report to ardour the delta that the loop sees (revert me if you object)
2013-04-05 13:17:13 +07:00
Hans Baier
5308c31767
make MIDI clock work once more:
...
* increase filter bandwith to make it sync faster
* use transport_frame instead of audible_frame for calculating the loop error (thanks robin!)
* reduce the deadzone to 0.1% (thanks robin)
2013-04-05 12:33:58 +07:00
985e3dcc50
ignore "external timecode is sync locked" for non timecode slaves.
2013-04-05 06:50:54 +02:00
19bd641915
commit immediately post linking
2013-04-04 18:45:27 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
e510aed38d
fix reversed semantics from 86f1b for LaterNoteEndComparator()
2013-04-03 14:10:33 -04:00
1d8bac08c0
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-02 16:11:04 -04:00
04cba6eca0
fix (?) behaviour when punching into automation write mode while the transport is moving, hopefully without breaking anything else
2013-04-02 16:10:51 -04:00
5a4d0fff01
vtl: remove xjadeo option dialog
...
xjadeo options (selective session restore) are only
useful for testing and debugging.
2013-04-02 18:06:38 +02:00
2da10afb64
fix #5424 : routes created from templates do not get names based on the user-supplied text from the add route dialog
2013-04-01 20:45:57 -04:00
c9bb51bcca
clarify comment about Automatable/ControlSet inheritance
2013-04-01 19:47:08 -04:00
11ca19ed8f
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-01 18:54:41 -04:00
661a9d37e7
fix compilation on OS X
2013-04-01 09:03:33 -04:00
de8e003289
remove debug output
2013-03-31 09:41:51 -04:00
8388e82fd3
more work on the suprisingly ongoing filename/path/origin issue
2013-03-31 09:35:06 -04:00
Roy Vegard Ovesen
81a343ff7f
Make sure every imported file is copied to the session path
2013-03-31 03:59:10 +02:00
b691d4bf04
fix up some confusion with filesources' _origin and _file_is_new members. if _origin is set, it means that the file is "external" to the session (aka "embedded") and for some purposes this is more significant than _file_is_new. rename SourceFactory::createReadable() to ::createExternal() to more clearly indicate its purpose; remove never-supplied "origin" argument from SourceFactor::createWritable(). Fixes problems caused by 864ce8f0
2013-03-30 14:02:26 -04:00
Julien de Kozak
f0f26fb8d3
Fix tests compilation
2013-03-30 18:39:43 +01:00
Julien de Kozak
27d77b8719
Fix some compilation warnings
2013-03-30 18:09:40 +01:00
864ce8f0d1
if a filesource is supposed to be new, don't waste time looking for it. if it has its _origin member set, search for that, not its name (affects embedded files)
2013-03-30 10:06:08 -04:00
757f223714
fix input metering when not rolling but using h/w monitoring: need to explicitly run meter in this case, since we are otherwise just passing silence
2013-03-30 00:14:33 -04:00
3b20beb8d8
Merge branch 'patches' of https://github.com/jdekozak/ardour
2013-03-29 14:18:08 -04:00
86f1b8c71f
major fixes for MIDI patch change and note undo/redo. Patch change handling was completely broken because of the use of absolute floating point comparisons for time comparison, and serialization/deserialization of patch change property changes was borked because of int/char conversions by stringstream. Note undo/redo would fail for note removal if a note had been moved and/or had its note number changed as the next operation after it was added, because time-based lookup would fail. Similar small changes made for sysex messages, which just needed the musical_time comparisons and nothing else
2013-03-29 11:52:25 -04:00
b47e71f8ac
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-03-28 09:56:31 -04:00
74d54ae739
little extra debugging to show discovered LXVST .so's
2013-03-28 09:56:22 -04:00
c97244aaa9
vtl: prepare simple/advanced usage modes
...
"simple": localhost only system; hide much of the setup complexity
"advanced":' allow for remote-server, paths mapping, server index etc.
2013-03-28 13:42:40 +01:00
4abbabdcf9
Squashed commit of the following:
...
commit fdbae82077db53add90df7448a06869dac89acc6
Author: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed Mar 27 21:45:28 2013 -0400
mammoth changes in basic signal flow, total redesign of MIDI channel filtering and more.
commit 59343a8283698e02bc0f622313b29e98f449e4c8
Author: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed Mar 27 01:58:53 2013 -0400
initial working version after changes to MIDI channel filtering. may affect metering input too. testing not yet finished
this commit merges many deep changes in ardour's internal architecture,
combined with a total redesign of how MIDI channel filtering works.
data in a track used to flow from JACK port buffers to diskstream's ringbuffers
and was then copied from the ringbuffers into a BufferSet for use during
Route::process_output_buffers(). The butler thread would handle the movement of
data between the ringbuffers and disk.
with this commit, data now flows from JACK port buffers into the BufferSet used
for Route processing, and is copied from the BufferSet into the diskstream's
ringbuffers (the butler thread continues to handle interactions with disk as
usual).
this change allowed a dramatic consolidation of code and simplification of most
aspects of Track/Route::roll() and Track/Route::no_roll(). in particular, see
Route::fill_buffers_with_input() which now concisely describes how we move data
from JACK port buffers into the BufferSet for all Route types (including Tracks).
this work was initially motivated by changing MIDI channel filtering so that we
can process capture and playback independently. there is now a very clean
pathway for this - see MidiTrack::roll() (NOTE: This needs implementing in the
no-roll case too - a TODO item).
the channel selector for MIDI tracks has been moved out of the track header and
is now accessible via the context menu. more work is likely here, to make it
(more) obvious to the user when filtering is going on.
2013-03-27 21:50:18 -04:00
b3fa4dd8f3
vtl: video sets session start/end markers.
2013-03-27 18:21:09 +01:00
bd2d4d4247
add new VisibilityTracker class to implement cycling window visibility "properly" - i.e. avoiding hide+show/present to get a hidden or partially obscured window visible again
2013-03-25 20:03:59 -04:00
fe29965980
Fix memory leak.
2013-03-24 20:10:11 -04:00
adf40b97e0
Load LV2 presets using lilv state API to support presets with state.
2013-03-24 18:44:18 -04:00
Sakari Bergen
b6c2dec8fa
Fix static initialization order problem
2013-03-24 21:18:20 +02:00
Sakari Bergen
24816de6ca
Fix PBD wscript to be python3 compatible
2013-03-24 14:51:57 +02:00
Julien de Kozak
16f8fc0657
Fix some compilation warnings
2013-03-23 14:50:58 +01:00
d99b5dfa37
fix nasty crash when using double-nested compound (consolidated) regions caused by not (re)allocating enough mixdown buffers; fix up various warnings from valgrind about mismatching operator delete[] by using shared_array<T> rather than shared_ptr<T>, as should have been the case all along
2013-03-21 10:14:01 -04:00
027f0e156a
Merge branch 'patches' of https://github.com/jdekozak/ardour
2013-03-20 17:47:47 -04:00
a5d3f2d578
make PBD::stacktrace() be clear if it cannot generate stacktraces for some (runtime) reason. not sure why this is an issue, but it is, right now, on my machine
2013-03-20 17:20:13 -04:00
