13
0
Commit Graph

3590 Commits

Author SHA1 Message Date
4a0c798242 fundamentally alter how we compute frames_per_beat(). this follows much discussion on IRC. fundamentally, tempo and ONLY tempo affects the computation of frames_per_beat(), meter has no effect at all. However, following typical DAW conventions, we continue to want the "grid" to show metric divisions, not fixed beats, so add a new method (Meter::frames_per_division()) that retains the old math which takes meter into account. This commit will alter the behaviour of MIDI notes in any session with multiple time signatures. They will likely break. Unfortunately, there is no alternative to this breakage at this time.
git-svn-id: svn://localhost/ardour2/branches/3.0@10988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 14:00:44 +00:00
Carl Hetherington
a107b95307 Set up region BBT time when frame position changes, if the region is glued to BBT; fixes part of #4257.
git-svn-id: svn://localhost/ardour2/branches/3.0@10986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 02:50:47 +00:00
Carl Hetherington
748b24009b Similar hacks to framepos_minus_beats to handle -ve
positions as were appled to framepos_plus_beats.


git-svn-id: svn://localhost/ardour2/branches/3.0@10984 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 21:14:35 +00:00
Carl Hetherington
73a91402cd Save templates as directories with plugin state, if
there is any, and copy that state to sessions created
from those templates.  Should fix #4525.  Breaks
existing session templates, sorry; they can be fixed by
moving the .template file into a new directory with the
name of the template (minus the .template).


