aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
1d8bac08c0
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-04-02 16:11:04 -04:00
04cba6eca0
fix (?) behaviour when punching into automation write mode while the transport is moving, hopefully without breaking anything else
2013-04-02 16:10:51 -04: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
c9bb51bcca
clarify comment about Automatable/ControlSet inheritance
2013-04-01 19:47:08 -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
661a9d37e7
fix compilation on OS X
2013-04-01 09:03:33 -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
de8e003289
remove debug output
2013-03-31 09:41:51 -04:00
2ddbf6cd56
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-03-31 09:35:15 -04:00
8388e82fd3
more work on the suprisingly ongoing filename/path/origin issue
2013-03-31 09:35:06 -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
deaceb4727
vtl: minor UI dialog tweaks
2013-03-30 16:51:02 +01:00
d8f0cc8fcb
vtl: update ffmpeg parameters and output-parsing
2013-03-30 16:50:56 +01:00
864ce8f0d1
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)
2013-03-30 10:06:08 -04:00
91a2798001
allow double click on radio buttons in ambiguous file dialog to finish dialog
2013-03-30 10:04:50 -04:00
0a05c08a1a
alter menu name for processor automation and hide extra separator in menu when not needed
2013-03-30 09:23:12 -04:00
c184d1fbe6
add tooltip for channel edit button
2013-03-30 09:19:37 -04:00
757f223714
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
2013-03-30 00:14:33 -04:00
9fc7eb1f0d
remove incorrect #includes of <cairo/cairo.h> and replace with <cairo.h>
2013-03-29 20:36:11 -04:00
3b20beb8d8
Merge branch 'patches' of https://github.com/jdekozak/ardour
2013-03-29 14:18:08 -04:00
197e75ab80
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
2013-03-29 14:09:03 -04:00
9fce80d2bc
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 )
2013-03-29 12:36:03 -04:00
810e59d61a
Merge branch 'master' of git.ardour.org:ardour/ardour
2013-03-29 11:53:02 -04:00
86f1b8c71f
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
2013-03-29 11:52:25 -04:00
8cd3dd2061
vtl: workaround xjadeo <= 0.6.4 issue
2013-03-29 12:36:19 +01:00
daec8e44d5
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
2013-03-29 12:36:14 +01:00
47ee22d91d
vtl: update ffprobe csv parsing
2013-03-29 12:36:08 +01:00
9274b870ab
vtl: amend 0c2d95b - fix possible race condition when terminating external program
2013-03-29 12:36:02 +01:00
941898843e
vtl: add close/remove video menu entry
2013-03-29 12:35:57 +01:00
