436eecbb3c
check for xjadeo/xjremote >= 0.7.7
2014-06-07 17:28:46 +02:00
8c9749e42f
merge with master and fix 4 conflicts by hand
2014-06-02 11:32:13 -04:00
9f266e9061
try get_win_special_folder() for harvid & xjadeo (if registry fails)
2014-04-24 13:22:17 +02:00
1929cbffb4
query windows registry for xjadeo & harvid path
2014-04-24 02:08:19 +02:00
8a8dc9ca04
fix xjadeo on windows (directly use xjadeo.exe)
2014-04-23 21:27:05 +02:00
4fd1a5edd5
videotimeline: path related fixes for windows
2014-04-19 02:03:43 +02:00
670c066793
add manual reference to missing video-tools warnings
2014-04-11 17:24:50 +02:00
89e63b4bce
fix some memory leaks
2014-03-23 00:46:12 +01:00
a0abf608d6
replace a few creeping instances of the string "Ardour" with PROGRAM_NAME
2014-02-10 10:53:01 -05:00
f8574fc39d
'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy
2013-10-03 09:06:56 +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
8ddd12a60d
Rename SearchPath class Searchpath
...
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
b5845ea458
dedicated namespace for video-utils
...
conflicting symbol prophylaxis
2013-08-08 15:26:19 -04:00
1700b30e4e
tiny detail.. GUI-callback may try to check vmonitor->is_started() or issue a periodic seek update while it's going away
2013-08-08 15:26:18 -04:00
6178e65cdd
vtl: replace Ardour with Program-Name in messages
2013-08-08 15:26:01 -04:00
43ae996b3a
dedicated namespace for video-utils
...
conflicting symbol prophylaxis
2013-08-03 16:54:57 +02:00
f81cbe06ea
tiny detail.. GUI-callback may try to check vmonitor->is_started() or issue a periodic seek update while it's going away
2013-07-31 20:19:57 +02:00
d7a52dc0fe
vtl: replace Ardour with Program-Name in messages
2013-07-25 14:19:28 +02:00
46b6987311
fix merge of master
...
frames => samples rename in cairocanvas branch caused minor breakage
2013-06-14 10:50:40 -04:00
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
489121ca20
vtl: clean-up "Remove Video" action state
2013-06-13 17:17:28 +02:00
27e2b09f63
vtl: check if server's docroot matches ardour's config
...
NOTE: this breaks backwards compatibility with icsd and
harvid < 0.3.0 which do not report their settings.
It may also conflict with harvid running on localhost in a chroot.
Ideally this will be a warning only.
That the user can choose to ignore this and should get the option
to stop the video-server and re-start it using a different docroot.
2013-06-13 00:58:19 +02:00
6b480bb2f7
vtl: make "Remove Video" insensitive if N/A
2013-06-13 00:58:19 +02:00
8b5f990267
vtl: send A/V offset to video-monitor when launched
2013-06-10 19:43:23 +02:00
f5a8e563e8
vtl: NOOP, replace old define
2013-06-10 19:33:54 +02:00
70a422c1c7
vtl: remove cruft
2013-06-10 19:10:12 +02:00
c190870b50
vtl: disable video-monitor settings override (unused for now)
2013-06-10 19:10:12 +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
31d234b48c
Merge branch 'master' into cairocanvas
2013-06-07 13:18:48 -04:00
b13c5bff54
vtl: NOOP - clean up code.
2013-06-07 15:35:49 +02:00
31fbf351a8
vtl: round fractional framerates to 1/100 to compare for identity
2013-06-07 14:37:15 +02:00
74f2472c7d
vtl: more frame->sample renames and cleaning
2013-04-17 09:10:47 +02:00
1227f2b73e
vtl: get rid of one more unnecessary canvas-group
2013-04-17 02:27:06 +02:00
b713af2083
vtl: use ArdourImage
...
* update videotimeline -> new zoom, position API
* update image-frame use Cairo based ArdourImage instead of GdkPixbuf
2013-04-16 23:28:08 +02:00
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
