mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-09 05:22:52 +00:00
9cb7a5bec7
This allows us to sync the position to the entity immediately, rather than the sound jumping about. Someone has set up rick-rolling pocket computers (<3 to whoever did this), and the lag on them irritates me enough to fix this. Fixes #1074
94 lines
2.8 KiB
Java
94 lines
2.8 KiB
Java
/*
|
|
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
* Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
|
|
* Send enquiries to dratcliffe@gmail.com
|
|
*/
|
|
package dan200.computercraft.client.sound;
|
|
|
|
import dan200.computercraft.ComputerCraft;
|
|
import dan200.computercraft.shared.peripheral.speaker.SpeakerPosition;
|
|
import io.netty.buffer.ByteBuf;
|
|
import net.minecraft.client.Minecraft;
|
|
import net.minecraft.client.audio.SoundHandler;
|
|
import net.minecraft.util.ResourceLocation;
|
|
|
|
/**
|
|
* An instance of a speaker, which is either playing a {@link DfpwmStream} stream or a normal sound.
|
|
*/
|
|
public class SpeakerInstance
|
|
{
|
|
public static final ResourceLocation DFPWM_STREAM = new ResourceLocation( ComputerCraft.MOD_ID, "speaker.dfpwm_fake_audio_should_not_be_played" );
|
|
|
|
private DfpwmStream currentStream;
|
|
private SpeakerSound sound;
|
|
|
|
SpeakerInstance()
|
|
{
|
|
}
|
|
|
|
public synchronized void pushAudio( ByteBuf buffer )
|
|
{
|
|
SpeakerSound sound = this.sound;
|
|
|
|
DfpwmStream stream = currentStream;
|
|
if( stream == null ) stream = currentStream = new DfpwmStream();
|
|
boolean exhausted = stream.isEmpty();
|
|
currentStream.push( buffer );
|
|
|
|
// If we've got nothing left in the buffer, enqueue an additional one just in case.
|
|
if( exhausted && sound != null && sound.stream == stream && sound.source != null )
|
|
{
|
|
sound.executor.execute( () -> {
|
|
if( !sound.source.stopped() ) sound.source.pumpBuffers( 1 );
|
|
} );
|
|
}
|
|
}
|
|
|
|
public void playAudio( SpeakerPosition position, float volume )
|
|
{
|
|
SoundHandler soundManager = Minecraft.getInstance().getSoundManager();
|
|
|
|
if( sound != null && sound.stream != currentStream )
|
|
{
|
|
soundManager.stop( sound );
|
|
sound = null;
|
|
}
|
|
|
|
if( sound != null && !soundManager.isActive( sound ) ) sound = null;
|
|
|
|
if( sound == null && currentStream != null )
|
|
{
|
|
sound = new SpeakerSound( DFPWM_STREAM, currentStream, position, volume, 1.0f );
|
|
soundManager.play( sound );
|
|
}
|
|
}
|
|
|
|
public void playSound( SpeakerPosition position, ResourceLocation location, float volume, float pitch )
|
|
{
|
|
SoundHandler soundManager = Minecraft.getInstance().getSoundManager();
|
|
currentStream = null;
|
|
|
|
if( sound != null )
|
|
{
|
|
soundManager.stop( sound );
|
|
sound = null;
|
|
}
|
|
|
|
sound = new SpeakerSound( location, null, position, volume, pitch );
|
|
soundManager.play( sound );
|
|
}
|
|
|
|
void setPosition( SpeakerPosition position )
|
|
{
|
|
if( sound != null ) sound.setPosition( position );
|
|
}
|
|
|
|
void stop()
|
|
{
|
|
if( sound != null ) Minecraft.getInstance().getSoundManager().stop( sound );
|
|
|
|
currentStream = null;
|
|
sound = null;
|
|
}
|
|
}
|