# HG changeset patch # User Matti Hamalainen # Date 1595464726 -10800 # Node ID fa826ee09b3329f0f54fcd524b2b163bf098e9df # Parent 5f76cf36e5c56ff2388c3b7b1168b079bd7d0fbe# Parent d6b9410f1b1b7f1999ed352fce5d17756b25b5a6 Merge. diff -r 5f76cf36e5c5 -r fa826ee09b33 minijss/jss.h --- 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 diff -r 5f76cf36e5c5 -r fa826ee09b33 minijss/jssmix.h --- 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,