Use shared_ptr

2 files changed, 6 insertions, 4 deletions

diff --git a/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.cpp b/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.cpp
index 0169fc56..f12f839f 100644
--- a/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.cpp
+++ b/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.cpp
@@ -25,8 +25,10 @@ static const char *TAG = "SimpleNoiseMaker";
 using namespace oboe;
 
 oboe::Result SimpleNoiseMaker::open() {
-    mDataCallback = std::make_unique<MyDataCallback>();
-    mErrorCallback = std::make_unique<MyErrorCallback>(this);
+    // Use shared_ptr to prevent use of a deleted callback.
+    mDataCallback = std::make_shared<MyDataCallback>();
+    mErrorCallback = std::make_shared<MyErrorCallback>(this);
+    
     AudioStreamBuilder builder;
     oboe::Result result = builder.setSharingMode(oboe::SharingMode::Exclusive)
             ->setPerformanceMode(oboe::PerformanceMode::LowLatency)
diff --git a/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.h b/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.h
index 3be27cb2..6376c0b2 100644
--- a/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.h
+++ b/samples/minimaloboe/src/main/cpp/SimpleNoiseMaker.h
@@ -62,8 +62,8 @@ private:
     };
 
     std::shared_ptr<oboe::AudioStream> mStream;
-    std::unique_ptr<MyDataCallback> mDataCallback;
-    std::unique_ptr<MyErrorCallback> mErrorCallback;
+    std::shared_ptr<MyDataCallback> mDataCallback;
+    std::shared_ptr<MyErrorCallback> mErrorCallback;
 
     static constexpr int kChannelCount = 2;
 };