From e7787c10cb2de2a6e4e67083646982d3576617f6 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Wed, 4 Dec 2013 22:17:49 -0600 Subject: [PATCH] Move blipflash, dynamictext and count into plus module --- src/modules/avsync/Makefile | 38 ----------------- src/modules/avsync/factory.c | 42 ------------------- src/modules/gtk2/Makefile | 2 - src/modules/gtk2/factory.c | 10 ----- src/modules/plus/Makefile | 8 +++- .../{avsync => plus}/consumer_blipflash.c | 0 .../{avsync => plus}/consumer_blipflash.yml | 0 src/modules/plus/factory.c | 12 ++++++ .../{gtk2 => plus}/filter_dynamictext.c | 0 .../{gtk2 => plus}/filter_dynamictext.yml | 2 +- .../{avsync => plus}/producer_blipflash.c | 0 .../{avsync => plus}/producer_blipflash.yml | 0 src/modules/{gtk2 => plus}/producer_count.c | 0 src/modules/{gtk2 => plus}/producer_count.yml | 0 14 files changed, 19 insertions(+), 95 deletions(-) delete mode 100644 src/modules/avsync/Makefile delete mode 100644 src/modules/avsync/factory.c rename src/modules/{avsync => plus}/consumer_blipflash.c (100%) rename src/modules/{avsync => plus}/consumer_blipflash.yml (100%) rename src/modules/{gtk2 => plus}/filter_dynamictext.c (100%) rename src/modules/{gtk2 => plus}/filter_dynamictext.yml (98%) rename src/modules/{avsync => plus}/producer_blipflash.c (100%) rename src/modules/{avsync => plus}/producer_blipflash.yml (100%) rename src/modules/{gtk2 => plus}/producer_count.c (100%) rename src/modules/{gtk2 => plus}/producer_count.yml (100%) diff --git a/src/modules/avsync/Makefile b/src/modules/avsync/Makefile deleted file mode 100644 index c0362901..00000000 --- a/src/modules/avsync/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -CFLAGS += -I../.. - -LDFLAGS += -L../../framework -lmlt -lm -lpthread - -include ../../../config.mak - -TARGET = ../libmltavsync$(LIBSUF) - -OBJS = factory.o \ - producer_blipflash.o \ - consumer_blipflash.o - -ASM_OBJS = - -SRCS := $(OBJS:.o=.c) - -all: $(TARGET) - -$(TARGET): $(OBJS) $(ASM_OBJS) - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) - -depend: $(SRCS) - $(CC) -MM $(CFLAGS) $^ 1>.depend - -distclean: clean - rm -f .depend - -clean: - rm -f $(OBJS) $(ASM_OBJS) $(TARGET) - -install: all - install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" - install -d "$(DESTDIR)$(mltdatadir)/avsync" - install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/avsync" - -ifneq ($(wildcard .depend),) -include .depend -endif diff --git a/src/modules/avsync/factory.c b/src/modules/avsync/factory.c deleted file mode 100644 index 79687fe1..00000000 --- a/src/modules/avsync/factory.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * factory.c -- the factory method interfaces - * Copyright (C) 2013 Brian Matherly - * Author: Brian Matherly - * - * 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 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 - * Lesser General Public License for more details. - * - * 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 -#include -#include - -extern mlt_consumer consumer_blipflash_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); -extern mlt_producer producer_blipflash_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/avsync/%s", mlt_environment( "MLT_DATA" ), (char*) data ); - return mlt_properties_parse_yaml( file ); -} - -MLT_REPOSITORY -{ - MLT_REGISTER( consumer_type, "blipflash", consumer_blipflash_init ); - MLT_REGISTER( producer_type, "blipflash", producer_blipflash_init ); - - MLT_REGISTER_METADATA( consumer_type, "blipflash", metadata, "consumer_blipflash.yml" ); - MLT_REGISTER_METADATA( producer_type, "blipflash", metadata, "producer_blipflash.yml" ); -} diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile index a76fc9a7..b4fb3ffe 100644 --- a/src/modules/gtk2/Makefile +++ b/src/modules/gtk2/Makefile @@ -34,8 +34,6 @@ endif ifdef USE_PANGO OBJS += producer_pango.o -OBJS += producer_count.o -OBJS += filter_dynamictext.o CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2` LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2` ifeq ($(targetos),Darwin) diff --git a/src/modules/gtk2/factory.c b/src/modules/gtk2/factory.c index 08e4f48a..fa98b22e 100644 --- a/src/modules/gtk2/factory.c +++ b/src/modules/gtk2/factory.c @@ -34,8 +34,6 @@ extern mlt_consumer consumer_gtk2_preview_init( mlt_profile profile, void *widge #ifdef USE_PANGO extern mlt_producer producer_pango_init( const char *filename ); -extern mlt_producer producer_count_init( const char *arg ); -extern mlt_filter filter_dynamictext_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); #endif static void initialise( ) @@ -60,10 +58,6 @@ void *create_service( mlt_profile profile, mlt_service_type type, const char *id #ifdef USE_PANGO if ( !strcmp( id, "pango" ) ) return producer_pango_init( arg ); - if ( !strcmp( id, "count" ) ) - return producer_count_init( arg ); - if ( !strcmp( id, "dynamictext" ) ) - return filter_dynamictext_init( profile, type, id, arg ); #endif #ifdef USE_PIXBUF @@ -88,15 +82,11 @@ static mlt_properties metadata( mlt_service_type type, const char *id, void *dat MLT_REPOSITORY { - MLT_REGISTER( producer_type, "count", create_service ); - MLT_REGISTER( filter_type, "dynamictext", create_service ); MLT_REGISTER( consumer_type, "gtk2_preview", create_service ); MLT_REGISTER( filter_type, "gtkrescale", create_service ); MLT_REGISTER( producer_type, "pango", create_service ); MLT_REGISTER( producer_type, "pixbuf", create_service ); - MLT_REGISTER_METADATA( producer_type, "count", metadata, "producer_count.yml" ); - MLT_REGISTER_METADATA( filter_type, "dynamictext", metadata, "filter_dynamictext.yml" ); MLT_REGISTER_METADATA( consumer_type, "gtk2_preview", metadata, "consumer_gtk2_preview.yml" ); MLT_REGISTER_METADATA( filter_type, "gtkrescale", metadata, "filter_rescale.yml" ); MLT_REGISTER_METADATA( producer_type, "pango", metadata, "producer_pango.yml" ); diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile index 62019da8..44646655 100644 --- a/src/modules/plus/Makefile +++ b/src/modules/plus/Makefile @@ -1,16 +1,20 @@ CFLAGS += -I../.. -LDFLAGS += -L../../framework -lmlt -lm +LDFLAGS += -L../../framework -lmlt -lm -lpthread include ../../../config.mak TARGET = ../libmltplus$(LIBSUF) -OBJS = factory.o \ +OBJS = consumer_blipflash.o \ + factory.o \ filter_affine.o \ filter_charcoal.o \ + filter_dynamictext.o \ filter_invert.o \ filter_sepia.o \ + producer_blipflash.o \ + producer_count.o \ transition_affine.o SRCS := $(OBJS:.o=.c) diff --git a/src/modules/avsync/consumer_blipflash.c b/src/modules/plus/consumer_blipflash.c similarity index 100% rename from src/modules/avsync/consumer_blipflash.c rename to src/modules/plus/consumer_blipflash.c diff --git a/src/modules/avsync/consumer_blipflash.yml b/src/modules/plus/consumer_blipflash.yml similarity index 100% rename from src/modules/avsync/consumer_blipflash.yml rename to src/modules/plus/consumer_blipflash.yml diff --git a/src/modules/plus/factory.c b/src/modules/plus/factory.c index ec2b229e..949b4269 100644 --- a/src/modules/plus/factory.c +++ b/src/modules/plus/factory.c @@ -22,10 +22,14 @@ #include #include +extern mlt_consumer consumer_blipflash_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_affine_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_charcoal_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_filter filter_dynamictext_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_invert_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); extern mlt_filter filter_sepia_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_producer producer_blipflash_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ); +extern mlt_producer producer_count_init( const char *arg ); extern mlt_transition transition_affine_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 ) @@ -37,15 +41,23 @@ static mlt_properties metadata( mlt_service_type type, const char *id, void *dat MLT_REPOSITORY { + MLT_REGISTER( consumer_type, "blipflash", consumer_blipflash_init ); MLT_REGISTER( filter_type, "affine", filter_affine_init ); MLT_REGISTER( filter_type, "charcoal", filter_charcoal_init ); + MLT_REGISTER( filter_type, "dynamictext", filter_dynamictext_init ); MLT_REGISTER( filter_type, "invert", filter_invert_init ); MLT_REGISTER( filter_type, "sepia", filter_sepia_init ); + MLT_REGISTER( producer_type, "blipflash", producer_blipflash_init ); + MLT_REGISTER( producer_type, "count", producer_count_init ); MLT_REGISTER( transition_type, "affine", transition_affine_init ); + MLT_REGISTER_METADATA( consumer_type, "blipflash", metadata, "consumer_blipflash.yml" ); MLT_REGISTER_METADATA( filter_type, "affine", metadata, "filter_affine.yml" ); MLT_REGISTER_METADATA( filter_type, "charcoal", metadata, "filter_charcoal.yml" ); + MLT_REGISTER_METADATA( filter_type, "dynamictext", metadata, "filter_dynamictext.yml" ); MLT_REGISTER_METADATA( filter_type, "invert", metadata, "filter_invert.yml" ); MLT_REGISTER_METADATA( filter_type, "sepia", metadata, "filter_sepia.yml" ); + MLT_REGISTER_METADATA( producer_type, "blipflash", metadata, "producer_blipflash.yml" ); + MLT_REGISTER_METADATA( producer_type, "count", metadata, "producer_count.yml" ); MLT_REGISTER_METADATA( transition_type, "affine", metadata, "transition_affine.yml" ); } diff --git a/src/modules/gtk2/filter_dynamictext.c b/src/modules/plus/filter_dynamictext.c similarity index 100% rename from src/modules/gtk2/filter_dynamictext.c rename to src/modules/plus/filter_dynamictext.c diff --git a/src/modules/gtk2/filter_dynamictext.yml b/src/modules/plus/filter_dynamictext.yml similarity index 98% rename from src/modules/gtk2/filter_dynamictext.yml rename to src/modules/plus/filter_dynamictext.yml index 5ee7d4b8..2b4132bc 100644 --- a/src/modules/gtk2/filter_dynamictext.yml +++ b/src/modules/plus/filter_dynamictext.yml @@ -3,7 +3,7 @@ type: filter identifier: dynamictext title: Dynamic text version: 1 -copyright: Ushodaya Enterprises Limited +copyright: Brian Matherly creator: Brian Matherly license: LGPLv2.1 language: en diff --git a/src/modules/avsync/producer_blipflash.c b/src/modules/plus/producer_blipflash.c similarity index 100% rename from src/modules/avsync/producer_blipflash.c rename to src/modules/plus/producer_blipflash.c diff --git a/src/modules/avsync/producer_blipflash.yml b/src/modules/plus/producer_blipflash.yml similarity index 100% rename from src/modules/avsync/producer_blipflash.yml rename to src/modules/plus/producer_blipflash.yml diff --git a/src/modules/gtk2/producer_count.c b/src/modules/plus/producer_count.c similarity index 100% rename from src/modules/gtk2/producer_count.c rename to src/modules/plus/producer_count.c diff --git a/src/modules/gtk2/producer_count.yml b/src/modules/plus/producer_count.yml similarity index 100% rename from src/modules/gtk2/producer_count.yml rename to src/modules/plus/producer_count.yml -- 2.39.2