13
0
Commit Graph

138 Commits

Author SHA1 Message Date
cf52d6e4b4 enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h 2016-07-14 14:45:23 -04:00
2c9c210213 manually fix rebase/merge issues caused by addition of plugin presets to methods which add a new track/bus 2016-05-31 15:30:42 -04:00
e0ff70cf86 first vaguely working version using PresentationInfo
remote control ID and "order keys" have been removed.
2016-05-31 15:30:42 -04:00
03660573e2 fix import-thread SNAFU
* pressing Esc or WM close button did not cancel import thread
 * proper Abort does not wait for import thread either

It was possible to launch a 2nd (and Nth) import thread, all sharing
the Editor's ImportStatus data-structure, all having the same
registered thread-name and same thread-pool name.  Plenty of room for
crashes.
2016-05-21 23:30:11 +02:00
89ae64c39f use strict i/o preference during import 2016-03-28 18:25:34 +02:00
André Nusser
1df97b4174 Fix wrong 'Import to Region List' default on first call. -fixes #6631 2015-10-09 02:05:41 +02:00
4dc63966f0 globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
d686cb213f Added PT .ptf session audio import functionality
Signed-off-by: Damien Zammit <damien@zamaudio.com>
2015-08-06 00:28:35 +02:00
nick_m
4e865a1c54 Session import dialog is no longer a transient for the editor. 2015-03-15 05:23:09 +11:00
1de39b8971 Add instrument selector to import dialog.
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-24 20:07:10 -05:00
David Robillard
670938c8c4 Fix various cursor problems.
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-20 01:13:25 -05:00
d3d0e342d4 tracked down another remaining SessionHandleRef
import_status.sources kept references to the
most recently imported ARDOUR::SndFileSource
“all new sources” from Session::import_files()
2014-12-10 21:45:11 +01:00
6b3a8915f3 add abort() to non-reached code
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-11-14 11:30:08 +01:00
2efc520f9d *t*racks not *c*hannels (amend 009ced9640) 2014-09-13 19:57:04 +02:00
009ced9640 fix crash when importing midi files with >1 midi-channel -- fixes #5965 2014-09-13 16:53:04 +02:00
e5e12acc56 Merge branch 'ripple-mode-cc' into cairocanvas
Fix up merge conflicts in
	gtk2_ardour/editor_mouse.cc
	gtk2_ardour/editor_ops.cc

Also fix up compile errors.
2014-07-01 19:10:47 +01:00
23e7cf1019 merge with master.
Manually resolved conflicts in import.cc and session.cc
2014-07-01 09:46:18 -04:00
a3c378cf62 move utility functions into a dedicated namespace 2014-06-25 21:47:54 +02:00
66a5d09f36 use new canvas cursor API to manage cursors while embedding audio 2014-06-19 09:26:00 -04:00
74bc0c8468 substantive changes to the logic and safety for naming of (audio/MIDI) sources, especially when created via import 2014-06-02 11:20:37 -04:00
08a1409b1f back port 6576105 from cairocanvas as fix for data loss/file deletion 2014-05-29 16:28:57 -04:00
be575b7945 fix data loss/file deletion caused by mistaken used of 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-29 16:27:41 -04:00
d75c7151d4 Ripple mode: basic implementation
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-05-07 19:46:24 +01:00
dfdf9a35f1 resolve gtk + VST threading issues
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-02-22 03:11:48 +01:00
b3dd518b22 remove cruft 2014-01-19 22:49:48 +01:00
04bf9d1e95 fix newly-appearing crash-at-close caused by muddled thinking in 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-08-15 11:44:47 -04:00
d5209cb4bf fix #5609 (import with 1 track per channel mis-associates tracks + channels)
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-07-23 11:29:10 -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
74c9c806d2 remove stay-on-top behavior from import dialog, and set its WM class
git-svn-id: svn://localhost/ardour2/branches/3.0@13721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-23 20:34:43 +00:00
be4337689e make import dialog non-modal
git-svn-id: svn://localhost/ardour2/branches/3.0@13717 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-23 18:25:26 +00:00
348db7bae5 fix duplicate import of previously selected files when using apply.
git-svn-id: svn://localhost/ardour2/branches/3.0@13716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-23 16:27:01 +00:00
d70429a066 provide an easier way to add mixed (audio+MIDI) tracks to a session, to 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-22 01:45:16 +00:00
Carl Hetherington
94b6c7626c Commit one reversible command for the whole of an import, rather than one 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-09 15:04:24 +00:00
Carl Hetherington
8da3833895 Fix up hack to cope with zero-length imported MIDI regions so that it actually works.
git-svn-id: svn://localhost/ardour2/branches/3.0@12629 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09 15:04:18 +00:00
Carl Hetherington
de2d3057b5 Rename import_audiofiles -> import_files.
git-svn-id: svn://localhost/ardour2/branches/3.0@12628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-09 15:04:11 +00:00
Carl Hetherington
49f353db5c Make sure that regions created during AsTrack and AsTapeTrack imports
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-06-09 13:36:02 +00:00
6fa6514cfd Remove over 500 unnecessary includes (including 54 of session.h).
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-05-24 06:09:29 +00:00
af90dc2bae add a way to create a new MIDI track with an instrument pre-selected
git-svn-id: svn://localhost/ardour2/branches/3.0@11421 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-02 04:12:23 +00:00
8fb9e72a77 allow import to selected MIDI tracks (note that this gets confused if the 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-07-26 17:22:10 +00:00
Todd Naugle
cb8bc87a54 Fixed bug where embedded sources did not correctly obey the BWF time stamp 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-16 15:18:01 +00:00
ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
Carl Hetherington
84aeb92d15 Re-fix problems when zero-length MIDI regions are created by an import. Set 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-17 23:07:46 +00:00
c3c8530ffc initial volley of work for AudioPlaylistSource, the basic prototype for sources-that-are-nested
git-svn-id: svn://localhost/ardour2/branches/3.0@9508 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-13 19:55:52 +00:00
Carl Hetherington
eaa916f480 Stop MIDI import generating zero-length regions. May fix #4000.
git-svn-id: svn://localhost/ardour2/branches/3.0@9400 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-21 15:19:22 +00:00
e54d71ec3d remove unused arguments to keep gcc quiet
git-svn-id: svn://localhost/ardour2/branches/3.0@9291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-05 01:03:44 +00:00
Carl Hetherington
d48489ec1b Make all types of import at least partially undo-able so that the session range gets set properly on import.
git-svn-id: svn://localhost/ardour2/branches/3.0@8560 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-21 00:58:45 +00:00
Carl Hetherington
1e8586742e Fix session range location by hooking into the undo system. Fixes #3654.
git-svn-id: svn://localhost/ardour2/branches/3.0@8539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 17:38:56 +00:00
e621d704ac fix crash when importing MIDI with "at timestamp" chosen
git-svn-id: svn://localhost/ardour2/branches/3.0@8206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-07 14:45:51 +00:00
8b68ed57ec Fix some messed up code (spacey tabs).
(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-25 20:37:39 +00:00
Carl Hetherington
8fc660e76e Move mouse cursor stuff out of Editor into its own class.
git-svn-id: svn://localhost/ardour2/branches/3.0@8048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-16 14:53:16 +00:00