summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_audio_import.cc
AgeCommit message (Collapse)Author
2015-03-15Session import dialog is no longer a transient for the editor.nick_m
2014-12-24Add instrument selector to import dialog.David Robillard
Idea here is for importing large multi-track MIDI files to be immediately listenable upon play without tediously adding a ton of instrument plugins manually.
2014-12-20Fix various cursor problems.David Robillard
Add a new scoped cursor system that makes it much harder to screw up and end up with stick cursors and so on.
2014-12-10tracked down another remaining SessionHandleRefRobin Gareus
import_status.sources kept references to the most recently imported ARDOUR::SndFileSource “all new sources” from Session::import_files()
2014-11-14add abort() to non-reached codeRobin Gareus
This cleans up a lot of false-positives in static analysis and also helps compilers to optimize code paths in general. (tagging the fatal stingstream operator as ‘noreturn’ is far less trivial)
2014-09-13*t*racks not *c*hannels (amend 009ced9640)Robin Gareus
2014-09-13fix crash when importing midi files with >1 midi-channel -- fixes #5965Robin Gareus
2014-07-01Merge branch 'ripple-mode-cc' into cairocanvasColin Fletcher
Fix up merge conflicts in gtk2_ardour/editor_mouse.cc gtk2_ardour/editor_ops.cc Also fix up compile errors.
2014-07-01merge with master.Paul Davis
Manually resolved conflicts in import.cc and session.cc
2014-06-25move utility functions into a dedicated namespaceRobin Gareus
2014-06-19use new canvas cursor API to manage cursors while embedding audioPaul Davis
2014-06-02substantive changes to the logic and safety for naming of (audio/MIDI) ↵Paul Davis
sources, especially when created via import
2014-05-29back port 6576105 from cairocanvas as fix for data loss/file deletionPaul Davis
2014-05-29fix data loss/file deletion caused by mistaken used of ↵Paul Davis
Session::source_by_path() to check if an AUDIO filesource with a given path already exists. ::source_by_path() was written for MIDI files only. I fixed the call and renamed the two similar functions (one for audio and one for MIDI) to make it more clear.
2014-05-07Ripple mode: basic implementationColin Fletcher
Add a value for Ripple to EditMode enum. Add Ripple edit mode to edit mode dropdown, by adding it to the Editor::build_edit_mode_menu() helper function, and remove the old code that added items to the (now unused) Editor::edit_mode_strings. Add the regions that should be affected by the drag to RegionDrag::_views so that the drag carries them along automatically. Use a copy of the RegionList in Playlist::core_ripple(), since bad things happen when iterating over regions and they get moved around in the list. Handle rippling in removal of regions from playlist. When dragging in ripple mode, exclude all regions that lie before the original start position of the selected regions being dragged from rippling: this is what Mixbus does. Make editor dragging respect snap-to settings, by using the existing compute_x_delta() function, which did almost the right thing. Move setting of _last_frame_position out of that function so all ripple-dragged regions can move. Ripple when dragging from region list: even though Mixbus doesn't do this, it seems like a good idea. Prevent multi-track selection being dragged across tracks, by making RegionMotionDrag::y_movement_allowed() virtual, and overriding it in RegionRippleDrag to forbid dragging of selections containing regions on more than one track to dofferent tracks in ripple mode. Remember which TimeAxisView a ripple-mode drag that's allowed cross-track drags started from, so that the effect of rippling regions after any region that's dragged off that track can be undone.
2014-02-22resolve gtk + VST threading issuesRobin Gareus
while (gtk_events_pending()) gtk_main_iteration(); never returns as long as there's a idle call registered somewhere (and it's not called from an idle callback itself)
2014-01-19remove cruftRobin Gareus
2013-08-15fix newly-appearing crash-at-close caused by muddled thinking in ↵Paul Davis
pbd/pthread_utils threads created with this code can now just return a value as they normally would, and the infrastructure will ensure cleanup. there is no longer any reason to call pthread_exit_pbd() and so that has been removed.
2013-07-23fix #5609 (import with 1 track per channel mis-associates tracks + channels)Paul Davis
when using ImportDistinctChannels, correctly name regions so that playlists for each channel/track are also named differently, and thus reloaded properly when the session is reloaded.
2013-03-30fix up some confusion with filesources' _origin and _file_is_new members. if ↵Paul Davis
_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
2012-12-23remove stay-on-top behavior from import dialog, and set its WM classPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@13721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-23make import dialog non-modalPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@13717 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-23fix duplicate import of previously selected files when using apply.Robin Gareus
git-svn-id: svn://localhost/ardour2/branches/3.0@13716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-22provide an easier way to add mixed (audio+MIDI) tracks to a session, to ↵Paul Davis
facilitate the use of plugins like Reaktor which accept both audio & MIDI data. there's probably still a paradigm shift waiting to happen here but its likely post-3.0. git-svn-id: svn://localhost/ardour2/branches/3.0@12816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09Commit one reversible command for the whole of an import, rather than one ↵Carl Hetherington
per region; makes MIDI imports into multiple tracks undoable in one step (#4788). git-svn-id: svn://localhost/ardour2/branches/3.0@12630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09Fix up hack to cope with zero-length imported MIDI regions so that it ↵Carl Hetherington
actually works. git-svn-id: svn://localhost/ardour2/branches/3.0@12629 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09Rename import_audiofiles -> import_files.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@12628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09Make sure that regions created during AsTrack and AsTapeTrack importsCarl Hetherington
are added to the master region list, otherwise if they are subsequently deleted they will be lost. This causes the undo record to go wrong as it references a non-existant region. May have been the cause of bug #4919. git-svn-id: svn://localhost/ardour2/branches/3.0@12626 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24Remove over 500 unnecessary includes (including 54 of session.h).David Robillard
It's slightly possible that this causes trivial build failures on different configurations, but otherwise shouldn't cause any problems (i.e. no actual changes other than include/naming/namespace stuff). I deliberately avoided removing libardour-config.h since this can mysteriously break things, though a few of those do seem to be unnecessary. This commit only targets includes of ardour/*.h. There is also a very large number of unnecessary includes of stuff in gtk2_ardour; tackling that should also give a big improvement in build time when things are modified. git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-02add a way to create a new MIDI track with an instrument pre-selectedPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@11421 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-26allow import to selected MIDI tracks (note that this gets confused if the ↵Paul Davis
MIDI file contains multiple MetaTracks - each track ends up in the same track, which may or may not be the right thing) git-svn-id: svn://localhost/ardour2/branches/3.0@9938 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-16Fixed bug where embedded sources did not correctly obey the BWF time stamp ↵Todd Naugle
and would import at the timestamp of the first file. Fixes #0004070 git-svn-id: svn://localhost/ardour2/branches/3.0@9742 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01Delete trailing whitespaceDavid Robillard
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17Re-fix problems when zero-length MIDI regions are created by an import. Set ↵Carl Hetherington
those regions to have the length of one beat, rather than 1 frame, so that the length doesn't get rounded back down to 0 by frames/beats conversions (bug #4000). git-svn-id: svn://localhost/ardour2/branches/3.0@9549 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-13initial volley of work for AudioPlaylistSource, the basic prototype for ↵Paul Davis
sources-that-are-nested git-svn-id: svn://localhost/ardour2/branches/3.0@9508 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-21Stop MIDI import generating zero-length regions. May fix #4000.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@9400 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-05remove unused arguments to keep gcc quietPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@9291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-21Make all types of import at least partially undo-able so that the session ↵Carl Hetherington
range gets set properly on import. git-svn-id: svn://localhost/ardour2/branches/3.0@8560 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19Fix session range location by hooking into the undo system. Fixes #3654.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@8539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-07fix crash when importing MIDI with "at timestamp" chosenPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@8206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25Fix some messed up code (spacey tabs).David Robillard
(There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-16Move mouse cursor stuff out of Editor into its own class.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@8048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-09handle multiple imports of the same file better (via better source naming); ↵Paul Davis
make session properties editor pretty much work for search paths git-svn-id: svn://localhost/ardour2/branches/3.0@7989 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-09always store source names as relative paths; always add directories of ↵Paul Davis
embedded files to search path; never use hardlinks for embedding anymore git-svn-id: svn://localhost/ardour2/branches/3.0@7984 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-05try to sensibly handle repeated imports of the same file. the same thing ↵Paul Davis
might be required for embeds git-svn-id: svn://localhost/ardour2/branches/3.0@7975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-29Save state a little less often during multi-file imports.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@7863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-29Fix confusion about the 'done' variable in InterThreadInfo during import. ↵Carl Hetherington
'done' now means that a given run of the import thread has completed; 'all_done' means that the whole import operation has completed. Fixes #3396. git-svn-id: svn://localhost/ardour2/branches/3.0@7862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-22much craziness with canvas cursors; fix 0 beat cursor text when shortening ↵Paul Davis
notes; fix crash when trimming locked regions; don't show trim cursors when region is locked; partial version of enumwriter validation fix from 2.X (less necessary with 3.0; probably more ... git-svn-id: svn://localhost/ardour2/branches/3.0@7831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17megaopus patch #2 for today: remove nframes64_t and sframes_t from sourcePaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-16make resampled sources (during import) report their "natural position" (i.e. ↵Paul Davis
BWF timecode) using the samplerate of the session, not the original source, for correct positioning; minor frame{pos,cnt}_t cleanup git-svn-id: svn://localhost/ardour2/branches/3.0@7785 d708f5d6-7413-0410-9779-e7cbd77b26cf