13
0
Commit Graph

8 Commits

Author SHA1 Message Date
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
ca1d58c254 vtl: remove inadvertently committed CURLERRORDEBUG 2013-04-10 23:40:23 +02: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
41faeb76e1 fix typo in prev commit 2013-03-26 14:48:15 +01:00
0781b871d4 vtl: increase retry timeout on 503, print http status on error. 2013-03-26 14:11:52 +01:00
e1f3dcee2a vtl: re-request frame on 503/try-again 2013-03-19 00:48:37 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00