summaryrefslogtreecommitdiff
path: root/src/drumgizmo.cc
diff options
context:
space:
mode:
authorChristian Glöckner <cgloeckner@freenet.de>2016-03-29 15:36:53 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2016-03-31 17:35:47 +0200
commitbc4e506e48785ce448f18098b96c0d7333abb801 (patch)
tree1f282fe53493fe0292ef51a791c8f61283e44542 /src/drumgizmo.cc
parent1a8361a1f6a1bf442d474cf5baf2e9a09f511777 (diff)
API Refactoring for class Drumkit
Diffstat (limited to 'src/drumgizmo.cc')
-rw-r--r--src/drumgizmo.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index 4ce45ba..0570114 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -101,7 +101,7 @@ bool DrumGizmo::loadkit(std::string file)
#ifdef WITH_RESAMPLER
for(int i = 0; i < MAX_NUM_CHANNELS; ++i)
{
- resampler[i].setup(kit.samplerate(), Conf::samplerate);
+ resampler[i].setup(kit.getSamplerate(), Conf::samplerate);
}
#endif/*WITH_RESAMPLER*/
@@ -167,7 +167,7 @@ void DrumGizmo::handleMessage(Message *msg)
EngineSettingsMessage *msg = new EngineSettingsMessage();
msg->midimapfile = mmapfile;
msg->midimap_loaded = mmap_loaded;
- msg->drumkitfile = kit.file();
+ msg->drumkitfile = kit.getFile();
msg->drumkit_loaded = loader.isDone();
msg->enable_velocity_modifier = Conf::enable_velocity_modifier;
msg->velocity_modifier_falloff = Conf::velocity_modifier_falloff;
@@ -646,7 +646,7 @@ void DrumGizmo::setSamplerate(int samplerate)
#ifdef WITH_RESAMPLER
for(int i = 0; i < MAX_NUM_CHANNELS; ++i)
{
- resampler[i].setup(kit.samplerate(), Conf::samplerate);
+ resampler[i].setup(kit.getSamplerate(), Conf::samplerate);
}
if(resampler[0].getRatio() != 1)
{
@@ -688,7 +688,7 @@ std::string DrumGizmo::configString()
return
"<config>\n"
- " <value name=\"drumkitfile\">" + kit.file() + "</value>\n"
+ " <value name=\"drumkitfile\">" + kit.getFile() + "</value>\n"
" <value name=\"midimapfile\">" + mmapfile + "</value>\n"
" <value name=\"enable_velocity_modifier\">" +
bool2str(Conf::enable_velocity_modifier) + "</value>\n"
@@ -752,7 +752,7 @@ bool DrumGizmo::setConfigString(std::string cfg)
}
std::string newkit = p.value("drumkitfile");
- if(newkit != "" && kit.file() != newkit)
+ if(newkit != "" && kit.getFile() != newkit)
{
/*
if(!loadkit(p.values["drumkitfile"]))