# HG changeset patch # User Matti Hamalainen # Date 1433337424 -10800 # Node ID 4b22da2a309fc6672b126981d803933fc0386ed7 # Parent 6fc71b410cc3fdc203104bef601e3a4be40f47b0 Comments, cleanups. diff -r 6fc71b410cc3 -r 4b22da2a309f minijss/jssmix.c --- a/minijss/jssmix.c Mon Jun 01 03:34:16 2015 +0300 +++ b/minijss/jssmix.c Wed Jun 03 16:17:04 2015 +0300 @@ -102,7 +102,7 @@ "Invalid number of channels %d\n", outChannels); } - if (outFreq < 4000) + if (outFreq < 1000) { JSSERROR(DMERR_INVALID_ARGS, NULL, "Invalid mixing frequency %d\n", outFreq); @@ -147,8 +147,8 @@ mixer->mutex = dmCreateMutex(); #endif mixer->outFormat = outFormat; + mixer->outChannels = outChannels; mixer->outFreq = outFreq; - mixer->outChannels = outChannels; mixer->jvmMixChannel_FW = jvmMixRoutines[mixerIdx].jvmMixChannel_FW; mixer->jvmMixChannel_BW = jvmMixRoutines[mixerIdx].jvmMixChannel_BW; diff -r 6fc71b410cc3 -r 4b22da2a309f minijss/jssmix.h --- a/minijss/jssmix.h Mon Jun 01 03:34:16 2015 +0300 +++ b/minijss/jssmix.h Wed Jun 03 16:17:04 2015 +0300 @@ -42,7 +42,7 @@ int chVolumeD, chPanningD; - int chFreq; // Frequency of sampel in Hz + int chFreq; // Frequency of sample in Hz void *chData; // Pointer to data @@ -65,10 +65,11 @@ struct _JSSMixer { - int outFormat, - outChannels, - outFreq, + int outFormat, // Output format (see JSS_AUDIO_* in jss.h) + outChannels, // Number of output channels + outFreq, // Real output frequency globalVol; + JSSChannel channels[jsetNChannels]; int addBufSize;