Merge ../mlt

[melted] / src / modules / sdl / factory.c

diff --git a/src/modules/sdl/factory.c b/src/modules/sdl/factory.c
index 9e5f56e..68301c2 100644 (file)
--- a/src/modules/sdl/factory.c
+++ b/src/modules/sdl/factory.c
@@ -3,44 +3,38 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
+#include <framework/mlt.h>
 
-#include "consumer_sdl.h"
+extern mlt_consumer consumer_sdl_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_consumer consumer_sdl_still_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_consumer consumer_sdl_preview_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 
-void *mlt_create_producer( char *id, void *arg )
-{
-       return NULL;
-}
-
-void *mlt_create_filter( char *id, void *arg )
-{
-       return NULL;
-}
+#ifdef WITH_SDL_IMAGE
+extern mlt_producer producer_sdl_image_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+#endif
 
-void *mlt_create_transition( char *id, void *arg )
+MLT_REPOSITORY
 {
-       return NULL;
+       MLT_REGISTER( consumer_type, "sdl", consumer_sdl_init );
+       MLT_REGISTER( consumer_type, "sdl_preview", consumer_sdl_preview_init );
+       MLT_REGISTER( consumer_type, "sdl_still", consumer_sdl_still_init );
+#ifdef WITH_SDL_IMAGE
+       MLT_REGISTER( producer_type, "sdl_image", producer_sdl_image_init );
+#endif
 }
-
-void *mlt_create_consumer( char *id, void *arg )
-{
-       if ( !strcmp( id, "sdl" ) )
-               return consumer_sdl_init( arg );
-       return NULL;
-}
-