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
44564654fd
Merge branch 'master' into cairocanvas
2013-04-06 16:09:34 -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
2a1b4bff48
do not include templates in a distributed version of ardour, they are useless. see the comments in templates/wscript on why this is so, and why this change was made
2013-04-06 11:37:16 -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
b023273d01
add pkg-config check on liblo, now that NSM support requires 0.26 rather than just "any" version ( fixes #5435 )
2013-04-06 09:29:54 -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
6830d83236
vtl: make videotimeline work with new cairo canvas
...
timeline thumbnail display, moving (drag/drop) and zoom works.
There still some crashes e.g. resizing the height of the timeline
and with off-screen image buffering when zooming in.
Likely due to concurrency issues:
VideoImageFrame::exposeimg() and direct access of the pixbuf:
"Assertion `!_bounding_box_dirty' failed." in canvas/item.cc:191
more work is needed..
2013-04-06 04:10:27 +02:00
486edf1680
add API to directly request access to pixbuf
2013-04-06 04:10:23 +02:00
67e4f49064
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-05 22:05:33 -04:00
1150a37ab7
do not include harvid by default in linux build (wrong variable definition)
2013-04-05 22:01:09 -04:00
dbe7ecb07c
add -L to curl in linux build script so that 301 responses while fetching harvid are handled
2013-04-05 22:00:30 -04:00
cd0d68a591
mark the step entry dialog as a dialog even though it is an ArdourWindow, to help with WM layering issues
2013-04-05 18:00:59 -04: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
6c7a61f6e5
Fix display of Spectral Analysis when no tracks are selected.
...
Spectral Analysis now displays graphs for selected regions, even when there
are no tracks selected. Fixes #2226 .
2013-04-05 17:49:31 +01:00
fcf7530676
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-05 12:00:42 -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
096fe04e61
Make track header faders insensitive to vertical scroll-wheel events again.
...
This effectively reverts d235a27a
2013-04-05 10:08:36 +01: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
3f97d8c6d5
vtl: remove obvious warning
2013-04-05 00:15:57 +02:00
7fe22a7af3
vtl: overall export progress bar
2013-04-04 23:40:36 +02:00
b358a09165
vtl: A/V sync lock on import
...
When extracting and importing audio from a video,
mark the audio region's position as locked to the
video.
While locked, the audio region can only be moved
by moving the video with a granularity of one Timecode
frame.
2013-04-04 15:44:32 +02:00
d982887e32
vtl: re-order view menu entries
2013-04-04 15:38:30 +02:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
b4e5eb3c8b
vtl: audio-export progress-bar tweaks
...
use the same concept as session > export > audio;
hopefully this fixes jack-disconnects during export.
2013-04-04 01:05:53 +02:00
1040801ffe
vtl: video-monitor letterbox & orig-zoom to menu
2013-04-04 01:05:49 +02:00
ddfc047f0e
Update region_ops.txt to match current behaviour, and fix a couple of comments.
...
Update region_ops.txt to better describe the current behaviour of
Editor::get_regions_from_selection_and_edit_point(), and fix a couple of
comments that still referred to the no-longer-existing 'edit' property of
route groups.
2013-04-03 23:21:53 +01:00
9301991f6e
vtl: video-monitor interaction
...
* Menu > View > Video Monitor -- bi-directional communication
with xjadeo for window-state and OSD.
* fix saving state on session close (wait for xjadeo to terminate)
2013-04-03 22:29:37 +02:00
399aee309d
vtl: use mpeg4 with intra frames for internal seek format
2013-04-03 22:29:33 +02:00
da260ef5f9
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-03 14:16:42 -04:00
e510aed38d
fix reversed semantics from 86f1b for LaterNoteEndComparator()
2013-04-03 14:10:33 -04:00
47efae83d1
Don't include unselected regions in edit grouped region operations.
...
Make Editor::get_regions_from_selection_and_entered() only return regions
that are actually selected or entered, not their unselected equivalents.
2013-04-03 18:21:12 +01:00
b49f2a10d2
Ignore track selection if there are any selected regions.
...
Make Editor::get_regions_from_selection_and_edit_point() only consider the
selected tracks when finding regions to operate on if there are no regions
selected, and never if the edit point is 'mouse'.
2013-04-03 17:29:34 +01:00
f4a9c02b1d
Use selection->regions instead of Editor::get_regions_from_selection()
...
Remove Editor::get_regions_from_selection(), and use selection->regions
directly in the few places it was called.
2013-04-03 17:04:04 +01:00
Roy Vegard Ovesen
11747ab16c
Enable snapshots and port connect on startup
2013-04-03 17:50:59 +02:00
ec6dd2dc8b
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-03 10:35:47 -04:00
Roy Vegard Ovesen
810a603fb2
Prevent infinite loops
2013-04-03 16:18:42 +02:00
b27700f10c
fix NSM initialization.
...
Possible segfault on startup if NSM is not used.
2013-04-03 02:36:15 +02:00
7b99abb05d
vtl: renice export dialog
...
* fix scale w/h min+max
* update labels and alignment
2013-04-03 00:59:29 +02: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
