commit 8f47ec8ac9bb405a94e4a46add7afd0e095c8ccf
author Thomas Guilbert <tguilbert@google.com> Fri Jul 12 12:07:59 2019 -0700
committer Thomas Guilbert <tguilbert@google.com> Fri Jul 12 12:07:59 2019 -0700
tree 237786571d374ff67e5f640864f46fe9e7432833
parent c7aae7b75e8591321dff1e9df77842619b116d15

Small fixes from #352

include/oboe/AudioStream.h

diff --git a/include/oboe/AudioStream.h b/include/oboe/AudioStream.h
index 07f7d3a..ab30c3e 100644
--- a/include/oboe/AudioStream.h
+++ b/include/oboe/AudioStream.h
@@ -63,7 +63,7 @@
      *
      * @return
      */
-    virtual Result open();
+    virtual Result open() = 0;
 
     /**
      * Close the stream and deallocate any resources from the open() call.

src/common/AudioStream.cpp

diff --git a/src/common/AudioStream.cpp b/src/common/AudioStream.cpp
index 6bf4e0c..7ed3024 100644
--- a/src/common/AudioStream.cpp
+++ b/src/common/AudioStream.cpp
@@ -30,11 +30,6 @@
         : AudioStreamBase(builder) {
 }
 
-Result AudioStream::open() {
-    // Parameters are validated by the underlying API.
-    return Result::OK;
-}
-
 Result AudioStream::close() {
     // Update local counters so they can be read after the close.
     updateFramesWritten();
@@ -162,7 +157,6 @@
 
 void AudioStream::launchStopThread() {
     // Stop this stream on a separate thread
-    // std::thread t(requestStop);
     std::thread t(oboe_stop_thread_proc, this);
     t.detach();
 }

src/common/StabilizedCallback.cpp

diff --git a/src/common/StabilizedCallback.cpp b/src/common/StabilizedCallback.cpp
index 7a0adba..692db89 100644
--- a/src/common/StabilizedCallback.cpp
+++ b/src/common/StabilizedCallback.cpp
@@ -61,8 +61,8 @@
     }
 
     int64_t numFramesAsNanos = (numFrames * kNanosPerSecond) / oboeStream->getSampleRate();
-    int64_t targetDurationNanos = (int64_t)
-            (numFramesAsNanos * kPercentageOfCallbackToUse) - lateStartNanos;
+    int64_t targetDurationNanos = static_cast<int64_t>(
+            (numFramesAsNanos * kPercentageOfCallbackToUse) - lateStartNanos);
 
     Trace::beginSection("Actual load");
     DataCallbackResult result = mCallback->onAudioReady(oboeStream, audioData, numFrames);

src/opensles/AudioOutputStreamOpenSLES.cpp

diff --git a/src/opensles/AudioOutputStreamOpenSLES.cpp b/src/opensles/AudioOutputStreamOpenSLES.cpp
index 2b785ba..d493464 100644
--- a/src/opensles/AudioOutputStreamOpenSLES.cpp
+++ b/src/opensles/AudioOutputStreamOpenSLES.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <cassert>
+#include <assert.h>
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
@@ -66,9 +66,6 @@
         : AudioStreamOpenSLES(builder) {
 }
 
-AudioOutputStreamOpenSLES::~AudioOutputStreamOpenSLES() {
-}
-
 // These will wind up in <SLES/OpenSLES_Android.h>
 constexpr int SL_ANDROID_SPEAKER_STEREO = (SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT);
 

src/opensles/AudioOutputStreamOpenSLES.h

diff --git a/src/opensles/AudioOutputStreamOpenSLES.h b/src/opensles/AudioOutputStreamOpenSLES.h
index 999a80c..a164010 100644
--- a/src/opensles/AudioOutputStreamOpenSLES.h
+++ b/src/opensles/AudioOutputStreamOpenSLES.h
@@ -34,7 +34,7 @@
     AudioOutputStreamOpenSLES();
     explicit AudioOutputStreamOpenSLES(const AudioStreamBuilder &builder);
 
-    virtual ~AudioOutputStreamOpenSLES();
+    virtual ~AudioOutputStreamOpenSLES() = default;
 
     Result open() override;
     Result close() override;