diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2017-10-14 14:09:05 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2017-10-14 14:09:05 +0200 |
| commit | 1ec558fa5875d4827a246ccfe0ec8de84d5c5076 (patch) | |
| tree | ce02e30c62cce6b40fb36df4434e18dde8e3a3bf /src | |
| parent | aab40a86534b57fae7c309b992d7a11932433a6f (diff) | |
Remove use of MemChecker as we don't need it anymore (due to diskstreaming) and because some build systems are responding to it with sporadic failures. Thanks to James Cowgill for pointing this out.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/drumkitloader.cc | 12 | ||||
| -rw-r--r-- | src/drumkitloader.h | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f50acc6..4d9441a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,6 @@ nodist_libdg_la_SOURCES = \ instrument.cc \ instrumentparser.cc \ latencyfilter.cc \ - memchecker.cc \ midimapparser.cc \ midimapper.cc \ path.cc \ @@ -76,7 +75,6 @@ EXTRA_DIST = \ instrument.h \ instrumentparser.h \ latencyfilter.h \ - memchecker.h \ midimapparser.h \ midimapper.h \ nolocale.h \ @@ -93,4 +91,4 @@ EXTRA_DIST = \ staminafilter.h \ syncedsettings.h \ thread.h \ - versionstr.h
\ No newline at end of file + versionstr.h diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc index 6f0521b..e6f4c45 100644 --- a/src/drumkitloader.cc +++ b/src/drumkitloader.cc @@ -121,12 +121,12 @@ bool DrumKitLoader::loadkit(const std::string& file) } // Check if there is enough free RAM to load the drumkit. - if(!memchecker.enoughFreeMemory(kit)) - { - printf("WARNING: " - "There doesn't seem to be enough RAM available to load the kit.\n" - "Trying to load it anyway...\n"); - } + //if(!memchecker.enoughFreeMemory(kit)) + //{ + // printf("WARNING: " + // "There doesn't seem to be enough RAM available to load the kit.\n" + // "Trying to load it anyway...\n"); + //} // Put some information about the kit into the settings settings.drumkit_name = kit.getName(); diff --git a/src/drumkitloader.h b/src/drumkitloader.h index 09177fa..82ab4b5 100644 --- a/src/drumkitloader.h +++ b/src/drumkitloader.h @@ -37,7 +37,7 @@ #include "settings.h" #include "audioinputengine.h" #include "chresampler.h" -#include "memchecker.h" +//#include "memchecker.h" #include "audiocache.h" //! This class is responsible for loading the drumkits in its own thread. @@ -90,7 +90,7 @@ protected: DrumKit& kit; AudioInputEngine& ie; Resamplers& resamplers; - MemChecker memchecker; + //MemChecker memchecker; Random& rand; AudioCache& audio_cache; std::size_t preload_samples{std::numeric_limits<std::size_t>::max()}; |