Skip to content

Commit 5f98733

Browse files
committed
[Refactor] SampleChannel::loadWave() -> SampleChannel::loadSample()
1 parent b187e4f commit 5f98733

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/core/channels/channel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ void Channel::loadSample(const Sample& s, std::size_t scene, Frame newShift)
240240
shared->tracker.store(0);
241241
shared->playStatus.store(s.wave != nullptr ? ChannelStatus::OFF : ChannelStatus::EMPTY);
242242

243-
sampleChannel->loadWave(s.wave, scene, s.range, newShift);
243+
sampleChannel->loadSample(s, scene, newShift);
244244
}
245245

246246
/* -------------------------------------------------------------------------- */

src/core/channels/sampleChannel.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ Frame SampleChannel::getWaveSize(std::size_t scene) const
120120

121121
/* -------------------------------------------------------------------------- */
122122

123-
void SampleChannel::loadWave(Wave* w, std::size_t scene, SampleRange newRange, Frame newShift)
123+
void SampleChannel::loadSample(const Sample& s, std::size_t scene, Frame newShift)
124124
{
125-
m_samples[scene] = {w, {}};
125+
m_samples[scene] = {s.wave, {}};
126126
shift = 0;
127127

128-
if (w != nullptr)
128+
if (s.wave != nullptr)
129129
{
130130
shift = newShift == -1 ? 0 : newShift;
131-
m_samples[scene].range = newRange.isValid() ? newRange : SampleRange(0, w->getBuffer().countFrames());
131+
m_samples[scene].range = s.range.isValid() ? s.range : SampleRange(0, s.wave->getBuffer().countFrames());
132132
}
133133
}
134134

src/core/channels/sampleChannel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class SampleChannel final
5252

5353
const SceneArray<Sample>& getSamples() const;
5454

55-
/* loadWave
55+
/* loadSample
5656
Loads Wave and sets it up (name, markers, ...). Resets begin/end points
5757
and shift if not specified. */
5858

59-
void loadWave(Wave*, std::size_t scene, SampleRange newRange = {}, Frame shift = -1);
59+
void loadSample(const Sample&, std::size_t scene, Frame newShift = -1);
6060

6161
/* setWave
6262
Just sets the pointer to a Wave object. Used during de-serialization. The

0 commit comments

Comments
 (0)