67e4f49064
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-05 22:05:33 -04:00
cd0d68a591
mark the step entry dialog as a dialog even though it is an ArdourWindow, to help with WM layering issues
2013-04-05 18:00:59 -04:00
6c7a61f6e5
Fix display of Spectral Analysis when no tracks are selected.
...
Spectral Analysis now displays graphs for selected regions, even when there
are no tracks selected. Fixes #2226 .
2013-04-05 17:49:31 +01:00
fcf7530676
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-05 12:00:42 -04:00
55a1048094
Merge branch 'patches' of https://github.com/jdekozak/ardour
2013-04-05 11:54:34 -04:00
096fe04e61
Make track header faders insensitive to vertical scroll-wheel events again.
...
This effectively reverts d235a27a
2013-04-05 10:08:36 +01:00
3f97d8c6d5
vtl: remove obvious warning
2013-04-05 00:15:57 +02:00
7fe22a7af3
vtl: overall export progress bar
2013-04-04 23:40:36 +02:00
b358a09165
vtl: A/V sync lock on import
...
When extracting and importing audio from a video,
mark the audio region's position as locked to the
video.
While locked, the audio region can only be moved
by moving the video with a granularity of one Timecode
frame.
2013-04-04 15:44:32 +02:00
d982887e32
vtl: re-order view menu entries
2013-04-04 15:38:30 +02:00
b4e5eb3c8b
vtl: audio-export progress-bar tweaks
...
use the same concept as session > export > audio;
hopefully this fixes jack-disconnects during export.
2013-04-04 01:05:53 +02:00
1040801ffe
vtl: video-monitor letterbox & orig-zoom to menu
2013-04-04 01:05:49 +02:00
ddfc047f0e
Update region_ops.txt to match current behaviour, and fix a couple of comments.
...
Update region_ops.txt to better describe the current behaviour of
Editor::get_regions_from_selection_and_edit_point(), and fix a couple of
comments that still referred to the no-longer-existing 'edit' property of
route groups.
2013-04-03 23:21:53 +01: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
399aee309d
vtl: use mpeg4 with intra frames for internal seek format
2013-04-03 22:29:33 +02:00
47efae83d1
Don't include unselected regions in edit grouped region operations.
...
Make Editor::get_regions_from_selection_and_entered() only return regions
that are actually selected or entered, not their unselected equivalents.
2013-04-03 18:21:12 +01:00
b49f2a10d2
Ignore track selection if there are any selected regions.
...
Make Editor::get_regions_from_selection_and_edit_point() only consider the
selected tracks when finding regions to operate on if there are no regions
selected, and never if the edit point is 'mouse'.
2013-04-03 17:29:34 +01:00
f4a9c02b1d
Use selection->regions instead of Editor::get_regions_from_selection()
...
Remove Editor::get_regions_from_selection(), and use selection->regions
directly in the few places it was called.
2013-04-03 17:04:04 +01:00
Roy Vegard Ovesen
11747ab16c
Enable snapshots and port connect on startup
2013-04-03 17:50:59 +02:00
ec6dd2dc8b
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-03 10:35:47 -04:00
Roy Vegard Ovesen
810a603fb2
Prevent infinite loops
2013-04-03 16:18:42 +02:00
b27700f10c
fix NSM initialization.
...
Possible segfault on startup if NSM is not used.
2013-04-03 02:36:15 +02:00
7b99abb05d
vtl: renice export dialog
...
* fix scale w/h min+max
* update labels and alignment
2013-04-03 00:59:29 +02:00
Roy Vegard Ovesen
d94a3c2bd0
Forgot to clean up nsm.* in previous commit
2013-04-02 21:25:27 +02:00
Roy Vegard Ovesen
992fe3adeb
Don't wait for session_is_loaded from nsm server
2013-04-02 20:33:39 +02:00
e06ff1cf29
vtl: update session start/end only when adding (or dragging) the video
2013-04-02 18:06:47 +02:00
467b137222
vtl: remove video-maintenance menu
...
* only really relevant for testing/debugging.
* the back-end functions are still used for 'normal' operation
and called implicitly when opening/closing a video.
* call stop_video_server() when removing a video.
2013-04-02 18:06:43 +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
37b108959c
vtl: update export information
2013-04-02 18:06:34 +02:00
1d48fb011e
vtl: update video-export
...
* range: pre/postfix with black video-frames
* fix A/V offset - decode and skip source until offset is reached
* use spinning progress-bar during decode&skip
* use video-stream index in stream-map
* fix audio-export abort; stop freewheeling
* re-indent code
2013-04-02 12:30:19 +02:00
922ef41995
vtl: draw cross if info-request fails in open-video preview.
2013-04-02 12:30:13 +02:00
2da10afb64
fix #5424 : routes created from templates do not get names based on the user-supplied text from the add route dialog
2013-04-01 20:45:57 -04:00
851a392495
likely fix for #5426 (hide all tracks doesn't work and causes inconsistent state
2013-04-01 19:56:33 -04:00
19d5cafa8a
fix up iterator syntax and unnecessary use of X_() in NSM patch
2013-04-01 19:46:24 -04:00
11ca19ed8f
Merge branch 'nsm' of https://github.com/royvegard/ardour
2013-04-01 18:54:41 -04:00
b27a89d1dc
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-03-31 17:02:07 -04:00
41708d39b9
fix missing slash-newline in --help output
2013-03-31 16:58:06 -04: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
ab3040f789
vtl: ffmpeg interaction:
...
* use ardour/SRC to resample audio on import
* parse framerate via codec-timebase if available
* update encoder parameters
* add vpx/webm as codec option
2013-03-31 19:34:58 +02:00
6f78b82452
vtl: open video dialog - aspect ratios
2013-03-31 19:34:53 +02:00
2ddbf6cd56
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-03-31 09:35:15 -04:00
Roy Vegard Ovesen
91080c31db
Disable some actions that are not allowed while under nsm
2013-03-31 15:28:29 +02:00
69d70bca37
vtl: open-video dialog tweaks
...
* show Timecode in/out
* fix text alignment
* parse aspect-ratio
* reset seek-slider on file selection
* make fps label translatable
2013-03-31 09:29:27 +02:00
Roy Vegard Ovesen
2806828962
Better start up
...
Don't reply to nsm server until ardour project is finished loading
2013-03-31 03:59:10 +02:00
Roy Vegard Ovesen
81a343ff7f
Make sure every imported file is copied to the session path
2013-03-31 03:59:10 +02:00
Roy Vegard Ovesen
43b94f7aa7
Prevent the new session dialog from appearing
2013-03-31 03:59:10 +02:00
Roy Vegard Ovesen
6ef371745a
non-session-manager support
...
Implements open, save and dirtiness.
No error checking, no menu items disabling.
2013-03-31 03:59:09 +02:00
153e572696
include -P (--no-connect-ports) option in --help output
2013-03-30 20:17:49 -04:00
236360d8ff
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-03-30 14:02:38 -04:00
b691d4bf04
fix up some confusion with filesources' _origin and _file_is_new members. if _origin is set, it means that the file is "external" to the session (aka "embedded") and for some purposes this is more significant than _file_is_new. rename SourceFactory::createReadable() to ::createExternal() to more clearly indicate its purpose; remove never-supplied "origin" argument from SourceFactor::createWritable(). Fixes problems caused by 864ce8f0
2013-03-30 14:02:26 -04:00
