Skip to content

Commit

Permalink
FloatValue back at it again why did you do this un4seen
Browse files Browse the repository at this point in the history
  • Loading branch information
kairusds committed Aug 2, 2021
1 parent c65982e commit cdce200
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/ru/nsu/ccfit/zuev/audio/BassAudioProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ public class BassAudioProvider {
public static final int WINDOW_FFT = 1024;

private int channel = 0;
private float freq = 1.0f;
private BASS.FloatValue freq = new BASS.FloatValue();
private int fileFlag = 0;
private int decoder = 0;
private int multiplier = 0;

private ByteBuffer buffer = null;

public BassAudioProvider() {
freq.value = 1.0f;
BASS.BASS_Init(-1, 44100, BASS.BASS_DEVICE_LATENCY);
BASS.BASS_SetConfig(BASS.BASS_CONFIG_DEV_BUFFER, 0);
// BASS.BASS_SetConfig(BASS.BASS_CONFIG_BUFFER, 100);
Expand All @@ -42,12 +43,12 @@ public boolean prepare(final String fileName) {

if (decoder == DECODER_DOUBLE_TIME) {
float targetTempo = multiplier - 100.0f;
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq);
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq.value);
BASS.BASS_ChannelSetAttribute(channel, BASS_FX.BASS_ATTRIB_TEMPO, targetTempo);

} else if (decoder == DECODER_NIGHT_CORE) {
float targetFreq = multiplier / 100.0f;
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq * targetFreq);
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq.value * targetFreq);
BASS.BASS_ChannelSetAttribute(channel, BASS_FX.BASS_ATTRIB_TEMPO, 1.0f);
}
}
Expand All @@ -66,12 +67,12 @@ public boolean prepare(final AssetManager manager, final String assetName) {

if (decoder == DECODER_DOUBLE_TIME) {
float targetTempo = multiplier - 100.0f;
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq);
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq.value);
BASS.BASS_ChannelSetAttribute(channel, BASS_FX.BASS_ATTRIB_TEMPO, targetTempo);

} else if (decoder == DECODER_NIGHT_CORE) {
float targetFreq = multiplier / 100.0f;
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq * targetFreq);
BASS.BASS_ChannelSetAttribute(channel, BASS.BASS_ATTRIB_FREQ, freq.value * targetFreq);
BASS.BASS_ChannelSetAttribute(channel, BASS_FX.BASS_ATTRIB_TEMPO, 1.0f);
}
}
Expand Down

0 comments on commit cdce200

Please sign in to comment.