6ae4f10437
Merge branch 'master' into cairocanvas
...
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
66ee2c8e59
enable videotimeline by default
2013-04-11 19:49:48 +02:00
ae2b39b2e3
remove intermediate GdkPixbuf from waveview rendering, and use shared_array<> to manage peak data
2013-04-10 15:27:55 -04:00
204da61f98
remove incorrect merge of cairocanvas patch that stopped most tracks from displaying; add more debugging info
2013-04-10 14:42:36 -04:00
9a8ee11f65
Merge branch 'master' into cairocanvas
2013-04-10 12:37:16 -04:00
75118796e1
add -D canvasevents tracing for grabbed items and remove render count output
2013-04-10 11:09:16 -04:00
a1745f2cf1
remove debugging output
2013-04-10 10:53:21 -04:00
1cb9779401
remove extra output from PBD::stacktrace
2013-04-10 10:49:27 -04:00
54e101eb3f
alter arrow drawing to fully close path and thus avoid cairo mitering variability
2013-04-10 10:27:37 -04:00
56bc98f78b
fix LXVST support for plugins that make audioMaster callbacks from within effOpen (e.g. glitch)
2013-04-10 08:32:39 -04:00
6592c8696a
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-09 14:25:02 -04:00
bca507a808
Merge branch 'master' into cairocanvas
2013-04-09 14:23:41 -04:00
053eaf77fd
a variety of fixes for the cairocanvas, but it still buggy as hell handling events and lots of other stuff
2013-04-09 14:22:58 -04:00
722d7f4de6
update all i18n .po files
2013-04-09 09:32:14 -04:00
1267b1d61c
mo' better debugging of canvas "structure" via Item::dump and derivatives
2013-04-08 19:48:09 -04:00
d9df0ea6e5
fix prev commit SaveSession() signal was sent too late.
2013-04-08 20:52:33 +02:00
8630fd1703
add session save signal and hook-up videotimeline
2013-04-08 19:51:48 +02:00
f2f92aaf8c
lazy redraw of Canvas::Text image
2013-04-06 19:04:34 -04:00
b9750bac72
pre-render text canvas items so that ::render() is just a blit from an image surface
2013-04-06 18:35:32 -04:00
bcd65def7d
Merge branch 'master' into cairocanvas
2013-04-06 16:57:08 -04:00
f84a3942cf
partially clean up warnings from "prolooks" code
2013-04-06 16:46:21 -04:00
fce302847f
fix two unused args warnings
2013-04-06 16:39:37 -04:00
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
