Skip to content

Add speaker.PlayAndWait #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkKremer merged 2 commits into from
Jan 24, 2024
Merged

Add speaker.PlayAndWait #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aced228
Add speaker.PlayAndWait
MarkKremer Jan 7, 2024
125171c
Merge remote-tracking branch 'origin/main' into speaker-play-and-wait
MarkKremer Jan 24, 2024
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
24 changes: 24 additions & 0 deletions speaker/speaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package speaker
import (
"io"
"sync"
"time"

"github.com/ebitengine/oto/v3"
"github.com/pkg/errors"
Expand All @@ -21,6 +22,8 @@ var (
mixer beep.Mixer
context *oto.Context
player *oto.Player

bufferDuration time.Duration
)

// Init initializes audio playback through speaker. Must be called before using this package.
Expand Down Expand Up @@ -60,6 +63,8 @@ func Init(sampleRate beep.SampleRate, bufferSize int) error {
player.SetBufferSize(playerBufferSize * bytesPerSample)
player.Play()

bufferDuration = sampleRate.D(bufferSize)

return nil
}

Expand Down Expand Up @@ -95,6 +100,25 @@ func Play(s ...beep.Streamer) {
mu.Unlock()
}

// PlayAndWait plays all provided Streamers through the speaker and waits until they have all finished playing.
func PlayAndWait(s ...beep.Streamer) {
mu.Lock()
var wg sync.WaitGroup
wg.Add(len(s))
for _, e := range s {
mixer.Add(beep.Seq(e, beep.Callback(func() {
wg.Done()
})))
}
mu.Unlock()

// Wait for the streamers to drain.
wg.Wait()

// Wait the expected time it takes for the samples to reach the driver.
time.Sleep(bufferDuration)
}

// Suspend suspends the entire audio play.
//
// This function is intended to save resources when no audio is playing.
Expand Down