Skip to content

fix: 解决接入有限耳机, 输入输出还是null的问题 #993

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
fly602 merged 1 commit into from
Jan 13, 2026
Merged

fix: 解决接入有限耳机, 输入输出还是null的问题 #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions audio1/audio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@ func (a *Audio) resumeSinkConfig(s *Sink) {
logger.Warning(dbusErr)
}

logger.Warningf("set %v mute %v", s.Name, GetConfigKeeper().Mute.MuteOutput || !portConfig.Enabled)
logger.Debugf("set %v mute %v", s.Name, GetConfigKeeper().Mute.MuteOutput || !portConfig.Enabled)
s.setMute(GetConfigKeeper().Mute.MuteOutput || !portConfig.Enabled)
s.setMono(a.Mono)
}
Expand Down Expand Up @@ -1591,7 +1591,7 @@ func (a *Audio) StopAudioService() *dbus.Error {
return
} else {
runningServices, _ = runningServices.Delete(serviceMap[jobPath])
logger.Warningf("service %s stopped, %v is running", serviceMap[jobPath], runningServices)
logger.Infof("service %s stopped, %v is running", serviceMap[jobPath], runningServices)
if len(runningServices) == 0 {
done <- true
}
Expand Down
22 changes: 17 additions & 5 deletions audio1/audio_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ func (a *Audio) needAutoSwitchOutputPort() bool {
// 自动切换端口，至少要保证声卡的profile是配置文件中设置的profile
// 如果不是，可能还在切换中，等待一下
func (a *Audio) autoSwitchPort() {
logger.Warning("auto switch port")
logger.Debug("auto switch port")
a.autoSwitchOutputPort()
a.autoSwitchInputPort()
}
Expand All @@ -353,7 +353,10 @@ func (a *Audio) handleCardEvent(eventType int, idx uint32) {
case pulse.EventTypeRemove: // 删除声卡
a.handleCardRemoved(idx)
shouldAutoSwitch = true
case pulse.EventTypeChange: // 声卡属性变化,也可能是有线耳机插拔了端口
case pulse.EventTypeChange:
// 声卡属性变化,也可能是有线耳机插拔了端口
// 端口可用性的变化未能引起sink/source的变化，但有可能是优选端口，
// 例如：变化的端口和当前端口不属于同一个配置，且变化的端口不在已存在的source中，因此不会有事件变化，需要在此处理
shouldAutoSwitch = a.handleCardChanged(idx)
default:
logger.Warningf("unhandled card event, card=%d, type=%d", idx, eventType)
Expand Down Expand Up @@ -528,7 +531,11 @@ func (a *Audio) handleSinkChanged(idx uint32) {
if _, ok := a.sinks[idx]; ok {
a.sinks[idx].update(sink)
}

// 处理场景： 当sink的端口可用性发生变化时，切换端口
// cardchange事件也会触发，但是处理不了，因为这时sink可能还没更新，无可用端口
if isPhysicalDevice(sink.Name) && a.checkCardIsReady(sink.Card) {
a.autoSwitchPort()
}
}

func (a *Audio) handleSourceEvent(eventType int, idx uint32) {
Expand Down Expand Up @@ -571,7 +578,7 @@ func (a *Audio) handleSourceAdded(idx uint32) {
// 其他的虚拟通道不做自动切换处理
return
} else if a.checkCardIsReady(source.Card) {
a.autoSwitchPort()
a.autoSwitchInputPort()
}

}
Expand All @@ -598,7 +605,7 @@ func (a *Audio) handleSourceRemoved(idx uint32) {
a.defaultSource = nil
}
if isPhy && a.checkCardIsReady(cardId) {
a.autoSwitchPort()
a.autoSwitchInputPort()
}
}

Expand All @@ -614,6 +621,11 @@ func (a *Audio) handleSourceChanged(idx uint32) {
if _, ok := a.sources[idx]; ok {
a.sources[idx].update(source)
}
// 处理场景： 当source的端口可用性发生变化时，切换端口
// cardchange事件也会触发，但是处理不了，因为这时source可能还没更新，无可用端口
if isPhysicalDevice(source.Name) && a.checkCardIsReady(source.Card) {
a.autoSwitchInputPort()
}
}

func (a *Audio) handleSinkInputEvent(eventType int, idx uint32) {
Expand Down