Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: whitequark/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e54fb1a0b6c2
Choose a base ref
...
head repository: whitequark/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cfc95f1a8fc
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 25, 2019

  1. applet.yamaha_opl: unbreak handling of VGMs for a different chip.

    @whitequark
    whitequark committed Feb 25, 2019
    Copy the full SHA
    3cfc95f View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 software/glasgow/applet/yamaha_opl/__init__.py
2 changes: 1 addition & 1 deletion software/glasgow/applet/yamaha_opl/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -524,7 +524,6 @@ async def serve_vgm(self, request):
vgm_stream = gzip.GzipFile(fileobj=vgm_stream)

vgm_reader = VGMStreamReader(vgm_stream)
vgm_player = YamahaVGMStreamPlayer(vgm_reader, self._opl_iface)
except OSError:
raise ValueError("File is not in VGM or VGZ format")

@@ -538,6 +537,7 @@ async def serve_vgm(self, request):
self._logger.info("web: %s: VGM is looped for %.2f/%.2f s",
digest, vgm_reader.loop_seconds, vgm_reader.total_seconds)

vgm_player = YamahaVGMStreamPlayer(vgm_reader, self._opl_iface)
except ValueError as e:
self._logger.warning("web: %s: broken upload: %s",
digest, str(e))