Commit Graph

27 Commits

Author SHA1 Message Date
543099afba rework SystemExec - use vfork wrapper (and lots of related stuff) 2014-03-13 16:58:07 +01:00
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
960a47330a switch from JACK_Slave to Engine_Slave 2013-09-19 17:34:23 -04:00
486720de61 Use Glib::usleep for portability 2013-07-22 13:44:32 +10:00
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
9b9ebee02c remove inadvertently committed debug message 2013-06-11 00:49:36 +02:00
8b5f990267 vtl: send A/V offset to video-monitor when launched 2013-06-10 19:43:23 +02:00
3940ec3fa7 vtl: fix for not-saving video-monitor settings 2013-06-10 19:10:12 +02:00
70a422c1c7 vtl: remove cruft 2013-06-10 19:10:12 +02:00
717a38982a vtl: reduce ardour<>xjadeo communication
avoid duplcate OSD related messages.
2013-06-10 19:10:12 +02:00
b203da5eb9 vtl: fix duplicate saved settings 2013-06-10 19:10:12 +02:00
5b7b56236b move emulate_key_event() to utils 2013-06-10 01:54:55 +02:00
06ab2f9c10 do not allow to change timecode-offset in xjadeo while ardour has control 2013-06-10 01:05:00 +02:00
d4a656fc35 properly fake/forward keyboard events from video-monitor 2013-06-10 00:52:24 +02:00
85ceefd70a handle async communication from xjadeo 2013-06-09 22:56:34 +02:00
788b14365e fix video-monitor session settings
save settings when xjadeo terminates,
not only on explicit session save/quit.
2013-06-09 22:56:33 +02:00
ce0aa96838 NOOP - use PBD's std::string to number functions 2013-06-08 09:03:26 +02:00
40944574c6 the big rework of window management. probably not complete at thsi point, but this is mostly functional 2013-05-04 22:02:05 -04:00
74f2472c7d vtl: more frame->sample renames and cleaning 2013-04-17 09:10:47 +02:00
abba366fce fix some unused argument warnings 2013-04-16 14:04:07 -04:00
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +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
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
745804fd7e vtl: debug xjadeo communication 2013-03-28 16:59:01 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00