]> git.sesse.net Git - mlt/commitdiff
add define MELT_NOSDL to not use SDL_main()
authorDan Dennedy <dan@dennedy.org>
Sat, 14 Jul 2012 21:02:00 +0000 (14:02 -0700)
committerDan Dennedy <dan@dennedy.org>
Sat, 14 Jul 2012 21:02:00 +0000 (14:02 -0700)
This is helpful on OS X when using melt as a utility to prevent the
program from appearing in the Dock.

src/melt/melt.c

index b3b7b287fe8eafa68da499ec21e92b5b1512809e..c125a72e511364594856cb46e652b90551bc456d 100644 (file)
@@ -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