ardour/livetrax
13
0
Fork 0
Code
21,204 Commits 1 Branch 1 Tag 199 MiB
e37b250d4d
Commit Graph

21204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Thursfield
e37b250d4d Use correct type of std::map::count 
Compiling Ardour commit ec8a4de015 with GCC
6.1.1 (on Fedora 24) gave this build failure:

    In file included from /home/sam/ardour/libs/lua/LuaBridge/LuaBridge.h:154:0,
                     from ../tools/luadevel/devel.cc:16:
    /home/sam/ardour/libs/lua/LuaBridge/detail/Namespace.h: In instantiation of ‘luabridge::Namespace::Class<std::map<K, V> > luabridge::Namespace::beginStdMap(const char*) [with K = std::__cxx11::basic_string<char>; V = std::__cxx11::basic_string<char>]’:
    ../tools/luadevel/devel.cc:89:60:   required from here
    /home/sam/ardour/libs/lua/LuaBridge/detail/Namespace.h:1666:30: error: no matches converting function ‘count’ to type ‘void (class std::map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char>, std::less<std::__cxx11::basic_string<char> >, std::allocator<std::pair<const std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> > > >::*)()’
           .addFunction ("count", (void (LT::*)())&LT::count)
                                  ^~~~~~~~~~~~~~~~~~~
    In file included from /usr/include/c++/6.1.1/map:61:0,
                     from /home/sam/ardour/libs/lua/LuaBridge/LuaBridge.h:45,
                     from ../tools/luadevel/devel.cc:16:
    /usr/include/c++/6.1.1/bits/stl_map.h:1131:2: note: candidates are: template<class _Kt> decltype (((const std::map<_Key, _Tp, _Compare, _Alloc>*)this)->std::map<_Key, _Tp, _Compare, _Alloc>::_M_t._M_count_tr(__x)) std::map<_Key, _Tp, _Compare, _Alloc>::count(const _Kt&) const [with _Kt = _Kt; _Key = std::__cxx11::basic_string<char>; _Tp = std::__cxx11::basic_string<char>; _Compare = std::less<std::__cxx11::basic_string<char> >; _Alloc = std::allocator<std::pair<const std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> > >]
      count(const _Kt& __x) const -> decltype(_M_t._M_count_tr(__x))
      ^~~~~
    /usr/include/c++/6.1.1/bits/stl_map.h:1125:7: note:                 std::map<_Key, _Tp, _Compare, _Alloc>::size_type std::map<_Key, _Tp, _Compare, _Alloc>::count(const key_type&) const [with _Key = std::__cxx11::basic_string<char>; _Tp = std::__cxx11::basic_string<char>; _Compare = std::less<std::__cxx11::basic_string<char> >; _Alloc = std::allocator<std::pair<const std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> > >; std::map<_Key, _Tp, _Compare, _Alloc>::size_type = long unsigned int; std::map<_Key, _Tp, _Compare, _Alloc>::key_type = std::__cxx11::basic_string<char>]
           count(const key_type& __x) const
           ^~~~~

Casting std::map::count to the correct type instead of a fake void()
type fixes the compile failure.
 2016-06-26 16:18:34 +02:00
Robin Gareus
b8442f8acd fix uninstaller for variants (Mixbus32C vs Mixbus) 2016-06-25 19:56:34 +02:00
Robin Gareus
d5cc04d57b fix typo 2016-06-25 18:54:11 +02:00
Robin Gareus
ace9ee194d fix typos in prev commit 2016-06-25 03:47:38 +02:00
Robin Gareus
e9a8ccc7e2 major internal plugin & processor API change: 
Pass current (latency compensated) cycle times to plugin.
This fixes time-reporting to plugins and also fixes automation
and when bouncing (the session->transport* is not valid) etc.
 2016-06-25 02:23:56 +02:00
Robin Gareus
6a12022ccf fix vamp path: 
* append, not replace
* make it work on wine/ardour
 2016-06-25 00:44:04 +02:00
Robin Gareus
265c60126a fix KeyEditor::print() for windows (hopefully, untested) 2016-06-24 22:45:25 +02:00
nick_m
cde951f30f Fix counting thinko in tests. 
- note that the negative framepos in
	  FrameposPlusBeatsTest::singleTempoTest() will
	  not pass. needs some thougt as to whether it is testing
	  the correct thing.
 2016-06-25 01:37:48 +10:00
