Playback

generator/score.py

@@ -9,7 +9,7 @@ import generator.engraving.validation
 import generator.fretboard
 import generator.model
 import generator.pico_artwork
-import generator.playback
+import generator.performance
 
 def load_json(path: pathlib.Path) -> dict:
   document = json.loads(path.read_text(encoding='utf-8'))
@@ -24,6 +24,9 @@ def validate_json(document: dict, path: pathlib.Path, validated_pages: set[str]
       raise ValueError('invalid score bundle; regenerate score assets')
     if (presentation.get('engine'), presentation.get('width'), presentation.get('height')) != (generator.engraving.validation.ENGINE_NAME, generator.engraving.validation.PAGE_WIDTH, generator.engraving.validation.PAGE_HEIGHT):
       raise ValueError('unsupported score presentation; regenerate score assets')
+    generator.performance.validate_pages(document['music'], presentation['pages'])
+    if document.get('performance') != generator.performance.timing(document['music']):
+      raise ValueError('invalid performance timing')
     for page in presentation['pages']:
       if not isinstance(page, dict) or not isinstance(page.get('path'), str) or not isinstance(page.get('sha256'), str):
         raise ValueError('invalid score page manifest')
@@ -126,7 +129,6 @@ def count_json_files(root: pathlib.Path) -> int:
   return sum(1 for p in root.rglob('*.json') if p.is_file())
 
 def validate_generated_tree(root: pathlib.Path, validated_pages: set[str] | None = None) -> None:
-  audio_cache = {}
   validated_pages = set() if validated_pages is None else validated_pages
   for path in root.rglob('*.json'):
     document = json.loads(path.read_text(encoding='utf-8'))
@@ -134,5 +136,3 @@ def validate_generated_tree(root: pathlib.Path, validated_pages: set[str] | None
     generator.fretboard.validate_document(music)
     if 'presentation' in document:
       generator.pico_artwork.validate_title(root, document['presentation'].get('title_image'))
-    if 'playback' in document:
-      generator.playback.validate_assets(document['playback'], root, audio_cache)