13
0
Commit Graph

10306 Commits

Author SHA1 Message Date
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
Julien de Kozak
f0f26fb8d3 Fix tests compilation 2013-03-30 18:39:43 +01:00
Julien de Kozak
27d77b8719 Fix some compilation warnings 2013-03-30 18:09:40 +01: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
0c2d95b08f vtl: fix possible race condition when terminating external program 2013-03-28 23:32:02 +01:00
f1ce235b6b some deep tweaking to get MIDI channel control into nearly done shape for 3.1 2013-03-28 17:10:57 -04:00
bbb4aa0141 vtl: fflush stdout/in after writing to external process 2013-03-28 21:54:44 +01:00
74c9bc6fcc vtl: hide audio-import button when import/processing started 2013-03-28 21:53:42 +01:00
613678233a minor fix for misleading comment 2013-03-28 16:18:08 -04:00
745804fd7e vtl: debug xjadeo communication 2013-03-28 16:59:01 +01:00
950643462a vtl: prepare audio offset on A/V import 2013-03-28 16:58:30 +01:00
b47e71f8ac Merge branch 'master' of git.ardour.org:ardour/ardour 2013-03-28 09:56:31 -04:00
74d54ae739 little extra debugging to show discovered LXVST .so's 2013-03-28 09:56:22 -04:00
a1429ed39f 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.
2013-03-28 13:42:51 +01:00
e18b95b4f4 vtl: rc config dialog for simple/advanced config 2013-03-28 13:42:45 +01:00
c97244aaa9 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.
2013-03-28 13:42:40 +01:00
4abbabdcf9 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.
2013-03-27 21:50:18 -04:00