From 6453d1c04f43c722559ceff2293a24b281ff3262 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 16 Feb 2014 11:10:22 -0800 Subject: [PATCH] Move burningtv into plusgpl module. --- src/modules/effectv/Makefile | 37 ----------------- src/modules/effectv/factory.c | 40 ------------------- src/modules/effectv/gpl | 0 src/modules/plusgpl/Makefile | 7 +++- src/modules/plusgpl/factory.c | 16 +++++++- .../{effectv => plusgpl}/filter_burn.c | 0 .../{effectv => plusgpl}/filter_burningtv.yml | 0 src/modules/{effectv => plusgpl}/image.c | 0 src/modules/{effectv => plusgpl}/utils.c | 0 src/modules/{effectv => plusgpl}/utils.h | 0 10 files changed, 20 insertions(+), 80 deletions(-) delete mode 100644 src/modules/effectv/Makefile delete mode 100644 src/modules/effectv/factory.c delete mode 100644 src/modules/effectv/gpl rename src/modules/{effectv => plusgpl}/filter_burn.c (100%) rename src/modules/{effectv => plusgpl}/filter_burningtv.yml (100%) rename src/modules/{effectv => plusgpl}/image.c (100%) rename src/modules/{effectv => plusgpl}/utils.c (100%) rename src/modules/{effectv => plusgpl}/utils.h (100%) diff --git a/src/modules/effectv/Makefile b/src/modules/effectv/Makefile deleted file mode 100644 index b52d2633..00000000 --- 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 index 0a9c33d1..00000000 --- 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 -#include -#include - -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 index e69de29b..00000000 diff --git a/src/modules/plusgpl/Makefile b/src/modules/plusgpl/Makefile index c93f9c10..b9f99237 100644 --- 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 e0f2825f..9a89e304 100644 --- 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 + * Copyright (C) 2008-2014 Dan Dennedy * * 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 #include +#include +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 -- 2.39.2