git-svn-id: svn://localhost/ardour2/branches/3.0@10982 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 20:38:42 +00:00
Carl Hetherington
a03f3229f4 Minor fix to error message.
git-svn-id: svn://localhost/ardour2/branches/3.0@10981 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 20:38:31 +00:00
Carl Hetherington
b5478a8a2b Clarify stop-at-session-end behaviour; should fix #4033.
git-svn-id: svn://localhost/ardour2/branches/3.0@10978 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 16:26:03 +00:00
Carl Hetherington
1bbe08af1a Keep track of MIDI region's start positions in beats, to
match the source, so that starts are not corrupted when
tempos change (#4494).


git-svn-id: svn://localhost/ardour2/branches/3.0@10976 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 14:50:36 +00:00
Carl Hetherington
ed360080d0 Sessions loaded from 2.X don't have a diskstream (yet)
in Track::set_state(); prevent a crash, at least; not
100% sure if the behaviour is right, though.


git-svn-id: svn://localhost/ardour2/branches/3.0@10975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 14:14:17 +00:00
Carl Hetherington
e3b4fa678d Fix framewalk_to_beats when it traverses more than one
metric change.


git-svn-id: svn://localhost/ardour2/branches/3.0@10970 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 20:23:59 +00:00
d23a6de077 fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id()
git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 19:20:15 +00:00
Carl Hetherington
6e211e27e2 Slightly simpler implementation of framewalk_to_beats.
git-svn-id: svn://localhost/ardour2/branches/3.0@10967 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 16:06:29 +00:00
Carl Hetherington
6b27595c4e Comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@10966 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 15:08:13 +00:00
Carl Hetherington
5344f5ca0f Don't try to process_input() if an IO has no ports; fixes
#4546.


git-svn-id: svn://localhost/ardour2/branches/3.0@10965 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 14:03:37 +00:00
Carl Hetherington
e02e25e3f3 Add fixed-up framepos_plus_beats() and use it for the BeatsFramesConverter, since it only ever passed in beats to framepos_plus_bbt anyway.
git-svn-id: svn://localhost/ardour2/branches/3.0@10964 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 13:49:08 +00:00
Carl Hetherington
2a9ceb74c4 Compute delta time correctly when appending events; the converter must be used to convert a source time, not a delta time, otherwise tempo / meter changes are not correctly accounted for.
git-svn-id: svn://localhost/ardour2/branches/3.0@10963 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 13:48:50 +00:00
Carl Hetherington
8135a0c5ec Clean up test slightly.
git-svn-id: svn://localhost/ardour2/branches/3.0@10957 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 22:57:45 +00:00
Carl Hetherington
6af96fd59d Fix framewalk_to_beats with non-beat-aligned starting positions.
git-svn-id: svn://localhost/ardour2/branches/3.0@10956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 22:53:50 +00:00
Carl Hetherington
73461494d7 Add simple framewalk_to_beats test and normalise naming
of test files.


git-svn-id: svn://localhost/ardour2/branches/3.0@10954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 19:59:23 +00:00
f9c15b6136 Support new URIs for LV2 presets.
Old stuff continues to work for Calf, but it'd sure be nice if it would be updated...


git-svn-id: svn://localhost/ardour2/branches/3.0@10952 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 19:42:32 +00:00
7adac311b4 Fix whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@10951 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 19:36:20 +00:00
Carl Hetherington
067b81d0bf Remove unnecessary silencing of unused plugin inputs; unnecessary as (LADSPA/LV2 at least) connect_and_run routines pass in silent buffers for inputs that are not in the ChanMapping. The explicit silencing also failed if the plugin had more inputs than any processor on the route (fixes #4535).
git-svn-id: svn://localhost/ardour2/branches/3.0@10949 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 17:57:50 +00:00
Carl Hetherington
bbf028880f Re-add erroneously-removed configure_io method.
git-svn-id: svn://localhost/ardour2/branches/3.0@10944 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 14:10:33 +00:00
86ac8536d2 centralize legal-session-name-checkng and include : and ; in characters that we disallow, because they conflict with search path conventions on *nix and windows
git-svn-id: svn://localhost/ardour2/branches/3.0@10943 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 03:06:58 +00:00
Carl Hetherington
26366a4062 Remove unused buffers and associated support code from
InternalReturn.


git-svn-id: svn://localhost/ardour2/branches/3.0@10942 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-08 14:14:21 +00:00
ae63588c02 improved WORKING fix for search path issues
git-svn-id: svn://localhost/ardour2/branches/3.0@10940 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 18:52:14 +00:00
Carl Hetherington
5700d10890 Check that adding a port to an IO is ok with the processors
in its route, and raise an error if not (part of #4535).


git-svn-id: svn://localhost/ardour2/branches/3.0@10938 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 17:50:56 +00:00
ff7785142d fix up some logic so that we don't replicate the session dir path twice in the search path(s)
git-svn-id: svn://localhost/ardour2/branches/3.0@10937 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 17:45:18 +00:00
81b5814098 add visible() method to Tearoff so we can check whether or not it is hidden
git-svn-id: svn://localhost/ardour2/branches/3.0@10935 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 15:48:00 +00:00
50aee54219 remove visible "sound notes" button,add Config parameter to control this (which then saves the state the user selected), add control to the prefs dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@10934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 14:23:32 +00:00
20aeb5af0a move CairoWidget into gtkmm2ext, add CairoPacker, made the time info box use CairoPacker, make the info status "bar" use CairoPacker
git-svn-id: svn://localhost/ardour2/branches/3.0@10933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:57:45 +00:00
2f837b66f7 switch to benjamin otte's implemention of fit_to_pixels() but leave uncommented because this prototype is not used; move 2 other non-ardour-specific utility functions into gtkmm2ext
git-svn-id: svn://localhost/ardour2/branches/3.0@10931 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:07:43 +00:00
94658aa66e send correct PropertyChange for RouteGroup::set_route_active
git-svn-id: svn://localhost/ardour2/branches/3.0@10927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 03:22:06 +00:00
1c1c570898 send PropertyChange for RouteGroup::set_edit
git-svn-id: svn://localhost/ardour2/branches/3.0@10925 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 03:00:55 +00:00
06b52150ba send PropertyChange messages when changing RouteGroup properties
git-svn-id: svn://localhost/ardour2/branches/3.0@10922 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 02:04:09 +00:00
d29fe416da if color property is not yet set, don't render
git-svn-id: svn://localhost/ardour2/branches/3.0@10915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-06 21:58:41 +00:00
5e3a3b56de add a new simple cell renderer to be used to allow color display/editing in treeviews
git-svn-id: svn://localhost/ardour2/branches/3.0@10913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-06 21:43:30 +00:00
c44e520d8c when doing a pure copy of a region, which resets the position, reset the position to the original after returning from the copy constructor. this keeps the semantics similar to the copy done usign a property list, where position etc. is expected to be set after construction. fixes #4519
git-svn-id: svn://localhost/ardour2/branches/3.0@10906 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-05 18:49:04 +00:00
b0a2eb359d use the correct display for key accelerators
git-svn-id: svn://localhost/ardour2/branches/3.0@10893 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 22:01:59 +00:00
af768c7429 be consistent in the way we merge environment-set search paths and pre-defined ones
git-svn-id: svn://localhost/ardour2/branches/3.0@10890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 21:08:34 +00:00
7a5a5da953 probably fix failure to find export formats in packages
git-svn-id: svn://localhost/ardour2/branches/3.0@10888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 20:05:50 +00:00
6fbd05a77d some more package debugging to help find out why export formats are not found
git-svn-id: svn://localhost/ardour2/branches/3.0@10887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 19:37:15 +00:00
9238253441 some package debugging to help find out why export formats are not found
git-svn-id: svn://localhost/ardour2/branches/3.0@10886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 18:48:28 +00:00
Carl Hetherington
e2d6d8e34d Remove unused variables.
git-svn-id: svn://localhost/ardour2/branches/3.0@10885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 16:59:19 +00:00
5b913f9a2b add PAINT_VERTA_GR and PAINT_BOX_GR to rgba macros (from Mike Dawes)
git-svn-id: svn://localhost/ardour2/branches/3.0@10874 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 21:08:13 +00:00
34909f79ad Make Carbon GUI support for AU's optional at compile time (from Robin)
git-svn-id: svn://localhost/ardour2/branches/3.0@10872 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:42:27 +00:00
639bb7dc5d use compiler-generated _LP64 macro to detect x86_64 rather than USE_X86_64_ASM
git-svn-id: svn://localhost/ardour2/branches/3.0@10871 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:38:31 +00:00
14d601a0ff revert recent change to Evoral::Event, and use static_cast<> to get from Event to MIDIEvent
git-svn-id: svn://localhost/ardour2/branches/3.0@10870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:34:58 +00:00
07b4626ea5 build changes from robin gareus for OS X, changing AU support to be used appropriately rather than GTKOSX
git-svn-id: svn://localhost/ardour2/branches/3.0@10869 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:03:03 +00:00
d05a09991a catch up with is_silent change
git-svn-id: svn://localhost/ardour2/branches/3.0@10868 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:02:28 +00:00
5aa4d95f59 rename a Buffer/BufferSet method to be a little clearer as to its intent (is_silent(bool) => set_is_silent(bool))
git-svn-id: svn://localhost/ardour2/branches/3.0@10867 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 19:53:33 +00:00