13
0
Commit Graph

26 Commits

Author SHA1 Message Date
8877199ae0 leftmost_position => leftmost_sample, current_page_frames => current_page_samples 2013-04-12 11:21:12 -04:00
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
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
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
bca507a808 Merge branch 'master' into cairocanvas 2013-04-09 14:23:41 -04:00
082de27a4e vtl: query video-monitor-state on explicit session save 2013-04-09 17:13:42 +02:00
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
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
f7abf2de82 vtl: mark session dirty if video position-lock or timeline height changes 2013-04-08 21:17:48 +02:00
c7daf40358 mark session dirty if video is moved 2013-04-08 21:11:17 +02:00
8630fd1703 add session save signal and hook-up videotimeline 2013-04-08 19:51:48 +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
8eef4b1904 master merge; new files not added after initial cairocanvas patch application 2013-04-05 17:16:33 -04:00
1040801ffe vtl: video-monitor letterbox & orig-zoom to menu 2013-04-04 01:05:49 +02: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
e06ff1cf29 vtl: update session start/end only when adding (or dragging) the video 2013-04-02 18:06:47 +02:00
5a4d0fff01 vtl: remove xjadeo option dialog
xjadeo options (selective session restore) are only
useful for testing and debugging.
2013-04-02 18:06:38 +02:00
b9d22839f1 vtl: fix video-monitor [dialog] crash
caused by closing a session and then opening another video session
-> the video-monitor session reference was outdated.
2013-03-31 20:34:02 +02:00
8cd3dd2061 vtl: workaround xjadeo <= 0.6.4 issue 2013-03-29 12:36:19 +01:00
941898843e vtl: add close/remove video menu entry 2013-03-29 12:35:57 +01:00
a1429ed39f vtl: simple/localhost mode.
Hide most of the setup complexity that is irrelevant when
running the video-server on the same host as Ardour.

Add an abstraction layer to the config which will become
important later when /building in/ the video-server.
2013-03-28 13:42:51 +01:00
78aa7a13fd use C++ std function for max() 2013-03-27 18:45:08 +01:00
b3fa4dd8f3 vtl: video sets session start/end markers. 2013-03-27 18:21:09 +01:00
f0bb986b33 vtl: print (debug) messages if xjadeo is not available 2013-03-15 02:09:04 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00