Merge remote-tracking branch 'mpg123/master' into master-with-github-ci

madebr · Dec 29, 2024 · a682cdd · a682cdd
2 parents 3c34e2a + 4a8592b
commit a682cdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+1.32.11
+------
+- libout123:
+-- modules/win32: Align waveOutGetDevCapsA to WAVEOUTCAPSA, in anticipation
+   of some UNICODE change.
+
 1.32.10
 ------
 - scripts/tag_lyrics.py: fix for python3 (thanks to cclauss,

diff --git a/src/include/out123.h b/src/include/out123.h
@@ -20,7 +20,7 @@
  */
 #define OUT123_API_VERSION 5
 /** library patch level at client build time */
-#define OUT123_PATCHLEVEL  1
+#define OUT123_PATCHLEVEL  2
 
 /* We only need size_t definition. */
 #include <stddef.h>

diff --git a/src/libout123/modules/win32.c b/src/libout123/modules/win32.c
@@ -172,7 +172,7 @@ static int get_formats_win32(out123_handle *ao)
     int ret = 0;
     UINT dev_id = dev_select(ao);
 
-    MMRESULT mr = waveOutGetDevCaps(dev_id, &caps, sizeof(caps));
+    MMRESULT mr = waveOutGetDevCapsA(dev_id, &caps, sizeof(caps));
     if(mr != MMSYSERR_NOERROR)
       return 0; /* no formats? */
 
@@ -367,7 +367,7 @@ static int enumerate_win32( out123_handle *ao, int (*store_device)(void *devlist
   for(i = 0; i < devices; i++){
     memset(id, 0, sizeof(id));
     memset(&caps, 0, sizeof(caps));
-    mr = waveOutGetDevCaps(i, &caps, sizeof(caps));
+    mr = waveOutGetDevCapsA(i, &caps, sizeof(caps));
     if (mr != MMSYSERR_NOERROR) {
       switch(mr) {
         case MMSYSERR_BADDEVICEID: