13
0
Commit Graph

10900 Commits

Author SHA1 Message Date
b407b753f7 vtl: remember original video-file for later export/mux 2013-06-17 09:46:01 +02:00
1c24a847dd remove no-op "horizontal_position_changed()" method from StreamView and RouteTimeAxisView 2013-06-16 22:15:32 -04:00
cc960c4f07 remove executable mode-bit from files 2013-06-16 21:54:08 +02:00
e3db97efe9 vtl: use avi/mjpeg (insted of mpeg4) for video proxy
* average picture quality is worse
 * ..but seeking works accurately
   (no more PTS/DTS mess with Quicktime files)
 * ffmpeg transcode to mpeg4 retains PTS, DTS ( to mjpeg does not)
 * eventually harvid&xjadeo need to be
   updated to seek to non-monotonic PTS, DTS timestamps
2013-06-16 17:04:00 +02:00
24af570d06 vtl: update ffmpeg option sameq/qscale 2013-06-16 15:30:15 +02:00
d3f92cd1fb new track-height icons -- inspired by tom^_ 2013-06-15 00:01:03 +02:00
11619a37bf Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/imageframe_time_axis.cc
	gtk2_ardour/imageframe_time_axis.h
	gtk2_ardour/imageframe_time_axis_group.cc
	gtk2_ardour/imageframe_time_axis_group.h
	gtk2_ardour/imageframe_time_axis_view.cc
	gtk2_ardour/imageframe_time_axis_view.h
	gtk2_ardour/imageframe_view.cc
	gtk2_ardour/imageframe_view.h
	gtk2_ardour/marker_time_axis.cc
	gtk2_ardour/marker_time_axis.h
	gtk2_ardour/marker_time_axis_view.cc
	gtk2_ardour/marker_time_axis_view.h
	gtk2_ardour/marker_view.cc
	gtk2_ardour/marker_view.h
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/visual_time_axis.cc
	gtk2_ardour/visual_time_axis.h
	libs/canvas/canvas/circle.h
2013-06-14 21:09:24 +02:00
77ac803ba0 osx packaging: clean up temp dirs
OSX's .DS_Store file keeps rmdir from working.
2013-06-14 18:15:05 +02:00
377a016d59 packaging scripts: use rsync for video-tools 2013-06-14 18:12:55 +02:00
12584b7a7a don't display freewheeling & samplerate LV2 ports on GUI 2013-06-14 17:33:29 +02:00
cd04861f37 remove cruft 2013-06-14 17:29:14 +02:00
b44060ce96 remove old/unused export_multiplicator 2013-06-14 17:28:46 +02:00
084af4727d remove cruft - old CMT imageframe* 2013-06-14 17:18:59 +02:00
46b6987311 fix merge of master
frames => samples rename in cairocanvas branch caused minor breakage
2013-06-14 10:50:40 -04:00
006e3575be NOOP clean up code
move curl-http-get wrapper-function which is used by various
videotimeline related code to util.c
2013-06-14 13:58:56 +02:00
748de7e794 avoid name-conflict
when compiled with -rdynamic, "AudioStream" symbol
conflicts with AspectVST.so
2013-06-14 13:58:55 +02:00
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
80a13145f3 Generalize no-plugin-state from AudioUnits to all plugins
Replace AU_STATE_SUPPORT compile-time define with NO_PLUGIN_STATE and make it prevent plugin state setting, preset loading, preset saving and plugin state saving. Blocks on these actions exist partially in the backend and partially in the GUI (this latter class are not absolute, and should OSC or MIDI be able to drive Plugin::save_preset() the block could be circumvented). Set NO_PLUGIN_STATE if --freebie is used at waf-configure time
2013-06-13 22:50:54 -04:00
ea1dc49915 update russian translation
From Alexander Prokoudine
2013-06-13 21:26:30 -04:00
5d52ae1825 Update Russian translation of Ardour 3.2 2013-06-14 02:21:02 +02:00
2b90a57655 Fix the spelling and abstract the program name
The video exporting dialog has a few spelling bugs, as well
as unabstracted program name. The patch fixes it.
2013-06-14 02:10:31 +02:00
d7e336e0f2 s/Framenumber/Frame number/ 2013-06-14 00:41:02 +02:00
1e78407e81 update OSX disk image
* unpack xjadeo dmg - add Jadeo.app
 * new background image with arrow for xjadeo
2013-06-13 22:42:37 +02:00
489121ca20 vtl: clean-up "Remove Video" action state 2013-06-13 17:17:28 +02:00
a1e3cee926 bump to v3.2 2013-06-13 10:53:51 -04:00
e2df0413f4 fix up versioning stuff for libardour, which should track regular ardour release versions 2013-06-13 10:53:36 -04: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
67704f8de2 try removing --backtrace from VM build script 2013-06-12 07:17:37 -04:00
155388ec3c fix up detection of version by define_versions.sh 2013-06-11 11:41:49 -04:00
2e1e5da78e more changes to consolidate version definition into the top level wscript file 2013-06-11 11:37:52 -04:00
ef6366a7cd adjust the way version and revision info are gathered, defined and used 2013-06-11 10:58:24 -04:00
61e302c6bb make startup helper script use actual version, not a hard-coded 3.0 value 2013-06-11 10:32:16 -04:00
39215e04a9 stop hard-coding main executable as ardour-3.0 2013-06-11 10:18:58 -04:00
b7b279c588 round 2: *correctly* add --harvid to VM build scripts 2013-06-11 09:30:56 -04:00
014e3d6603 add --harvid to VM build scripts 2013-06-11 09:28:59 -04:00
31e8c77609 update .po files 2013-06-11 08:49:52 -04:00
21a4ce62dc vtl: wait for output from ffprobe
fix code-ordering bug that sneaked in when re-factoring the parser.
2013-06-11 02:58:10 +02:00
1ca430babd separate general vs temporary(no vtl) OSX defines 2013-06-11 01:26:49 +02:00
9b9ebee02c remove inadvertently committed debug message 2013-06-11 00:49:36 +02:00
50e3e61881 when exiting internal edit mode because of a mouse button press on a non-MIDI region, _join_object_range_state is set to NONE, not OBJECT, which would block selection of the clicked-upon region. fix that, to prevent an assert()-driven crash when the drag ends and there are no regions selected 2013-06-10 18:28:32 -04:00
2b745cab64 set PATH (used for harvid+ffmpeg) 2013-06-10 22:24:19 +02:00
4023a120ad deploy harvid+ffmpeg binaries directly w/ardour OSX bundle 2013-06-10 22:23:49 +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
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
c190870b50 vtl: disable video-monitor settings override (unused for now) 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