Remove the old media types

ultraq · Feb 13, 2024 · f33a530 · f33a530
1 parent 2b18dd1
commit f33a530
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 1,249 deletions.
diff --git a/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/MediaPlayer.groovy b/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/MediaPlayer.groovy
@@ -89,23 +89,6 @@ class MediaPlayer extends Application {
 
 		scene << mediaNode
 
-//		mediaLoader = switch (mediaFile) {
-//			case VideoFile -> new VideoLoader(mediaFile, scene, graphicsSystem, gameClock, inputEventStream)
-//			case AnimationFile -> new AnimationLoader(mediaFile, scene, graphicsSystem, gameClock, inputEventStream)
-//			case SoundFile -> new SoundLoader(mediaFile, scene, gameClock, inputEventStream)
-//			case ImageFile -> new ImageLoader(mediaFile, scene)
-//			case ImagesFile -> new ImagesLoader(mediaFile, palette, scene, graphicsSystem, inputEventStream)
-//			default -> throw new UnsupportedOperationException("No media player for the associated file class of ${mediaFile}")
-//		}
-//
-//		var media = mediaLoader.load()
-//		if (media instanceof Playable) {
-//			media.on(StopEvent) { event ->
-//				stop()
-//			}
-//			media.play()
-//		}
-
 		// Universal quit on exit
 		inputEventStream.on(KeyEvent) { event ->
 			if (event.action == GLFW_PRESS && event.key == GLFW_KEY_ESCAPE) {

diff --git a/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/PlaybackScript.groovy b/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/PlaybackScript.groovy
@@ -18,10 +18,10 @@ package nz.net.ultraq.redhorizon.cli.mediaplayer
 
 import nz.net.ultraq.redhorizon.engine.Application
 import nz.net.ultraq.redhorizon.engine.input.KeyControl
-import nz.net.ultraq.redhorizon.engine.media.Playable
-import nz.net.ultraq.redhorizon.engine.media.StopEvent
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
+import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.Playable
 import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.PlaybackReadyEvent
+import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.StopEvent
 import nz.net.ultraq.redhorizon.engine.scenegraph.scripting.Script
 
 import org.slf4j.Logger

diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/Animation.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/Animation.groovy
diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/Image.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/Image.groovy