Paul Davis
bca507a808
Merge branch 'master' into cairocanvas
2013-04-09 14:23:41 -04:00
Paul Davis
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
Robin Gareus
082de27a4e
vtl: query video-monitor-state on explicit session save
2013-04-09 17:13:42 +02:00
Robin Gareus
ed1f310f10
vtl: rework session-needs-save logic
...
* videotimeline now immediately marks the session dirty on
every state-changing operation
* video-montor is polled every 2.5 seconds for menu-relevant state info
(ontop, OSD,..) and every 30 seconds for full state (window pos, size,..)
* new interface to query the video-monitor for its state and wait for
all replies - terminating the process and using ::wait() is no longer
required
* Ardour> quit and Ardour > close-session does no longer close the video
session to enforce video-monitor state sync but uses above new interface
2013-04-09 04:05:46 +02:00
Robin Gareus
49ddf8ecce
vtl: disconnect from session-save signal
...
the videotimeline is a global unique instance that is allocated during
startup and deleted on exit. The Scopedconnection is not deleted
with the session.
2013-04-09 04:05:42 +02:00
Robin Gareus
8a3ebe7510
vtl: resume if "don't close/exit" is selected
2013-04-09 04:05:34 +02:00
Paul Davis
1267b1d61c
mo' better debugging of canvas "structure" via Item::dump and derivatives
2013-04-08 19:48:09 -04:00
Paul Davis
18048747b6
fix up marker text color
2013-04-08 19:47:54 -04:00
Robin Gareus
f7abf2de82
vtl: mark session dirty if video position-lock or timeline height changes
2013-04-08 21:17:48 +02:00
Robin Gareus
c7daf40358
mark session dirty if video is moved
2013-04-08 21:11:17 +02:00
Robin Gareus
d9df0ea6e5
fix prev commit SaveSession() signal was sent too late.
2013-04-08 20:52:33 +02:00
Robin Gareus
8630fd1703
add session save signal and hook-up videotimeline
2013-04-08 19:51:48 +02:00
Paul Davis
1606996845
once more try to get that revision info correct, sigh
2013-04-08 12:50:58 -04:00
Paul Davis
0f47a171c9
try to get that revision info correct, sigh
2013-04-08 12:46:36 -04:00
Paul Davis
4b54057569
fix definition of release version info in the case where git describe --tags returns a precise tag, rather than tag-REVCOUNT
2013-04-08 12:32:14 -04:00
Paul Davis
d79e3a21c6
bump to 3.1
2013-04-08 12:00:29 -04:00
Paul Davis
22b3744fb8
remove message about checking for announcements
2013-04-08 12:00:19 -04:00
Paul Davis
0a20a850be
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-08 09:30:49 -04:00
Paul Davis
23cac60a2f
add julien dekozak to the authors list
2013-04-08 09:30:39 -04:00
Robin Gareus
bec5882dbb
harvid binaries moved to ardour.org
2013-04-07 19:39:06 +02:00
Paul Davis
f2f92aaf8c
lazy redraw of Canvas::Text image
2013-04-06 19:04:34 -04:00
Paul Davis
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
Paul Davis
bcd65def7d
Merge branch 'master' into cairocanvas
2013-04-06 16:57:08 -04:00
Paul Davis
f84a3942cf
partially clean up warnings from "prolooks" code
2013-04-06 16:46:21 -04:00
Paul Davis
fce302847f
fix two unused args warnings
2013-04-06 16:39:37 -04:00
Paul Davis
fc787fad50
canvas markers now use ArdourCanvas::Text, not ArdourCanvas::Pixbuf, since the latter will be optimized to use Pixbuf too
2013-04-06 16:39:11 -04:00
Paul Davis
6b5846ab95
fix up unusued args warning in nsm code
2013-04-06 16:38:29 -04:00
Paul Davis
81506ea41c
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
2013-04-06 16:12:27 -04:00
Paul Davis
30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
Paul Davis
44564654fd
Merge branch 'master' into cairocanvas
2013-04-06 16:09:34 -04:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
eb40660038
fix up export formats search path to correctly locate bundled (or installed) export formats
2013-04-06 08:45:49 -04:00
Robin Gareus
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
Robin Gareus
486edf1680
add API to directly request access to pixbuf
2013-04-06 04:10:23 +02:00
Paul Davis
67e4f49064
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-05 22:05:33 -04:00
Paul Davis
1150a37ab7
do not include harvid by default in linux build (wrong variable definition)
2013-04-05 22:01:09 -04:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
Colin Fletcher
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
Paul Davis
fcf7530676
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-05 12:00:42 -04:00
Paul Davis
55a1048094
Merge branch 'patches' of https://github.com/jdekozak/ardour
2013-04-05 11:54:34 -04:00
Paul Davis
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
Paul Davis
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
