Move burningtv into plusgpl module.

diff --git a/src/modules/effectv/Makefile b/src/modules/effectv/Makefile
deleted file mode 100644 (file)
index b52d263..0000000
--- a/src/modules/effectv/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt -lm
-
-include ../../../config.mak
-
-TARGET = ../libmlteffectv$(LIBSUF)
-
-OBJS = factory.o \
-          filter_burn.o \
-          image.o \
-          utils.o
-
-SRCS := $(OBJS:.o=.c)
-
-all:   $(TARGET)
-
-$(TARGET): $(OBJS)
-               $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
-
-depend:        $(SRCS)
-               $(CC) -MM $(CFLAGS) $^ 1>.depend
-
-distclean:     clean
-               rm -f .depend
-
-clean: 
-               rm -f $(OBJS) $(TARGET) 
-
-install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
-       install -d "$(DESTDIR)$(mltdatadir)/effectv"
-       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/effectv"
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif

diff --git a/src/modules/effectv/factory.c b/src/modules/effectv/factory.c
deleted file mode 100644 (file)
index 0a9c33d..0000000
--- a/src/modules/effectv/factory.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * factory.c -- the factory method interfaces
- * Copyright (C) 2007 Stephane Fillod
- *
- * 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 program 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.
- *
- * 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.
- */
-
-#include <framework/mlt.h>
-#include <string.h>
-#include <limits.h>
-
-extern mlt_filter filter_burn_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
-
-static mlt_properties metadata( mlt_service_type type, const char *id, void *data )
-{
-       char file[ PATH_MAX ];
-       snprintf( file, PATH_MAX, "%s/effectv/%s", mlt_environment( "MLT_DATA" ), (char*) data );
-       return mlt_properties_parse_yaml( file );
-}
-
-MLT_REPOSITORY
-{
-       MLT_REGISTER( filter_type, "BurningTV", filter_burn_init );
-       MLT_REGISTER( filter_type, "burningtv", filter_burn_init );
-
-       MLT_REGISTER_METADATA( filter_type, "BurningTV", metadata, "filter_burningtv.yml" );
-       MLT_REGISTER_METADATA( filter_type, "burningtv", metadata, "filter_burningtv.yml" );
-}

diff --git a/src/modules/effectv/gpl b/src/modules/effectv/gpl
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/modules/plusgpl/Makefile b/src/modules/plusgpl/Makefile
index c93f9c10649830bdccacb470e326df104f6d1d57..b9f992371560711e7765e66bea409156d9a30b07 100644 (file)
--- a/src/modules/plusgpl/Makefile
+++ b/src/modules/plusgpl/Makefile
@@ -1,13 +1,16 @@
 CFLAGS += -I../..
 
-LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lm
 
 include ../../../config.mak
 
 TARGET = ../libmltplusgpl$(LIBSUF)
 
 OBJS = factory.o \
-          filter_telecide.o
+          filter_telecide.o \
+          filter_burn.o \
+          image.o \
+          utils.o
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/plusgpl/factory.c b/src/modules/plusgpl/factory.c
index e0f2825f7d590f566cf42f75996397ee3b49bb1f..9a89e3047391a8b4318ba6561263245a6aaac7a9 100644 (file)
--- a/src/modules/plusgpl/factory.c
+++ b/src/modules/plusgpl/factory.c
@@ -1,6 +1,6 @@
 /*
  * factory.c -- the factory method interfaces
- * Copyright (C) 2008 Dan Dennedy <dan@dennedy.org>
+ * Copyright (C) 2008-2014 Dan Dennedy <dan@dennedy.org>
  *
  * 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
@@ -19,10 +19,24 @@
 
 #include <string.h>
 #include <framework/mlt.h>
+#include <limits.h>
 
+extern mlt_filter filter_burn_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_filter filter_telecide_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 
+static mlt_properties metadata( mlt_service_type type, const char *id, void *data )
+{
+       char file[ PATH_MAX ];
+       snprintf( file, PATH_MAX, "%s/plusgpl/%s", mlt_environment( "MLT_DATA" ), (char*) data );
+       return mlt_properties_parse_yaml( file );
+}
+
 MLT_REPOSITORY
 {
+       MLT_REGISTER( filter_type, "BurningTV", filter_burn_init );
+       MLT_REGISTER( filter_type, "burningtv", filter_burn_init );
        MLT_REGISTER( filter_type, "telecide", filter_telecide_init );
+
+       MLT_REGISTER_METADATA( filter_type, "BurningTV", metadata, "filter_burningtv.yml" );
+       MLT_REGISTER_METADATA( filter_type, "burningtv", metadata, "filter_burningtv.yml" );
 }

diff --git a/src/modules/effectv/filter_burn.c b/src/modules/plusgpl/filter_burn.c
similarity index 100%
rename from src/modules/effectv/filter_burn.c
rename to src/modules/plusgpl/filter_burn.c

diff --git a/src/modules/effectv/filter_burningtv.yml b/src/modules/plusgpl/filter_burningtv.yml
similarity index 100%
rename from src/modules/effectv/filter_burningtv.yml
rename to src/modules/plusgpl/filter_burningtv.yml

diff --git a/src/modules/effectv/image.c b/src/modules/plusgpl/image.c
similarity index 100%
rename from src/modules/effectv/image.c
rename to src/modules/plusgpl/image.c

diff --git a/src/modules/effectv/utils.c b/src/modules/plusgpl/utils.c
similarity index 100%
rename from src/modules/effectv/utils.c
rename to src/modules/plusgpl/utils.c

diff --git a/src/modules/effectv/utils.h b/src/modules/plusgpl/utils.h
similarity index 100%
rename from src/modules/effectv/utils.h
rename to src/modules/plusgpl/utils.h