oboe: make chanCountToChanMask non-virtual

google · Feb 12, 2018 · c7a2b00 · c7a2b00
1 parent 6d8e3e1
commit c7a2b00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/opensles/AudioInputStreamOpenSLES.h b/src/opensles/AudioInputStreamOpenSLES.h
@@ -49,7 +49,8 @@ class AudioInputStreamOpenSLES : public AudioStreamOpenSLES {
                               StreamState *nextState,
                               int64_t timeoutNanoseconds) override;
 
-    int chanCountToChanMask(int chanCount) override;
+    int chanCountToChanMask(int chanCount);
+
 private:
 
     Result setRecordState(SLuint32 newState);

diff --git a/src/opensles/AudioOutputStreamOpenSLES.h b/src/opensles/AudioOutputStreamOpenSLES.h
@@ -48,7 +48,7 @@ class AudioOutputStreamOpenSLES : public AudioStreamOpenSLES {
                               StreamState *nextState,
                               int64_t timeoutNanoseconds) override;
 
-    int chanCountToChanMask(int chanCount) override;
+    int chanCountToChanMask(int chanCount);
 
 private:
 

diff --git a/src/opensles/AudioStreamOpenSLES.h b/src/opensles/AudioStreamOpenSLES.h
@@ -57,8 +57,6 @@ class AudioStreamOpenSLES : public AudioStreamBuffered {
 
     int32_t getFramesPerBurst() override;
 
-    virtual int chanCountToChanMask(int chanCount) = 0;
-
     /**
      * Process next OpenSL ES buffer.
      * Called by by OpenSL ES framework.