Robin Gareus [Fri, 5 Apr 2013 04:50:54 +0000 (06:50 +0200)]
ignore "external timecode is sync locked" for non timecode slaves.
Robin Gareus [Thu, 4 Apr 2013 22:15:57 +0000 (00:15 +0200)]
vtl: remove obvious warning
Robin Gareus [Thu, 4 Apr 2013 21:40:36 +0000 (23:40 +0200)]
vtl: overall export progress bar
Robin Gareus [Thu, 4 Apr 2013 13:44:32 +0000 (15:44 +0200)]
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.
Robin Gareus [Thu, 4 Apr 2013 13:38:30 +0000 (15:38 +0200)]
vtl: re-order view menu entries
Robin Gareus [Wed, 3 Apr 2013 23:04:27 +0000 (01:04 +0200)]
vtl: audio-export progress-bar tweaks
use the same concept as session > export > audio;
hopefully this fixes jack-disconnects during export.
Robin Gareus [Wed, 3 Apr 2013 22:51:03 +0000 (00:51 +0200)]
vtl: video-monitor letterbox & orig-zoom to menu
Colin Fletcher [Wed, 3 Apr 2013 22:21:53 +0000 (23:21 +0100)]
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.
Robin Gareus [Wed, 3 Apr 2013 20:29:04 +0000 (22:29 +0200)]
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)
Robin Gareus [Wed, 3 Apr 2013 15:22:57 +0000 (17:22 +0200)]
vtl: use mpeg4 with intra frames for internal seek format
Paul Davis [Wed, 3 Apr 2013 18:16:42 +0000 (14:16 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Wed, 3 Apr 2013 18:10:33 +0000 (14:10 -0400)]
fix reversed semantics from 86f1b for LaterNoteEndComparator()
Colin Fletcher [Wed, 3 Apr 2013 17:21:12 +0000 (18:21 +0100)]
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.
Colin Fletcher [Wed, 3 Apr 2013 16:29:34 +0000 (17:29 +0100)]
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'.
Colin Fletcher [Wed, 3 Apr 2013 15:54:32 +0000 (16:54 +0100)]
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.
Paul Davis [Wed, 3 Apr 2013 14:35:47 +0000 (10:35 -0400)]
Merge branch 'nsm' of https://github.com/royvegard/ardour
Roy Vegard Ovesen [Wed, 3 Apr 2013 14:18:42 +0000 (16:18 +0200)]
Prevent infinite loops
Robin Gareus [Wed, 3 Apr 2013 00:36:15 +0000 (02:36 +0200)]
fix NSM initialization.
Possible segfault on startup if NSM is not used.
Robin Gareus [Tue, 2 Apr 2013 22:58:19 +0000 (00:58 +0200)]
vtl: renice export dialog
* fix scale w/h min+max
* update labels and alignment
Paul Davis [Tue, 2 Apr 2013 20:11:04 +0000 (16:11 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Tue, 2 Apr 2013 20:10:51 +0000 (16:10 -0400)]
fix (?) behaviour when punching into automation write mode while the transport is moving, hopefully without breaking anything else
Roy Vegard Ovesen [Tue, 2 Apr 2013 19:25:27 +0000 (21:25 +0200)]
Forgot to clean up nsm.* in previous commit
Roy Vegard Ovesen [Tue, 2 Apr 2013 18:33:39 +0000 (20:33 +0200)]
Don't wait for session_is_loaded from nsm server
Robin Gareus [Tue, 2 Apr 2013 16:06:02 +0000 (18:06 +0200)]
vtl: update session start/end only when adding (or dragging) the video
Robin Gareus [Tue, 2 Apr 2013 16:02:41 +0000 (18:02 +0200)]
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.
Robin Gareus [Tue, 2 Apr 2013 15:57:09 +0000 (17:57 +0200)]
vtl: remove xjadeo option dialog
xjadeo options (selective session restore) are only
useful for testing and debugging.
Robin Gareus [Tue, 2 Apr 2013 14:37:28 +0000 (16:37 +0200)]
vtl: update export information
Robin Gareus [Tue, 2 Apr 2013 10:27:08 +0000 (12:27 +0200)]
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
Robin Gareus [Mon, 1 Apr 2013 16:39:15 +0000 (18:39 +0200)]
vtl: draw cross if info-request fails in open-video preview.
Paul Davis [Tue, 2 Apr 2013 00:45:57 +0000 (20:45 -0400)]
fix #5424: routes created from templates do not get names based on the user-supplied text from the add route dialog
Paul Davis [Mon, 1 Apr 2013 23:56:33 +0000 (19:56 -0400)]
likely fix for #5426 (hide all tracks doesn't work and causes inconsistent state
Paul Davis [Mon, 1 Apr 2013 23:47:08 +0000 (19:47 -0400)]
clarify comment about Automatable/ControlSet inheritance
Paul Davis [Mon, 1 Apr 2013 23:46:24 +0000 (19:46 -0400)]
fix up iterator syntax and unnecessary use of X_() in NSM patch
Paul Davis [Mon, 1 Apr 2013 22:54:41 +0000 (18:54 -0400)]
Merge branch 'nsm' of https://github.com/royvegard/ardour
Paul Davis [Mon, 1 Apr 2013 13:03:33 +0000 (09:03 -0400)]
fix compilation on OS X
Paul Davis [Sun, 31 Mar 2013 21:02:07 +0000 (17:02 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Sun, 31 Mar 2013 20:58:06 +0000 (16:58 -0400)]
fix missing slash-newline in --help output
Robin Gareus [Sun, 31 Mar 2013 18:33:26 +0000 (20:33 +0200)]
vtl: fix video-monitor [dialog] crash
caused by closing a session and then opening another video session
-> the video-monitor session reference was outdated.
Robin Gareus [Sun, 31 Mar 2013 17:34:05 +0000 (19:34 +0200)]
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
Robin Gareus [Sun, 31 Mar 2013 16:27:46 +0000 (18:27 +0200)]
vtl: open video dialog - aspect ratios
Paul Davis [Sun, 31 Mar 2013 13:41:51 +0000 (09:41 -0400)]
remove debug output
Paul Davis [Sun, 31 Mar 2013 13:35:15 +0000 (09:35 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Sun, 31 Mar 2013 13:35:06 +0000 (09:35 -0400)]
more work on the suprisingly ongoing filename/path/origin issue
Roy Vegard Ovesen [Sun, 31 Mar 2013 13:28:29 +0000 (15:28 +0200)]
Disable some actions that are not allowed while under nsm
Robin Gareus [Sun, 31 Mar 2013 07:29:27 +0000 (09:29 +0200)]
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
Roy Vegard Ovesen [Sun, 31 Mar 2013 01:46:07 +0000 (03:46 +0200)]
Better start up
Don't reply to nsm server until ardour project is finished loading
Roy Vegard Ovesen [Sat, 30 Mar 2013 18:12:31 +0000 (19:12 +0100)]
Make sure every imported file is copied to the session path
Roy Vegard Ovesen [Sat, 30 Mar 2013 17:15:57 +0000 (18:15 +0100)]
Prevent the new session dialog from appearing
Roy Vegard Ovesen [Thu, 21 Mar 2013 20:16:48 +0000 (21:16 +0100)]
non-session-manager support
Implements open, save and dirtiness.
No error checking, no menu items disabling.
Paul Davis [Sun, 31 Mar 2013 00:17:49 +0000 (20:17 -0400)]
include -P (--no-connect-ports) option in --help output
Paul Davis [Sat, 30 Mar 2013 18:02:38 +0000 (14:02 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Sat, 30 Mar 2013 18:02:26 +0000 (14:02 -0400)]
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
Robin Gareus [Sat, 30 Mar 2013 15:50:22 +0000 (16:50 +0100)]
vtl: minor UI dialog tweaks
Robin Gareus [Sat, 30 Mar 2013 15:45:22 +0000 (16:45 +0100)]
vtl: update ffmpeg parameters and output-parsing
Paul Davis [Sat, 30 Mar 2013 14:06:08 +0000 (10:06 -0400)]
if a filesource is supposed to be new, don't waste time looking for it. if it has its _origin member set, search for that, not its name (affects embedded files)
Paul Davis [Sat, 30 Mar 2013 14:04:50 +0000 (10:04 -0400)]
allow double click on radio buttons in ambiguous file dialog to finish dialog
Paul Davis [Sat, 30 Mar 2013 13:23:12 +0000 (09:23 -0400)]
alter menu name for processor automation and hide extra separator in menu when not needed
Paul Davis [Sat, 30 Mar 2013 13:19:37 +0000 (09:19 -0400)]
add tooltip for channel edit button
Paul Davis [Sat, 30 Mar 2013 04:14:33 +0000 (00:14 -0400)]
fix input metering when not rolling but using h/w monitoring: need to explicitly run meter in this case, since we are otherwise just passing silence
Paul Davis [Sat, 30 Mar 2013 00:36:11 +0000 (20:36 -0400)]
remove incorrect #includes of <cairo/cairo.h> and replace with <cairo.h>
Paul Davis [Fri, 29 Mar 2013 18:18:08 +0000 (14:18 -0400)]
Merge branch 'patches' of https://github.com/jdekozak/ardour
Paul Davis [Fri, 29 Mar 2013 18:09:03 +0000 (14:09 -0400)]
allow Drag-n-Drop onto the empty canvas (again); always import MIDI files since we consider them writable and so embedding isn't a safe option
Paul Davis [Fri, 29 Mar 2013 16:36:03 +0000 (12:36 -0400)]
tweak name shown in plugin selector listview as column header for "Hide"; rebuild plugin menu after hidden status for a plugin is changed, so that the effect is present without requiring a restart of Ardour (#5422)
Paul Davis [Fri, 29 Mar 2013 15:53:02 +0000 (11:53 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Fri, 29 Mar 2013 15:52:25 +0000 (11:52 -0400)]
major fixes for MIDI patch change and note undo/redo. Patch change handling was completely broken because of the use of absolute floating point comparisons for time comparison, and serialization/deserialization of patch change property changes was borked because of int/char conversions by stringstream. Note undo/redo would fail for note removal if a note had been moved and/or had its note number changed as the next operation after it was added, because time-based lookup would fail. Similar small changes made for sysex messages, which just needed the musical_time comparisons and nothing else
Robin Gareus [Fri, 29 Mar 2013 11:35:21 +0000 (12:35 +0100)]
vtl: workaround xjadeo <= 0.6.4 issue
Robin Gareus [Fri, 29 Mar 2013 11:20:09 +0000 (12:20 +0100)]
vtl: rework import workflow
- do not allow to simply copy the video file
- decision to transcode or just reference is made in "transcode dialog"
not during file-selection.
Only there the actual codec is known and can be judged to be suitable
for direct reference
- simplify "transcode dialog" - no more buttons for specific actions,
drop-down select actions.
- increase minimum bitrate for imported file to 500kbit/s
Robin Gareus [Fri, 29 Mar 2013 10:07:20 +0000 (11:07 +0100)]
vtl: update ffprobe csv parsing
Robin Gareus [Fri, 29 Mar 2013 08:48:29 +0000 (09:48 +0100)]
vtl: amend
0c2d95b - fix possible race condition when terminating external program
Robin Gareus [Fri, 29 Mar 2013 08:46:29 +0000 (09:46 +0100)]
vtl: add close/remove video menu entry
Robin Gareus [Thu, 28 Mar 2013 22:32:02 +0000 (23:32 +0100)]
vtl: fix possible race condition when terminating external program
Paul Davis [Thu, 28 Mar 2013 21:10:57 +0000 (17:10 -0400)]
some deep tweaking to get MIDI channel control into nearly done shape for 3.1
Robin Gareus [Thu, 28 Mar 2013 20:54:44 +0000 (21:54 +0100)]
vtl: fflush stdout/in after writing to external process
Robin Gareus [Thu, 28 Mar 2013 20:53:42 +0000 (21:53 +0100)]
vtl: hide audio-import button when import/processing started
Paul Davis [Thu, 28 Mar 2013 20:18:08 +0000 (16:18 -0400)]
minor fix for misleading comment
Robin Gareus [Thu, 28 Mar 2013 15:59:01 +0000 (16:59 +0100)]
vtl: debug xjadeo communication
Robin Gareus [Thu, 28 Mar 2013 15:58:30 +0000 (16:58 +0100)]
vtl: prepare audio offset on A/V import
Paul Davis [Thu, 28 Mar 2013 13:56:31 +0000 (09:56 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Thu, 28 Mar 2013 13:56:22 +0000 (09:56 -0400)]
little extra debugging to show discovered LXVST .so's
Robin Gareus [Thu, 28 Mar 2013 12:41:36 +0000 (13:41 +0100)]
vtl: simple/localhost mode.
Hide most of the setup complexity that is irrelevant when
running the video-server on the same host as Ardour.
Add an abstraction layer to the config which will become
important later when /building in/ the video-server.
Robin Gareus [Thu, 28 Mar 2013 12:20:47 +0000 (13:20 +0100)]
vtl: rc config dialog for simple/advanced config
Robin Gareus [Wed, 27 Mar 2013 21:27:26 +0000 (22:27 +0100)]
vtl: prepare simple/advanced usage modes
"simple": localhost only system; hide much of the setup complexity
"advanced":' allow for remote-server, paths mapping, server index etc.
Paul Davis [Thu, 28 Mar 2013 01:50:18 +0000 (21:50 -0400)]
Squashed commit of the following:
commit
fdbae82077db53add90df7448a06869dac89acc6
Author: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed Mar 27 21:45:28 2013 -0400
mammoth changes in basic signal flow, total redesign of MIDI channel filtering and more.
commit
59343a8283698e02bc0f622313b29e98f449e4c8
Author: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed Mar 27 01:58:53 2013 -0400
initial working version after changes to MIDI channel filtering. may affect metering input too. testing not yet finished
this commit merges many deep changes in ardour's internal architecture,
combined with a total redesign of how MIDI channel filtering works.
data in a track used to flow from JACK port buffers to diskstream's ringbuffers
and was then copied from the ringbuffers into a BufferSet for use during
Route::process_output_buffers(). The butler thread would handle the movement of
data between the ringbuffers and disk.
with this commit, data now flows from JACK port buffers into the BufferSet used
for Route processing, and is copied from the BufferSet into the diskstream's
ringbuffers (the butler thread continues to handle interactions with disk as
usual).
this change allowed a dramatic consolidation of code and simplification of most
aspects of Track/Route::roll() and Track/Route::no_roll(). in particular, see
Route::fill_buffers_with_input() which now concisely describes how we move data
from JACK port buffers into the BufferSet for all Route types (including Tracks).
this work was initially motivated by changing MIDI channel filtering so that we
can process capture and playback independently. there is now a very clean
pathway for this - see MidiTrack::roll() (NOTE: This needs implementing in the
no-roll case too - a TODO item).
the channel selector for MIDI tracks has been moved out of the track header and
is now accessible via the context menu. more work is likely here, to make it
(more) obvious to the user when filtering is going on.
Robin Gareus [Wed, 27 Mar 2013 17:45:08 +0000 (18:45 +0100)]
use C++ std function for max()
Robin Gareus [Wed, 27 Mar 2013 17:27:16 +0000 (18:27 +0100)]
move "Video Monitor" to WindowMenu
Robin Gareus [Wed, 27 Mar 2013 17:21:09 +0000 (18:21 +0100)]
vtl: video sets session start/end markers.
Robin Gareus [Wed, 27 Mar 2013 15:04:56 +0000 (16:04 +0100)]
messages related to video-server & ffmpeg external binaries
Robin Gareus [Wed, 27 Mar 2013 13:51:25 +0000 (14:51 +0100)]
optionally include video-server in linux bundle
Robin Gareus [Tue, 26 Mar 2013 21:19:04 +0000 (22:19 +0100)]
canonical names for video-tools
Robin Gareus [Tue, 26 Mar 2013 13:48:15 +0000 (14:48 +0100)]
fix typo in prev commit
Robin Gareus [Tue, 26 Mar 2013 13:11:52 +0000 (14:11 +0100)]
vtl: increase retry timeout on 503, print http status on error.
Robin Gareus [Tue, 26 Mar 2013 13:11:20 +0000 (14:11 +0100)]
add <ardour-root>/bin to PATH
prepare for video-util deployment in Linux bundle
Paul Davis [Tue, 26 Mar 2013 00:04:36 +0000 (20:04 -0400)]
use new VisibilityTracker class for ArdourWindow
Paul Davis [Tue, 26 Mar 2013 00:03:59 +0000 (20:03 -0400)]
add new VisibilityTracker class to implement cycling window visibility "properly" - i.e. avoiding hide+show/present to get a hidden or partially obscured window visible again
Paul Davis [Mon, 25 Mar 2013 14:39:00 +0000 (10:39 -0400)]
remove notion of BUILD from build and uninstall scripts
Paul Davis [Mon, 25 Mar 2013 14:37:47 +0000 (10:37 -0400)]
remove notion of BUILD from stage2.run
Paul Davis [Mon, 25 Mar 2013 13:49:07 +0000 (09:49 -0400)]
possible new naming convention, plus factor out version/DEBUG info into a sourced shell script fragment that can be shared by build+package
Paul Davis [Mon, 25 Mar 2013 13:25:03 +0000 (09:25 -0400)]
Merge branch 'master' of git.ardour.org:ardour/ardour
Paul Davis [Mon, 25 Mar 2013 13:10:38 +0000 (09:10 -0400)]
more packaging tweaks related to git/wscript/python
David Robillard [Mon, 25 Mar 2013 00:10:11 +0000 (20:10 -0400)]
Fix memory leak.