From: Dan Dennedy <dan@dennedy.org>
Date: Sat, 14 Jul 2012 21:02:00 +0000 (-0700)
Subject: add define MELT_NOSDL to not use SDL_main()
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=70f31db4883e2e0e5fe67d56c585fc4e86773731;p=mlt

add define MELT_NOSDL to not use SDL_main()

This is helpful on OS X when using melt as a utility to prevent the
program from appearing in the Dock.
---

diff --git a/src/melt/melt.c b/src/melt/melt.c
index b3b7b287..c125a72e 100644
--- a/src/melt/melt.c
+++ b/src/melt/melt.c
@@ -32,7 +32,7 @@
 
 #include <framework/mlt.h>
 
-#if defined(__DARWIN__) || defined(WIN32)
+#if (defined(__DARWIN__) || defined(WIN32)) && !defined(MELT_NOSDL)
 #include <SDL.h>
 #endif
 
@@ -321,7 +321,7 @@ static void load_consumer( mlt_consumer *consumer, mlt_profile profile, int argc
 	}
 }
 
-#if defined(__DARWIN__) || defined(WIN32)
+#if (defined(__DARWIN__) || defined(WIN32)) && !defined(MELT_NOSDL)
 
 static void event_handling( mlt_producer producer, mlt_consumer consumer )
 {
@@ -385,7 +385,7 @@ static void transport( mlt_producer producer, mlt_consumer consumer )
 				transport_action( producer, string );
 			}
 
-#if defined(__DARWIN__) || defined(WIN32)
+#if (defined(__DARWIN__) || defined(WIN32)) && !defined(MELT_NOSDL)
 			event_handling( producer, consumer );
 #endif