Commit graph

10274 commits

Author SHA1 Message Date
Paul Davis
4e84bc3a39 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 2013-04-12 21:46:44 -04:00
Paul Davis
b05968fb4e change frames_per_pixel to samples_per_pixel 2013-04-12 11:31:50 -04:00
Paul Davis
e5a3747686 switch from frames_per_pixel to samples_per_pixel in the one canvas object that uses this 2013-04-12 11:31:17 -04:00
Paul Davis
8877199ae0 leftmost_position => leftmost_sample, current_page_frames => current_page_samples 2013-04-12 11:21:12 -04:00
Paul Davis
4258a34912 change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample 2013-04-12 11:15:45 -04:00
Paul Davis
ecfd2a7455 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 2013-04-12 11:09:49 -04:00
Paul Davis
fcb423f3f6 slightly optimize drawing of rectangles with all 4 sides outlined to avoid multiple paths etc 2013-04-12 11:08:24 -04:00
Paul Davis
f208593249 Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas 2013-04-11 22:54:22 -04:00
Paul Davis
7caf517b27 add (bezier) curves to canvas, use for automation lines; fix issue with rectangles missing their upper line segment; more cairo canvas fixes 2013-04-11 22:54:12 -04:00
Paul Davis
ee1f0520a8 many changes to get the cairo-canvas version much, much more functional. still problems with a lot of subtle and not-so-subtle issues 2013-04-11 20:19:22 -04:00
Paul Davis
1fda7b293a fix up positioning of verbose cursor if it is too close to the bottom of the canvas (for MidiRegionView) 2013-04-11 20:01:14 -04:00
Robin Gareus
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
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Robin Gareus
b7c617b057 possible fix for #5441 -- ardour hangs on shutdown (trying to stop harvid/xjadeo) 2013-04-10 23:41:44 +02:00
Robin Gareus
ca1d58c254 vtl: remove inadvertently committed CURLERRORDEBUG 2013-04-10 23:40:23 +02:00
Paul Davis
ae2b39b2e3 remove intermediate GdkPixbuf from waveview rendering, and use shared_array<> to manage peak data 2013-04-10 15:27:55 -04:00
Paul Davis
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
Paul Davis
9a8ee11f65 Merge branch 'master' into cairocanvas 2013-04-10 12:37:16 -04:00
Paul Davis
75118796e1 add -D canvasevents tracing for grabbed items and remove render count output 2013-04-10 11:09:16 -04:00
Paul Davis
a1745f2cf1 remove debugging output 2013-04-10 10:53:21 -04:00
Paul Davis
1cb9779401 remove extra output from PBD::stacktrace 2013-04-10 10:49:27 -04:00
Paul Davis
54e101eb3f alter arrow drawing to fully close path and thus avoid cairo mitering variability 2013-04-10 10:27:37 -04:00
Paul Davis
97da762c50 make size/shape of playhead cursor match gnomecanvas version 2013-04-10 10:24:17 -04:00
Paul Davis
56bc98f78b fix LXVST support for plugins that make audioMaster callbacks from within effOpen (e.g. glitch) 2013-04-10 08:32:39 -04:00
Paul Davis
6592c8696a Merge branch 'master' of git.ardour.org:ardour/ardour 2013-04-09 14:25:02 -04:00
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
Paul Davis
722d7f4de6 update all i18n .po files 2013-04-09 09:32:14 -04: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
Julien de Kozak
019af63914 Fix name spelling 2013-04-08 19:23:38 +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