fix musescore#23112: don't call shared_from_this() in MuseSamplerWrapper

Because it locks the pointer, EventAudioSource loses ownership of it and can no longer destroy it
RomanPudashkin · Jun 10, 2024 · f9f3bb1 · f9f3bb1
1 parent 424f2a3
commit f9f3bb1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/framework/musesampler/internal/imusesamplertracks.h b/src/framework/musesampler/internal/imusesamplertracks.h
@@ -34,8 +34,6 @@ class IMuseSamplerTracks
  virtual const TrackList& allTracks() const = 0;
  virtual ms_Track addTrack() = 0;
 };
-
-using IMuseSamplerTracksPtr = std::shared_ptr<IMuseSamplerTracks>;
 }
 
 #endif // MUSE_MUSESAMPLER_IMUSESAMPLERTRACKS_H
diff --git a/src/framework/musesampler/internal/musesamplersequencer.cpp b/src/framework/musesampler/internal/musesamplersequencer.cpp
@@ -103,7 +103,7 @@ static const std::unordered_map<ArticulationType, ms_NoteHead> NOTEHEAD_TYPES =
  { ArticulationType::SlashedForwardsNote, ms_NoteHead_SlashLeftFilled },
 };
 
-void MuseSamplerSequencer::init(MuseSamplerLibHandlerPtr samplerLib, ms_MuseSampler sampler, IMuseSamplerTracksPtr tracks,
+void MuseSamplerSequencer::init(MuseSamplerLibHandlerPtr samplerLib, ms_MuseSampler sampler, IMuseSamplerTracks* tracks,
  std::string&& defaultPresetCode)
 {
  m_samplerLib = samplerLib;

diff --git a/src/framework/musesampler/internal/musesamplersequencer.h b/src/framework/musesampler/internal/musesamplersequencer.h
@@ -64,7 +64,7 @@ namespace muse::musesampler {
 class MuseSamplerSequencer : public muse::audio::AbstractEventSequencer<mpe::NoteEvent, AuditionStartNoteEvent, AuditionStopNoteEvent>
 {
 public:
- void init(MuseSamplerLibHandlerPtr samplerLib, ms_MuseSampler sampler, IMuseSamplerTracksPtr tracks, std::string&& defaultPresetCode);
+ void init(MuseSamplerLibHandlerPtr samplerLib, ms_MuseSampler sampler, IMuseSamplerTracks* tracks, std::string&& defaultPresetCode);
 
  void updateOffStreamEvents(const mpe::PlaybackEventsMap& events, const mpe::PlaybackParamMap& params) override;
  void updateMainStreamEvents(const mpe::PlaybackEventsMap& events, const mpe::DynamicLevelMap& dynamics,
@@ -99,7 +99,7 @@ class MuseSamplerSequencer : public muse::audio::AbstractEventSequencer<mpe::Not
 
  MuseSamplerLibHandlerPtr m_samplerLib = nullptr;
  ms_MuseSampler m_sampler = nullptr;
- IMuseSamplerTracksPtr m_tracks = nullptr;
+ IMuseSamplerTracks* m_tracks = nullptr;
 
  using layer_idx_t = size_t;
  std::unordered_map<layer_idx_t, track_idx_t> m_layerIdxToTrackIdx;

diff --git a/src/framework/musesampler/internal/musesamplerwrapper.cpp b/src/framework/musesampler/internal/musesamplerwrapper.cpp
@@ -176,7 +176,7 @@ void MuseSamplerWrapper::setupSound(const mpe::PlaybackSetupData& setupData)
  }
  }
 
- m_sequencer.init(m_samplerLib, m_sampler, shared_from_this(), resolveDefaultPresetCode(m_instrument));
+ m_sequencer.init(m_samplerLib, m_sampler, this, resolveDefaultPresetCode(m_instrument));
 }
 
 void MuseSamplerWrapper::setupEvents(const mpe::PlaybackData& playbackData)