13
0
Commit Graph

5251 Commits

Author SHA1 Message Date
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
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04: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
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
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
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
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
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
78aa7a13fd use C++ std function for max() 2013-03-27 18:45:08 +01:00
7697ff6b7c move "Video Monitor" to WindowMenu 2013-03-27 18:27:16 +01:00
b3fa4dd8f3 vtl: video sets session start/end markers. 2013-03-27 18:21:09 +01:00
ba7def458e messages related to video-server & ffmpeg external binaries 2013-03-27 16:04:56 +01:00
1bec1059fb canonical names for video-tools 2013-03-26 22:19:04 +01:00
41faeb76e1 fix typo in prev commit 2013-03-26 14:48:15 +01:00
0781b871d4 vtl: increase retry timeout on 503, print http status on error. 2013-03-26 14:11:52 +01:00
7c19d00544 use new VisibilityTracker class for ArdourWindow 2013-03-25 20:04:36 -04:00
Sakari Bergen
010a75d389 Add option to export track output to stem export dialog 2013-03-24 21:53:34 +02:00
Julien de Kozak
16f8fc0657 Fix some compilation warnings 2013-03-23 14:50:58 +01:00
0348f9543e Merge branch 'master' of git.ardour.org:ardour/ardour 2013-03-22 20:28:42 -04:00
7a3e9032ca make 0/KP_0 do the same thing in the mono panner as it does in the stereo panner (reset to center) 2013-03-22 20:22:46 -04:00
268553ecd4 honor CTRL modifier when drag/drop importing files (copy vs embed) 2013-03-21 21:33:02 +01:00
d99b5dfa37 fix nasty crash when using double-nested compound (consolidated) regions caused by not (re)allocating enough mixdown buffers; fix up various warnings from valgrind about mismatching operator delete[] by using shared_array<T> rather than shared_ptr<T>, as should have been the case all along 2013-03-21 10:14:01 -04:00
7b998ceba1 fix an old bug introduced when cth tried (valiantly) to make region-list -> DnD -> canvas behave like a regular region drag. this doesnt' work because the RegionInsertDrag() grabs the mouse and breaks the DnD. in addition, the code failed to correctly indicate when a drop was possible (over a Track) and when it was not (over a Bus) - this has also been fixed. the actual code in Editor::drop_regions() could and should be simplified - no reason to use a RegionInsertDrag here, but it was fast 2013-03-20 17:33:25 -04:00
9eaefe3d12 remaining part of static library commit, should have been a part of 16ce39c230 2013-03-20 17:22:32 -04:00
Adrian Knoth
57d758c9e2 [cosmetics] Replace "misformed" by "malformed" in PO files
Found by Debian's automatic QA tool.
2013-03-19 17:36:24 +01:00
c71e381019 Merge branch 'master' of git.ardour.org:ardour/ardour 2013-03-19 10:25:31 -04:00
e1f3dcee2a vtl: re-request frame on 503/try-again 2013-03-19 00:48:37 +01:00
719818b569 Merge branch 'kdev4' of https://github.com/jdekozak/ardour 2013-03-18 18:57:21 -04:00
88bf5eceea parameter-ize the URL used to donate from the nag screen 2013-03-18 16:56:05 -04:00
Julien de Kozak
eb7a85b8f9 Set the revision mechanism independent from the VCS name 2013-03-18 20:13:05 +01:00
b0fa3896f5 remove cruft (old cvsignore files) 2013-03-17 23:08:27 +01:00
852e7c01ad Hopefully fix ardour.menus rebuilding when things change. 2013-03-17 13:47:51 -04:00
2233e91086 Freesound fixes for #5853, and a few other small improvements
Add a 'More' button to load the next page of results without clearing the already-found list.
Don't allow cancellation of searches, and don't update progress bar around searches, since we only get one page at a time now.
Show number of pages of results remaining to download in the tooltip of the 'More' button.
Use a new Mootcher object for each request, to avoid bad things happening when clicking in the Freesound search results list while a search or file download is already in progress.
Make the 'Stop' button insensitive except when it will actually stop the download of a sound file.
Only retrieve one page worth of data per search, rather than looping to get all pages.
Don't show an error in the log window if the user cancelled download.
Request 100 items per page, rather than the default 30.
Fix DOS line endings.
2013-03-17 12:33:59 +00:00
0d05cf3a0c change http_status to a long, as per Curl API, which stops mysterious crashes caused by overwriting the WRITELOCATION ptr 2013-03-14 22:25:30 -04:00
199e4b9c95 vtl: also use video-monitor for files found using the index 2013-03-15 02:11:03 +01:00
f0bb986b33 vtl: print (debug) messages if xjadeo is not available 2013-03-15 02:09:04 +01:00
b11c1fd15d touch "been-here-before" file even if user didn't modify any of teh default configuration 2013-03-14 15:11:31 -04:00
de194b48e5 vtl: fix crash if ffprobe returns zero fps 2013-03-14 01:38:21 +01:00