13
0
Commit Graph

4308 Commits

Author SHA1 Message Date
Carl Hetherington
fd89d52af5 Fix operator< so that strict weak ordering is
maintained, so that key lookups work.


git-svn-id: svn://localhost/ardour2/branches/3.0@12542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-02 14:53:26 +00:00
6d46299df3 MCP: another patch from rodrigo:
* setting a (arbitraty) limit to zoom out to prevent segfaults because out of memory condition;
    * setting initial update of master fader, and read, play and stop leds on the Mackie;
    * changed the timecode display char selection for update algorithm as chars are sent one by one and not all right most;
    * implemented method of showing timecode at the mackie to better deal with the differences between Ardour's foramts and Mackie's, i.e, use spaces in place of the zeros that had no meaning;
    * preventing timecode display updates when the surface isn't yet active.


git-svn-id: svn://localhost/ardour2/branches/3.0@12541 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-02 14:51:53 +00:00
1cb5aed0ce couple of fixes to enable building, and building with gtkmm 2.2(<4)
git-svn-id: svn://localhost/ardour2/branches/3.0@12540 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-02 14:50:09 +00:00
bbcfffc2da revert part of earlier MCP patch from rodrigo
git-svn-id: svn://localhost/ardour2/branches/3.0@12534 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 21:25:12 +00:00
Carl Hetherington
c1c5151ca4 Prevent latency measurement output buffer being silenced by
cycle_end, to fix port insert latency measurement (#4504).


git-svn-id: svn://localhost/ardour2/branches/3.0@12530 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 18:24:38 +00:00
Carl Hetherington
162d672769 Minor tidy-ups to MTDM code; add test.
git-svn-id: svn://localhost/ardour2/branches/3.0@12527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 16:52:56 +00:00
Carl Hetherington
6930071cdb When we rename a track, only rename its playlist if it
has never contained any regions (#4759).


git-svn-id: svn://localhost/ardour2/branches/3.0@12525 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 15:19:30 +00:00
ba5e71b50f MCP: Patch from Rodrigo that:
* implements Metering on/off through Button::Read as per Seablade's suggestion. I choose this button as it's the "Show meters" button in Traktion;
    * removes redundant code from Meter::update_transport_rolling();
    * renames Meter::update_transport_rolling() to Meter::notify_metering_state_changed();
    * renamed Surface::notify_transport_state_changed() to Surface::notify_metering_state_changed();
    * renamed Strip::notify_transport_state_changed() to Strip::notify_metering_state_changed();
    * created MackieControlProtocol::notify_metering_state_changed() and made MackieControlProtocol::notify_transport_state_changed() use it;
    * implemented turning off of timecode display and two char display in Surface::zero_all ();
    * implemented master fader zeroing in Surface::zero_all ();
    * calling Surfaces->zero_all() at MackieControlProtocol destructor;
    * implemented restore of 2nd LCD line content after metering being active.



git-svn-id: svn://localhost/ardour2/branches/3.0@12520 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 12:56:20 +00:00
bc3aea6f93 fix construction of new xfades from legacy xfades, and add a few comments here and there
git-svn-id: svn://localhost/ardour2/branches/3.0@12519 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 01:07:00 +00:00
Carl Hetherington
e39a8fc968 Make faders visually desensitised when their tracks are in automation-play.
git-svn-id: svn://localhost/ardour2/branches/3.0@12518 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 00:41:28 +00:00
Carl Hetherington
06aa9c7435 Remove unused method.
git-svn-id: svn://localhost/ardour2/branches/3.0@12516 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 22:44:29 +00:00
Carl Hetherington
1db2be2fef Fix uninitialised variable causing garbage output from panners in some cases.
git-svn-id: svn://localhost/ardour2/branches/3.0@12515 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 20:58:29 +00:00
Carl Hetherington
a6786a6dd2 Hopefully less bad version of Evoral::RangeList::subtract,
with more tests.


git-svn-id: svn://localhost/ardour2/branches/3.0@12514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 20:23:31 +00:00
Carl Hetherington
19becdf7e0 Add primary-modifier click on monitor knobs to go to -inf dB (part
of patch by emem in #4726).


git-svn-id: svn://localhost/ardour2/branches/3.0@12511 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 18:04:54 +00:00
Carl Hetherington
6a4628e50a Use the same logic to decide on step size when scroll-wheeling faders in the mixer and knobs in the monitor section (part of #4726).
git-svn-id: svn://localhost/ardour2/branches/3.0@12510 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 18:04:47 +00:00
5c298dfef3 fix comment regarding keyboard modifiers on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@12501 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 14:01:46 +00:00
0b958b7f15 allow alt-drag on stereo panner to move just one side of the stereo field. this wiggles a bit, possibly because of rounding, and that probably needs to be addressed
git-svn-id: svn://localhost/ardour2/branches/3.0@12500 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 13:58:59 +00:00
78c0811ed7 revert previous change
git-svn-id: svn://localhost/ardour2/branches/3.0@12498 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 21:19:28 +00:00
643350c4e7 try not thinning when loading old-school automation lists
git-svn-id: svn://localhost/ardour2/branches/3.0@12497 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 21:07:15 +00:00
bfefff3588 rethink how to load legacy crossfades as new-style xfades
git-svn-id: svn://localhost/ardour2/branches/3.0@12496 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 19:30:38 +00:00
71dd60c736 don't abort when loading legacy xfades if the constituent regions cannot be found
git-svn-id: svn://localhost/ardour2/branches/3.0@12495 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 16:16:27 +00:00
ddc513c38d debugging legacy xfade loading, part 2
git-svn-id: svn://localhost/ardour2/branches/3.0@12494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 15:43:56 +00:00
92a5107037 debugging legacy xfade loading
git-svn-id: svn://localhost/ardour2/branches/3.0@12493 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 15:36:09 +00:00
28e3bc3ac7 MCP: metering changes from rodrigo, makes metering work correctly on the MC Pro (also checked on the nucleus)
git-svn-id: svn://localhost/ardour2/branches/3.0@12489 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 14:32:27 +00:00
cd58caa93b MCP: remove misleading and confusing and out of date comment
git-svn-id: svn://localhost/ardour2/branches/3.0@12485 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 00:01:15 +00:00
28aed9e0d1 MCP: correct display of timecode
git-svn-id: svn://localhost/ardour2/branches/3.0@12484 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 23:44:34 +00:00
1491787cfb MCP: fix assigment of outbound sysex messages, and don't drain port->selectable() for ipMIDI devices, since this throws away all incoming data, which arrives on the same fd as port->selectable() (unlike JACK MIDI)
git-svn-id: svn://localhost/ardour2/branches/3.0@12483 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 23:30:13 +00:00
40ef762db4 fix missing negation from previous MCP commit
git-svn-id: svn://localhost/ardour2/branches/3.0@12482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 20:34:19 +00:00
1d5bade8a1 patch from rodrigo severo to make mackie timecode display work
git-svn-id: svn://localhost/ardour2/branches/3.0@12480 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 20:18:43 +00:00
7198894473 don't reset region fades to default after a playlist op unless the fades used to be part of an xfade and now no longer are (should fix #4893)
git-svn-id: svn://localhost/ardour2/branches/3.0@12476 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 12:54:49 +00:00
Carl Hetherington
ec362b39ad Missing files.
git-svn-id: svn://localhost/ardour2/branches/3.0@12469 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-28 16:48:39 +00:00
Carl Hetherington
7eb8a33910 Add path_is_within to decide if a path is within a given
directory, taking symlinks into account, and use it to
decide whether a file is within the session folder.  Should
fix #4552.


git-svn-id: svn://localhost/ardour2/branches/3.0@12468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-28 16:32:41 +00:00
d825f20a32 explicit checks for all components of the LV2 stack
git-svn-id: svn://localhost/ardour2/branches/3.0@12465 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-28 13:51:26 +00:00
3696f98e6f Re-implement URIMap to tolerate broken plugins that use the wrong context to
map MIDI event types (fix #4889).

All uri-map contexts are now just ignored, and equivalent to urid (which is
equivalent to uri-map with context NULL).  We now just hope that no event types
are mapped after UINT16_MAX URIs have been mapped, and die horribly otherwise.
This is exceedingly unlikely to happen any time in the next several years, if
ever.


git-svn-id: svn://localhost/ardour2/branches/3.0@12462 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 23:05:45 +00:00
bdfd71602f add a fix for the one problem case from the last commit: region splitting, where we don't announce regions until the entire edit op is done, but for naming purpoes each new region created needs to be in the map. likely that i will commit a better, cleaner fix for this later
git-svn-id: svn://localhost/ardour2/branches/3.0@12458 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 18:22:45 +00:00
20299f71e3 don't add regions created with announce=false to the global region map. i hope this doesn't have too many side effects ...
git-svn-id: svn://localhost/ardour2/branches/3.0@12457 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 18:08:03 +00:00
06c7a5da6b don't alter session search path frm within FileSource constructor, do it when a source is added to the session; related - don't add sources that are created with announce=false to the session, and as a (new) corollary, no longer cause them to potentially alter the session search path (this applies mostly to sources created for auditioning)
git-svn-id: svn://localhost/ardour2/branches/3.0@12456 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 18:07:30 +00:00
341d033b2c MIDI::Port::(get|set)_state() should be virtual, so that derived classes get their chance in the sun. Fixes #4887
git-svn-id: svn://localhost/ardour2/branches/3.0@12455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 16:49:51 +00:00
d7a32eb85e MCP: remember to drain the x-thread FIFO that tells us that JACK MIDI data has been received
git-svn-id: svn://localhost/ardour2/branches/3.0@12453 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 10:57:36 +00:00
e3f73f2655 convert audioregion xfade stuff to properties, add "is-short" property for fade in and out so that we can keep track of whether an (x)fade is supposed to remain "short", and don't do "mess-with-region-below" stuff when trimming a short xfade. should be back-compatible with 3beta4a
git-svn-id: svn://localhost/ardour2/branches/3.0@12452 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-26 01:24:01 +00:00
2d017301f9 add ::length() method to Evoral::ControlList
git-svn-id: svn://localhost/ardour2/branches/3.0@12451 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-25 19:59:11 +00:00
8d41955b3d missing method for MCP
git-svn-id: svn://localhost/ardour2/branches/3.0@12449 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-25 17:56:26 +00:00
9dae320b12 always create short xfades when adding a region based on capture
git-svn-id: svn://localhost/ardour2/branches/3.0@12443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 22:03:19 +00:00
450965602b remove old RECMUTEX conditional
git-svn-id: svn://localhost/ardour2/branches/3.0@12441 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 21:33:42 +00:00
7d252412c3 add support for <HasMeters value=XX/> stanza in MCP device info file
git-svn-id: svn://localhost/ardour2/branches/3.0@12440 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 19:27:29 +00:00
Carl Hetherington
80095b7c9d Missing include.
git-svn-id: svn://localhost/ardour2/branches/3.0@12433 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 17:43:13 +00:00
Carl Hetherington
7110c6de67 Tweak comment.
git-svn-id: svn://localhost/ardour2/branches/3.0@12432 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 17:43:07 +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
27a1cf2cf7 Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:54:10 +00:00
effe4de188 Fix blatang logic errors (?), which is rather odd since this file was generated by Vala...
git-svn-id: svn://localhost/ardour2/branches/3.0@12417 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:51:30 +00:00