projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert
[ardour.git]
/
libs
/
ardour
/
globals.cc
diff --git
a/libs/ardour/globals.cc
b/libs/ardour/globals.cc
index 7c713980c31898dd720260178e2d7d8aa91ac593..3a37073e29d2997b9318cc59152cc0e7802827b2 100644
(file)
--- a/
libs/ardour/globals.cc
+++ b/
libs/ardour/globals.cc
@@
-29,12
+29,12
@@
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
-#ifdef VST_SUPPORT
+#ifdef
WINDOWS_
VST_SUPPORT
#include <fst.h>
#endif
#ifdef LXVST_SUPPORT
#include <fst.h>
#endif
#ifdef LXVST_SUPPORT
-#include "ardour/
vstfx
.h"
+#include "ardour/
linux_vst_support
.h"
#endif
#ifdef AUDIOUNIT_SUPPORT
#endif
#ifdef AUDIOUNIT_SUPPORT
@@
-241,7
+241,7
@@
lotsa_files_please ()
}
int
}
int
-ARDOUR::init (bool use_vst, bool try_optimization)
+ARDOUR::init (bool use_
windows_
vst, bool try_optimization)
{
if (!Glib::thread_supported()) {
Glib::thread_init();
{
if (!Glib::thread_supported()) {
Glib::thread_init();
@@
-293,7
+293,7
@@
ARDOUR::init (bool use_vst, bool try_optimization)
return -1;
}
return -1;
}
- Config->set_use_
vst (use
_vst);
+ Config->set_use_
windows_vst (use_windows
_vst);
#ifdef LXVST_SUPPORT
Config->set_use_lxvst(true);
#endif
#ifdef LXVST_SUPPORT
Config->set_use_lxvst(true);
#endif
@@
-301,8
+301,8
@@
ARDOUR::init (bool use_vst, bool try_optimization)
Profile = new RuntimeProfile;
Profile = new RuntimeProfile;
-#ifdef VST_SUPPORT
- if (Config->get_use_vst() && fst_init (0)) {
+#ifdef
WINDOWS_
VST_SUPPORT
+ if (Config->get_use_
windows_
vst() && fst_init (0)) {
return -1;
}
#endif
return -1;
}
#endif
@@
-334,10
+334,10
@@
ARDOUR::init (bool use_vst, bool try_optimization)
Analyser::init ();
/* singleton - first object is "it" */
Analyser::init ();
/* singleton - first object is "it" */
-
new PluginManager
();
+
(void) PluginManager::instance
();
ProcessThread::init ();
ProcessThread::init ();
- BufferManager::init (10); // XX should be num_processors_for_dsp
+ BufferManager::init (10); // XX should be num_processors_for_dsp
+ 1 for the GUI thread
PannerManager::instance().discover_panners();
PannerManager::instance().discover_panners();
@@
-374,6
+374,10
@@
ARDOUR::init_post_engine ()
if ((node = Config->control_protocol_state()) != 0) {
ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
}
if ((node = Config->control_protocol_state()) != 0) {
ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
}
+
+ /* find plugins */
+
+ ARDOUR::PluginManager::instance().refresh ();
}
int
}
int
@@
-382,7
+386,7
@@
ARDOUR::cleanup ()
delete Library;
lrdf_cleanup ();
delete &ControlProtocolManager::instance();
delete Library;
lrdf_cleanup ();
delete &ControlProtocolManager::instance();
-#ifdef VST_SUPPORT
+#ifdef
WINDOWS_
VST_SUPPORT
fst_exit ();
#endif
fst_exit ();
#endif
@@
-450,9
+454,14
@@
ARDOUR::setup_fpu ()
MXCSR = _mm_getcsr();
MXCSR = _mm_getcsr();
+#ifdef DEBUG_DENORMAL_EXCEPTION
+ /* This will raise a FP exception if a denormal is detected */
+ MXCSR &= ~_MM_MASK_DENORM;
+#endif
+
switch (Config->get_denormal_model()) {
case DenormalNone:
switch (Config->get_denormal_model()) {
case DenormalNone:
- MXCSR &= ~(_MM_FLUSH_ZERO_ON
|0x800
0);
+ MXCSR &= ~(_MM_FLUSH_ZERO_ON
| 0x4
0);
break;
case DenormalFTZ:
break;
case DenormalFTZ:
@@
-464,14
+473,14
@@
ARDOUR::setup_fpu ()
case DenormalDAZ:
MXCSR &= ~_MM_FLUSH_ZERO_ON;
if (fpu.has_denormals_are_zero()) {
case DenormalDAZ:
MXCSR &= ~_MM_FLUSH_ZERO_ON;
if (fpu.has_denormals_are_zero()) {
- MXCSR |= 0x
800
0;
+ MXCSR |= 0x
4
0;
}
break;
case DenormalFTZDAZ:
if (fpu.has_flush_to_zero()) {
if (fpu.has_denormals_are_zero()) {
}
break;
case DenormalFTZDAZ:
if (fpu.has_flush_to_zero()) {
if (fpu.has_denormals_are_zero()) {
- MXCSR |= _MM_FLUSH_ZERO_ON | 0x
800
0;
+ MXCSR |= _MM_FLUSH_ZERO_ON | 0x
4
0;
} else {
MXCSR |= _MM_FLUSH_ZERO_ON;
}
} else {
MXCSR |= _MM_FLUSH_ZERO_ON;
}