ao/wasapi: expose GUID and PKEY convenience functions

Give them the prefix mp_ and make them nonstatic.

3 files changed, 49 insertions, 45 deletions

diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c
index e09b162356..0d299361e4 100755
--- a/audio/out/ao_wasapi_changenotify.c
+++ b/audio/out/ao_wasapi_changenotify.c
@@ -30,47 +30,6 @@
 #include "ao_wasapi.h"
 #include "ao_wasapi_utils.h"
 
-static int GUID_compare(const GUID *l, const GUID *r)
-{
-    unsigned int i;
-    if (l->Data1 != r->Data1) return 1;
-    if (l->Data2 != r->Data2) return 1;
-    if (l->Data3 != r->Data3) return 1;
-    for (i = 0; i < 8; i++) {
-        if (l->Data4[i] != r->Data4[i]) return 1;
-    }
-    return 0;
-}
-
-static int PKEY_compare(const PROPERTYKEY *l, const PROPERTYKEY *r)
-{
-    if (GUID_compare(&l->fmtid, &r->fmtid)) return 1;
-    if (l->pid != r->pid) return 1;
-    return 0;
-}
-
-static char *GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid)
-{
-    snprintf(buf, buf_size,
-             "{%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x}",
-             (unsigned) guid->Data1, guid->Data2, guid->Data3,
-             guid->Data4[0], guid->Data4[1],
-             guid->Data4[2], guid->Data4[3],
-             guid->Data4[4], guid->Data4[5],
-             guid->Data4[6], guid->Data4[7]);
-    return buf;
-}
-
-static char *PKEY_to_str_buf(char *buf, size_t buf_size, const PROPERTYKEY *pkey)
-{
-    buf = GUID_to_str_buf(buf, buf_size, &pkey->fmtid);
-    size_t guid_len = strnlen(buf, buf_size);
-    snprintf(buf + guid_len, buf_size - guid_len, ",%"PRIu32, (uint32_t)pkey->pid );
-    return buf;
-}
-
-#define PKEY_to_str(pkey) PKEY_to_str_buf((char[42]){0}, 42, (pkey))
-
 static char* ERole_to_str(ERole role)
 {
     switch(role){
@@ -95,8 +54,8 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_QueryInterface(
     IMMNotificationClient* This, REFIID riid, void **ppvObject)
 {
     /* Compatible with IMMNotificationClient and IUnknown */
-    if (!GUID_compare(&IID_IMMNotificationClient, riid) ||
-        !GUID_compare(&IID_IUnknown, riid)) {
+    if (!mp_GUID_compare(&IID_IMMNotificationClient, riid) ||
+        !mp_GUID_compare(&IID_IUnknown, riid)) {
         *ppvObject = (void *)This;
         return S_OK;
     } else {
@@ -219,12 +178,12 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnPropertyValueChanged(
     if (pwstrDeviceId && !wcscmp(change->monitored, pwstrDeviceId)) {
         MP_VERBOSE(ao, "OnPropertyValueChanged triggered\n");
         MP_VERBOSE(ao, "Changed property: ");
-        if (!PKEY_compare(&PKEY_AudioEngine_DeviceFormat, &key)) {
+        if (!mp_PKEY_compare(&PKEY_AudioEngine_DeviceFormat, &key)) {
             MP_VERBOSE(change->ao,
                        "PKEY_AudioEngine_DeviceFormat - requesting ao reload\n");
             ao_request_reload(change->ao);
         } else {
-            MP_VERBOSE(ao, "%s\n", PKEY_to_str(&key));
+            MP_VERBOSE(ao, "%s\n", mp_PKEY_to_str(&key));
         }
     }
     return S_OK;
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 712610bc73..818ab09205 100755
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -49,6 +49,45 @@ DEFINE_GUID(mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT,
             0x00000003, 0x0000, 0x0010, 0x80, 0x00,
             0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
+int mp_GUID_compare(const GUID *l, const GUID *r)
+{
+    unsigned int i;
+    if (l->Data1 != r->Data1) return 1;
+    if (l->Data2 != r->Data2) return 1;
+    if (l->Data3 != r->Data3) return 1;
+    for (i = 0; i < 8; i++) {
+        if (l->Data4[i] != r->Data4[i]) return 1;
+    }
+    return 0;
+}
+
+int mp_PKEY_compare(const PROPERTYKEY *l, const PROPERTYKEY *r)
+{
+    if (mp_GUID_compare(&l->fmtid, &r->fmtid)) return 1;
+    if (l->pid != r->pid) return 1;
+    return 0;
+}
+
+char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid)
+{
+    snprintf(buf, buf_size,
+             "{%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x}",
+             (unsigned) guid->Data1, guid->Data2, guid->Data3,
+             guid->Data4[0], guid->Data4[1],
+             guid->Data4[2], guid->Data4[3],
+             guid->Data4[4], guid->Data4[5],
+             guid->Data4[6], guid->Data4[7]);
+    return buf;
+}
+
+char *mp_PKEY_to_str_buf(char *buf, size_t buf_size, const PROPERTYKEY *pkey)
+{
+    buf = mp_GUID_to_str_buf(buf, buf_size, &pkey->fmtid);
+    size_t guid_len = strnlen(buf, buf_size);
+    snprintf(buf + guid_len, buf_size - guid_len, ",%"PRIu32, (uint32_t)pkey->pid );
+    return buf;
+}
+
 union WAVEFMT {
     WAVEFORMATEX *ex;
     WAVEFORMATEXTENSIBLE *extensible;
diff --git a/audio/out/ao_wasapi_utils.h b/audio/out/ao_wasapi_utils.h
index 24d8daffbc..135b556d12 100755
--- a/audio/out/ao_wasapi_utils.h
+++ b/audio/out/ao_wasapi_utils.h
@@ -27,6 +27,12 @@
 #include "ao.h"
 #include "internal.h"
 
+int mp_GUID_compare(const GUID *l, const GUID *r);
+int mp_PKEY_compare(const PROPERTYKEY *l, const PROPERTYKEY *r);
+char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid);
+char *mp_PKEY_to_str_buf(char *buf, size_t buf_size, const PROPERTYKEY *pkey);
+#define mp_PKEY_to_str(pkey) mp_PKEY_to_str_buf((char[42]){0}, 42, (pkey))
+
 int wasapi_fill_VistaBlob(wasapi_state *state);
 
 const char *wasapi_explain_err(const HRESULT hr);