Robin Gareus [Tue, 16 Apr 2013 21:28:53 +0000 (23:28 +0200)]
vtl: remove superfluous group
Robin Gareus [Tue, 16 Apr 2013 20:57:19 +0000 (22:57 +0200)]
vtl: use ArdourImage
* update videotimeline -> new zoom, position API
* update image-frame use Cairo based ArdourImage instead of GdkPixbuf
Paul Davis [Tue, 16 Apr 2013 20:14:57 +0000 (16:14 -0400)]
somewhat restore ability to see rectified waveforms
Paul Davis [Tue, 16 Apr 2013 19:38:18 +0000 (15:38 -0400)]
restore log-scaled waveform functionality
Paul Davis [Tue, 16 Apr 2013 18:20:04 +0000 (14:20 -0400)]
(hopefully) fix double-buffering design of ArdourCanvas::Image
Paul Davis [Tue, 16 Apr 2013 18:04:59 +0000 (14:04 -0400)]
change rendering technique for waveforms, add back optional gradient, add back amplitude scaling, add rgb/hsv conversion utilities to canvas
Paul Davis [Tue, 16 Apr 2013 18:04:07 +0000 (14:04 -0400)]
fix some unused argument warnings
Paul Davis [Tue, 16 Apr 2013 18:03:51 +0000 (14:03 -0400)]
fix some unused argument warnings
Paul Davis [Tue, 16 Apr 2013 18:03:21 +0000 (14:03 -0400)]
remove commented out popup about video export success
Paul Davis [Tue, 16 Apr 2013 14:07:52 +0000 (10:07 -0400)]
add back various functionality to waveviews such as zero line, amplitude scaling
Paul Davis [Tue, 16 Apr 2013 13:25:53 +0000 (09:25 -0400)]
partially fix scaling issues with pathological MIDI regions (e.g. 15k notes per region), particularly during loading. more to be done, perhaps, for editing purposes where we redisplay the entire model after a change
Paul Davis [Tue, 16 Apr 2013 02:34:36 +0000 (22:34 -0400)]
add some comments to Canvas::Image and ensure that the canvas redraws after a put_image() call is handled in the GUI thread
Paul Davis [Tue, 16 Apr 2013 02:10:18 +0000 (22:10 -0400)]
add headers to all canvas .cc and .h files
Paul Davis [Tue, 16 Apr 2013 02:00:13 +0000 (22:00 -0400)]
remove all xml++.h inclusion by canvas implementations
Paul Davis [Tue, 16 Apr 2013 01:57:08 +0000 (21:57 -0400)]
remove all XML related API from canvas. it may have been useful during development, but it is just a distraction - we will NEVER be saving or restoring canvas state via XML or any kind of serialized state
Paul Davis [Tue, 16 Apr 2013 01:40:15 +0000 (21:40 -0400)]
add new canvas Image item, with somewhat optimized API for asynchronous, threaded rendering directly into an image buffer suitable for use by cairo as a source surface (currently untested)
Paul Davis [Mon, 15 Apr 2013 20:10:13 +0000 (16:10 -0400)]
fix markers so that the blue line spans both canvases
Paul Davis [Mon, 15 Apr 2013 18:45:22 +0000 (14:45 -0400)]
tweak time axis view item text positioning; allow ArdourCanvas::Text to have its width clamped, and use this as TAVI's get narrow so that text doesn't overflow
Paul Davis [Mon, 15 Apr 2013 17:50:05 +0000 (13:50 -0400)]
Fix dragging objects on the canvas and remove redundant canvas groups
Delivery of fake motion events to the editor needed the event coordinates to be
in canvas space, as they are with "real" events. Editor and other objects had
many redundant groups from timbyr's work on gnomecanvas to scroll by moving
groups. We don't need this anymore with cairo-canvas (though possibly a
stationay background group for the canvas might be useful again one day as in
the SAE logo. Its implementation would be fairly different though, since we
would have to explicitly move the group on every scroll, since nothing else
ever moves on scroll).
Also tweaks to text item placement, and switch TimeAxisViewItem from
name_pixbuf to name_text, since ArdourCanvas::Text is already "pixbuf optimized".
Paul Davis [Mon, 15 Apr 2013 14:38:12 +0000 (10:38 -0400)]
a few changes to fix region dragging, all related to coordinate system handling, which is now much simpler with the new canvas; more debugging output when asked for
Paul Davis [Sat, 13 Apr 2013 11:50:31 +0000 (07:50 -0400)]
remove another pointless adjustment
Paul Davis [Sat, 13 Apr 2013 11:29:49 +0000 (07:29 -0400)]
removal of sundry Adjustments and consolidation of scrolling around two editor-owned Adjustments
Paul Davis [Sat, 13 Apr 2013 01:47:02 +0000 (21:47 -0400)]
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
Paul Davis [Sat, 13 Apr 2013 01:46:44 +0000 (21:46 -0400)]
changes to get cairocanvas branch to build on OS X, with its stupid nil and Rect macros, plus some const_cast<> and unused variable fixes that should really be in master but will have to wait till we rebase master
Paul Davis [Fri, 12 Apr 2013 22:01:44 +0000 (18:01 -0400)]
remove TimeAxisView::clip_to_viewport() and Editor::update_canvas_now() and Editor::flush_canvas() which should no longer be necessary with a sane canvas design
Paul Davis [Fri, 12 Apr 2013 22:00:46 +0000 (18:00 -0400)]
manual translate events in Editor::track_canvas_scroll() to canvas space, because the event arrives there directly, not via the canvas. no other similar eventhandler in that code uses the event coordinates
Paul Davis [Fri, 12 Apr 2013 16:53:52 +0000 (12:53 -0400)]
stop using vertical adjustment to account for scrolling, since event coordinates for all events that are delivered to the canvas are adjusted before Editor sees them
Paul Davis [Fri, 12 Apr 2013 15:31:50 +0000 (11:31 -0400)]
change frames_per_pixel to samples_per_pixel
Paul Davis [Fri, 12 Apr 2013 15:31:17 +0000 (11:31 -0400)]
switch from frames_per_pixel to samples_per_pixel in the one canvas object that uses this
Paul Davis [Fri, 12 Apr 2013 15:21:12 +0000 (11:21 -0400)]
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
Paul Davis [Fri, 12 Apr 2013 15:15:45 +0000 (11:15 -0400)]
change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample
Paul Davis [Fri, 12 Apr 2013 15:09:49 +0000 (11:09 -0400)]
remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor
Paul Davis [Fri, 12 Apr 2013 15:08:24 +0000 (11:08 -0400)]
slightly optimize drawing of rectangles with all 4 sides outlined to avoid multiple paths etc
Paul Davis [Fri, 12 Apr 2013 02:54:22 +0000 (22:54 -0400)]
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
Paul Davis [Fri, 12 Apr 2013 02:54:12 +0000 (22:54 -0400)]
add (bezier) curves to canvas, use for automation lines; fix issue with rectangles missing their upper line segment; more cairo canvas fixes
Paul Davis [Fri, 12 Apr 2013 00:19:22 +0000 (20:19 -0400)]
many changes to get the cairo-canvas version much, much more functional. still problems with a lot of subtle and not-so-subtle issues
Paul Davis [Fri, 12 Apr 2013 00:01:14 +0000 (20:01 -0400)]
fix up positioning of verbose cursor if it is too close to the bottom of the canvas (for MidiRegionView)
Robin Gareus [Thu, 11 Apr 2013 20:24:05 +0000 (22:24 +0200)]
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
Robin Gareus [Thu, 11 Apr 2013 17:49:29 +0000 (19:49 +0200)]
enable videotimeline by default
Robin Gareus [Wed, 10 Apr 2013 21:41:44 +0000 (23:41 +0200)]
possible fix for #5441 -- ardour hangs on shutdown (trying to stop harvid/xjadeo)
Robin Gareus [Wed, 10 Apr 2013 21:40:23 +0000 (23:40 +0200)]
vtl: remove inadvertently committed CURLERRORDEBUG
Paul Davis [Wed, 10 Apr 2013 19:27:55 +0000 (15:27 -0400)]
remove intermediate GdkPixbuf from waveview rendering, and use shared_array<> to manage peak data
Paul Davis [Wed, 10 Apr 2013 18:42:36 +0000 (14:42 -0400)]
remove incorrect merge of cairocanvas patch that stopped most tracks from displaying; add more debugging info
Paul Davis [Wed, 10 Apr 2013 16:37:16 +0000 (12:37 -0400)]
Merge branch 'master' into cairocanvas
Paul Davis [Wed, 10 Apr 2013 15:09:16 +0000 (11:09 -0400)]
add -D canvasevents tracing for grabbed items and remove render count output
Paul Davis [Wed, 10 Apr 2013 14:53:21 +0000 (10:53 -0400)]
remove debugging output
Paul Davis [Wed, 10 Apr 2013 14:49:27 +0000 (10:49 -0400)]
remove extra output from PBD::stacktrace
Paul Davis [Wed, 10 Apr 2013 14:27:37 +0000 (10:27 -0400)]
alter arrow drawing to fully close path and thus avoid cairo mitering variability
Paul Davis [Wed, 10 Apr 2013 14:24:17 +0000 (10:24 -0400)]
make size/shape of playhead cursor match gnomecanvas version
Paul Davis [Wed, 10 Apr 2013 12:32:39 +0000 (08:32 -0400)]
fix LXVST support for plugins that make audioMaster callbacks from within effOpen (e.g. glitch)
Paul Davis [Tue, 9 Apr 2013 18:25:02 +0000 (14:25 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Tue, 9 Apr 2013 18:23:41 +0000 (14:23 -0400)]
Merge branch 'master' into cairocanvas
Paul Davis [Tue, 9 Apr 2013 18:22:58 +0000 (14:22 -0400)]
a variety of fixes for the cairocanvas, but it still buggy as hell handling events and lots of other stuff
Robin Gareus [Tue, 9 Apr 2013 15:13:42 +0000 (17:13 +0200)]
vtl: query video-monitor-state on explicit session save
Paul Davis [Tue, 9 Apr 2013 13:32:14 +0000 (09:32 -0400)]
update all i18n .po files
Robin Gareus [Tue, 9 Apr 2013 02:05:07 +0000 (04:05 +0200)]
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
Robin Gareus [Tue, 9 Apr 2013 01:47:47 +0000 (03:47 +0200)]
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.
Robin Gareus [Mon, 8 Apr 2013 22:48:15 +0000 (00:48 +0200)]
vtl: resume if "don't close/exit" is selected
Paul Davis [Mon, 8 Apr 2013 23:48:09 +0000 (19:48 -0400)]
mo' better debugging of canvas "structure" via Item::dump and derivatives
Paul Davis [Mon, 8 Apr 2013 23:47:54 +0000 (19:47 -0400)]
fix up marker text color
Robin Gareus [Mon, 8 Apr 2013 19:17:48 +0000 (21:17 +0200)]
vtl: mark session dirty if video position-lock or timeline height changes
Robin Gareus [Mon, 8 Apr 2013 19:11:17 +0000 (21:11 +0200)]
mark session dirty if video is moved
Robin Gareus [Mon, 8 Apr 2013 18:52:33 +0000 (20:52 +0200)]
fix prev commit SaveSession() signal was sent too late.
Robin Gareus [Mon, 8 Apr 2013 17:51:00 +0000 (19:51 +0200)]
add session save signal and hook-up videotimeline
Julien de Kozak [Mon, 8 Apr 2013 17:23:38 +0000 (19:23 +0200)]
Fix name spelling
Paul Davis [Mon, 8 Apr 2013 16:50:58 +0000 (12:50 -0400)]
once more try to get that revision info correct, sigh
Paul Davis [Mon, 8 Apr 2013 16:46:36 +0000 (12:46 -0400)]
try to get that revision info correct, sigh
Paul Davis [Mon, 8 Apr 2013 16:32:14 +0000 (12:32 -0400)]
fix definition of release version info in the case where git describe --tags returns a precise tag, rather than tag-REVCOUNT
Paul Davis [Mon, 8 Apr 2013 16:00:29 +0000 (12:00 -0400)]
bump to 3.1
Paul Davis [Mon, 8 Apr 2013 16:00:19 +0000 (12:00 -0400)]
remove message about checking for announcements
Paul Davis [Mon, 8 Apr 2013 13:30:49 +0000 (09:30 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Mon, 8 Apr 2013 13:30:39 +0000 (09:30 -0400)]
add julien dekozak to the authors list
Robin Gareus [Sun, 7 Apr 2013 17:39:06 +0000 (19:39 +0200)]
harvid binaries moved to ardour.org
Paul Davis [Sat, 6 Apr 2013 23:04:34 +0000 (19:04 -0400)]
lazy redraw of Canvas::Text image
Paul Davis [Sat, 6 Apr 2013 22:35:32 +0000 (18:35 -0400)]
pre-render text canvas items so that ::render() is just a blit from an image surface
Paul Davis [Sat, 6 Apr 2013 20:57:08 +0000 (16:57 -0400)]
Merge branch 'master' into cairocanvas
Paul Davis [Sat, 6 Apr 2013 20:46:21 +0000 (16:46 -0400)]
partially clean up warnings from "prolooks" code
Paul Davis [Sat, 6 Apr 2013 20:39:37 +0000 (16:39 -0400)]
fix two unused args warnings
Paul Davis [Sat, 6 Apr 2013 20:39:11 +0000 (16:39 -0400)]
canvas markers now use ArdourCanvas::Text, not ArdourCanvas::Pixbuf, since the latter will be optimized to use Pixbuf too
Paul Davis [Sat, 6 Apr 2013 20:38:29 +0000 (16:38 -0400)]
fix up unusued args warning in nsm code
Paul Davis [Sat, 6 Apr 2013 20:12:27 +0000 (16:12 -0400)]
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
Paul Davis [Sat, 6 Apr 2013 20:12:15 +0000 (16:12 -0400)]
Merge ... master, including manual merge conflict resolution
Paul Davis [Sat, 6 Apr 2013 20:09:34 +0000 (16:09 -0400)]
Merge branch 'master' into cairocanvas
Paul Davis [Sat, 6 Apr 2013 20:04:02 +0000 (16:04 -0400)]
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
Paul Davis [Sat, 6 Apr 2013 15:37:16 +0000 (11:37 -0400)]
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
Paul Davis [Sat, 6 Apr 2013 15:21:09 +0000 (11:21 -0400)]
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
Paul Davis [Sat, 6 Apr 2013 13:52:11 +0000 (09:52 -0400)]
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)
Paul Davis [Sat, 6 Apr 2013 13:29:54 +0000 (09:29 -0400)]
add pkg-config check on liblo, now that NSM support requires 0.26 rather than just "any" version (fixes #5435)
Paul Davis [Sat, 6 Apr 2013 13:13:39 +0000 (09:13 -0400)]
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)
Paul Davis [Sat, 6 Apr 2013 12:45:49 +0000 (08:45 -0400)]
fix up export formats search path to correctly locate bundled (or installed) export formats
Robin Gareus [Sat, 6 Apr 2013 02:09:58 +0000 (04:09 +0200)]
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..
Robin Gareus [Sat, 6 Apr 2013 01:50:42 +0000 (03:50 +0200)]
add API to directly request access to pixbuf
Paul Davis [Sat, 6 Apr 2013 02:05:33 +0000 (22:05 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Sat, 6 Apr 2013 02:01:09 +0000 (22:01 -0400)]
do not include harvid by default in linux build (wrong variable definition)
Paul Davis [Sat, 6 Apr 2013 02:00:30 +0000 (22:00 -0400)]
add -L to curl in linux build script so that 301 responses while fetching harvid are handled
Paul Davis [Fri, 5 Apr 2013 22:00:59 +0000 (18:00 -0400)]
mark the step entry dialog as a dialog even though it is an ArdourWindow, to help with WM layering issues
Paul Davis [Fri, 5 Apr 2013 22:00:18 +0000 (18:00 -0400)]
if auditioner connections are somehow wiped out in CONFIG/ardour.rc, treat them as if they are still "default"
Paul Davis [Fri, 5 Apr 2013 21:16:33 +0000 (17:16 -0400)]
master merge; new files not added after initial cairocanvas patch application
Colin Fletcher [Fri, 5 Apr 2013 16:48:36 +0000 (17:48 +0100)]
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.
Paul Davis [Fri, 5 Apr 2013 16:00:42 +0000 (12:00 -0400)]
Merge branch 'nsm' of https://github.com/royvegard/ardour