Permalink
Browse files

conflicts merged adintool-gui

  • Loading branch information...
nitslp-ri committed Mar 5, 2016
2 parents 95013a2 + 5518000 commit 442adfed2f4688da3c37090dbf2ec2cd6b5588a7
Showing with 10,593 additions and 1,433 deletions.
  1. +51 −0 adintool/Makefile.gui.in
  2. +17 −10 adintool/Makefile.in
  3. +66 −0 adintool/README-GUI.txt
  4. +377 −0 adintool/aclocal.m4
  5. +184 −1,417 adintool/adintool.c
  6. +147 −0 adintool/adintool.h
  7. +1,372 −0 adintool/config.guess
  8. +1,473 −0 adintool/config.sub
  9. +4,722 −0 adintool/configure
  10. +32 −0 adintool/configure.in
  11. +251 −0 adintool/install-sh
  12. +1,591 −0 adintool/mainloop.c
  13. +305 −0 adintool/options.c
  14. +3 −4 configure
  15. +2 −2 configure.in
View
@@ -0,0 +1,51 @@
# Copyright (c) 1991-2013 Kawahara Lab., Kyoto University
# Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
# Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology
# All rights reserved
#
# $Id: Makefile.in,v 1.8 2013/06/20 17:14:16 sumomo Exp $
#
SHELL=/bin/sh
.SUFFIXES:
.SUFFIXES: .c .o
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -o $@ -c $<
LIBSENT=../libsent
LIBJULIUS=../libjulius
CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags`
LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
RM=@RM@ -f
prefix=@prefix@
exec_prefix=@exec_prefix@
INSTALL=@INSTALL@
SDL_CFLAGS=`sdl2-config --cflags` -DUSE_SDL
SDL_LDFLAGS=`sdl2-config --static-libs`
OBJ=adintool.o options.o mainloop.o
TARGET=adintool-gui@EXEEXT@
all: $(TARGET)
adintool-gui@EXEEXT@: $(OBJ) $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(SDL_LDFLAGS)
install: install.bin
install.bin: $(TARGET)
${INSTALL} -d @bindir@
@INSTALL_PROGRAM@ $(TARGET) @bindir@
clean:
$(RM) $(OBJ)
$(RM) *~ core
$(RM) $(TARGET) $(TARGET).exe
distclean:
$(RM) $(OBJ)
$(RM) *~ core
$(RM) $(TARGET) $(TARGET).exe
$(RM) Makefile.gui
View
@@ -22,30 +22,37 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
INSTALL=@INSTALL@
############################################################
OBJ=adintool.o options.o mainloop.o
TARGET=adintool@EXEEXT@
all: $(TARGET)
all: $(TARGET) @extra_target@
$(TARGET): adintool.c $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ adintool.c $(LDFLAGS)
gui:
$(RM) $(OBJ)
$(MAKE) -f Makefile.gui
############################################################
$(TARGET): $(OBJ) $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS)
install: install.bin
install.bin: $(TARGET)
${INSTALL} -d @bindir@
@INSTALL_PROGRAM@ $(TARGET) @bindir@
############################################################
$(MAKE) -f Makefile.gui install.bin
clean:
$(RM) *.o *~ core
$(RM) $(OBJ)
$(RM) config.log config.cache
$(RM) *~ core
$(RM) $(TARGET) $(TARGET).exe
$(MAKE) -f Makefile.gui clean
distclean:
$(RM) *.o *~ core
$(RM) $(OBJ)
$(RM) config.log config.cache
$(RM) *~ core
$(RM) $(TARGET) $(TARGET).exe
$(RM) config.status
$(RM) Makefile
$(MAKE) -f Makefile.gui distclean
View
@@ -0,0 +1,66 @@
About adintool-gui
2016/03/05
----------------
This directory contains two tools:
- "adintool" --- the legacy audio input frontend for Julius
- "adintool-gui" --- GUI version of adintool
In addition to "adintool", "adintool-gui" displays real-time input
waveform with trigger information on screen. You can directly monitor
the input waveform and how VAD works, and you can also change the
trigger level threshold (-lv) on the fly by up/down key.
----------------
- Compile
To compile "adintool-gui", SDL2 library (Version > 2.0) is required.
On Debian based system, you can install it by:
% sudo apt-get install libsdl2-dev
----------------
- Test
Start "adintool-gui" with no argument to monitor input. It will
display the real-time input waveform, trigger threshold (horizontal
yellow line) and show how its VAD is running. You can adjust the
threshold by up and down arrow key.
----------------
- Usage
You can give the same option of "adintool" to "adintool-gui". The
differences are:
- With no argument, "adintool-gui" runs in monitor mode, as desribed
above. Actually, the monitor mode is equivalent to giving option
"-in mic -out none", output nothing.
- When "-out adinnet" or "-out vecnet" is specified, it DOES NOT
CONNECT TO THE SERVER AT STARTUP! You can connect/disconnect to
the server by pressing 'c' key. Status "Connect/Disconnect" is
shown as filled/unfilled box on the top-right corner.
- Pressing 'Enter' key immediately sends segmentation request to
server, causing Julius to stop recognition and start again. It is
useful when the speaker is too loud and input can not be segmented
by VAD.
-------------------------------
Keys for adintool-gui:
- 'ESC' exit
- 'UP'/'DOWN' trigger threshold up/down
- 'c' output start/stop | server connect/disconnect
- 'm' mute/unmute
- 'Enter' force audio segmentation
-------------------------------
Upper-right red box indicator:
not displayed = capturing audio but not output
filled square = capturing audio and outputing the triggered samples
line square = pausing by server request, capturing audio but not output
Oops, something went wrong.

0 comments on commit 442adfe

Please sign in to comment.