Commit Graph

95 Commits

Author SHA1 Message Date
Carl Hetherington 1ea4b09d5d Add drawing.
git-svn-id: svn://localhost/ardour2/branches/3.0@12023 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 22:23:12 +00:00
Carl Hetherington 2072261bb0 Re-work fade operation to be closer to Mixbus; things
below the top region's fades are implicitly faded in
the opposite sense; restore short crossfades option.


git-svn-id: svn://localhost/ardour2/branches/3.0@12022 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 22:22:47 +00:00
Carl Hetherington a2897ecef6 Fairly major change to the way in which crossfades are handled;
they are now done with region fades, rather than separate objects.
After this commit, Ardour will try to convert your session files
to the new crossfade format, but will make a backup in your
session folder first.

If you have works in progress using Ardour 3 it is
***STRONGLY RECOMMENDED*** that you back up session files before
updating to this commit.


git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 16:32:22 +00:00
Carl Hetherington 452672f78f Make crossfade convert-to-full and activate/deactivate work across edit groups (#4658).
git-svn-id: svn://localhost/ardour2/branches/3.0@11413 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-01 01:07:52 +00:00
Carl Hetherington b9a9d8d047 Use a few shared_ptrs to make things slightly neater.
git-svn-id: svn://localhost/ardour2/branches/3.0@11156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 13:56:09 +00:00
Carl Hetherington dd53e7284a Set up layering_index immediately on an explicit layer, so that undo
works properly.  Stop the layer being a stateful property, as it is
always derived from layering_index, unambigiously, by relayer().


git-svn-id: svn://localhost/ardour2/branches/3.0@11120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 20:05:48 +00:00
Carl Hetherington 75e6adcf03 Remove unused read/write data count code.
git-svn-id: svn://localhost/ardour2/branches/3.0@10300 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-24 20:45:29 +00:00
Paul Davis fb917cff45 remove absurd internal Crossfade constructor that confused region start and region position; set position explicitly in the two places that we use these crossfades; revert to the assert that caught this crazy error
git-svn-id: svn://localhost/ardour2/branches/3.0@10259 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-20 21:17:25 +00:00
Carl Hetherington 711d344188 Remove unused parameters to AudioRegion::read_at
git-svn-id: svn://localhost/ardour2/branches/3.0@9899 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-19 00:22:01 +00:00
Carl Hetherington cd17e05e3a Fix some set-but-not-used variable warnings from gcc 4.6
git-svn-id: svn://localhost/ardour2/branches/3.0@9783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-02 17:16:46 +00:00
Paul Davis 9687e8a667 second half of "bomb out if playlist construction from XML fails"
git-svn-id: svn://localhost/ardour2/branches/3.0@9759 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-22 20:06:10 +00:00
David Robillard a473d630eb Fix broken whitespace. I'd apologize for the compile times if it was my fault :D
git-svn-id: svn://localhost/ardour2/branches/3.0@9654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 16:50:12 +00:00
Paul Davis d4d5b30aeb remove unused and useless "src" argument for a number of Region property modifying methods
git-svn-id: svn://localhost/ardour2/branches/3.0@9632 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 13:54:44 +00:00
Paul Davis 6eba90adb3 add dependents to a compound playlist before creating a source from it, so that the source's new peakfile shows the xfades
git-svn-id: svn://localhost/ardour2/branches/3.0@9631 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 13:23:19 +00:00
Paul Davis d6be900da0 more combine/uncombine fixes including making uncombine push the compound region gain level into the constituents and doing the right thing when we uncombine in a playlist other than the one in which the compound region was created
git-svn-id: svn://localhost/ardour2/branches/3.0@9601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 17:22:22 +00:00
Paul Davis 16c280e405 turn off relevant fade in/out before creating peakfiles for compound region sources
git-svn-id: svn://localhost/ardour2/branches/3.0@9596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 13:56:19 +00:00
Paul Davis 884e147a9c restore compound region fade, where possible, to constituent regions, after uncombine
git-svn-id: svn://localhost/ardour2/branches/3.0@9593 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 22:44:30 +00:00
Paul Davis 9925ab554e logic to copy audio region fade in/fade out into compound regions (one-way for now)
git-svn-id: svn://localhost/ardour2/branches/3.0@9588 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 18:51:00 +00:00
Paul Davis ba51f635f7 revert that last commit
git-svn-id: svn://localhost/ardour2/branches/3.0@9548 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 21:44:10 +00:00
Paul Davis 39d8aa0e94 put compounded-xfades at the right place, i think
git-svn-id: svn://localhost/ardour2/branches/3.0@9547 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 21:43:29 +00:00
Paul Davis 4fade1ea35 xfades in combined regions seem to work
git-svn-id: svn://localhost/ardour2/branches/3.0@9546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 18:23:01 +00:00
Paul Davis be830adccb not actually working attempt to copy relevant xfades into compound regions; fix compilation issues with an earlier commit
git-svn-id: svn://localhost/ardour2/branches/3.0@9544 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 16:45:22 +00:00
Ben Loftis aa6adacc75 fix thinko in playlist constructor for cut and copy
git-svn-id: svn://localhost/ardour2/branches/3.0@9541 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 15:20:18 +00:00
Paul Davis 3ae786bb06 fix minor type error
git-svn-id: svn://localhost/ardour2/branches/3.0@9497 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-12 00:01:46 +00:00
Carl Hetherington 48493b444b Fix previous patch using Ben's patch from A2 to fix #4035 properly.
git-svn-id: svn://localhost/ardour2/branches/3.0@9496 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-11 22:26:13 +00:00
Carl Hetherington f31b485e90 Reset fades on regions copied from time ranges in other regions (#4035).
git-svn-id: svn://localhost/ardour2/branches/3.0@9494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-11 15:58:09 +00:00
Paul Davis ce03319dd1 prevent formation of new xfades when two regions are precisely co-terminal, and invalidate existing xfades if their participants become co-terminal
git-svn-id: svn://localhost/ardour2/branches/3.0@8605 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 01:03:05 +00:00
Carl Hetherington c6e9362987 Fix build.
git-svn-id: svn://localhost/ardour2/branches/3.0@8525 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-17 23:30:35 +00:00
Carl Hetherington 73192bc1a7 Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-03 22:26:29 +00:00
Carl Hetherington cdfbec0eb1 A few type fixes.
git-svn-id: svn://localhost/ardour2/branches/3.0@8154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-02 19:25:53 +00:00
Carl Hetherington 875f0befd5 Fix restoration of MementoCommand<Crossfade>. Fixes #3418.
git-svn-id: svn://localhost/ardour2/branches/3.0@7771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 00:41:53 +00:00
Carl Hetherington 3150041423 (Hopefully) clarify operator= and copy construction behaviour of the Property hierarchy. Also make operator= copy the value but NOT the property ID; this stops e.g. a = b giving a the property ID of b and confusing things. Fixes some problems with save/restore of region sync position.
git-svn-id: svn://localhost/ardour2/branches/3.0@7707 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-29 01:09:05 +00:00
Carl Hetherington c243a02c99 Fix crossfade undo using the stateful diff system. Fixes #3257.
git-svn-id: svn://localhost/ardour2/branches/3.0@7694 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-26 01:44:11 +00:00
Paul Davis 884ee2a3cc check dependents in Playlist after moving a region to a specific layer; make region layering editor appear reliably; click on xfade sets clicked_routeview
git-svn-id: svn://localhost/ardour2/branches/3.0@7692 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 22:42:35 +00:00
Carl Hetherington 092e598389 When a region movement is undone, prevent the resulting movement from triggering the automation-follows-regions code. Fixes #3348.
git-svn-id: svn://localhost/ardour2/branches/3.0@7464 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-22 01:22:33 +00:00
Paul Davis f188ffffc1 fix some non-debug compile warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@7293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 21:43:40 +00:00
Paul Davis f4401c5928 midway snapshot of work done on managing Region & Source lifetimes correctly. may fix missing MIDI file bug ; save empty playlists because they may be referred to by the history file ; undo commands auto-delete when objects they refer to die (currently not commands built from XML deserialization); Sources now know how many regions are using them for something, meaning that we know if we can delete the files holding any data for the source
git-svn-id: svn://localhost/ardour2/branches/3.0@7291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 20:14:07 +00:00
Paul Davis e258b2622a MIDI region forking, plus Playlist::regions_to_read() fix forward ported from 2.X. region forking requires a few cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@7118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 03:03:28 +00:00
David Robillard 650c6d5824 Fix various code quality issues found by cppcheck (e.g. uninitialized members, larger than necessary variable scope, memory leaks, etc).
git-svn-id: svn://localhost/ardour2/branches/3.0@6710 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-23 20:25:53 +00:00
Paul Davis fa701b8c06 change PropertyChange from a bitfield into a real object, with all the many widespread changes that causes
git-svn-id: svn://localhost/ardour2/branches/3.0@6701 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-19 18:09:08 +00:00
Paul Davis ce7a5e1c9f the Properties & 64bit region commit
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-18 13:59:49 +00:00
Paul Davis 832aa18a81 a boatload of minor and middle-sized changes to try to speed up undo. imperfect, unfinished, but probably right to commit now
git-svn-id: svn://localhost/ardour2/branches/3.0@6561 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-25 20:34:09 +00:00
Paul Davis c83389b8ec cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked)
git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 20:21:43 +00:00
Paul Davis f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next)
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 18:23:07 +00:00
Paul Davis aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-19 20:26:31 +00:00
Paul Davis f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:24:23 +00:00
Paul Davis 8687895abb remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-12 15:02:15 +00:00
Carl Hetherington 63f5e14e01 Fix double-delete crash.
git-svn-id: svn://localhost/ardour2/branches/3.0@6232 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 00:58:01 +00:00
Paul Davis 51693a3a58 tracing and small fixes to improve object destruction pathways
git-svn-id: svn://localhost/ardour2/branches/3.0@6195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-28 00:49:04 +00:00
Paul Davis 8713667ec1 rework Stateful::set_state() patch to avoid default version argument
git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 18:56:11 +00:00