tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix instruments for engine changes, fixes program change bug. (#7365)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2022-04-08 16:22:05 +02:00
committed by GitHub
parent a4d55235cc
commit 6e73e94cc6
8 changed files with 327 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Instruments/SharedInstrumentComponent.cs
View File

@@ -15,9 +15,6 @@ public abstract class SharedInstrumentComponent : Component
[ViewVariables]
public bool Playing { get; set; }
[ViewVariables]
public uint LastSequencerTick { get; set; }
[DataField("program"), ViewVariables(VVAccess.ReadWrite)]
public byte InstrumentProgram { get; set; }
@@ -73,9 +70,9 @@ public sealed class InstrumentStartMidiEvent : EntityEventArgs
public sealed class InstrumentMidiEventEvent : EntityEventArgs
{
public EntityUid Uid { get; }
public MidiEvent[] MidiEvent { get; }
public RobustMidiEvent[] MidiEvent { get; }
public InstrumentMidiEventEvent(EntityUid uid, MidiEvent[] midiEvent)
public InstrumentMidiEventEvent(EntityUid uid, RobustMidiEvent[] midiEvent)
{
Uid = uid;
MidiEvent = midiEvent;
@@ -92,7 +89,7 @@ public sealed class InstrumentState : ComponentState
public bool AllowProgramChange { get; }
public bool RespectMidiLimits { get; }
public InstrumentState(bool playing, byte instrumentProgram, byte instrumentBank, bool allowPercussion, bool allowProgramChange, bool respectMidiLimits, uint sequencerTick = 0)
public InstrumentState(bool playing, byte instrumentProgram, byte instrumentBank, bool allowPercussion, bool allowProgramChange, bool respectMidiLimits)
{
Playing = playing;
InstrumentProgram = instrumentProgram;