diff --git a/audio1/audio.go b/audio1/audio.go index dc8b1060f..b654fec68 100644 --- a/audio1/audio.go +++ b/audio1/audio.go @@ -207,7 +207,7 @@ func newAudio(service *dbusutil.Service) *Audio { return a } -func startAudioServer(count int, service *dbusutil.Service) error { +func startAudioServer(service *dbusutil.Service) error { var serverPath dbus.ObjectPath audioServers := []string{"pipewire.service", "pluseaudio.service"} @@ -252,12 +252,6 @@ func startAudioServer(count int, service *dbusutil.Service) error { } if !has { - if count > 0 { - logger.Debug("retry start audio server after 500ms") - - time.Sleep(500 * time.Millisecond) - return startAudioServer(count-1, service) - } return errors.New("failed to start audio server") } diff --git a/audio1/module.go b/audio1/module.go index 4683ed080..928de9ee7 100644 --- a/audio1/module.go +++ b/audio1/module.go @@ -39,9 +39,9 @@ func (*Module) GetDependencies() []string { func (m *Module) start() error { service := loader.GetService() - err := startAudioServer(5, service) // 为了保证蓝牙模块依赖audio模块,并且audio模块启动pulseaudio完成. + err := startAudioServer(service) // 为了保证蓝牙模块依赖audio模块,并且audio模块启动音频服务完成. if err != nil { - err = xerrors.Errorf("failed to start pulseaudio: %w", err) + err = xerrors.Errorf("failed to start audio server: %w", err) logger.Warning(err) return err }