Move blipflash, dynamictext and count into plus module

diff --git a/src/modules/avsync/Makefile b/src/modules/avsync/Makefile
deleted file mode 100644 (file)
index c036290..0000000
--- 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 (file)
index 79687fe..0000000
--- 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 <pez4brian@yahoo.com>
- *
- * 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 <framework/mlt.h>
-#include <string.h>
-#include <limits.h>
-
-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 a76fc9a7586c021eb636610d6dcb6d05a96144f1..b4fb3ffe4e578dbd9c0ec461e46d0e02a17b77b4 100644 (file)
--- 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 08e4f48aa619bc3fccaab8e5a558fcf71d342f37..fa98b22e14eb2e7fece0674db9f40758da82b20e 100644 (file)
--- 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 62019da8d75fa1bc198b0e4771be24c420794e71..446466551e5cfa9b7fdf30818c67336fd3aa4abf 100644 (file)
--- 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 ec2b229e8cc0b96a4afc0db53ed1627479d9afa8..949b426950c401c27e4cc212b47ae10cd2139459 100644 (file)
--- a/src/modules/plus/factory.c
+++ b/src/modules/plus/factory.c
@@ -22,10 +22,14 @@
 #include <limits.h>
 #include <framework/mlt.h>
 
+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 5ee7d4b821d109b3a1265b75ba514c2fb17e59b1..2b4132bcfb51814f81daebf66fb57450bdc873dd 100644 (file)
--- 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