13
0
Commit Graph

11910 Commits

Author SHA1 Message Date
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
465b800d8b when looking for backends, search for *.dll as well as *.so and *.dylib 2013-10-09 13:57:00 -04:00
927ebe3b5f reduce version requirement for JACK 2013-10-08 17:12:20 -04:00
af8a1c146d move JACK configuration test(s) down to where they belong (in libs/backend/jack) 2013-10-08 16:13:39 -04:00
645350815c remove link-time use of JACK, since it is now dlopen'ed by the chosen backend 2013-10-08 14:16:13 -04:00
c98abed37f restore jack timebase master and jack session callback functionality (moved into the JACK backend) 2013-10-08 14:02:03 -04:00
7e077bdeba -arestore jack timebase master and jack session callback functionality (moved into the JACK backend) 2013-10-08 14:01:43 -04:00
c94f0b6298 updated DE translation from edgar aichinger 2013-10-08 12:22:49 -04:00
1085866f47 updated DE translation from edgar aichinger 2013-10-08 12:22:08 -04:00
19ba3b8de7 fix some issues with window flow when session loading fails; shrink "New Session" button in session setup dialog 2013-10-08 12:18:27 -04:00
22eea8e9e2 possible relief for snapshot loading 2013-10-07 20:46:10 -04:00
2230dc92cd remove debug output 2013-10-07 20:30:28 -04:00
da7d3afc87 use AudioEngine destructor to do necessary stuff when shutting it down, and remove unused Config stuff in AudioEngine 2013-10-07 20:30:06 -04:00
f1b2674d9b change return type on ARDOUR::cleanup() since nobody cares what it returns 2013-10-07 20:29:05 -04:00
c727d18b80 delete the UI from main() to get full cleanup 2013-10-07 20:28:20 -04:00
5d85b5257e use new GtkUI design in ARDOUR_UI 2013-10-07 20:27:54 -04:00
5265ceec51 change tortured GtkUI startup process into something just a little more sane, and remove "stopping" code since that belongs in a destructor 2013-10-07 20:27:04 -04:00
7ac849689d window proxy should delete its window during its destructor 2013-10-07 20:17:49 -04:00
d74255343e fix up some aspects of loading from a cmdline session name 2013-10-06 16:32:02 -04:00
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
7d78172abf Miscellaneous additions to 'msvc_extra_headers' 2013-10-06 11:01:25 +01:00
df2b5c90e4 'gtk2_ardour' - In 'Note' c'tor, don't try to set 'rectangle->name' unless 'CANVAS_DEBUG' is defined 2013-10-06 11:00:10 +01:00
e93c425d6f 'gtk2_ardour' - One further Glib::usleep needed 2013-10-06 10:52:41 +01:00
7f4ed54f53 'gtk2_ardour' - Some further casting 2013-10-06 10:50:45 +01:00
2d5e605bf1 Merge branch 'audiothreads' of https://github.com/mojofunk/ardour 2013-10-04 14:00:20 -04:00
449f600c69 remove another unnecessary use of libgen.h 2013-10-04 13:02:41 -04:00
ddcb78f3e2 use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least), part 2 2013-10-04 13:00:59 -04:00
028cd5660f use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least) 2013-10-04 12:50:03 -04:00
1344014cbd switch from MAXPATHLEN to PATH_MAX, and use <limits.h> not <sys/param.h> for portability 2013-10-04 12:46:31 -04:00
6daa7c1bc3 remove unnecessary header include 2013-10-04 12:46:02 -04:00
3aee160b19 provide PBD::demangle() even on platforms without HAVE_EXECINFO 2013-10-04 12:22:00 -04:00
74f3955682 remove OSC related cruft from ardour_ui_options.cc
control surface activation is handled via an entirely separate mechanism now
2013-10-04 11:46:50 -04:00
f3a22fb880 Implement JACKAudioBackend::in_process_thread 2013-10-04 18:54:54 +10:00
53ad2d187f Move processing thread list from ARDOUR::Graph into AudioBackend implementation 2013-10-04 18:53:37 +10:00
df363a4fb3 Add AudioBackendThread class to support different thread type on windows 2013-10-04 18:51:47 +10:00
da628185b1 'gtk2_ardour' - Make sure that 'getpid()' can be found when building with MSVC 2013-10-03 09:57:25 +01:00
5da78cea9a 'gtk2_ardour' - Use 'const_iterator' where appropriate, instead of 'iterator' 2013-10-03 09:52:39 +01:00
bc2b2f9e35 'gtk2_ardour' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC 2013-10-03 09:50:34 +01:00
904367748c 'gtk2_ardour' - 'std::isinf' + 'std::isnan' are not available in MSVC (at least, not VC8) 2013-10-03 09:48:19 +01:00
f763e370c5 'gtk2_ardour' - When building with MSVC, use 'std::min' + 'std::max' rather than 'fmin' + 'fmax' 2013-10-03 09:43:55 +01:00
a19afc5903 'gtk2_ardour' - Specify 'Glib::usleep' where needed (global ::usleep is not available for MSVC) 2013-10-03 09:34:52 +01:00
8bf59e88e5 'gtk2_ardour' - Use 'floor / floorf' instead of 'trunc / truncf' 2013-10-03 09:32:08 +01:00
bb062f2b90 'gtk2_ardour' - Use 'GStatBuf' instead of 'struct stat' 2013-10-03 09:27:40 +01:00
d7a16f7de6 'gtk2_ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC) 2013-10-03 09:12:02 +01:00
f8574fc39d 'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy 2013-10-03 09:06:56 +01:00
82f0f3a9a7 fix up crash caused by changes in object creation order and setting the state of the click IO object 2013-10-02 16:17:22 -04:00
d382925fba Add a header file guard (to prevent multiple #inclusion) 2013-09-26 15:17:40 +01:00
d614dc1e18 Deliberately specify 'Gtk::manage' where necessary (avoids creating ambiguities when we #include this header file elsewhere) 2013-09-26 11:47:17 +01:00
4f4a53e870 A further change which needs to be tested on the other compilers
(splitting a long string into 2 x concatenated strings)
2013-09-26 11:01:15 +01:00
a88f38cf10 'gtk2_ardour (msvc)' - Some changes needed before anything at all will compile
For the most part, the compilation problems are caused by lines such as:-

      WM::Proxy<ThemeManager> theme_manager;

Before MSVC will compile the above it needs to know that the specified object type contains an appropriate (i.e. publicly available) default c'tor. Therefore the corresponding header file needs to get #included, rather than just declaring that type to be a class (whilst all classes have a default c'tor, it needn't necessarily be public). The remaining changes are mostly minor.

This commit should be tested ASAP to make sure it doesn't upset the other compilers.
2013-09-26 10:58:07 +01:00