summaryrefslogtreecommitdiff
path: root/src/instrument.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/instrument.cc')
-rw-r--r--src/instrument.cc18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/instrument.cc b/src/instrument.cc
index ac6aa28..30f3423 100644
--- a/src/instrument.cc
+++ b/src/instrument.cc
@@ -130,27 +130,15 @@ std::size_t Instrument::getNumberOfFiles() const
return audiofiles.size();
}
-float Instrument::getMaxPower() const
+Instrument::PowerRange Instrument::getPowers(float position) const
{
if(version >= VersionStr("2.0"))
{
- return powerlist.getMaxPower();
+ return { powerlist.getMaxPower(), powerlist.getMaxPower() };
}
else
{
- return 1.0f;
- }
-}
-
-float Instrument::getMinPower() const
-{
- if(version >= VersionStr("2.0"))
- {
- return powerlist.getMinPower();
- }
- else
- {
- return 0.0f;
+ return { 0.0f, 1.0f };
}
}