Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion OpenUtau.Core/Audio/MiniAudioOutput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ public void Play() {
if (PlaybackState != PlaybackState.Playing) {
CheckError(ou_audio_device_start(nativeContext));
}
if (PlaybackState != PlaybackState.Paused) {
currentTimeMs = 0;
}
PlaybackState = PlaybackState.Playing;
currentTimeMs = 0;
eof = false;
}

Expand Down
2 changes: 0 additions & 2 deletions OpenUtau.Core/PlaybackManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ public void PlayOrPause(int tick = -1, int endTick = -1, int trackNo = -1) {

public void Play(UProject project, int tick, int endTick = -1, int trackNo = -1) {
if (AudioOutput.PlaybackState == PlaybackState.Paused) {
startMs = project.timeAxis.TickPosToMsPos(tick);
masterMix.Waited = 0;
PlayingMaster = true;
AudioOutput.Play();
return;
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau.Core/SignalChain/MasterAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MasterAdapter : ISampleProvider {
private int position;

public WaveFormat WaveFormat => waveFormat;
public int Waited { get; set; }
public int Waited { get; private set; }
public bool IsWaiting { get; private set; }
public MasterAdapter(ISignalSource source) {
waveFormat = WaveFormat.CreateIeeeFloatWaveFormat(44100, 2);
Expand Down
Loading