diff --git a/src/Makefile.am b/src/Makefile.am index 3388390..73d6166 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,11 +3,11 @@ AM_CFLAGS = -Wall -Werror INCLUDES = $(DEPS_CFLAGS) -bin_PROGRAMS = minimodem miniscope +bin_PROGRAMS = minimodem tscope minimodem_LDADD = $(DEPS_LIBS) minimodem_SOURCES = minimodem.c -miniscope_LDADD = $(DEPS_LIBS) -miniscope_SOURCES = miniscope.c +tscope_LDADD = $(DEPS_LIBS) +tscope_SOURCES = tscope.c diff --git a/src/Makefile.in b/src/Makefile.in index a8a386d..49e9413 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -32,7 +32,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -bin_PROGRAMS = minimodem$(EXEEXT) miniscope$(EXEEXT) +bin_PROGRAMS = minimodem$(EXEEXT) tscope$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -49,9 +49,9 @@ am_minimodem_OBJECTS = minimodem.$(OBJEXT) minimodem_OBJECTS = $(am_minimodem_OBJECTS) am__DEPENDENCIES_1 = minimodem_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_miniscope_OBJECTS = miniscope.$(OBJEXT) -miniscope_OBJECTS = $(am_miniscope_OBJECTS) -miniscope_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_tscope_OBJECTS = tscope.$(OBJEXT) +tscope_OBJECTS = $(am_tscope_OBJECTS) +tscope_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -60,8 +60,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(minimodem_SOURCES) $(miniscope_SOURCES) -DIST_SOURCES = $(minimodem_SOURCES) $(miniscope_SOURCES) +SOURCES = $(minimodem_SOURCES) $(tscope_SOURCES) +DIST_SOURCES = $(minimodem_SOURCES) $(tscope_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -157,8 +157,8 @@ AM_CFLAGS = -Wall -Werror INCLUDES = $(DEPS_CFLAGS) minimodem_LDADD = $(DEPS_LIBS) minimodem_SOURCES = minimodem.c -miniscope_LDADD = $(DEPS_LIBS) -miniscope_SOURCES = miniscope.c +tscope_LDADD = $(DEPS_LIBS) +tscope_SOURCES = tscope.c all: all-am .SUFFIXES: @@ -233,9 +233,9 @@ clean-binPROGRAMS: minimodem$(EXEEXT): $(minimodem_OBJECTS) $(minimodem_DEPENDENCIES) @rm -f minimodem$(EXEEXT) $(LINK) $(minimodem_OBJECTS) $(minimodem_LDADD) $(LIBS) -miniscope$(EXEEXT): $(miniscope_OBJECTS) $(miniscope_DEPENDENCIES) - @rm -f miniscope$(EXEEXT) - $(LINK) $(miniscope_OBJECTS) $(miniscope_LDADD) $(LIBS) +tscope$(EXEEXT): $(tscope_OBJECTS) $(tscope_DEPENDENCIES) + @rm -f tscope$(EXEEXT) + $(LINK) $(tscope_OBJECTS) $(tscope_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -244,7 +244,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minimodem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miniscope.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tscope.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/miniscope.c b/src/tscope.c similarity index 94% rename from src/miniscope.c rename to src/tscope.c index cb2caa1..c2c73eb 100644 --- a/src/miniscope.c +++ b/src/tscope.c @@ -1,5 +1,5 @@ /* - * miniscope.c + * tscope.c * * Author: Kamal Mostafa * @@ -40,7 +40,7 @@ band_mag( fftwf_complex * const cplx, unsigned int band, float scalar ) void -miniscope_print( fftwf_complex * const fftout, int nbands, float magscalar, +tscope_print( fftwf_complex * const fftout, int nbands, float magscalar, unsigned char one_line_mode, unsigned char show_maxmag ) { char magchars[] = " .-=+#^"; @@ -94,7 +94,7 @@ main( int argc, char*argv[] ) one_line_mode = 0; } else { fprintf(stderr, - "usage: miniscope [-s] [ analysis_rate [ band_width ] ]\n"); + "usage: tscope [-s] [ analysis_rate [ band_width ] ]\n"); return 1; } argi++; @@ -111,7 +111,7 @@ main( int argc, char*argv[] ) /* Initiate the capture stream */ int error; pa_simple *s; - s = pa_simple_new(NULL, argv[0], PA_STREAM_RECORD, NULL, "spectrum scope", + s = pa_simple_new(NULL, argv[0], PA_STREAM_RECORD, NULL, "text spectrum scope", &ss, NULL, NULL, &error); if ( !s ) { fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", @@ -197,7 +197,7 @@ main( int argc, char*argv[] ) /* display the spectrum magnitudes for each channel */ int n; for ( n=0; n