feat: make filters stereo & add channel arg to volume effect

altmp · Nov 26, 2023 · ef57f11 · ef57f11
1 parent a468854
commit ef57f11
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/include/IAudioFilter.h b/include/IAudioFilter.h
@@ -5,7 +5,7 @@ class IAudioFilter {
 	virtual ~IAudioFilter() = default;
 
 	[[nodiscard]] virtual uint32_t ApplyRotateEffect(float fRate, int priority) const = 0;
-	[[nodiscard]] virtual uint32_t ApplyVolumeEffect(float fVolume, int priority) const = 0;
+	[[nodiscard]] virtual uint32_t ApplyVolumeEffect(float fVolume, int priority, int channel) const = 0;
 	[[nodiscard]] virtual uint32_t ApplyPeakeqEffect(int lBand, float fBandwidth, float fQ, float fCenter, float fGain, int priority) const = 0;
 	[[nodiscard]] virtual uint32_t ApplyDampEffect(float fTarget, float fQuiet, float fRate, float fGain, float fDelay, int priority) const = 0;
 	[[nodiscard]] virtual uint32_t ApplyAutowahEffect(float fDryMix, float fWetMix, float fFeedback, float fRate, float fRange, float fFreq, int priority) const = 0;

diff --git a/include/alt-voice.h b/include/alt-voice.h
@@ -21,5 +21,5 @@ AltVoiceError AV_CreateOpusEncoder(IOpusEncoder** opusEncoder, int bitRate);
 AltVoiceError AV_CreateOpusDecoder(IOpusDecoder** opusDecoder);
 void AV_DestroyOpusEncoder(const IOpusEncoder* opusEncoder);
 void AV_DestroyOpusDecoder(const IOpusDecoder* opusDecoder);
-AltVoiceError AV_CreateAudioFilter(IAudioFilter** audioFilter);
+AltVoiceError AV_CreateAudioFilter(IAudioFilter** audioFilter, int channels);
 void AV_DestroyAudioFilter(const IAudioFilter* audioFilter);
diff --git a/localpkg/packages/l/libopus/xmake.lua b/localpkg/packages/l/libopus/xmake.lua
@@ -7,7 +7,7 @@ package("libopus")
              "https://gitlab.xiph.org/xiph/opus.git")
 
     add_versions("1.3.1", "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d")
-    add_patches("1.3.1", path.join(os.scriptdir(), "patches", "1.3.1", "cmake.patch"), "603c746006d3f1f44700bc55fd46c2b466c5002b3612055af0216463a115c42f")
+    add_patches("1.3.1", path.join(os.scriptdir(), "patches", "1.3.1", "cmake.patch"), "c928fecab1eead857216c8eb459d62209eb16d205f62d562da72a4ccc0b5e804")
     add_configs("avxSupported", { description = "AVX_SUPPORTED", default = true, type = "boolean" })
     add_configs("opusx86MayHaveAvx", { description = "OPUS_X86_MAY_HAVE_AVX", default = true, type = "boolean" })
 

diff --git a/src/CAudioFilter.cpp b/src/CAudioFilter.cpp
@@ -27,11 +27,11 @@ uint32_t CAudioFilter::ApplyRotateEffect(float fRate, int priority) const
 	return effectHandle;
 }
 
-uint32_t CAudioFilter::ApplyVolumeEffect(float fVolume, int priority) const
+uint32_t CAudioFilter::ApplyVolumeEffect(float fVolume, int priority, int channel) const
 {
 	BASS_BFX_VOLUME effectData;
 	effectData.fVolume = fVolume;
-	effectData.lChannel = BASS_BFX_CHANALL;
+	effectData.lChannel = channel;
 
 	const HFX effectHandle = BASS_ChannelSetFX(Stream, BASS_FX_BFX_VOLUME, priority);
 	BASS_FXSetParameters(effectHandle, &effectData);

diff --git a/src/CAudioFilter.h b/src/CAudioFilter.h
@@ -11,7 +11,7 @@ class CAudioFilter: public IAudioFilter
 	~CAudioFilter() override;
 
 	[[nodiscard]] uint32_t ApplyRotateEffect(float fRate, int priority) const override;
-	[[nodiscard]] uint32_t ApplyVolumeEffect(float fVolume, int priority) const override;
+	[[nodiscard]] uint32_t ApplyVolumeEffect(float fVolume, int priority, int channel) const override;
 	[[nodiscard]] uint32_t ApplyPeakeqEffect(int lBand, float fBandwidth, float fQ, float fCenter, float fGain, int priority) const override;
 	[[nodiscard]] uint32_t ApplyDampEffect(float fTarget, float fQuiet, float fRate, float fGain, float fDelay, int priority) const override;
 	[[nodiscard]] uint32_t ApplyAutowahEffect(float fDryMix, float fWetMix, float fFeedback, float fRate, float fRange, float fFreq, int priority) const override;

diff --git a/src/alt-voice.cpp b/src/alt-voice.cpp
@@ -120,11 +120,11 @@ AltVoiceError AV_CreateOpusDecoder(IOpusDecoder** opusDecoder)
 	}
 }
 
-AltVoiceError AV_CreateAudioFilter(IAudioFilter** audioFilter)
+AltVoiceError AV_CreateAudioFilter(IAudioFilter** audioFilter, int channels)
 {
 	try
 	{
-		IAudioFilter* filter = new CAudioFilter(SAMPLE_RATE, AUDIO_CHANNELS, BASS_STREAM_DECODE);
+		IAudioFilter* filter = new CAudioFilter(SAMPLE_RATE, channels, BASS_STREAM_DECODE);
 		*audioFilter = filter;
 		return AltVoiceError::Ok;
 	}