From 5ce433ce1a755ca87cece50891e43988f5891a61 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Sat, 17 Apr 2004 10:29:33 +0000 Subject: [PATCH] switched to mlt_tokeniser and removed libst-config from Makefile git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@286 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/sox/Makefile | 5 ++--- src/modules/sox/filter_sox.c | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile index 58f97f6..4c2ef83 100644 --- a/src/modules/sox/Makefile +++ b/src/modules/sox/Makefile @@ -5,10 +5,9 @@ TARGET = ../libmltsox.so OBJS = factory.o \ filter_sox.o -CFLAGS = -O4 -pipe -ffast-math -fomit-frame-pointer -I../../ -Wall -g \ - `libst-config --cflags` +CFLAGS = -O4 -pipe -ffast-math -fomit-frame-pointer -I../../ -Wall -g -LDFLAGS = `libst-config --libs` -lst +LDFLAGS = -lst SRCS := $(OBJS:.o=.c) diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c index 6cd8ae9..956d163 100644 --- a/src/modules/sox/filter_sox.c +++ b/src/modules/sox/filter_sox.c @@ -21,14 +21,14 @@ #include "filter_sox.h" #include -#include "valerie/valerie_tokeniser.c" +#include #include #include #include #include -#include +#include #define BUFFER_LEN 8192 #define AMPLITUDE_NORM 0.2511886431509580 /* -12dBFS */ @@ -60,13 +60,13 @@ static inline double mean( double *buf, int count ) */ static int create_effect( mlt_filter this, char *value, int count, int channel, int frequency ) { - valerie_tokeniser tokeniser = valerie_tokeniser_init(); + mlt_tokeniser tokeniser = mlt_tokeniser_init(); eff_t eff = mlt_pool_alloc( sizeof( struct st_effect ) ); char id[ 256 ]; int error = 1; // Tokenise the effect specification - valerie_tokeniser_parse_new( tokeniser, value, " " ); + mlt_tokeniser_parse_new( tokeniser, value, " " ); // Locate the effect int opt_count = st_geteffect_opt( eff, tokeniser->count, tokeniser->tokens ); @@ -99,7 +99,7 @@ static int create_effect( mlt_filter this, char *value, int count, int channel, if ( error == 1 ) mlt_pool_release( eff ); - valerie_tokeniser_close( tokeniser ); + mlt_tokeniser_close( tokeniser ); return error; } -- 1.7.4.4