From fe85a132142c3b26acd73c6eea70a8eae882947e Mon Sep 17 00:00:00 2001
From: David Reid <mackron@gmail.com>
Date: Sat, 15 Aug 2020 09:54:20 +1000
Subject: [PATCH] Add ma_decoder_get_cursor_in_pcm_frames().

---
 miniaudio.h          | 40 ++++++++++++++++++++++++++++------------
 research/ma_engine.h |  2 +-
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/miniaudio.h b/miniaudio.h
index f0a79dcb..ef080e5e 100644
--- a/miniaudio.h
+++ b/miniaudio.h
@@ -1,6 +1,6 @@
 /*
 Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
-miniaudio - v0.10.16 - 2020-08-14
+miniaudio - v0.10.17 - TBD
 
 David Reid - davidreidsoftware@gmail.com
 
@@ -1423,7 +1423,7 @@ extern "C" {
 
 #define MA_VERSION_MAJOR    0
 #define MA_VERSION_MINOR    10
-#define MA_VERSION_REVISION 16
+#define MA_VERSION_REVISION 17
 #define MA_VERSION_STRING   MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION)
 
 #if defined(_MSC_VER) && !defined(__clang__)
@@ -5486,6 +5486,11 @@ MA_API ma_result ma_decoder_init_file_vorbis_w(const wchar_t* pFilePath, const m
 
 MA_API ma_result ma_decoder_uninit(ma_decoder* pDecoder);
 
+/*
+Retrieves the current position of the read cursor in PCM frames.
+*/
+MA_API ma_result ma_decoder_get_cursor_in_pcm_frames(ma_decoder* pDecoder, ma_uint64* pCursor);
+
 /*
 Retrieves the length of the decoder in PCM frames.
 
@@ -44499,15 +44504,6 @@ static ma_result ma_decoder__data_source_on_get_data_format(ma_data_source* pDat
     return MA_SUCCESS;
 }
 
-static ma_result ma_decoder__data_source_on_get_cursor(ma_data_source* pDataSource, ma_uint64* pCursor)
-{
-    ma_decoder* pDecoder = (ma_decoder*)pDataSource;
-
-    *pCursor = pDecoder->readPointerInPCMFrames;
-
-    return MA_SUCCESS;
-}
-
 static ma_result ma_decoder__data_source_on_get_length(ma_data_source* pDataSource, ma_uint64* pLength)
 {
     ma_decoder* pDecoder = (ma_decoder*)pDataSource;
@@ -44539,7 +44535,7 @@ static ma_result ma_decoder__preinit(ma_decoder_read_proc onRead, ma_decoder_see
     pDecoder->ds.onRead          = ma_decoder__data_source_on_read;
     pDecoder->ds.onSeek          = ma_decoder__data_source_on_seek;
     pDecoder->ds.onGetDataFormat = ma_decoder__data_source_on_get_data_format;
-    pDecoder->ds.onGetCursor     = ma_decoder__data_source_on_get_cursor;
+    pDecoder->ds.onGetCursor     = ma_decoder_get_cursor_in_pcm_frames;
     pDecoder->ds.onGetLength     = ma_decoder__data_source_on_get_length;
 
     pDecoder->onRead    = onRead;
@@ -45703,6 +45699,23 @@ MA_API ma_result ma_decoder_uninit(ma_decoder* pDecoder)
     return MA_SUCCESS;
 }
 
+MA_API ma_result ma_decoder_get_cursor_in_pcm_frames(ma_decoder* pDecoder, ma_uint64* pCursor)
+{
+    if (pCursor == NULL) {
+        return MA_INVALID_ARGS;
+    }
+
+    *pCursor = 0;
+
+    if (pDecoder == NULL) {
+        return MA_INVALID_ARGS;
+    }
+
+    *pCursor = pDecoder->readPointerInPCMFrames;
+
+    return MA_SUCCESS;
+}
+
 MA_API ma_uint64 ma_decoder_get_length_in_pcm_frames(ma_decoder* pDecoder)
 {
     if (pDecoder == NULL) {
@@ -62461,6 +62474,9 @@ The following miscellaneous changes have also been made.
 /*
 REVISION HISTORY
 ================
+v0.10.17 - TBD
+  - Add ma_decoder_get_cursor_in_pcm_frames()
+
 v0.10.16 - 2020-08-14
   - WASAPI: Fix a potential crash due to using an uninitialized variable.
   - OpenSL: Enable runtime linking.
diff --git a/research/ma_engine.h b/research/ma_engine.h
index 4c4a9400..d5e46ec0 100644
--- a/research/ma_engine.h
+++ b/research/ma_engine.h
@@ -3012,7 +3012,7 @@ static void ma_resource_manager_data_stream_fill_page(ma_resource_manager_data_s
             /* Loop back to the start if we reached the end. We'll also have a known length at this point as well. */
             if (framesRead < framesRemaining) {
                 if (pDataStream->totalLengthInPCMFrames == 0) {
-                    ma_data_source_get_cursor_in_pcm_frames(&pDataStream->decoder, &pDataStream->totalLengthInPCMFrames);
+                    ma_decoder_get_cursor_in_pcm_frames(&pDataStream->decoder, &pDataStream->totalLengthInPCMFrames);
                 }
 
                 ma_decoder_seek_to_pcm_frame(&pDataStream->decoder, 0);