changeset 2536:fa826ee09b33

Merge.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 23 Jul 2020 03:38:46 +0300
parents 5f76cf36e5c5 (current diff) d6b9410f1b1b (diff)
children 646641d72128
files
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/minijss/jss.h	Thu Jul 23 03:38:31 2020 +0300
+++ b/minijss/jss.h	Thu Jul 23 03:38:46 2020 +0300
@@ -45,7 +45,7 @@
 #define jchPanRight     (0xff)      // Rightmost pan
 
 // Audio formats
-enum
+enum JSS_AUDIO_FMT
 {
     JSS_AUDIO_U8,           // 8-bit formats
     JSS_AUDIO_S8,
@@ -53,14 +53,14 @@
     JSS_AUDIO_S16,
     JSS_AUDIO_U32,          // 32-bit (24+padding)
     JSS_AUDIO_S32
-} JSS_AUDIO_FMT;
+};
 
 
-enum
+enum JSS_AUDIO_CHANNELS
 {
     JSS_AUDIO_MONO = 1,
     JSS_AUDIO_STEREO = 2
-} JSS_AUDIO_CHANNELS;
+};
 
 
 /* System initialization and shutdown
--- a/minijss/jssmix.h	Thu Jul 23 03:38:31 2020 +0300
+++ b/minijss/jssmix.h	Thu Jul 23 03:38:46 2020 +0300
@@ -94,7 +94,7 @@
 
 /* Enums
  */
-enum {
+enum JSS_MIX_MODE {
     JMIX_AUTO = 0,
     JMIX_C,
     JMIX_MMX,