# HG changeset patch # User nenolod # Date 1130188742 25200 # Node ID ec508fe218b9f646c5025985c97984a4c1c9e412 # Parent 0d2d278b40007d30fdc1e594837d59622bd02b72 [svn] - Tone generator plugin. diff -r 0d2d278b4000 -r ec508fe218b9 Input/Makefile.am --- a/Input/Makefile.am Mon Oct 24 13:59:44 2005 -0700 +++ b/Input/Makefile.am Mon Oct 24 14:19:02 2005 -0700 @@ -1,2 +1,2 @@ -ALL_PLUGINS = mpg123 aac vorbis cdaudio wav +ALL_PLUGINS = mpg123 aac vorbis tonegen cdaudio wav SUBDIRS = $(INPUT_PLUGINS) diff -r 0d2d278b4000 -r ec508fe218b9 Input/Makefile.in --- a/Input/Makefile.in Mon Oct 24 13:59:44 2005 -0700 +++ b/Input/Makefile.in Mon Oct 24 14:19:02 2005 -0700 @@ -262,7 +262,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -ALL_PLUGINS = mpg123 aac vorbis cdaudio wav +ALL_PLUGINS = mpg123 aac vorbis tonegen cdaudio wav SUBDIRS = $(INPUT_PLUGINS) all: all-recursive diff -r 0d2d278b4000 -r ec508fe218b9 Input/tonegen/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/tonegen/Makefile.am Mon Oct 24 14:19:02 2005 -0700 @@ -0,0 +1,9 @@ +lib_LTLIBRARIES = libtonegen.la + +libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) + +libtonegen_la_LDFLAGS = @PLUGIN_LDFLAGS@ + +libtonegen_la_SOURCES = tonegen.c +INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir) + diff -r 0d2d278b4000 -r ec508fe218b9 Input/tonegen/Makefile.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/tonegen/Makefile.in Mon Oct 24 14:19:02 2005 -0700 @@ -0,0 +1,560 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = Input/tonegen +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libtonegen_la_LIBADD = +am_libtonegen_la_OBJECTS = tonegen.lo +libtonegen_la_OBJECTS = $(am_libtonegen_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libtonegen_la_SOURCES) +DIST_SOURCES = $(libtonegen_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ARCH_DEFINES = @ARCH_DEFINES@ +ARCH_X86_FALSE = @ARCH_X86_FALSE@ +ARCH_X86_TRUE = @ARCH_X86_TRUE@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BEEP_DEFINES = @BEEP_DEFINES@ +BEEP_PATH = @BEEP_PATH@ +BMP_RCPATH = @BMP_RCPATH@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCAS = @CCAS@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EFFECT_PLUGINS = @EFFECT_PLUGINS@ +EFFECT_PLUGIN_DIR = @EFFECT_PLUGIN_DIR@ +EGREP = @EGREP@ +ENABLE_AAC_FALSE = @ENABLE_AAC_FALSE@ +ENABLE_AAC_TRUE = @ENABLE_AAC_TRUE@ +ENABLE_MPG123_FALSE = @ENABLE_MPG123_FALSE@ +ENABLE_MPG123_TRUE = @ENABLE_MPG123_TRUE@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GENCAT = @GENCAT@ +GENERAL_PLUGINS = @GENERAL_PLUGINS@ +GENERAL_PLUGIN_DIR = @GENERAL_PLUGIN_DIR@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@ +HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@ +HAVE_CDROM_FALSE = @HAVE_CDROM_FALSE@ +HAVE_CDROM_TRUE = @HAVE_CDROM_TRUE@ +HAVE_ESD_FALSE = @HAVE_ESD_FALSE@ +HAVE_ESD_TRUE = @HAVE_ESD_TRUE@ +HAVE_GCONF_FALSE = @HAVE_GCONF_FALSE@ +HAVE_GCONF_TRUE = @HAVE_GCONF_TRUE@ +HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@ +HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ +HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ +HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ +HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ +HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ +HAVE_OSS_TRUE = @HAVE_OSS_TRUE@ +HAVE_SOLARIS_FALSE = @HAVE_SOLARIS_FALSE@ +HAVE_SOLARIS_TRUE = @HAVE_SOLARIS_TRUE@ +HAVE_SUN_FALSE = @HAVE_SUN_FALSE@ +HAVE_SUN_TRUE = @HAVE_SUN_TRUE@ +ID3LIBS = @ID3LIBS@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INPUT_PLUGIN_DIR = @INPUT_PLUGIN_DIR@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBBEEP_MAJOR_VERSION = @LIBBEEP_MAJOR_VERSION@ +LIBBEEP_MICRO_VERSION = @LIBBEEP_MICRO_VERSION@ +LIBBEEP_MINOR_VERSION = @LIBBEEP_MINOR_VERSION@ +LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ +LIBGLADE_LIBS = @LIBGLADE_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +OGG_VORBIS_CFLAGS = @OGG_VORBIS_CFLAGS@ +OGG_VORBIS_LIBS = @OGG_VORBIS_LIBS@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +OUTPUT_PLUGIN_DIR = @OUTPUT_PLUGIN_DIR@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PC_REQUIRES = @PC_REQUIRES@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +USE_SIMD_FALSE = @USE_SIMD_FALSE@ +USE_SIMD_TRUE = @USE_SIMD_TRUE@ +USE_X86ASM_FALSE = @USE_X86ASM_FALSE@ +USE_X86ASM_TRUE = @USE_X86ASM_TRUE@ +VERSION = @VERSION@ +VISUALIZATION_PLUGINS = @VISUALIZATION_PLUGINS@ +VISUALIZATION_PLUGIN_DIR = @VISUALIZATION_PLUGIN_DIR@ +XGETTEXT = @XGETTEXT@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +beepdir = @beepdir@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +plugindir = @plugindir@ +pluginsubs = @pluginsubs@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +lib_LTLIBRARIES = libtonegen.la +libtonegen_la_LDFLAGS = @PLUGIN_LDFLAGS@ +libtonegen_la_SOURCES = tonegen.c +INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Input/tonegen/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Input/tonegen/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libtonegen.la: $(libtonegen_la_OBJECTS) $(libtonegen_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libtonegen_la_LDFLAGS) $(libtonegen_la_OBJECTS) $(libtonegen_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tonegen.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(libdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: install-libLTLIBRARIES + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -r 0d2d278b4000 -r ec508fe218b9 Input/tonegen/tonegen.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/tonegen/tonegen.c Mon Oct 24 14:19:02 2005 -0700 @@ -0,0 +1,265 @@ +/* + * Copyright 2000,2001 Haavard Kvaalen + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "audacious/plugin.h" +#include "libaudacious/util.h" +#include "config.h" +#include +#include +#include +#include +#include +#include + +#define MIN_FREQ 10 +#define MAX_FREQ 20000 +#define OUTPUT_FREQ 44100 + +#ifndef PI +#define PI 3.14159265358979323846 +#endif + +static InputPlugin tone_ip; + +static gboolean going; +static gboolean audio_error; +static pthread_t play_thread; + +static void tone_about(void) +{ + static GtkWidget *box; + box = xmms_show_message( + _("About Tone Generator"), +/* I18N: UTF-8 Translation: "Haavard Kvaalen" -> "H\303\245vard Kv\303\245len" */ + _("Sinus tone generator by Haavard Kvaalen \n" + "Modified by Daniel J. Peng \n\n" + "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n" + "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"), + _("Ok"), FALSE, NULL, NULL); + gtk_signal_connect(GTK_OBJECT(box), "destroy", + gtk_widget_destroyed, &box); +} + +static int tone_is_our_file(char *filename) +{ + if (!strncmp(filename, "tone://", 7)) + return TRUE; + return FALSE; +} + +#define BUF_SAMPLES 512 +#define BUF_BYTES BUF_SAMPLES * 2 + +static void* play_loop(void *arg) +{ + GArray* frequencies = arg; + gint16 data[BUF_SAMPLES]; + int i; + struct { + double wd; + unsigned int period, t; + } *tone; + + tone = g_malloc(frequencies->len * sizeof(*tone)); + + for (i = 0; i < frequencies->len; i++) + { + double f = g_array_index(frequencies, double, i); + tone[i].wd = 2 * PI * f / OUTPUT_FREQ; + tone[i].period = (G_MAXINT * 2U / OUTPUT_FREQ) * + (OUTPUT_FREQ / f); + tone[i].t = 0; + } + + while (going) + { + for (i = 0; i < BUF_SAMPLES; i++) + { + int j; + double sum_sines; + + for (sum_sines = 0, j = 0; j < frequencies->len; j++) + { + sum_sines += sin(tone[j].wd * tone[j].t); + if (tone[j].t > tone[j].period) + tone[j].t -= tone[j].period; + tone[j].t++; + } + data[i] = rint(((1 << 15) - 1) * + (sum_sines / frequencies->len)); + } + tone_ip.add_vis_pcm(tone_ip.output->written_time(), + FMT_S16_NE, 1, BUF_BYTES, data); + while (tone_ip.output->buffer_free() < BUF_BYTES && going) + xmms_usleep(30000); + if (going) + tone_ip.output->write_audio(data, BUF_BYTES); + } + + g_array_free(frequencies, TRUE); + g_free(tone); + + /* Make sure the output plugin stops prebuffering */ + tone_ip.output->buffer_free(); + tone_ip.output->buffer_free(); + + pthread_exit(NULL); +} + +static GArray* tone_filename_parse(const char* filename) +{ + GArray *frequencies = g_array_new(FALSE, FALSE, sizeof(double)); + char **strings, **ptr; + + if (strncmp(filename,"tone://", 7)) + return NULL; + + filename += 7; + strings = g_strsplit(filename, ";", 100); + + for (ptr = strings; *ptr != NULL; ptr++) + { + double freq = strtod(*ptr, NULL); + if (freq >= MIN_FREQ && freq <= MAX_FREQ) + g_array_append_val(frequencies, freq); + } + g_strfreev(strings); + + if (frequencies->len == 0) + { + g_array_free(frequencies, TRUE); + frequencies = NULL; + } + + return frequencies; +} + +static char* tone_title(char *filename) +{ + GArray *freqs; + char* title; + int i; + + freqs = tone_filename_parse(filename); + if (freqs == NULL) + return NULL; + + title = g_strdup_printf("%s %.1f Hz", _("Tone Generator: "), + g_array_index(freqs, double, 0)); + for (i = 1; i < freqs->len; i++) + { + char *old_title; + old_title = title; + title = g_strdup_printf("%s;%.1f Hz", old_title, + g_array_index(freqs, double, i)); + g_free(old_title); + } + g_array_free(freqs, TRUE); + + return title; +} + + +static void tone_play(char *filename) +{ + GArray* frequencies; + char *name; + + frequencies = tone_filename_parse(filename); + if (frequencies == NULL) + return; + + going = TRUE; + audio_error = FALSE; + if (tone_ip.output->open_audio(FMT_S16_NE, OUTPUT_FREQ, 1) == 0) + { + audio_error = TRUE; + going = FALSE; + return; + } + + name = tone_title(filename); + tone_ip.set_info(name, -1, 16 * OUTPUT_FREQ, OUTPUT_FREQ, 1); + g_free(name); + pthread_create(&play_thread, NULL, play_loop, frequencies); +} + +static void tone_stop(void) +{ + if (going) + { + going = FALSE; + pthread_join(play_thread, NULL); + tone_ip.output->close_audio(); + } +} + +static void tone_pause(short paused) +{ + tone_ip.output->pause(paused); +} + +static int tone_get_time(void) +{ + if (audio_error) + return -2; + if (!going && !tone_ip.output->buffer_playing()) + return -1; + return tone_ip.output->output_time(); +} + +static void tone_song_info(char *filename, char **title, int *length) +{ + *length = -1; + *title = tone_title(filename); +} + +static InputPlugin tone_ip = +{ + NULL, + NULL, + NULL, /* Description */ + NULL, + tone_about, + NULL, + tone_is_our_file, + NULL, + tone_play, + tone_stop, + tone_pause, + NULL, + NULL, + tone_get_time, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + tone_song_info, + NULL, + NULL +}; + +InputPlugin *get_iplugin_info(void) +{ + tone_ip.description = g_strdup_printf(_("Tone Generator %s"), VERSION); + return &tone_ip; +} diff -r 0d2d278b4000 -r ec508fe218b9 configure --- a/configure Mon Oct 24 13:59:44 2005 -0700 +++ b/configure Mon Oct 24 14:19:02 2005 -0700 @@ -28907,7 +28907,7 @@ - ac_config_files="$ac_config_files Makefile audacious.1 audacious.spec audacious.pc audacious/audacious.desktop audacious/Makefile audacious/glade/Makefile audacious/images/Makefile libaudacious/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/alsa/Makefile Input/Makefile Input/mpg123/Makefile Input/aac/Makefile Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/aac/src/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile Input/wav/Makefile Visualization/Makefile Visualization/blur_scope/Makefile po/Makefile.in intl/Makefile icons/Makefile skin/Makefile" + ac_config_files="$ac_config_files Makefile audacious.1 audacious.spec audacious.pc audacious/audacious.desktop audacious/Makefile audacious/glade/Makefile audacious/images/Makefile libaudacious/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/alsa/Makefile Input/Makefile Input/mpg123/Makefile Input/aac/Makefile Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/aac/src/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile Input/wav/Makefile Visualization/Makefile Visualization/blur_scope/Makefile po/Makefile.in intl/Makefile icons/Makefile skin/Makefile" cat >confcache <<\_ACEOF @@ -29597,6 +29597,7 @@ "Input/aac/libmp4v2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/libmp4v2/Makefile" ;; "Input/aac/libfaad2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/libfaad2/Makefile" ;; "Input/aac/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/src/Makefile" ;; + "Input/tonegen/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/tonegen/Makefile" ;; "Input/vorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/vorbis/Makefile" ;; "Input/cdaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/cdaudio/Makefile" ;; "Input/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/wav/Makefile" ;; @@ -30714,6 +30715,7 @@ echo " MPEG 4 Audio (AAC): $enable_aac" echo " CD Digital Audio (cdda): yes" echo " Microsoft WAV (wav): yes" +echo " Tone Generator: yes" echo " Ogg Vorbis (vorbis): $have_oggvorbis" echo "" echo " Visualization" diff -r 0d2d278b4000 -r ec508fe218b9 configure.ac --- a/configure.ac Mon Oct 24 13:59:44 2005 -0700 +++ b/configure.ac Mon Oct 24 14:19:02 2005 -0700 @@ -602,6 +602,7 @@ Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/aac/src/Makefile + Input/tonegen/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile Input/wav/Makefile @@ -652,6 +653,7 @@ echo " MPEG 4 Audio (AAC): $enable_aac" echo " CD Digital Audio (cdda): yes" echo " Microsoft WAV (wav): yes" +echo " Tone Generator: yes" echo " Ogg Vorbis (vorbis): $have_oggvorbis" echo "" echo " Visualization"