From 710ab9ea78f60c2ece6537862bdd868748ce7f2e Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 16 Feb 2014 11:20:08 -0800 Subject: [PATCH] Move rotoscoping filter into plusgpl module. --- src/modules/plusgpl/Makefile | 8 +++- src/modules/{rotoscoping => plusgpl}/cJSON.c | 0 src/modules/{rotoscoping => plusgpl}/cJSON.h | 0 src/modules/plusgpl/factory.c | 3 ++ .../filter_rotoscoping.c | 0 .../filter_rotoscoping.yml | 0 src/modules/rotoscoping/Makefile | 39 ------------------- src/modules/rotoscoping/factory.c | 39 ------------------- src/modules/rotoscoping/gpl | 0 9 files changed, 9 insertions(+), 80 deletions(-) rename src/modules/{rotoscoping => plusgpl}/cJSON.c (100%) rename src/modules/{rotoscoping => plusgpl}/cJSON.h (100%) rename src/modules/{rotoscoping => plusgpl}/filter_rotoscoping.c (100%) rename src/modules/{rotoscoping => plusgpl}/filter_rotoscoping.yml (100%) delete mode 100644 src/modules/rotoscoping/Makefile delete mode 100644 src/modules/rotoscoping/factory.c delete mode 100644 src/modules/rotoscoping/gpl diff --git a/src/modules/plusgpl/Makefile b/src/modules/plusgpl/Makefile index b9f99237..c204ad3d 100644 --- a/src/modules/plusgpl/Makefile +++ b/src/modules/plusgpl/Makefile @@ -7,10 +7,12 @@ include ../../../config.mak TARGET = ../libmltplusgpl$(LIBSUF) OBJS = factory.o \ - filter_telecide.o \ filter_burn.o \ image.o \ - utils.o + utils.o \ + filter_rotoscoping.o \ + cJSON.o \ + filter_telecide.o SRCS := $(OBJS:.o=.c) @@ -30,6 +32,8 @@ clean: install: all install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d $(DESTDIR)$(mltdatadir)/plusgpl + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/plusgpl" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/rotoscoping/cJSON.c b/src/modules/plusgpl/cJSON.c similarity index 100% rename from src/modules/rotoscoping/cJSON.c rename to src/modules/plusgpl/cJSON.c diff --git a/src/modules/rotoscoping/cJSON.h b/src/modules/plusgpl/cJSON.h similarity index 100% rename from src/modules/rotoscoping/cJSON.h rename to src/modules/plusgpl/cJSON.h diff --git a/src/modules/plusgpl/factory.c b/src/modules/plusgpl/factory.c index 9a89e304..dddc117c 100644 --- a/src/modules/plusgpl/factory.c +++ b/src/modules/plusgpl/factory.c @@ -22,6 +22,7 @@ #include extern mlt_filter filter_burn_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_filter filter_rotoscoping_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 ) @@ -35,8 +36,10 @@ MLT_REPOSITORY { MLT_REGISTER( filter_type, "BurningTV", filter_burn_init ); MLT_REGISTER( filter_type, "burningtv", filter_burn_init ); + MLT_REGISTER( filter_type, "rotoscoping", filter_rotoscoping_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" ); + MLT_REGISTER_METADATA( filter_type, "rotoscoping", metadata, "filter_rotoscoping.yml" ); } diff --git a/src/modules/rotoscoping/filter_rotoscoping.c b/src/modules/plusgpl/filter_rotoscoping.c similarity index 100% rename from src/modules/rotoscoping/filter_rotoscoping.c rename to src/modules/plusgpl/filter_rotoscoping.c diff --git a/src/modules/rotoscoping/filter_rotoscoping.yml b/src/modules/plusgpl/filter_rotoscoping.yml similarity index 100% rename from src/modules/rotoscoping/filter_rotoscoping.yml rename to src/modules/plusgpl/filter_rotoscoping.yml diff --git a/src/modules/rotoscoping/Makefile b/src/modules/rotoscoping/Makefile deleted file mode 100644 index f3f2dec0..00000000 --- a/src/modules/rotoscoping/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -CFLAGS += -I../.. - -LDFLAGS += -L../../framework -lmlt -lm - -include ../../../config.mak - -TARGET = ../libmltrotoscoping$(LIBSUF) - -OBJS = factory.o \ - filter_rotoscoping.o \ - cJSON.o - - -LDFLAGS += -lm - -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)/rotoscoping - install -m 644 filter_rotoscoping.yml "$(DESTDIR)$(mltdatadir)/rotoscoping" - -ifneq ($(wildcard .depend),) -include .depend -endif diff --git a/src/modules/rotoscoping/factory.c b/src/modules/rotoscoping/factory.c deleted file mode 100644 index 0d6162b1..00000000 --- a/src/modules/rotoscoping/factory.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * factory.c -- the factory method interfaces - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates - * - * 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_rotoscoping_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); - -static mlt_properties rotoscoping_metadata( mlt_service_type type, const char *id, void *data ) -{ - char file[ PATH_MAX ]; - snprintf( file, PATH_MAX, "%s/rotoscoping/filter_%s.yml", mlt_environment( "MLT_DATA" ), id ); - return mlt_properties_parse_yaml( file ); -} - -MLT_REPOSITORY -{ - MLT_REGISTER( filter_type, "rotoscoping", filter_rotoscoping_init ); - - MLT_REGISTER_METADATA( filter_type, "rotoscoping", rotoscoping_metadata, NULL ); -} diff --git a/src/modules/rotoscoping/gpl b/src/modules/rotoscoping/gpl deleted file mode 100644 index e69de29b..00000000 -- 2.39.2