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.cc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/audiofile.cc') diff --git a/src/audiofile.cc b/src/audiofile.cc index a8e9d4a..c2c5cf9 100644 --- a/src/audiofile.cc +++ b/src/audiofile.cc @@ -35,11 +35,14 @@ #include -AudioFile::AudioFile(const std::string& filename, std::size_t filechannel, bool main) +#include "channel.h" + +AudioFile::AudioFile(const std::string& filename, std::size_t filechannel, + InstrumentChannel* instrument_channel) : filename(filename) , filechannel(filechannel) - , main(main) , magic{this} + , instrument_channel(instrument_channel) { } @@ -151,3 +154,14 @@ bool AudioFile::isLoaded() const { return is_loaded; } + +main_state_t AudioFile::mainState() const +{ + if(instrument_channel == nullptr) + { + DEBUG(audiofile, "no instrument_channel!"); + return main_state_t::unset; + } + + return instrument_channel->main; +} -- cgit v1.2.3