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

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index 58f97f6ddd31052a77cc450ce7a0e88fcaa3e334..4c2ef835def056c0231cf3048489e05a3ef7f18d 100644 (file)
--- 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 6cd8ae950d70da84f7a39513311c2d38978ae863..956d16381697ef222c512c29cdc874f6dba06850 100644 (file)
--- a/src/modules/sox/filter_sox.c
+++ b/src/modules/sox/filter_sox.c
@@ -21,14 +21,14 @@
 #include "filter_sox.h"
 
 #include <framework/mlt_frame.h>
-#include "valerie/valerie_tokeniser.c"
+#include <framework/mlt_tokeniser.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
-#include <st.h>
+#include <sox/st.h>
 
 #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;
 }