From 1c25d3a69ac27dc1f93bca3a71996e757b452c4b Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 3 Sep 2017 14:08:41 +0200 Subject: Add bleed controls for the drumkit with priority over those set in the instrument files. --- src/audiofile.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/audiofile.h') diff --git a/src/audiofile.h b/src/audiofile.h index 5d6cdae..d73dad8 100644 --- a/src/audiofile.h +++ b/src/audiofile.h @@ -35,11 +35,15 @@ #include #include "audio.h" +#include "channel.h" + +class InstrumentChannel; class AudioFile { public: - AudioFile(const std::string& filename, std::size_t filechannel, bool main = true); + AudioFile(const std::string& filename, std::size_t filechannel, + InstrumentChannel* instrument_channel = nullptr); ~AudioFile(); void load(std::size_t sample_limit = std::numeric_limits::max()); @@ -55,13 +59,16 @@ public: bool isValid() const; + //! Returns if this audio file is to be played on a main channel (ie. not a + //! secondary channel) + main_state_t mainState() const; + std::mutex mutex; std::size_t filechannel; - bool main; - private: void* magic{nullptr}; volatile bool is_loaded{false}; + InstrumentChannel* instrument_channel; }; -- cgit v1.2.3