36b0ff4ea9
restore functionality of show/hide column in mixer track/bus list
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12994 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-08 19:03:20 +00:00
e2c26e1b99
Report correct time instead of old time when locating as Jack transport master.
...
I encountered this today writing a transport slave, but it seems to be the same
problem as issue #743 from 8 years ago. The issue is easier to see with a
transport slave client that prints any transport change whatsoever, for example
if the current location is some point well into the session and rewind to start
is pressed, Ardour reports the old position, not zero. With this change, it
reports zero as expected.
See comment about why this was happening. If locating here is evil for some
reason, then some other way of making jack_timebase_callback report the target
position is required. Contrary to what the old comment below this change
suggests, follow_slave() does not update _transport_frame in time.
git-svn-id: svn://localhost/ardour2/branches/3.0@12993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-08 03:40:15 +00:00
39b42e3766
Fix Jack transport master after session load.
...
Transport master was not being taken because when the configuration variable is
set, AudioEngine::set_session() has not been called yet so
AudioEngine::reset_timebase() did nothing (the transport stuff at the beginning
of Session::when_engine_running() is questionable for the same reasons).
I am not sure if this is correct, but I have failed to more thoroughly figure
out the issue. At least Ardour actually sets Jack transport information now.
However, there are some discrepancies between Ardour time and Jack time, as
reported by Session::jack_timebase_callback().
Perhaps related, the transport master menu item does not restore correctly.
Previous to this commit, the only way to make a loaded session take transport
master was to "set" this out of sync item (which did nothing), then unset it,
then set it again, which would finally actually cause the configuration change.
git-svn-id: svn://localhost/ardour2/branches/3.0@12992 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-07 21:00:47 +00:00
f110126fca
do not deactivate the meter in a frozen track
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-06 19:18:33 +00:00
Carl Hetherington
0dc992bcf7
Don't rename playlists on rename track if the track has >1
...
playlist; hopefully helps with the confusion in mantis
#4977 .
git-svn-id: svn://localhost/ardour2/branches/3.0@12990 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-05 00:02:13 +00:00
Carl Hetherington
c1d4f87471
Fix crash on trying to snap to markers when there aren't
...
any (#4988 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12989 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:53:44 +00:00
Carl Hetherington
25e5bfd17e
Rename Editor::duplicate_dialog to Editor::duplicate_range
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:31:06 +00:00
Carl Hetherington
392a7fd238
Don't show previously hidden xfades when finishing a region
...
drag; should fix #4982 .
git-svn-id: svn://localhost/ardour2/branches/3.0@12987 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:09:32 +00:00
Carl Hetherington
e35a84a32b
Revert erroneous commit 12922 and replace with a better fix
...
(should fix #4947 , #4963 , #4987 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 19:56:14 +00:00
Sakari Bergen
d762be4f73
Fix the ProcessContext copy-ctor stuff for older compilers, which don't support template base class initialization without template parameters
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-02 15:48:29 +00:00
Sakari Bergen
5b5998208f
Probably fix warnings on Apple's gcc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12973 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-01 10:23:44 +00:00
7db500301d
further efforts at cleaning up the design of the interaction/relationship between route sort order keys and remote control IDs
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12962 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 22:27:37 +00:00
Carl Hetherington
81de53da1d
Fix missing lock causing erroneous disk space reports when dragging audio clocks.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12961 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 16:08:48 +00:00
Carl Hetherington
4904a20577
Don't start a clock drag if we drag to the right of the numbers.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12960 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 15:56:51 +00:00
Carl Hetherington
b97a1bfb97
Connect to controllable->Destroyed in all cases; fixes crash on route removal.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12959 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 15:38:07 +00:00
Carl Hetherington
e09e185e3e
Add what I think is a missing lock when reading controllables.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12958 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 15:37:54 +00:00
1708ab55b9
fix MIDI binding stuff when the controllable does actually exist the first time we go looking for it ( #4950 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12957 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 14:44:29 +00:00
958c63bd18
minor cleanups from 12952
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 14:32:26 +00:00
f46a7bc509
reorder #includes to avoid the usual Apple BS with un-namespaced typenames like Style
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 02:11:26 +00:00
11415b49be
first pass at the big rethink of managing sort order keys for editor and mixer. this appears to work, but remote control IDs are not yet correct (frequently off by one because of the presence of the master bus in the editor)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-27 22:57:06 +00:00
5ba1996fd7
A (hopefully) better fix for toggle-mixer-on-top, using gtk_window_is_active() to work out whether the mixer is already on top.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12952 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-27 12:21:23 +00:00
266030b79c
some generic midi debugging plus an assert
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12950 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 20:49:52 +00:00
dde521f2c6
fix up some issues introduced by lifecycle tracking of Controllable in Generic MIDI control code
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12947 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 19:10:11 +00:00
faaac88ac8
correctly(?) set number of process thread buffers based on run-time-discovered num-cpus ( #4951 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12946 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 18:58:39 +00:00
Carl Hetherington
a50dd69c0c
Add test for loading sessions, and a session with a
...
rec-enabled track that currently crashes.
git-svn-id: svn://localhost/ardour2/branches/3.0@12945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 18:47:20 +00:00
Carl Hetherington
7031e12495
Fix uninitialised variable.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12944 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 17:58:20 +00:00
Carl Hetherington
c147f707c1
Alternate Korg nanoKONTROL map from JaaxxOne ( #4954 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12943 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 17:14:49 +00:00
Carl Hetherington
6fcb91182c
Patch from JaaxxOne to fix rec-enable toggle with the
...
Korg nanoKONTROL (#4953 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12942 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 17:13:13 +00:00
Carl Hetherington
6a778added
Nudge the time axis view gain slider up a bit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12941 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 17:03:38 +00:00
Carl Hetherington
c52bdcf69d
Remove unused named selection / chunk code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12939 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 02:11:06 +00:00
a054a74dd2
disconnect from a Controllable when it is destroyed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12938 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 01:55:53 +00:00
Carl Hetherington
06ad59e936
Fix some oddities with playhead movement when locating
...
during roll.
git-svn-id: svn://localhost/ardour2/branches/3.0@12937 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 01:40:34 +00:00
Carl Hetherington
a5d013d841
Some spelling mistake fixes from Debian.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12936 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 01:40:27 +00:00
9dc7811147
add rodrigo to the authors list
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12935 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 01:29:27 +00:00
Carl Hetherington
098f0157df
Allow new idle visual changer calls to be requested while
...
the current changer is executing; fixes #4567 .
git-svn-id: svn://localhost/ardour2/branches/3.0@12934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 00:07:45 +00:00
Carl Hetherington
cc9ed077be
Patch from johan_mattsson_m to be more graceful if there
...
is an undo record which references a non-existant
object; this shouldn't happen, of course, but there was
a bug in some early betas which made it occur (#4920 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12930 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 21:19:21 +00:00
Carl Hetherington
49a32910c5
Patch from tophatdave to prevent exit from note edit
...
mode on double-click with a modifier held down;
prevents creation of malformed notes (#4664 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12929 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 21:19:06 +00:00
Carl Hetherington
2b559c41ae
Try slightly narrower faders in the track controls area
...
(#4445 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12928 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 20:32:14 +00:00
Carl Hetherington
0786ff15a0
Patch from royvegard to add a set-bank midi function
...
(#4949 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 19:26:00 +00:00
Carl Hetherington
c7ebac12b1
Don't specify real-time priority when starting JACK ( #4946 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 14:41:03 +00:00
97d920593f
drastic rethink of the relationship between remote control ID and route order keys. unless the user explicitly switches to UserOrdered, Route::_remote_control_id is an unallocated pointer, and Route::remote_control_id() simply returns a value based on the relevant order_key() value. Also, change the key used in the Route::order_keys std::map<> from a string to an enum, since there is no evidence that we are benefitting from the theoretical benefit of using a string. Generally tidy up allocation of order keys so that the master and monitor busses always get a "special" MixerSort key value, based on the MMC ID for master (already defined within Ardour), and all other tracks/busses start at zero. Syncing keys between editor and mixer will leave the MixerSort key for the master and monitor bus alone, reflecting the fact that we display these in their own distinct parts of the GUI and they are not orderable like other tracks or busses within the mixer window
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12923 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 12:46:13 +00:00
Carl Hetherington
f2f35e50a0
Create diskstream before calling Route::set_state, the
...
set_state causes muted MIDI tracks to look up their
diskstream (#4947 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12922 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 12:39:25 +00:00
92469df6ab
add late/lazy binding between generic MIDI bindings and controllable elements in the session. this allows you to load a binding map that refers to elements that have not yet been created in the session, and when they are created, the binding will work
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 12:33:13 +00:00
Sakari Bergen
ed51eb8801
Remove some excess commas from the export format description
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12920 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 20:00:30 +00:00
Sakari Bergen
d54d26e822
Inrease the export "chunk size" to speed it up over 10% at least in some situations
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12919 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 19:45:20 +00:00
Carl Hetherington
aa76272ae7
Revert to using SSE mix-buffers-with-gain rather than simple
...
one.
git-svn-id: svn://localhost/ardour2/branches/3.0@12918 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 17:12:06 +00:00
Sakari Bergen
0925abbc92
Change logic for compiling export format descriptions from incomplete formats
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12917 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 13:57:20 +00:00
Sakari Bergen
958fc23ed1
Fix stem export. The capturing processor of routes was never removed, and was restored inactive, which made stem export fail.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12916 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 13:38:42 +00:00
ff17d0c0a4
unused variable warning
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 12:57:08 +00:00
70e45046bb
put patch chnage dialog under the mouse cursor when it appears
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12914 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 12:56:56 +00:00