Robin Gareus
a8fa5e9158 Ignore numerals before "+" in tag 2016-06-24 02:34:56 +02:00
John Emmas
5fcfee7f4d When building with MSVC, adapt the various font sizes to be a closer match to the GCC build 
(the smaller fonts can't be an exact match or they end up looking too small).
 2016-06-23 15:20:03 +01:00
Paul Davis
cee1109d9b fix ampersands in group names in generated binding files 2016-06-23 08:37:24 -04:00
Paul Davis
22d52876b7 include group descriptions when processing keybindings 2016-06-23 08:37:24 -04:00
Paul Davis
37156d6761 more tweaks to HTML output when printing key bindings 2016-06-23 08:37:24 -04:00
Robin Gareus
6753efb780 show tooltips on favorite plugins -- closes #6902 2016-06-23 00:43:14 +02:00
Len Ovens
f3dd9eef8b OSC: master/monitor forced to sort at end 2016-06-22 14:50:13 -07:00
Len Ovens
844bf70002 OSC: Fix math off by one, Check for all stripable controls because VCAs have less (crash fix) 2016-06-22 14:10:59 -07:00
Robin Gareus
dd549bb09e another C++98 fix 2016-06-22 19:22:19 +02:00
Robin Gareus
64d7a82a52 fix gcc4 builds C++98 
Flag is an enum -- not a class nor namespace
 2016-06-22 16:18:07 +02:00
Len Ovens
cad5ed4f21 OSC: Might help if I used the right variable, Really fix select. 2016-06-21 20:31:53 -07:00
Len Ovens
74806a43c9 OSC: Fix out of range track. (crash) 2016-06-21 19:19:07 -07:00
Len Ovens
daddf2179f OSC: Add strip type selection. 2016-06-21 18:47:43 -07:00
Paul Davis
68b6d0d796 fix some more thinkos related to user color file management 2016-06-21 19:39:13 -04:00
Paul Davis
74f567b789 remove debug output 2016-06-21 19:32:50 -04:00
Paul Davis
fdaaaacdbf remove old file 2016-06-21 19:27:11 -04:00
Paul Davis
d2c4b6fe94 rename unastudia theme file to match per-program-name convention 2016-06-21 19:26:51 -04:00
Paul Davis
120c4bd9f3 fixes for color theme manager's handling of color file choices, notably while running from source tree 2016-06-21 19:26:06 -04:00
Paul Davis
d3a0355b55 tweaks to how UIConfiguration::color_file_name() operates 2016-06-21 19:26:05 -04:00
Paul Davis
3884cae064 fix default color file name in code default definition 2016-06-21 19:26:05 -04:00
Paul Davis
d4c26d63f6 remove unneeded declaration 2016-06-21 19:26:05 -04:00
Paul Davis
a38b9737a7 fix incorrect color file name in default UI config file 2016-06-21 19:26:05 -04:00
Paul Davis
d3d255753f use running_from_source_tree() 2016-06-21 19:26:05 -04:00
Paul Davis
40bb2a5a08 use running_from_source_tree() 2016-06-21 19:26:05 -04:00
Paul Davis
0cd43a553e provide ARDOUR_UI_UTILS::running_from_source_tree() 2016-06-21 19:26:05 -04:00
Robin Gareus
556c97b2d5 always run amp/trim LPF 
This fixes "clicks" when switching fader automation from "manual"
to "play/touch" while the transport is rolling.
 2016-06-21 21:59:21 +02:00
Paul Davis
9c32bfdf4c add comment button fill color alias for *all* themes 2016-06-21 15:01:03 -04:00
Paul Davis
f2648fdf4c add tempo curve colors to unastudia theme. 
Colors need adjusting by a theme owner/maintainer
 2016-06-21 14:59:02 -04:00
Paul Davis
0d37928807 add shuttle colors to unastudia theme. 
Colors need adjusting by a theme owner/maintainer
 2016-06-21 14:57:38 -04:00
Paul Davis
544f4a12dc new "studio one" theme from user straightothebar 2016-06-21 13:41:13 -04:00
Robin Gareus
e4ba62e4c4 show first word of comment on track's comment-button 2016-06-21 18:18:54 +02:00
Paul Davis
791cff6f46 use new keyboard modifier names, and replace GDK names with better versions 2016-06-21 08:59:39 -04:00
Paul Davis
6e10752a98 fix section naming in bindings file 2016-06-21 08:58:59 -04:00
Paul Davis
ae4e84fd51 provide some Keyboard:: methods to get access to other versions of modifier names 2016-06-21 08:58:38 -04:00
Paul Davis
10a4de1550 some modest improvements in the html rendering of key bindings, plus use of normal modifier names 2016-06-20 17:19:31 -04:00
Robin Gareus
b5a134d73a fix comment-button highlight 2016-06-20 00:59:21 +02:00
John Emmas
557031ca11 Remove confusion over ambiguous symbols 
libboost and libsigc++ both contain symbols called _1() / _2() etc. Forcing the use of namespace sigc causes us to use the ones from sigc++ when in fact, we want the ones from boost.

Hopefully this fix will work for all compilers.
 2016-06-18 11:41:12 +01:00
John Emmas
48329f8d6e Make sure MSVC knows which version of 'floor()' we want 2016-06-18 11:36:13 +01:00
John Emmas
6ca3c67046 Use Glib::usleep() for consistency 2016-06-18 11:34:14 +01:00
Robin Gareus
425c40ff08 fix upsampling import of X-channel files where buffersize % X != 0 2016-06-17 22:17:58 +02:00
Len Ovens
f4047b9a26 OSC: take care of track order changes too. Deal with mixer topology changes one time. 2016-06-16 19:41:39 -07:00
Len Ovens
3754859f2f OSC: Blank some more feedback values when select observer is destroyed. 2016-06-16 16:07:09 -07:00