From 2bc376b9ccc8398994f5f0d2e18971779afafe6f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Thu, 8 May 2008 13:02:06 +0400 Subject: [PATCH] Update single word --- singleword/Makefile.linux | 9 +++--- singleword/Makefile.mingw32 | 77 +++++++++++++++++++++------------------------ singleword/main.c | 10 +++++- singleword/praat.c | 10 ++++-- singleword/signals.c | 5 ++- 5 files changed, 61 insertions(+), 50 deletions(-) rewrite singleword/Makefile.mingw32 (64%) diff --git a/singleword/Makefile.linux b/singleword/Makefile.linux index 55af885..5a0e259 100644 --- a/singleword/Makefile.linux +++ b/singleword/Makefile.linux @@ -1,16 +1,17 @@ CC = gcc -O2 -Wall -PRAATDIR=../../sources_4608 +PRAATDIR=../../sources_5021 BIN = singleword SRC = main.c praat.c signals.c config.c cairo.c OBJ = main.o praat.o signals.o config.o cairo.o CFLAGS := `pkg-config --cflags gtk+-2.0 libglade-2.0 gthread-2.0` \ - -I$(PRAATDIR)/sys -I$(PRAATDIR)/fon -I$(PRAATDIR)/audio -I$(PRAATDIR)/dwsys -I$(PRAATDIR)/GSL -I$(PRAATDIR)/stat -g + -I$(PRAATDIR)/sys -I$(PRAATDIR)/fon -I$(PRAATDIR)/audio -I$(PRAATDIR)/dwsys \ + -I$(PRAATDIR)/GSL -I$(PRAATDIR)/stat -I$(PRAATDIR)/num -LIBS := -Wl,--export-dynamic \ +LIBS := -Wl,--gc-sections -Wl,-s -Wl,--export-dynamic \ `pkg-config --libs gtk+-2.0 libglade-2.0 gthread-2.0` \ - -L.. -lpraat + $(PRAATDIR)/kar/*.o $(PRAATDIR)/num/*.o $(PRAATDIR)/num/glpk/*.o $(PRAATDIR)/GSL/*.o $(PRAATDIR)/sys/*.o $(PRAATDIR)/FLAC/*.o $(PRAATDIR)/mp3/*.o $(PRAATDIR)/dwsys/*.o $(PRAATDIR)/dwtools/*.o $(PRAATDIR)/fon/*.o $(PRAATDIR)/stat/*.o $(PRAATDIR)/LPC/*.o all: $(BIN) diff --git a/singleword/Makefile.mingw32 b/singleword/Makefile.mingw32 dissimilarity index 64% index 6e2f9d2..1877da7 100644 --- a/singleword/Makefile.mingw32 +++ b/singleword/Makefile.mingw32 @@ -1,41 +1,36 @@ -PREFIX = mingw32 -CC = $(PREFIX)-gcc -mwindows -mconsole -DMINGW -DWINCOMPAT -DPITCHTIER -#-mwindows -DLLTOOL = $(PREFIX)-dlltool -PKG_CONFIG_PATH = /opt/gtk/lib/pkgconfig -PRAATDIR=../../sources_4608 - -BIN = singleword.exe -SRC = main.c praat.c signals.c config.c cairo.c -OBJ = main.o praat.o signals.o config.o cairo.o - -CFLAGS := -O2 -DMINGW -Wall -mms-bitfields -mno-cygwin -mwindows \ - $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - pkg-config --cflags gtk+-win32-2.0 libglade-2.0 gthread-2.0) \ - -I$(PRAATDIR)/sys -I$(PRAATDIR)/fon -I$(PRAATDIR)/audio -I$(PRAATDIR)/dwsys -I$(PRAATDIR)/GSL -I$(PRAATDIR)/stat - -LIBS := -Wl,--export-dynamic -Wl,--disable-auto-import \ - $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ - pkg-config --libs gtk+-win32-2.0 libglade-2.0 gthread-2.0) \ - -L$(PRAATDIR) -L.. -lpraat -lzip - -all: $(BIN) - -$(BIN): $(OBJ) app.exp - $(CC) -o $(BIN) $(OBJ) app.exp $(LIBS) - -app.exp: app.def - $(DLLTOOL) --dllname $(BIN) --def app.def --output-exp $@ - -app.def: $(OBJ) - $(DLLTOOL) --export-all --output-def $@ $(OBJ) - -libpraat.def: - cp $(PRAATDIR)/libpraat.def . - -.c.o: - $(CC) -c $(CFLAGS) -o $@ $< - -clean: - rm -f $(BIN) $(OBJ) app.exp app.def - +PREFIX = mingw32 +CC = $(PREFIX)-gcc -mwindows -mconsole -DMINGW -DWINCOMPAT -DPITCHTIER +#-mwindows +DLLTOOL = $(PREFIX)-dlltool +PKG_CONFIG_PATH = /opt/gtk/lib/pkgconfig +PRAATDIR=../../sources_5022-mingw + +BIN = singleword.exe +SRC = main.c praat.c signals.c config.c cairo.c +OBJ = main.o praat.o signals.o config.o cairo.o + +CFLAGS := -O2 -DMINGW -Wall -mms-bitfields -mno-cygwin -mwindows \ + $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ + pkg-config --cflags gtk+-win32-2.0 libglade-2.0 gthread-2.0) \ + -I$(PRAATDIR)/sys -I$(PRAATDIR)/fon -I$(PRAATDIR)/audio -I$(PRAATDIR)/dwsys -I$(PRAATDIR)/GSL -I$(PRAATDIR)/stat -I$(PRAATDIR)/stat -I$(PRAATDIR)/num + +LIBS := -Wl,--export-dynamic \ + $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)\ + pkg-config --libs gtk+-win32-2.0 libglade-2.0 gthread-2.0) \ + -L. -lzip \ + $(PRAATDIR)/main/main_Praat.o \ + $(PRAATDIR)/fon/libfon.a \ + $(PRAATDIR)/LPC/libLPC.a $(PRAATDIR)/FFNet/libFFNet.a $(PRAATDIR)/dwtools/libdwtools.a \ + $(PRAATDIR)/artsynth/libartsynth.a $(PRAATDIR)/fon/libfon.a $(PRAATDIR)/stat/libstat.a $(PRAATDIR)/dwsys/libdwsys.a \ + $(PRAATDIR)/sys/libsys.a $(PRAATDIR)/num/libnum.a $(PRAATDIR)/GSL/libgsl.a $(PRAATDIR)/kar/libkar.a \ + $(PRAATDIR)/FLAC/libFLAC.a $(PRAATDIR)/mp3/libmp3.a \ + -lwinmm -lwsock32 -lcomctl32 -Wl,--gc-sections -Wl,-s + +all: $(BIN) + +.c.o: + $(CC) -c $(CFLAGS) -o $@ $< + +clean: + rm -f $(BIN) $(OBJ) + diff --git a/singleword/main.c b/singleword/main.c index 1d0ca11..108527f 100644 --- a/singleword/main.c +++ b/singleword/main.c @@ -1,12 +1,20 @@ #include "singleword.h" #include "praat.h" #include "config.h" - +#include "signals.h" GladeXML *xml = NULL; int main(int argc, char **argv) { + void * needed; + needed = (void *)paint; + needed = (void *)buttonCommit_clicked_cb; + needed = (void *)buttonPlay_clicked_cb; + needed = (void *)entryPinyin_key_release_event_cb; + needed = (void *)buttonRecord_clicked_cb; + needed = (void *)buttonHum_clicked_cb; + gtk_init(&argc, &argv); bindtextdomain(g_get_application_name(), LOCALEDIR); diff --git a/singleword/praat.c b/singleword/praat.c index f6e68dc..6b12dce 100644 --- a/singleword/praat.c +++ b/singleword/praat.c @@ -64,20 +64,21 @@ gpointer sound_init(void *args) praat_uvafon_init(); #endif - Melder_setMaximumAsynchronicity (Melder_SYNCHRONOUS); +// Melder_setMaximumAsynchronicity (Melder_SYNCHRONOUS); melderSoundFromMic = Sound_recordFixedTime (1, 1.0, 0.5, 44100, 1.0); forget(melderSoundFromMic); Melder_clearError(); g_idle_add(setButtonsTrue, NULL); g_thread_exit(NULL); + return NULL; } static void playInPraat(gchar *path) { if (g_access(path, F_OK) == 0) { structMelderFile file; Sound melderSoundFromFile; - Melder_pathToFile(path, & file); + Melder_pathToFile(Melder_peekUtf8ToWcs(path), & file); melderSoundFromFile = Sound_readFromSoundFile (& file); if (! melderSoundFromFile) { g_warning(_("Praat cannot open the file!")); @@ -101,6 +102,7 @@ gpointer playHum(void *args) { g_idle_add(setButtonsTrue, NULL); } g_thread_exit(NULL); + return NULL; } @@ -111,6 +113,7 @@ gpointer play(void *args) { g_free(path); g_idle_add(setButtonsTrue, NULL); g_thread_exit(NULL); + return NULL; } gpointer record(void *args) { @@ -129,7 +132,7 @@ gpointer record(void *args) { Vector_scale(melderSoundFromMic, 0.99); - Melder_pathToFile(path, &file); + Melder_pathToFile(Melder_peekUtf8ToWcs(path), &file); Sound_writeToAudioFile16 (melderSoundFromMic, &file, Melder_WAV); forget(melderSoundFromMic); @@ -154,5 +157,6 @@ gpointer record(void *args) { g_idle_add(setButtonsTrue, NULL); } g_thread_exit(NULL); + return NULL; } diff --git a/singleword/signals.c b/singleword/signals.c index de459f1..dda43fa 100644 --- a/singleword/signals.c +++ b/singleword/signals.c @@ -1,7 +1,10 @@ #include "singleword.h" #include #include +#include #include "praat.h" +#include "signals.h" +#include "cairo.h" gchar *active = NULL; @@ -120,7 +123,7 @@ void removeRecordings() { g_unlink(file); g_free(file); if ((record = g_dir_open(RECORDPATH, 0, NULL)) != NULL) { - gchar *name; + const gchar *name; while ((name = g_dir_read_name(record)) != NULL) { if (g_str_has_suffix(name, ".wav") || g_str_has_suffix(name, ".Pitch") || g_str_has_suffix(name, ".PitchTier")) { file = g_build_filename(RECORDPATH, name, NULL); -- 2.11.4.GIT