Commit d90d818
committed
Merge main into develop to resync after squash-merged 0.16.0
The 0.16.0 release (PR #88) was squash-merged into main, which broke
git's view of shared history. Conflicts arose in PlayolaMainMixer.swift
and SpinPlayer.swift because develop has since evolved those files
(PR #89 made PlayolaMainMixer.start async, and the recent P2 fix added
off-main engine start to handleSuccessfulDownload).
Resolved by taking develop's version in both files — develop has
everything main has plus the newer fixes. Also restored the P1 baseUrl
fix in PlayolaStationPlayer.swift that the auto-merge silently reverted.0 file changed
0 commit comments