Commit Graph

5432 Commits

Author SHA1 Message Date
Paul Davis
1c74a3ab2d waveform drawing improvements
* handle logscaled and rectified
    * put dark tips in right places
    * improve color selection algorithm
2013-06-21 13:17:37 -04:00
Paul Davis
594a8c1221 set waveform color to a V-reduced version of the frame fill color. 2013-06-20 23:11:40 -04:00
Paul Davis
aaaeb958c1 switch samples_per_pixel to integer type 2013-06-18 23:02:54 -04:00
Paul Davis
a0c5de281a fix crash when recording, because the audioregion view has no frame handles 2013-06-18 08:22:25 -04:00
Paul Davis
1c24a847dd remove no-op "horizontal_position_changed()" method from StreamView and RouteTimeAxisView 2013-06-16 22:15:32 -04:00
Robin Gareus
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
Robin Gareus
cd04861f37 remove cruft 2013-06-14 17:29:14 +02:00
Robin Gareus
b44060ce96 remove old/unused export_multiplicator 2013-06-14 17:28:46 +02:00
Robin Gareus
084af4727d remove cruft - old CMT imageframe* 2013-06-14 17:18:59 +02:00
Paul Davis
46b6987311 fix merge of master
frames => samples rename in cairocanvas branch caused minor breakage
2013-06-14 10:50:40 -04:00
Robin Gareus
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
Robin Gareus
748de7e794 avoid name-conflict
when compiled with -rdynamic, "AudioStream" symbol
conflicts with AspectVST.so
2013-06-14 13:58:55 +02:00
Paul Davis
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
Paul Davis
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
Alexandre Prokoudine
5d52ae1825 Update Russian translation of Ardour 3.2 2013-06-14 02:21:02 +02:00
Alexandre Prokoudine
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
Robin Gareus
d7e336e0f2 s/Framenumber/Frame number/ 2013-06-14 00:41:02 +02:00
Robin Gareus
489121ca20 vtl: clean-up "Remove Video" action state 2013-06-13 17:17:28 +02:00
Robin Gareus
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
Robin Gareus
6b480bb2f7 vtl: make "Remove Video" insensitive if N/A 2013-06-13 00:58:19 +02:00
Paul Davis
2e1e5da78e more changes to consolidate version definition into the top level wscript file 2013-06-11 11:37:52 -04:00
Paul Davis
ef6366a7cd adjust the way version and revision info are gathered, defined and used 2013-06-11 10:58:24 -04:00
Paul Davis
31e8c77609 update .po files 2013-06-11 08:49:52 -04:00
Robin Gareus
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
Robin Gareus
1ca430babd separate general vs temporary(no vtl) OSX defines 2013-06-11 01:26:49 +02:00
Robin Gareus
9b9ebee02c remove inadvertently committed debug message 2013-06-11 00:49:36 +02:00
Paul Davis
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
Robin Gareus
2b745cab64 set PATH (used for harvid+ffmpeg) 2013-06-10 22:24:19 +02:00
Robin Gareus
8b5f990267 vtl: send A/V offset to video-monitor when launched 2013-06-10 19:43:23 +02:00
Robin Gareus
f5a8e563e8 vtl: NOOP, replace old define 2013-06-10 19:33:54 +02:00
Robin Gareus
3940ec3fa7 vtl: fix for not-saving video-monitor settings 2013-06-10 19:10:12 +02:00
Robin Gareus
70a422c1c7 vtl: remove cruft 2013-06-10 19:10:12 +02:00
Robin Gareus
c190870b50 vtl: disable video-monitor settings override (unused for now) 2013-06-10 19:10:12 +02:00
Robin Gareus
717a38982a vtl: reduce ardour<>xjadeo communication
avoid duplcate OSD related messages.
2013-06-10 19:10:12 +02:00
Robin Gareus
b203da5eb9 vtl: fix duplicate saved settings 2013-06-10 19:10:12 +02:00
Colin Fletcher
97ec274512 Make mouse operations on grouped regions apply to pre-existing selection
On clicking on a region that is part of an active edit group with the
'selection' property enabled, its equivalent regions also become selected.
Thus, there's no need to reset the selection to the equivalent
regions when performing mouse drags on the region, and trim/fade in/fade
out/move/copy will always operate on the existing region selection if there
is one.

Fixes #5515.
2013-06-10 18:07:52 +01:00
Robin Gareus
5b7b56236b move emulate_key_event() to utils 2013-06-10 01:54:55 +02:00
Robin Gareus
06ab2f9c10 do not allow to change timecode-offset in xjadeo while ardour has control 2013-06-10 01:05:00 +02:00
Robin Gareus
d4a656fc35 properly fake/forward keyboard events from video-monitor 2013-06-10 00:52:24 +02:00
Robin Gareus
85ceefd70a handle async communication from xjadeo 2013-06-09 22:56:34 +02:00
Robin Gareus
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
Robin Gareus
3942eec0e9 improve video-server start-up sequence
* don't wait if launching the app failed
* lower timeout and check interval
* print warnings..
2013-06-09 15:51:31 +02:00
Robin Gareus
4f0be474ef prepare font-styling meter labels
decrease size and weight of midi-velocity - make '127' fit,...
2013-06-08 11:51:17 +02:00
Robin Gareus
106364bcfc prefer audio-fader over midi-gain fader display.
This only affects mixer-strip display (and range).
The fader has effect on all MIDI and audio data
passing though it regardless of its display mode.
2013-06-08 09:08:31 +02:00
Robin Gareus
ce0aa96838 NOOP - use PBD's std::string to number functions 2013-06-08 09:03:26 +02:00
Robin Gareus
fea8e860c6 remove unused old code 2013-06-08 08:26:12 +02:00
Paul Davis
0d31fc76d5 Merge branch 'master' of git.ardour.org:ardour/ardour 2013-06-07 17:52:12 -04:00
Paul Davis
f7a27e17db fix display of external Send UI 2013-06-07 17:50:13 -04:00
Robin Gareus
b26cc12513 close all open fd's on fork 2013-06-07 20:50:59 +02:00
Robin Gareus
b8b24e8313 give video-server some time so launch -- prevent multiple instance 2013-06-07 20:14:42 +02:00