From a11ece1228ba71de2debbc440a0e0687bae58fc9 Mon Sep 17 00:00:00 2001
From: Dan Dennedy <dan@dennedy.org>
Date: Fri, 2 Mar 2018 12:44:32 -0800
Subject: [PATCH] Fix sdl2 metadata.

---
 src/modules/sdl/consumer_sdl.yml   |  3 ++-
 src/modules/sdl2/consumer_sdl2.yml | 28 +++++++++++-----------------
 src/modules/sdl2/factory.c         |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/modules/sdl/consumer_sdl.yml b/src/modules/sdl/consumer_sdl.yml
index 54b40573d..edfecdeb9 100644
--- a/src/modules/sdl/consumer_sdl.yml
+++ b/src/modules/sdl/consumer_sdl.yml
@@ -56,4 +56,5 @@ parameters:
     minimum: 0
     maximum: 1
     default: 1
-    widget: checkbox
\ No newline at end of file
+    widget: checkbox
+
diff --git a/src/modules/sdl2/consumer_sdl2.yml b/src/modules/sdl2/consumer_sdl2.yml
index e8040c19a..9b226a37a 100644
--- a/src/modules/sdl2/consumer_sdl2.yml
+++ b/src/modules/sdl2/consumer_sdl2.yml
@@ -11,55 +11,49 @@ tags:
   - Audio
   - Video
 description: >
-  Simple DirectMedia Layer audio and video output module.
+  Simple DirectMedia Layer audio and video output module
 parameters:
   - identifier: resolution
     title: Resolution
     type: string
-    description: The size of the window as WxH pixels.
+    description: The size of the window as WxH pixels
     argument: yes
     required: no
 
   - identifier: volume
     title: Volume
     type: float
-    description: Audio level factor.
+    description: Audio level factor
     mutable: yes
 
   - identifier: video_off
     title: Video off
-    type: integer
-    description: If 1, disable video output
+    type: boolean
+    description: Disable video output
     mutable: yes
-    minimum: 0
-    maximum: 1
     default: 0
     widget: checkbox
 
   - identifier: audio_off
     title: Audio off
-    type: integer
-    description: If 1, disable audio output
+    type: boolean
+    description: Disable audio output
     mutable: yes
-    minimum: 0
-    maximum: 1
     default: 0
     widget: checkbox
 
   - identifier: audio_buffer
     title: Audio buffer
     type: integer
-    description: Size of the sdl audio buffer.
+    description: Size of the SDL audio buffer
     mutable: yes
     default: 2048
     minimum: 128
 
   - identifier: scrub_audio
     title: Audio scrubbing
-    type: integer
-    description: If enabled, sound is played even when the speed is not normal.
+    type: boolean
+    description: Play sound even when the speed is not normal.
     mutable: yes
-    minimum: 0
-    maximum: 1
     default: 1
-    widget: checkbox
\ No newline at end of file
+    widget: checkbox
diff --git a/src/modules/sdl2/factory.c b/src/modules/sdl2/factory.c
index deb71e12a..b12a02389 100644
--- a/src/modules/sdl2/factory.c
+++ b/src/modules/sdl2/factory.c
@@ -28,7 +28,7 @@ extern mlt_consumer consumer_sdl_audio_init( mlt_profile profile, mlt_service_ty
 static mlt_properties metadata( mlt_service_type type, const char *id, void *data )
 {
 	char file[ PATH_MAX ];
-	snprintf( file, PATH_MAX, "%s/sdl/%s", mlt_environment( "MLT_DATA" ), (char*) data );
+	snprintf( file, PATH_MAX, "%s/sdl2/%s", mlt_environment( "MLT_DATA" ), (char*) data );
 	return mlt_properties_parse_yaml( file );
 }