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
84ddf22169
handle multiple imports of the same file better (via better source naming); 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-09 22:18:52 +00:00
7ae1a99d06
always store source names as relative paths; always add directories of 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-09 17:24:17 +00:00
aa78fb928b
try to sensibly handle repeated imports of the same file. the same thing might be required for embeds
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-05 20:36:44 +00:00
Carl Hetherington
cc9dabf882
Save state a little less often during multi-file imports.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-29 23:02:32 +00:00
Carl Hetherington
74c69114bc
Fix confusion about the 'done' variable in InterThreadInfo during import. '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-29 22:59:39 +00:00
ded4a143db
much craziness with canvas cursors; fix 0 beat cursor text when shortening 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-22 15:21:06 +00:00
ede4ecbb00
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 18:20:37 +00:00
8e00b86ebb
make resampled sources (during import) report their "natural position" (i.e. 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
2010-09-16 16:11:26 +00:00
da8eec7a83
remove Glib::ustring from gtk2_ardour
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 16:51:02 +00:00
4d112a8e6b
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 15:45:21 +00:00
Carl Hetherington
f30402d073
clear_history -> clear_changes and some comments.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7685 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 17:32:08 +00:00
eee61a9f9b
forward port commit 7608 for a3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7609 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-12 19:43:36 +00:00
