From a8fb82288feb6b258f2c04312f0c36ba8d79b494 Mon Sep 17 00:00:00 2001 From: John Wright Date: Wed, 28 Dec 2011 16:45:20 -0800 Subject: [PATCH] Import upstream version 0.99.2 --- .directory | 5 + AUTHORS | 1 - CMakeLists.txt | 160 + ChangeLog | 34 +- INSTALL | 229 - Makefile.am | 28 - Makefile.in | 658 --- README.txt | 30 + TODO | 70 +- aclocal.m4 | 1013 ---- cmake/FindALSA.cmake | 43 + cmake/FindALSA.cmake.new | 34 + cmake/FindALSA.cmake.own | 43 + cmake/FindFFTW3.cmake | 56 + cmake/FindJack.cmake | 87 + cmake/FindOSS.cmake | 46 + cmake/FindPortaudio.cmake | 107 + config.h.in | 122 - configure |10956 ----------------------------------- configure.ac | 190 - depcomp | 530 -- fmit.desktop | 16 +- install-sh | 323 -- libs/CppAddons/AUTHORS | 2 +- libs/CppAddons/CAMath.h | 1 + libs/CppAddons/CMakeLists.txt | 13 + libs/CppAddons/Doxyfile | 225 + libs/CppAddons/Fit.cpp | 37 - libs/CppAddons/Fit.h | 17 +- libs/CppAddons/Makefile.am | 4 - libs/CppAddons/Makefile.in | 442 -- libs/Makefile.am | 1 - libs/Makefile.in | 459 -- libs/Music/AUTHORS | 2 +- libs/Music/BubbleAlgo.cpp | 352 ++ libs/Music/BubbleAlgo.h | 93 + libs/Music/CMakeLists.txt | 25 + libs/Music/COPYING | 676 ++- libs/Music/Doxyfile | 220 + libs/Music/DummyMonoQuantizer.cpp | 72 + libs/Music/DummyMonoQuantizer.h | 45 + libs/Music/Filter.cpp | 771 ++- libs/Music/Filter.h | 43 +- libs/Music/FreqAnalysis.cpp | 5 +- libs/Music/INSTALL | 32 + libs/Music/Instrument.h | 259 + libs/Music/LatencyMonoQuantizer.cpp | 122 + libs/Music/LatencyMonoQuantizer.h | 66 + libs/Music/Makefile.am | 4 - libs/Music/Makefile.in | 457 -- libs/Music/MonoQuantizer.cpp | 38 + libs/Music/MonoQuantizer.h | 65 + libs/Music/Music.h | 30 +- libs/Music/Note.cpp | 62 + libs/Music/Quantizer.cpp | 122 + libs/Music/Quantizer.h | 95 + libs/Music/README | 64 + libs/Music/ScoreGenerator.cpp | 95 + libs/Music/ScoreGenerator.h | 238 + libs/Music/omidistream.cpp | 168 + libs/Music/omidistream.h | 153 + m4/Makefile.am | 1 - m4/Makefile.in | 303 - m4/ac_cxx_exceptions.m4 | 21 - m4/ac_cxx_have_complex.m4 | 24 - m4/ac_cxx_have_numeric_limits.m4 | 24 - m4/ac_cxx_have_sstream.m4 | 24 - m4/ac_cxx_have_stl.m4 | 26 - m4/ac_cxx_namespaces.m4 | 22 - m4/ac_cxx_templates.m4 | 22 - m4/bnv_have_qt.m4 | 431 -- m4/mdl_have_opengl.m4 | 97 - meanquar.scl | 17 + missing | 360 -- src/AutoQSettings.cpp | 79 +- src/AutoQSettings.h | 17 +- src/CMakeLists.txt | 64 + src/CaptureThread.cpp | 1190 +--- src/CaptureThread.h | 22 +- src/CaptureThreadImplALSA.cpp | 421 ++ src/CaptureThreadImplJACK.cpp | 319 + src/CaptureThreadImplOSS.cpp | 357 ++ src/CaptureThreadImplPortAudio.cpp | 325 ++ src/CustomInstrumentTunerForm.cpp | 330 +- src/CustomInstrumentTunerForm.h | 61 +- src/LatencyMonoQuantizer.cpp | 1 + src/Makefile.am | 12 - src/Makefile.in | 621 -- src/fmit.qrc | 10 + src/main.cpp | 11 +- src/modules/CMakeLists.txt | 34 + src/modules/DialView.cpp | 100 +- src/modules/DialView.h | 6 +- src/modules/GLErrorHistory.cpp | 130 +- src/modules/GLErrorHistory.h | 2 - src/modules/GLFT.cpp | 270 +- src/modules/GLFT.h | 20 +- src/modules/GLFreqStruct.cpp | 50 +- src/modules/GLGraph.cpp | 136 +- src/modules/GLGraph.h | 2 +- src/modules/GLSample.cpp | 63 +- src/modules/GLSample.h | 4 +- src/modules/GLStatistics.cpp | 305 +- src/modules/GLStatistics.h | 3 + src/modules/GLVolumeHistory.cpp | 45 +- src/modules/Makefile.am | 9 - src/modules/Makefile.in | 472 -- src/modules/MicrotonalView.cpp | 260 +- src/modules/MicrotonalView.h | 17 +- src/modules/View.cpp | 24 +- src/modules/View.h | 12 +- tr/Makefile.am | 9 - tr/Makefile.in | 342 -- tr/fmit_de.ts | 1279 +++- tr/fmit_fr.ts | 724 ++- ui/ConfigForm.ui | 4091 ++++++------- ui/InstrumentTunerForm.ui | 1315 ++--- ui/Makefile.am | 12 - ui/Makefile.in | 319 - ui/images/config.png | Bin 0 -> 2021 bytes ui/images/configForm.png | Bin 0 -> 2510 bytes ui/images/fmit.png | Bin 0 -> 5289 bytes ui/images/fmit.svg | 250 + ui/images/helpAbout.png | Bin 0 -> 1043 bytes ui/images/pause.png | Bin 0 -> 910 bytes ui/images/saveSettings.png | Bin 0 -> 2028 bytes 126 files changed, 11604 insertions(+), 24269 deletions(-) create mode 100644 .directory delete mode 100644 AUTHORS create mode 100644 CMakeLists.txt delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100644 Makefile.in delete mode 100644 NEWS delete mode 100644 README create mode 100644 README.txt delete mode 100644 aclocal.m4 create mode 100644 cmake/FindALSA.cmake create mode 100644 cmake/FindALSA.cmake.new create mode 100644 cmake/FindALSA.cmake.own create mode 100644 cmake/FindFFTW3.cmake create mode 100644 cmake/FindJack.cmake create mode 100644 cmake/FindOSS.cmake create mode 100644 cmake/FindPortaudio.cmake delete mode 100644 config.h.in delete mode 100755 configure delete mode 100644 configure.ac delete mode 100755 depcomp delete mode 100755 install-sh create mode 100644 libs/CppAddons/CMakeLists.txt create mode 100644 libs/CppAddons/Doxyfile delete mode 100644 libs/CppAddons/Fit.cpp delete mode 100644 libs/CppAddons/Makefile.am delete mode 100644 libs/CppAddons/Makefile.in delete mode 100644 libs/Makefile.am delete mode 100644 libs/Makefile.in create mode 100644 libs/Music/BubbleAlgo.cpp create mode 100644 libs/Music/BubbleAlgo.h create mode 100644 libs/Music/CMakeLists.txt create mode 100644 libs/Music/Doxyfile create mode 100644 libs/Music/DummyMonoQuantizer.cpp create mode 100644 libs/Music/DummyMonoQuantizer.h create mode 100644 libs/Music/INSTALL create mode 100644 libs/Music/Instrument.h create mode 100644 libs/Music/LatencyMonoQuantizer.cpp create mode 100644 libs/Music/LatencyMonoQuantizer.h delete mode 100644 libs/Music/Makefile.am delete mode 100644 libs/Music/Makefile.in create mode 100644 libs/Music/MonoQuantizer.cpp create mode 100644 libs/Music/MonoQuantizer.h create mode 100644 libs/Music/Note.cpp create mode 100644 libs/Music/Quantizer.cpp create mode 100644 libs/Music/Quantizer.h create mode 100644 libs/Music/README create mode 100644 libs/Music/ScoreGenerator.cpp create mode 100644 libs/Music/ScoreGenerator.h create mode 100644 libs/Music/omidistream.cpp create mode 100644 libs/Music/omidistream.h delete mode 100644 m4/Makefile.am delete mode 100644 m4/Makefile.in delete mode 100644 m4/ac_cxx_exceptions.m4 delete mode 100644 m4/ac_cxx_have_complex.m4 delete mode 100644 m4/ac_cxx_have_numeric_limits.m4 delete mode 100644 m4/ac_cxx_have_sstream.m4 delete mode 100644 m4/ac_cxx_have_stl.m4 delete mode 100644 m4/ac_cxx_namespaces.m4 delete mode 100644 m4/ac_cxx_templates.m4 delete mode 100644 m4/bnv_have_qt.m4 delete mode 100644 m4/mdl_have_opengl.m4 create mode 100644 meanquar.scl delete mode 100755 missing create mode 100644 src/CMakeLists.txt create mode 100644 src/CaptureThreadImplALSA.cpp create mode 100644 src/CaptureThreadImplJACK.cpp create mode 100644 src/CaptureThreadImplOSS.cpp create mode 100644 src/CaptureThreadImplPortAudio.cpp delete mode 100644 src/Makefile.am delete mode 100644 src/Makefile.in create mode 100644 src/fmit.qrc create mode 100644 src/modules/CMakeLists.txt delete mode 100644 src/modules/Makefile.am delete mode 100644 src/modules/Makefile.in delete mode 100644 tr/Makefile.am delete mode 100644 tr/Makefile.in delete mode 100644 ui/Makefile.am delete mode 100644 ui/Makefile.in create mode 100755 ui/images/config.png create mode 100755 ui/images/configForm.png create mode 100644 ui/images/fmit.png create mode 100644 ui/images/fmit.svg create mode 100755 ui/images/helpAbout.png create mode 100755 ui/images/pause.png create mode 100755 ui/images/saveSettings.png diff --git a/.directory b/.directory new file mode 100644 index 0000000..d639a75 --- /dev/null +++ b/.directory @@ -0,0 +1,5 @@ +[Dolphin] +AdditionalInfo=3 +ShowPreview=true +Timestamp=2011,1,2,21,46,47 +ViewMode=1 diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index f309b93..0000000 --- a/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Gilles Degottex diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..ce3ed8e --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,160 @@ + +project(fmit) # the name of your project + +CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0005 OLD) +endif(COMMAND cmake_policy) + +SET (PACKAGE_NAME "fmit") +SET (VERSION_MAJOR "0") +SET (VERSION_MINOR "99") +SET (VERSION_PATCH "2") +SET (VERSION_SUFFIX "") +SET (PACKAGE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) +MESSAGE(STATUS "${PACKAGE_NAME} ${PACKAGE_VERSION} (install in ${CMAKE_INSTALL_PREFIX})") +SET(PREFIX ${CMAKE_INSTALL_PREFIX}) + +# CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H) +# CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H) +# CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) + +# CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) +# IF(HAVE_UNISTD_H) +# ADD_DEFINITIONS(-DHAVE_UNISTD_H) +# ENDIF(HAVE_UNISTD_H) + +ADD_DEFINITIONS(-DPREFIX=\\\"${PREFIX}\\\" -DPACKAGE_NAME=\\\"${PACKAGE_NAME}\\\" -DPACKAGE_VERSION=\\\"${PACKAGE_VERSION}\\\") + +#FIND DEPENDENCIES +FIND_PACKAGE(Qt4 REQUIRED) +IF (QT4_FOUND) + MESSAGE(STATUS "Qt4 library found") +ELSE () + MESSAGE(FATAL_ERROR "No Qt4 library found !") +ENDIF () + +SET (FILES_TO_TRANSLATE ) + +SET(QT_USE_QTOPENGL TRUE) +#SET(QT_USE_QT3SUPPORT TRUE) + +INCLUDE(${QT_USE_FILE}) + +FIND_PACKAGE(GLUT REQUIRED) +IF (GLUT_FOUND) + MESSAGE(STATUS "GLUT library found") +ELSE () + MESSAGE(FATAL_ERROR "GLUT library NOT found !") +ENDIF () + +FIND_PACKAGE(OpenGL REQUIRED) +IF (OPENGL_FOUND) + MESSAGE(STATUS "OpenGL library found") +ELSE () + MESSAGE(FATAL_ERROR "OpenGL library NOT found !") +ENDIF () + +SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +FIND_PACKAGE(FFTW3 REQUIRED) + +# Options ---------------------------------------------------------------------- + +OPTION(SOUNDSYSTEM_USE_OSS "Build FMIT with OSS support") +IF (SOUNDSYSTEM_USE_OSS) + MESSAGE("OSS sound system requested") + FIND_PACKAGE(OSS) + IF (OSS_FOUND) + ADD_DEFINITIONS(-DCAPTURE_OSS) + MESSAGE(STATUS "OSS library ok") + ELSE () + MESSAGE(FATAL_ERROR "Unable to find OSS library") + ENDIF () +ENDIF () + +OPTION(SOUNDSYSTEM_USE_ALSA "Build FMIT with ALSA support" ON) +IF (SOUNDSYSTEM_USE_ALSA) + MESSAGE("ALSA sound system requested") + FIND_PACKAGE(ALSA) + IF (HAVE_ALSA) + ADD_DEFINITIONS(-DCAPTURE_ALSA) + MESSAGE(STATUS "ALSA library ok") + ELSE () + MESSAGE(FATAL_ERROR "Unable to find ALSA library") + ENDIF () +ENDIF () + +OPTION(SOUNDSYSTEM_USE_PORTAUDIO "Build FMIT with Portaudio support") +IF (SOUNDSYSTEM_USE_PORTAUDIO) + MESSAGE("Portaudio sound system requested") + FIND_PACKAGE(Portaudio) + IF (PORTAUDIO_FOUND) + ADD_DEFINITIONS(-DCAPTURE_PORTAUDIO) + MESSAGE(STATUS "Portaudio library ok") + ELSE () + MESSAGE(FATAL_ERROR "Unable to find Portaudio library") + ENDIF () +ENDIF () + +OPTION(SOUNDSYSTEM_USE_JACK "Build FMIT with JACK support" ON) +IF (SOUNDSYSTEM_USE_JACK) + MESSAGE("JACK sound system requested") + FIND_PACKAGE(Jack) + IF (JACK_FOUND) + ADD_DEFINITIONS(-DCAPTURE_JACK) + MESSAGE(STATUS "JACK library ok") + ELSE () + MESSAGE(FATAL_ERROR "Unable to find JACK library") + ENDIF () +ENDIF () + +# Qt4 Translations +FILE (GLOB TRANSLATIONS_FILES tr/*.ts) +OPTION(UPDATE_TRANSLATIONS "Update source translation tr/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)") + +# Building --------------------------------------------------------------------- + +# Tell cmake to process CMakeLists.txt in that subdirectory +ADD_SUBDIRECTORY(libs/Music) +ADD_SUBDIRECTORY(libs/CppAddons) +ADD_SUBDIRECTORY(src/modules) +ADD_SUBDIRECTORY(src) + +# Installation ----------------------------------------------------------------- + +# Desktop files +INSTALL(FILES + fmit.desktop + DESTINATION share/applications +) + +# Icon files +INSTALL(FILES + ui/images/fmit.svg + DESTINATION share/icons/hicolor/scalable/apps +) + +# Packaging -------------------------------------------------------------------- +# build a CPack driven installer package +# cpack --config CPackConfig.cmake +# cpack --config CPackSourceConfig.cmake +INCLUDE(InstallRequiredSystemLibraries) +SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +SET(CPACK_GENERATOR "TGZ;TBZ2") +SET(CPACK_PACKAGE_VENDOR "Gilles Degottex") +SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") +SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") +SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}") +SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") +SET(CPACK_SOURCE_IGNORE_FILES + CVS + .deps ".*\\\\.ui~" + CMakeFiles cmake_install.cmake CMakeCache.txt + Makefile + contrib build dwl remez old test + test_build.sh sync_dwl.sh +) +INCLUDE(CPack) diff --git a/ChangeLog b/ChangeLog index 26f83df..416b0ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2011-01-22 Gilles Degottex + * fix portaudio compilation + * ALSA and PortAudio seems to be exclusive now: avoid them to meet each other + by stopping the capture when inside the configuration panel. + * Update texts and french translations + +2011-01-21 Gilles Degottex + * Apply Qt4 patch of Florian Maier + * Adopt new spinbox layout proposed by Florian Maier + * tagged REALEASE-0-99-0 + +2011-01-02 Gilles Degottex + * fix jack_error_callback bug (Damian Wrobel) + * add an icon ! + +2010-05-17 Gilles Degottex + * move to CMake + * bug fix #14601 for JACK: use a jack_ringbuffer, thanks Arnout ! + * fix mixing down of 2 channels + * remove unvaluable sampling rate of the + predefined lists (48kHz and 96kHz) + * DFT view: change move and zoom features + +2009-05-17 Gilles Degottex + * DFT view + bug fixes + normalize window + remove auto-scale + use power of 2 FFT length + use window length in milliseconds + add vertical zoom with left mouse click + 2007-01-17 Gilles Degottex * Add FFTW3 class * Add Fourier transform view @@ -78,7 +110,7 @@ * moved to autotools * tagged 0.9.9 -2005-1-2 Gilles Degottex +2005-01-02 Gilles Degottex * move algorithms settings to a particular tab page * text review * french translation review diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 54caf7c..0000000 --- a/INSTALL +++ /dev/null @@ -1,229 +0,0 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 60d85e0..0000000 --- a/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -SUBDIRS = m4 libs ui src tr -default_DATA = fmit.desktop -defaultdir = $(prefix)/share/applications -EXTRA_DIST = ChangeLog AUTHORS COPYING TODO INSTALL fmit.desktop - -.PHONY: run dwl test-build test-build-cvs test-build-dist - -run: all - ./src/fmit - -dwl: - @echo update dwl directory - chown -R norwin.users dwl - cd dwl; rsync --delete -avr --rsh="ssh" . norwin@download.gna.org:/upload/fmit; cd .. - -test-build: test-build-cvs test-build-dist - -test-build-cvs: - rm -fr test/fmit - @echo test build through cvs - cd test; cvs -d norwin@cvs.gna.org:/cvs/fmit co fmit; cd fmit; sh burn_and_honk.sh; ./configure; make; cd ../.. -# cd test; cvs -d:pserver:anonymous@cvs.gna.org:/cvs/fmit co fmit; cd fmit; sh burn_and_honk.sh; ./configure; make; cd ../.. - -test-build-dist: dist - rm -fr test/$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 $(PACKAGE_NAME)-$(PACKAGE_VERSION) - @echo test build through archive - cp $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 test/; cd test; uz $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2; cd $(PACKAGE_NAME)-$(PACKAGE_VERSION); ./configure; make; cd ../.. - diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 7a0e4e7..0000000 --- a/Makefile.in +++ /dev/null @@ -1,658 +0,0 @@ -# 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 = : -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO depcomp install-sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -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)$(defaultdir)" -defaultDATA_INSTALL = $(INSTALL_DATA) -DATA = $(default_DATA) -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = m4 libs ui src tr -default_DATA = fmit.desktop -defaultdir = $(prefix)/share/applications -EXTRA_DIST = ChangeLog AUTHORS COPYING TODO INSTALL fmit.desktop -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 -uninstall-info-am: -install-defaultDATA: $(default_DATA) - @$(NORMAL_INSTALL) - test -z "$(defaultdir)" || $(mkdir_p) "$(DESTDIR)$(defaultdir)" - @list='$(default_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(defaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultdir)/$$f'"; \ - $(defaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultdir)/$$f"; \ - done - -uninstall-defaultDATA: - @$(NORMAL_UNINSTALL) - @list='$(default_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(defaultdir)/$$f'"; \ - rm -f "$(DESTDIR)$(defaultdir)/$$f"; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -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: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(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: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(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) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/m4 - @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 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) config.h -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(defaultdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -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-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-defaultDATA - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-defaultDATA uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-recursive distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-defaultDATA install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-defaultDATA uninstall-info-am - - -.PHONY: run dwl test-build test-build-cvs test-build-dist - -run: all - ./src/fmit - -dwl: - @echo update dwl directory - chown -R norwin.users dwl - cd dwl; rsync --delete -avr --rsh="ssh" . norwin@download.gna.org:/upload/fmit; cd .. - -test-build: test-build-cvs test-build-dist - -test-build-cvs: - rm -fr test/fmit - @echo test build through cvs - cd test; cvs -d norwin@cvs.gna.org:/cvs/fmit co fmit; cd fmit; sh burn_and_honk.sh; ./configure; make; cd ../.. -# cd test; cvs -d:pserver:anonymous@cvs.gna.org:/cvs/fmit co fmit; cd fmit; sh burn_and_honk.sh; ./configure; make; cd ../.. - -test-build-dist: dist - rm -fr test/$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 $(PACKAGE_NAME)-$(PACKAGE_VERSION) - @echo test build through archive - cp $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2 test/; cd test; uz $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2; cd $(PACKAGE_NAME)-$(PACKAGE_VERSION); ./configure; make; cd ../.. -# 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 --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/README b/README deleted file mode 100644 index e69de29..0000000 diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..918b25e --- /dev/null +++ b/README.txt @@ -0,0 +1,30 @@ +=================== FMIT - Free Music Instrument Tuner ========================= + +Author: Gilles Degottex + +Contributor: Florian Hars for the tunning scales, Arnout Engelen for the JACK issues +Packagers: Toni Graffy and all the PackMan team ! (SuSE); Ludovic Reslinger (Debian); Edward Tomasz Napierala (FreeBSD) +Donators: Joel Brandt, Martin Lynch, you +Other helpful people: +John Anderson for the microtonal module request; Scott Bahling for the request of the scales in cents; Jacob Shapiro to help me make FMIT working under Windows/Cygwin; Peter; ... + +======================= COMPILATION & INSTALLATION ============================= + +To compile FMIT: +From fmit package directory, create a directory build: +$ mkdir build +$ cd build +Configure with standard options (see below for options): +$ cmake .. + +Then as usual: +Compile +$ make +and install as root +# make install + +---------------------- For non-standard compilation ---------------------------- +check options: +$ cmake -L .. +To change an option, for example configure with PortAudio: +$ cmake -D SOUNDSYSTEM_USE_PORTAUDIO=ON .. diff --git a/TODO b/TODO index 6e673f6..32bf762 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,51 @@ -look for translations +automatically build qm files from ts: +http://www.cmake.org/Wiki/CMake:How_To_Build_Qt4_Software + +remove ConfigForm.png +update french translation + +automatiser le seuil de réaction +automatiser d'autres choses ? + +Add low-pass filter to avoid problems with high sampling rate + +Fix bug (voir mail) + + 1. Would it be possible to have a celeste offset i.e. where you could add a + constant value (Hz) to every note: +5Hz to -5Hz , this would be usefull for + tuning the celeste on the organ! + + 2. Would it be possible to have the note names only using sharps i.e. A#, C#, + D#, F#, G# this is what I have always encountered in the organ building + world. + - pouvoir passer d'un naming scheme � l'autre. + + 3. I would really like to use fmit. But it doesn't compile with the newest + version of Jack. It complains about "CaptureThread.cpp:(.text+0x7276): + undefined reference to `jack_error_callback'". It does compile with an + older version of Jack, but that version of Jack won't work with the + version of FFADO that works with my audio interface. Any chance you + could update fmit to compile with the newest version of Jack? + + 4. (voir mail de Jean-Jacques Sacr�): probl�me de chargement d'un + fichier de traduction. en effet, si PACKAGE_NAME correspond pas au path + d'installation, �a marche pas. nouveaut� dans la lib qt ? + + 5. (voir mail de wayne): implementer le low-pass filter + +Two remarks (of details): + + - as also can be seen on your welcome page, to my knowledge, 329.6Hz +is E3 rather than E4: since I remarked this for the whole frequency +range, it's probably due to the lack of a minus one somewhere in an +integer part operation. + + - I found that the default sound level for incoming audio is very +low so that setting is first required before using fmit; possibly, it +would be set higher in the next release. + + +unification of scales system volume à partir de la somme des harmoniques pas de la valeur max perceptive volume from weighted spectrum ? loudness ? de Bark ? @@ -12,17 +59,17 @@ Doc Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. promotion - contact AGNULA project - http://apps.linuxaudio.org/apps/screenshots + look for translations algo sep en bandes avec resampling ? Quantizer Viterbi + Detection automatique de la présence d'un son interface statistics - in a preselected range of notes + average on last n secondes, throw too old notes keep the history of the note (not only an average over the note) be able to drop too short notes average of volume @@ -32,7 +79,9 @@ interface add inharmonicity values in cents phase DFT - envelope ? + enveloppe LPC + adapt win length to f0, proportional to nb_periods + Spectrogram microtonal view autodetect octave ? stretch scale view to the complet scale length (not always 12 !) @@ -43,7 +92,10 @@ interface code cleaning use AutoQSetting under Views -autotools - maintainer-clean - doc directories of libs - curse autotools authors families up to five generations +COMMANDS ======================================================================= +lupdate ../ui ../src -ts fmit_fr.ts +lupdate ../ui ../src -ts fmit_de.ts +linguist tr/fmit_fr.ts +lrelease tr/fmit_fr.ts + +cmake -DCMAKE_BUILD_TYPE:STRING=Debug diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index 5af85d4..0000000 --- a/aclocal.m4 +++ /dev/null @@ -1,1013 +0,0 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. -# This file 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. - -dnl Configure Paths for Alsa -dnl Some modifications by Richard Boulton -dnl Christopher Lansdown -dnl Jaroslav Kysela -dnl Last modification: $Id: alsa.m4,v 1.24 2004/09/15 18:48:07 tiwai Exp $ -dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. -dnl enables arguments --with-alsa-prefix= -dnl --with-alsa-enc-prefix= -dnl --disable-alsatest -dnl -dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, -dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. -dnl -AC_DEFUN([AM_PATH_ALSA], -[dnl Save the original CFLAGS, LDFLAGS, and LIBS -alsa_save_CFLAGS="$CFLAGS" -alsa_save_LDFLAGS="$LDFLAGS" -alsa_save_LIBS="$LIBS" -alsa_found=yes - -dnl -dnl Get the cflags and libraries for alsa -dnl -AC_ARG_WITH(alsa-prefix, -[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)], -[alsa_prefix="$withval"], [alsa_prefix=""]) - -AC_ARG_WITH(alsa-inc-prefix, -[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)], -[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) - -dnl FIXME: this is not yet implemented -AC_ARG_ENABLE(alsatest, -[ --disable-alsatest Do not try to compile and run a test Alsa program], -[enable_alsatest="$enableval"], -[enable_alsatest=yes]) - -dnl Add any special include directories -AC_MSG_CHECKING(for ALSA CFLAGS) -if test "$alsa_inc_prefix" != "" ; then - ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="$CFLAGS -I$alsa_inc_prefix" -fi -AC_MSG_RESULT($ALSA_CFLAGS) - -dnl add any special lib dirs -AC_MSG_CHECKING(for ALSA LDFLAGS) -if test "$alsa_prefix" != "" ; then - ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" - LDFLAGS="$LDFLAGS $ALSA_LIBS" -fi - -dnl add the alsa library -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -LIBS="$ALSA_LIBS $LIBS" -AC_MSG_RESULT($ALSA_LIBS) - -dnl Check for a working version of libasound that is of the right version. -min_alsa_version=ifelse([$1], ,0.1.1,$1) -AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) -no_alsa="" - alsa_min_major_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - alsa_min_minor_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - alsa_min_micro_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - -AC_LANG_SAVE -AC_LANG_C -AC_TRY_COMPILE([ -#include -], [ -/* ensure backward compatibility */ -#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) -#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR -#endif -#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) -#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR -#endif -#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) -#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR -#endif - -# if(SND_LIB_MAJOR > $alsa_min_major_version) - exit(0); -# else -# if(SND_LIB_MAJOR < $alsa_min_major_version) -# error not present -# endif - -# if(SND_LIB_MINOR > $alsa_min_minor_version) - exit(0); -# else -# if(SND_LIB_MINOR < $alsa_min_minor_version) -# error not present -# endif - -# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) -# error not present -# endif -# endif -# endif -exit(0); -], - [AC_MSG_RESULT(found.)], - [AC_MSG_RESULT(not present.) - ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)]) - alsa_found=no] -) -AC_LANG_RESTORE - -dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -if test "x$enable_alsatest" = "xyes"; then -AC_CHECK_LIB([asound], [snd_ctl_open],, - [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) - alsa_found=no] -) -fi - -if test "x$alsa_found" = "xyes" ; then - ifelse([$2], , :, [$2]) - LIBS=`echo $LIBS | sed 's/-lasound//g'` - LIBS=`echo $LIBS | sed 's/ //'` - LIBS="-lasound $LIBS" -fi -if test "x$alsa_found" = "xno" ; then - ifelse([$3], , :, [$3]) - CFLAGS="$alsa_save_CFLAGS" - LDFLAGS="$alsa_save_LDFLAGS" - LIBS="$alsa_save_LIBS" - ALSA_CFLAGS="" - ALSA_LIBS="" -fi - -dnl That should be it. Now just export out symbols: -AC_SUBST(ALSA_CFLAGS) -AC_SUBST(ALSA_LIBS) -]) - - -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 7 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 8 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -#serial 3 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 12 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# serial 3 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 4 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# AM_PROG_MKDIR_P -# --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) -AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# serial 3 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 4 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file 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. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([m4/ac_cxx_exceptions.m4]) -m4_include([m4/ac_cxx_have_complex.m4]) -m4_include([m4/ac_cxx_have_numeric_limits.m4]) -m4_include([m4/ac_cxx_have_sstream.m4]) -m4_include([m4/ac_cxx_have_stl.m4]) -m4_include([m4/ac_cxx_namespaces.m4]) -m4_include([m4/ac_cxx_templates.m4]) -m4_include([m4/bnv_have_qt.m4]) -m4_include([m4/mdl_have_opengl.m4]) diff --git a/cmake/FindALSA.cmake b/cmake/FindALSA.cmake new file mode 100644 index 0000000..57ca14e --- /dev/null +++ b/cmake/FindALSA.cmake @@ -0,0 +1,43 @@ +## $Id: FindALSA.cmake,v 1.1 2010/05/15 15:57:16 norwin Exp $ + +# Check for the presence of ALSA +# +# HAVE_ALSA = Set to true, if all components have been found. +# ALSA_INCLUDES = Include path for the header files +# ALSA_LIBRARIES = Link these + +## ----------------------------------------------------------------------------- +## Check for the header files + +FIND_PATH (ALSA_INCLUDES alsa/asoundlib.h + PATHS /usr/local/include /usr/include + ) + +## ----------------------------------------------------------------------------- +## Check for the library + +FIND_LIBRARY (ALSA_LIBRARIES asound + PATHS /usr/local/lib /usr/lib /lib /sw/lib + ) + +## ----------------------------------------------------------------------------- +## Actions taken when all components have been found + +IF (ALSA_INCLUDES AND ALSA_LIBRARIES) + SET (HAVE_ALSA TRUE) +ELSE (ALSA_INCLUDES AND ALSA_LIBRARIES) + MESSAGE (STATUS "Unable to find ALSA library") +ENDIF (ALSA_INCLUDES AND ALSA_LIBRARIES) + +IF (HAVE_ALSA) + MESSAGE (STATUS "Found ALSA library") + MESSAGE (STATUS "ALSA_INCLUDES = ${ALSA_INCLUDES}") + MESSAGE (STATUS "ALSA_LIBRARIES = ${ALSA_LIBRARIES}") +ELSE (HAVE_ALSA) + IF (ALSA_FIND_REQUIRED) + MESSAGE (FATAL_ERROR "Could not find ALSA!") + ENDIF (ALSA_FIND_REQUIRED) +ENDIF (HAVE_ALSA) + +## ------------------------------------------------------------------------------ +## Mark as advanced ... diff --git a/cmake/FindALSA.cmake.new b/cmake/FindALSA.cmake.new new file mode 100644 index 0000000..04f0d4a --- /dev/null +++ b/cmake/FindALSA.cmake.new @@ -0,0 +1,34 @@ +# - Try to find ALSA +# Once done, this will define +# +# ALSA_FOUND - system has ALSA (GL and GLU) +# ALSA_INCLUDE_DIRS - the ALSA include directories +# ALSA_LIBRARIES - link these to use ALSA +# ALSA_GL_LIBRARY - only GL +# ALSA_GLU_LIBRARY - only GLU +# +# See documentation on how to write CMake scripts at +# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries + +include(LibFindMacros) + +libfind_pkg_check_modules(ALSA_PKGCONF alsa) + +find_path(ALSA_INCLUDE_DIR + NAMES alsa/version.h + PATHS ${ALSA_PKGCONF_INCLUDE_DIRS} +) + +find_library(ALSA_LIBRARY + NAMES asound + PATHS ${ALSA_PKGCONF_LIBRARY_DIRS} +) + +# Extract the version number +file(READ "${ALSA_INCLUDE_DIR}/alsa/version.h" _ALSA_VERSION_H_CONTENTS) +string(REGEX REPLACE ".*#define SND_LIB_VERSION_STR[ \t]*\"([^\n]*)\".*" "\\1" ALSA_VERSION "${_ALSA_VERSION_H_CONTENTS}") + +set(ALSA_PROCESS_INCLUDES ALSA_INCLUDE_DIR) +set(ALSA_PROCESS_LIBS ALSA_LIBRARY) +libfind_process(ALSA) + diff --git a/cmake/FindALSA.cmake.own b/cmake/FindALSA.cmake.own new file mode 100644 index 0000000..882adfb --- /dev/null +++ b/cmake/FindALSA.cmake.own @@ -0,0 +1,43 @@ +## $Id: FindALSA.cmake.own,v 1.1 2010/05/15 15:57:16 norwin Exp $ + +# Check for the presence of ALSA +# +# HAVE_ALSA = Set to true, if all components have been found. +# ALSA_INCLUDES = Include path for the header files +# ALSA_LIBRARIES = Link these + +## ----------------------------------------------------------------------------- +## Check for the header files + +FIND_PATH (ALSA_INCLUDES alsa/asoundlib.h + PATHS /usr/local/include /usr/include + ) + +## ----------------------------------------------------------------------------- +## Check for the library + +FIND_LIBRARY (ALSA_LIBRARIES asound + PATHS /usr/local/lib /usr/lib /lib /sw/lib + ) + +## ----------------------------------------------------------------------------- +## Actions taken when all components have been found + +IF (ALSA_INCLUDES AND ALSA_LIBRARIES) + SET (HAVE_ALSA TRUE) +ELSE (ALSA_INCLUDES AND ALSA_LIBRARIES) + MESSAGE (STATUS "Unable to find ALSA library") +ENDIF (ALSA_INCLUDES AND ALSA_LIBRARIES) + +IF (HAVE_ALSA) + MESSAGE (STATUS "Found ALSA library") + MESSAGE (STATUS "ALSA_INCLUDES = ${ALSA_INCLUDES}") + MESSAGE (STATUS "ALSA_LIBRARIES = ${ALSA_LIBRARIES}") +ELSE (HAVE_ALSA) + IF (ALSA_FIND_REQUIRED) + MESSAGE (FATAL_ERROR "Could not find ALSA!") + ENDIF (ALSA_FIND_REQUIRED) +ENDIF (HAVE_ALSA) + +## ------------------------------------------------------------------------------ +## Mark as advanced ... diff --git a/cmake/FindFFTW3.cmake b/cmake/FindFFTW3.cmake new file mode 100644 index 0000000..25929fb --- /dev/null +++ b/cmake/FindFFTW3.cmake @@ -0,0 +1,56 @@ +##------------------------------------------------------------------------------ +## $Id: FindFFTW3.cmake,v 1.3 2011/01/04 23:31:32 norwin Exp $ +##------------------------------------------------------------------------------ + +# - Check for the presence of FFTW3 +# +# The following variables are set when FFTW3 is found: +# HAVE_FFTW3 = Set to true, if all components of FFTW3 +# have been found. +# FFTW3_INCLUDES = Include path for the header files of FFTW3 +# FFTW3_LIBRARIES = Link these to use FFTW3 + +## ----------------------------------------------------------------------------- +## Check for the header files + +FIND_PATH (FFTW3_INCLUDES fftw3.h + PATHS /usr/local/include /usr/include /sw/include + ) + +## ----------------------------------------------------------------------------- +## Check for the library + +FIND_LIBRARY (FFTW3_LIBRARIES fftw3 fftw + PATHS /usr/local/lib /usr/lib /lib /sw/lib + ) + +## ----------------------------------------------------------------------------- +## Actions taken when all components have been found + +IF (FFTW3_INCLUDES AND FFTW3_LIBRARIES) + SET (HAVE_FFTW3 TRUE) +ELSE (FFTW3_INCLUDES AND FFTW3_LIBRARIES) + IF (NOT FFTW3_FIND_QUIETLY) + IF (NOT FFTW3_INCLUDES) + MESSAGE (STATUS "Unable to find FFTW3 header files!") + ENDIF (NOT FFTW3_INCLUDES) + IF (NOT FFTW3_LIBRARIES) + MESSAGE (STATUS "Unable to find FFTW3 library files!") + ENDIF (NOT FFTW3_LIBRARIES) + ENDIF (NOT FFTW3_FIND_QUIETLY) +ENDIF (FFTW3_INCLUDES AND FFTW3_LIBRARIES) + +IF (HAVE_FFTW3) + IF (NOT FFTW3_FIND_QUIETLY) + MESSAGE (STATUS "Found components for FFTW3") + MESSAGE (STATUS "FFTW3_INCLUDES = ${FFTW3_INCLUDES}") + MESSAGE (STATUS "FFTW3_LIBRARIES = ${FFTW3_LIBRARIES}") + ENDIF (NOT FFTW3_FIND_QUIETLY) +ELSE (HAVE_FFTW3) + IF (FFTW3_FIND_REQUIRED) + MESSAGE (FATAL_ERROR "Can not find FFTW3 library !") + ENDIF (FFTW3_FIND_REQUIRED) +ENDIF (HAVE_FFTW3) + +## ------------------------------------------------------------------------------ +## Mark as advanced ... diff --git a/cmake/FindJack.cmake b/cmake/FindJack.cmake new file mode 100644 index 0000000..44417de --- /dev/null +++ b/cmake/FindJack.cmake @@ -0,0 +1,87 @@ +# - Try to find jack-2.6 +# Once done this will define +# +# JACK_FOUND - system has jack +# JACK_INCLUDE_DIRS - the jack include directory +# JACK_LIBRARIES - Link these to use jack +# JACK_DEFINITIONS - Compiler switches required for using jack +# +# Copyright (c) 2008 Andreas Schneider +# Modified for other libraries by Lasse Kärkkäinen +# +# Redistribution and use is allowed according to the terms of the New +# BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + +if (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) + # in cache already + set(JACK_FOUND TRUE) +else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + include(UsePkgConfig) + pkgconfig(jack _JACK_INCLUDEDIR _JACK_LIBDIR _JACK_LDFLAGS _JACK_CFLAGS) + else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) + pkg_check_modules(_JACK jack) + endif (PKG_CONFIG_FOUND) + endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + find_path(JACK_INCLUDE_DIR + NAMES + jack/jack.h + PATHS + ${_JACK_INCLUDEDIR} + /usr/include + /usr/local/include + /opt/local/include + /sw/include + ) + + find_library(JACK_LIBRARY + NAMES + jack + PATHS + ${_JACK_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + if (JACK_LIBRARY) + set(JACK_FOUND TRUE) + endif (JACK_LIBRARY) + + set(JACK_INCLUDE_DIRS + ${JACK_INCLUDE_DIR} + ) + + if (JACK_FOUND) + set(JACK_LIBRARIES + ${JACK_LIBRARIES} + ${JACK_LIBRARY} + ) + endif (JACK_FOUND) + + if (JACK_INCLUDE_DIRS AND JACK_LIBRARIES) + set(JACK_FOUND TRUE) + endif (JACK_INCLUDE_DIRS AND JACK_LIBRARIES) + + if (JACK_FOUND) + if (NOT JACK_FIND_QUIETLY) + message(STATUS "Found jack: ${JACK_LIBRARY}") + endif (NOT JACK_FIND_QUIETLY) + else (JACK_FOUND) + if (JACK_FIND_REQUIRED) + message(FATAL_ERROR "Could not find JACK") + endif (JACK_FIND_REQUIRED) + endif (JACK_FOUND) + + # show the JACK_INCLUDE_DIRS and JACK_LIBRARIES variables only in the advanced view + mark_as_advanced(JACK_INCLUDE_DIRS JACK_LIBRARIES) + +endif (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) + diff --git a/cmake/FindOSS.cmake b/cmake/FindOSS.cmake new file mode 100644 index 0000000..105b3ec --- /dev/null +++ b/cmake/FindOSS.cmake @@ -0,0 +1,46 @@ +# - Find Oss +# Find Oss headers and libraries. +# +# OSS_INCLUDE_DIR - where to find soundcard.h, etc. +# OSS_FOUND - True if Oss found. + + +FIND_PATH(LINUX_OSS_INCLUDE_DIR "linux/soundcard.h" + "/usr/include" "/usr/local/include" +) + +FIND_PATH(SYS_OSS_INCLUDE_DIR "sys/soundcard.h" + "/usr/include" "/usr/local/include" +) + +FIND_PATH(MACHINE_OSS_INCLUDE_DIR "machine/soundcard.h" + "/usr/include" "/usr/local/include" +) + +SET(OSS_FOUND FALSE) + +IF(LINUX_OSS_INCLUDE_DIR) + SET(OSS_FOUND TRUE) + SET(OSS_INCLUDE_DIR ${LINUX_OSS_INCLUDE_DIR}) + SET(HAVE_LINUX_SOUNDCARD_H 1) +ENDIF() + +IF(SYS_OSS_INCLUDE_DIR) + SET(OSS_FOUND TRUE) + SET(OSS_INCLUDE_DIR ${SYS_OSS_INCLUDE_DIR}) + SET(HAVE_SYS_SOUNDCARD_H 1) +ENDIF() + +IF(MACHINE_OSS_INCLUDE_DIR) + SET(OSS_FOUND TRUE) + SET(OSS_INCLUDE_DIR ${MACHINE_OSS_INCLUDE_DIR}) + SET(HAVE_MACHINE_SOUNDCARD_H 1) +ENDIF() + +MARK_AS_ADVANCED ( + OSS_FOUND + OSS_INCLUDE_DIR + LINUX_OSS_INCLUDE_DIR + SYS_OSS_INCLUDE_DIR + MACHINE_OSS_INCLUDE_DIR +) diff --git a/cmake/FindPortaudio.cmake b/cmake/FindPortaudio.cmake new file mode 100644 index 0000000..158e20e --- /dev/null +++ b/cmake/FindPortaudio.cmake @@ -0,0 +1,107 @@ +# - Try to find Portaudio +# Once done this will define +# +# PORTAUDIO_FOUND - system has Portaudio +# PORTAUDIO_INCLUDE_DIRS - the Portaudio include directory +# PORTAUDIO_LIBRARIES - Link these to use Portaudio +# PORTAUDIO_DEFINITIONS - Compiler switches required for using Portaudio +# PORTAUDIO_VERSION - Portaudio version +# +# Copyright (c) 2006 Andreas Schneider +# +# Redistribution and use is allowed according to the terms of the New BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +if (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS) + # in cache already + set(PORTAUDIO_FOUND TRUE) +else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS) + if (NOT WIN32) + include(FindPkgConfig) + pkg_check_modules(PORTAUDIO2 portaudio-2.0) + endif (NOT WIN32) + + if (PORTAUDIO2_FOUND) + set(PORTAUDIO_INCLUDE_DIRS + ${PORTAUDIO2_INCLUDE_DIRS} + ) + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(PORTAUDIO_LIBRARIES "${PORTAUDIO2_LIBRARY_DIRS}/lib${PORTAUDIO2_LIBRARIES}.dylib") + else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(PORTAUDIO_LIBRARIES + ${PORTAUDIO2_LIBRARIES} + ) + endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(PORTAUDIO_VERSION + 19 + ) + set(PORTAUDIO_FOUND TRUE) + else (PORTAUDIO2_FOUND) + find_path(PORTAUDIO_INCLUDE_DIR + NAMES + portaudio.h + PATHS + /usr/include + /usr/local/include + /opt/local/include + /sw/include + ) + + find_library(PORTAUDIO_LIBRARY + NAMES + portaudio + PATHS + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + find_path(PORTAUDIO_LIBRARY_DIR + NAMES + portaudio + PATHS + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + set(PORTAUDIO_INCLUDE_DIRS + ${PORTAUDIO_INCLUDE_DIR} + ) + set(PORTAUDIO_LIBRARIES + ${PORTAUDIO_LIBRARY} + ) + + set(PORTAUDIO_LIBRARY_DIRS + ${PORTAUDIO_LIBRARY_DIR} + ) + + set(PORTAUDIO_VERSION + 18 + ) + + if (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES) + set(PORTAUDIO_FOUND TRUE) + endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES) + + if (PORTAUDIO_FOUND) + if (NOT Portaudio_FIND_QUIETLY) + message(STATUS "Found Portaudio: ${PORTAUDIO_LIBRARIES}") + endif (NOT Portaudio_FIND_QUIETLY) + else (PORTAUDIO_FOUND) + if (Portaudio_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Portaudio") + endif (Portaudio_FIND_REQUIRED) + endif (PORTAUDIO_FOUND) + endif (PORTAUDIO2_FOUND) + + + # show the PORTAUDIO_INCLUDE_DIRS and PORTAUDIO_LIBRARIES variables only in the advanced view + mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES) + +endif (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS) + diff --git a/config.h.in b/config.h.in deleted file mode 100644 index d47ded0..0000000 --- a/config.h.in +++ /dev/null @@ -1,122 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* define if the compiler has complex */ -#undef HAVE_COMPLEX - -/* define if the compiler supports exceptions */ -#undef HAVE_EXCEPTIONS - -/* Define to 1 if you have the header file. */ -#undef HAVE_FFTW3_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `asound' library (-lasound). */ -#undef HAVE_LIBASOUND - -/* Define to 1 if you have the `fftw3' library (-lfftw3). */ -#undef HAVE_LIBFFTW3 - -/* Define to 1 if you have the `jack' library (-ljack). */ -#undef HAVE_LIBJACK - -/* Define to 1 if you have the `portaudio' library (-lportaudio). */ -#undef HAVE_LIBPORTAUDIO - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* define if the compiler implements namespaces */ -#undef HAVE_NAMESPACES - -/* define if the compiler has numeric_limits */ -#undef HAVE_NUMERIC_LIMITS - -/* Define to 1 if you have the `pow' function. */ -#undef HAVE_POW - -/* Define to 1 if you have the `sqrt' function. */ -#undef HAVE_SQRT - -/* define if the compiler has stringstream */ -#undef HAVE_SSTREAM - -/* Define to 1 if stdbool.h conforms to C99. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* define if the compiler supports Standard Template Library */ -#undef HAVE_STL - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* define if the compiler supports basic templates */ -#undef HAVE_TEMPLATES - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if the system has the type `_Bool'. */ -#undef HAVE__BOOL - -/* References of the packager in the about box */ -#undef PACKAGER_STRING - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Installation prefix. */ -#undef PREFIX - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to `unsigned' if does not define. */ -#undef size_t - -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -#undef volatile diff --git a/configure b/configure deleted file mode 100755 index d3f4e3e..0000000 --- a/configure +++ /dev/null @@ -1,10956 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for fmit 0.97.7. -# -# Copyright (C) 2003 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_config_libobj_dir=. -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -# Identity of this package. -PACKAGE_NAME='fmit' -PACKAGE_TARNAME='fmit' -PACKAGE_VERSION='0.97.7' -PACKAGE_STRING='fmit 0.97.7' -PACKAGE_BUGREPORT='' - -ac_default_prefix=/usr/local/ -ac_default_prefix=/usr/local -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_STAT_H -# include -#endif -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#endif -#if HAVE_STRINGS_H -# include -#endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif -#if HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ac_prefix RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS QT_CXXFLAGS QT_DIR QT_LIBS QT_UIC QT_MOC GL_CFLAGS GL_LIBS ALSA_CFLAGS ALSA_LIBS LIBOBJS LTLIBOBJS' -ac_subst_files='' - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -ac_prev= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_option in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures fmit 0.97.7 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -_ACEOF - - cat <<_ACEOF -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of fmit 0.97.7:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-debug turn on debugging (default=no) - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-Mesa Prefer the Mesa library over a vendors native OpenGL - library (default=yes) - --enable-alsa turn on ALSA support (default=yes) - --disable-alsatest Do not try to compile and run a test Alsa program - --enable-oss turn on OSS support (default=yes) - --enable-jack turn on JACK support (default=yes) - --enable-portaudio turn on PortAudio support (default=no) - --enable-packager-string=NAME - add references of the packager in the about box - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-x use the X Window System - --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the - installation instructions of Trolltech. Header - files are in DIR/include, binary utilities are - in DIR/bin. The library is in DIR/lib, unless - --with-Qt-lib-dir is also set. - --with-Qt-include-dir=DIR - Qt header files are in DIR - --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR - --with-Qt-lib-dir=DIR The Qt library is in DIR - --with-Qt-lib=LIB Use -lLIB to link with the Qt library - --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional) - --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional) - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\_ACEOF -fmit configure 0.97.7 -generated by GNU Autoconf 2.59 - -Copyright (C) 2003 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit 0 -fi -exec 5>config.log -cat >&5 <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by fmit $as_me 0.97.7, which was -generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ - -_ACEOF -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_sep= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - sed "/^$/d" confdefs.h | sort - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - - - - - - - - - - - - ac_config_headers="$ac_config_headers config.h" - - -am__api_version="1.9" -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$AWK" && break -done - -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -all: - @echo 'ac_maketemp="$(MAKE)"' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftest.make -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SET_MAKE= -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='fmit' - VERSION='0.97.7' - - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -install_sh=${install_sh-"$am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - STRIP=$ac_ct_STRIP -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - - -echo "$as_me:$LINENO: checking whether to enable debugging" >&5 -echo $ECHO_N "checking whether to enable debugging... $ECHO_C" >&6 -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - -fi; -if test "x$enable_debug" = "xyes"; then - CXXFLAGS="$CPPFLAGS -g -DDEBUG" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - CXXFLAGS="$CPPFLAGS -O3 -ffast-math" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -# Set default installation prefix. - -ac_prefix=$prefix -if test "x$ac_prefix" = "xNONE"; then - ac_prefix=$ac_default_prefix -fi - - -cat >>confdefs.h <<_ACEOF -#define PREFIX "$ac_prefix" -_ACEOF - - -# Checks for programs. -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - - ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 -rm -f confinc confmf - -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" - -fi; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - - -depcc="$CC" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CXX" && break -done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - - CXX=$ac_ct_CXX -fi - - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 -if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* - - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -# Checks for languages. -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -# Checks for header files. - - -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - -for ac_header in stdlib.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to the fmit lists. ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# Checks for typedefs, structures, and compiler characteristics. -echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 -echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 -if test "${ac_cv_header_stdbool_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#ifndef bool -# error bool is not defined -#endif -#ifndef false -# error false is not defined -#endif -#if false -# error false is not 0 -#endif -#ifndef true -# error true is not defined -#endif -#if true != 1 -# error true is not 1 -#endif -#ifndef __bool_true_false_are_defined -# error __bool_true_false_are_defined is not defined -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) -0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) -0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - -int -main () -{ - return !a + !b + !c + !d + !e + !f + !g + !h + !i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_stdbool_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdbool_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 -echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 -echo "$as_me:$LINENO: checking for _Bool" >&5 -echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 -if test "${ac_cv_type__Bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((_Bool *) 0) - return 0; -if (sizeof (_Bool)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type__Bool=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type__Bool=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 -echo "${ECHO_T}$ac_cv_type__Bool" >&6 -if test $ac_cv_type__Bool = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - -fi - -if test $ac_cv_header_stdbool_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_STDBOOL_H 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_const=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 - - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -echo "$as_me:$LINENO: checking for working volatile" >&5 -echo $ECHO_N "checking for working volatile... $ECHO_C" >&6 -if test "${ac_cv_c_volatile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - -volatile int x; -int * volatile y; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_volatile=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_volatile=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 -echo "${ECHO_T}$ac_cv_c_volatile" >&6 -if test $ac_cv_c_volatile = no; then - -cat >>confdefs.h <<\_ACEOF -#define volatile -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_size_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether the compiler implements namespaces" >&5 -echo $ECHO_N "checking whether the compiler implements namespaces... $ECHO_C" >&6 -if test "${ac_cv_cxx_namespaces+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -namespace Outer { namespace Inner { int i = 0; }} -int -main () -{ -using namespace Outer::Inner; return i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cxx_namespaces=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cxx_namespaces=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_namespaces" >&5 -echo "${ECHO_T}$ac_cv_cxx_namespaces" >&6 -if test "$ac_cv_cxx_namespaces" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NAMESPACES -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether the compiler supports Standard Template Library" >&5 -echo $ECHO_N "checking whether the compiler supports Standard Template Library... $ECHO_C" >&6 -if test "${ac_cv_cxx_have_stl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -list x; x.push_back(5); -list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cxx_have_stl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cxx_have_stl=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_have_stl" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_stl" >&6 -if test "$ac_cv_cxx_have_stl" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_STL -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether the compiler has numeric_limits" >&5 -echo $ECHO_N "checking whether the compiler has numeric_limits... $ECHO_C" >&6 -if test "${ac_cv_cxx_have_numeric_limits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -double e = numeric_limits::epsilon(); return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cxx_have_numeric_limits=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cxx_have_numeric_limits=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_have_numeric_limits" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_numeric_limits" >&6 -if test "$ac_cv_cxx_have_numeric_limits" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NUMERIC_LIMITS -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether the compiler has stringstream" >&5 -echo $ECHO_N "checking whether the compiler has stringstream... $ECHO_C" >&6 -if test "${ac_cv_cxx_have_sstream+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -stringstream message; message << "Hello"; return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cxx_have_sstream=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cxx_have_sstream=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_have_sstream" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_sstream" >&6 -if test "$ac_cv_cxx_have_sstream" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SSTREAM -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether the compiler supports basic templates" >&5 -echo $ECHO_N "checking whether the compiler supports basic templates... $ECHO_C" >&6 -if test "${ac_cv_cxx_templates+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -template class A {public:A(){}}; -template void f(const A& ){} -int -main () -{ - -A d; A i; f(d); f(i); return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cxx_templates=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cxx_templates=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_templates" >&5 -echo "${ECHO_T}$ac_cv_cxx_templates" >&6 -if test "$ac_cv_cxx_templates" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TEMPLATES -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether the compiler supports exceptions" >&5 -echo $ECHO_N "checking whether the compiler supports exceptions... $ECHO_C" >&6 -if test "${ac_cv_cxx_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -try { throw 1; } catch (int i) { return i; } - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cxx_exceptions=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cxx_exceptions=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_exceptions" >&5 -echo "${ECHO_T}$ac_cv_cxx_exceptions" >&6 -if test "$ac_cv_cxx_exceptions" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_EXCEPTIONS -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether the compiler has complex" >&5 -echo $ECHO_N "checking whether the compiler has complex... $ECHO_C" >&6 -if test "${ac_cv_cxx_have_complex+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -int -main () -{ -complex a; complex b; return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cxx_have_complex=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cxx_have_complex=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_have_complex" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_complex" >&6 -if test "$ac_cv_cxx_have_complex" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_COMPLEX -_ACEOF - -fi - - -# Checks for library functions. -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif - -int -main () -{ -int i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_signal=int -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - - - -for ac_func in pow sqrt -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - -for ac_header in fftw3.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to the fmit lists. ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -echo "$as_me:$LINENO: checking for fftw_plan_dft_1d in -lfftw3" >&5 -echo $ECHO_N "checking for fftw_plan_dft_1d in -lfftw3... $ECHO_C" >&6 -if test "${ac_cv_lib_fftw3_fftw_plan_dft_1d+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfftw3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char fftw_plan_dft_1d (); -int -main () -{ -fftw_plan_dft_1d (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_fftw3_fftw_plan_dft_1d=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_fftw3_fftw_plan_dft_1d=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_fftw_plan_dft_1d" >&5 -echo "${ECHO_T}$ac_cv_lib_fftw3_fftw_plan_dft_1d" >&6 -if test $ac_cv_lib_fftw3_fftw_plan_dft_1d = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBFFTW3 1 -_ACEOF - - LIBS="-lfftw3 $LIBS" - -fi - - -# --- Qt --- -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main () -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main () -{ -remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main () -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - - - - - - echo "$as_me:$LINENO: checking for Qt" >&5 -echo $ECHO_N "checking for Qt... $ECHO_C" >&6 - - -# Check whether --with-Qt-dir or --without-Qt-dir was given. -if test "${with_Qt_dir+set}" = set; then - withval="$with_Qt_dir" - -fi; - -# Check whether --with-Qt-include-dir or --without-Qt-include-dir was given. -if test "${with_Qt_include_dir+set}" = set; then - withval="$with_Qt_include_dir" - -fi; - -# Check whether --with-Qt-bin-dir or --without-Qt-bin-dir was given. -if test "${with_Qt_bin_dir+set}" = set; then - withval="$with_Qt_bin_dir" - -fi; - -# Check whether --with-Qt-lib-dir or --without-Qt-lib-dir was given. -if test "${with_Qt_lib_dir+set}" = set; then - withval="$with_Qt_lib_dir" - -fi; - -# Check whether --with-Qt-lib or --without-Qt-lib was given. -if test "${with_Qt_lib+set}" = set; then - withval="$with_Qt_lib" - -fi; - if test x"$with_Qt_dir" = x"no" || - test x"$with_Qt_include-dir" = x"no" || - test x"$with_Qt_bin_dir" = x"no" || - test x"$with_Qt_lib_dir" = x"no" || - test x"$with_Qt_lib" = x"no"; then - # user disabled Qt. Leave cache alone. - have_qt="User disabled Qt." - else - # "yes" is a bogus option - if test x"$with_Qt_dir" = xyes; then - with_Qt_dir= - fi - if test x"$with_Qt_include_dir" = xyes; then - with_Qt_include_dir= - fi - if test x"$with_Qt_bin_dir" = xyes; then - with_Qt_bin_dir= - fi - if test x"$with_Qt_lib_dir" = xyes; then - with_Qt_lib_dir= - fi - if test x"$with_Qt_lib" = xyes; then - with_Qt_lib= - fi - # No Qt unless we discover otherwise - have_qt=no - # Check whether we are requested to link with a specific version - if test x"$with_Qt_lib" != x; then - bnv_qt_lib="$with_Qt_lib" - fi - # Check whether we were supplied with an answer already - if test x"$with_Qt_dir" != x; then - have_qt=yes - bnv_qt_dir="$with_Qt_dir" - bnv_qt_include_dir="$with_Qt_dir/include" - bnv_qt_bin_dir="$with_Qt_dir/bin" - bnv_qt_lib_dir="$with_Qt_dir/lib" - # Only search for the lib if the user did not define one already - if test x"$bnv_qt_lib" = x; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | sed s@[.].*@@`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # Use cached value or do search, starting with suggestions from - # the command line - if test "${bnv_cv_have_qt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - # We are not given a solution and there is no cached value. - bnv_qt_dir=NO - bnv_qt_include_dir=NO - bnv_qt_lib_dir=NO - if test x"$bnv_qt_lib" = x; then - bnv_qt_lib=NO - fi - - ## Binary utilities ## - if test x"$with_Qt_bin_dir" != x; then - bnv_qt_bin_dir=$with_Qt_bin_dir - fi - ## Look for header files ## - if test x"$with_Qt_include_dir" != x; then - bnv_qt_include_dir="$with_Qt_include_dir" - else - # The following header file is expected to define QT_VERSION. - qt_direct_test_header=qglobal.h - # Look for the header file in a standard set of common directories. - bnv_include_path_list=" - /usr/include - `ls -dr ${QTDIR}/include 2>/dev/null` - `ls -dr /usr/include/qt* 2>/dev/null` - `ls -dr /usr/lib/qt*/include 2>/dev/null` - `ls -dr /usr/local/qt*/include 2>/dev/null` - `ls -dr /opt/qt*/include 2>/dev/null` - `ls -dr /Developer/qt*/include 2>/dev/null` - " - for bnv_dir in $bnv_include_path_list; do - if test -r "$bnv_dir/$qt_direct_test_header"; then - bnv_dirs="$bnv_dirs $bnv_dir" - fi - done - # Now look for the newest in this list - bnv_prev_ver=0 - for bnv_dir in $bnv_dirs; do - bnv_this_ver=`egrep -w '#define QT_VERSION' $bnv_dir/$qt_direct_test_header | sed s/'#define QT_VERSION'//` - if expr $bnv_this_ver '>' $bnv_prev_ver > /dev/null; then - bnv_qt_include_dir=$bnv_dir - bnv_prev_ver=$bnv_this_ver - fi - done - fi - # Are these headers located in a traditional Trolltech installation? - # That would be $bnv_qt_include_dir stripped from its last element: - bnv_possible_qt_dir=`dirname $bnv_qt_include_dir` - if (test -x $bnv_possible_qt_dir/bin/moc) && - ((ls $bnv_possible_qt_dir/lib/libqt* > /dev/null 2>/dev/null) || - (ls $bnv_possible_qt_dir/lib64/libqt* > /dev/null 2>/dev/null)); then - # Then the rest is a piece of cake - bnv_qt_dir=$bnv_possible_qt_dir - bnv_qt_bin_dir="$bnv_qt_dir/bin" - if test x"$with_Qt_lib_dir" != x; then - bnv_qt_lib_dir="$with_Qt_lib_dir" - else - if (test -d $bnv_qt_dir/lib64); then - bnv_qt_lib_dir="$bnv_qt_dir/lib64" - else - bnv_qt_lib_dir="$bnv_qt_dir/lib" - fi - fi - # Only look for lib if the user did not supply it already - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | sed s@[.].*@@`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # There is no valid definition for $QTDIR as Trolltech likes to see it - bnv_qt_dir= - ## Look for Qt library ## - if test x"$with_Qt_lib_dir" != x; then - bnv_qt_lib_dir="$with_Qt_lib_dir" - # Only look for lib if the user did not supply it already - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | sed s@[.].*@@`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # Normally, when there is no traditional Trolltech installation, - # the library is installed in a place where the linker finds it - # automatically. - # If the user did not define the library name, try with qt - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib=qt - fi - qt_direct_test_header=qapplication.h - qt_direct_test_main=" - int argc; - char ** argv; - QApplication app(argc,argv); - " - # See if we find the library without any special options. - # Don't add top $LIBS permanently yet - bnv_save_LIBS="$LIBS" - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - bnv_qt_LIBS="$LIBS" - bnv_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="-I$bnv_qt_include_dir" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$qt_direct_test_header> -int -main () -{ -$qt_direct_test_main - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - # That did not work. Try the multi-threaded version - echo "Non-critical error, please neglect the above." >&5 - bnv_qt_lib=qt-mt - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$qt_direct_test_header> -int -main () -{ -$qt_direct_test_main - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - # That did not work. Try the OpenGL version - echo "Non-critical error, please neglect the above." >&5 - bnv_qt_lib=qt-gl - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$qt_direct_test_header> -int -main () -{ -$qt_direct_test_main - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - # That did not work. Maybe a library version I don't know about? - echo "Non-critical error, please neglect the above." >&5 - # Look for some Qt lib in a standard set of common directories. - bnv_dir_list=" - `echo $bnv_qt_includes | sed ss/includess` - /lib - /usr/lib64 - /usr/lib - /usr/local/lib64 - /usr/local/lib - /opt/lib64 - /opt/lib - `ls -dr /usr/lib64/qt* 2>/dev/null` - `ls -dr /usr/lib64/qt*/lib64 2>/dev/null` - `ls -dr /usr/lib/qt* 2>/dev/null` - `ls -dr /usr/local/qt* 2>/dev/null` - `ls -dr /opt/qt* 2>/dev/null` - " - for bnv_dir in $bnv_dir_list; do - if ls $bnv_dir/libqt* >/dev/null 2>/dev/null; then - # Gamble that it's the first one... - bnv_qt_lib="`ls $bnv_dir/libqt* | sed -n 1p | - sed s@$bnv_dir/lib@@ | sed s/[.].*//`" - bnv_qt_lib_dir="$bnv_dir" - break - fi - done - # Try with that one - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$qt_direct_test_header> -int -main () -{ -$qt_direct_test_main - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - # Leave bnv_qt_lib_dir defined - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test x"$bnv_qt_lib_dir" != x; then - bnv_qt_LIBS="-L$bnv_qt_lib_dir $LIBS" - else - bnv_qt_LIBS="$LIBS" - fi - LIBS="$bnv_save_LIBS" - CXXFLAGS="$bnv_save_CXXFLAGS" - fi fi - if test "$bnv_qt_dir" = NO || - test "$bnv_qt_include_dir" = NO || - test "$bnv_qt_lib_dir" = NO || - test "$bnv_qt_lib" = NO; then - # Problem with finding complete Qt. Cache the known absence of Qt. - bnv_cv_have_qt="have_qt=no" - else - # Record where we found Qt for the cache. - bnv_cv_have_qt="have_qt=yes \ - bnv_qt_dir=$bnv_qt_dir \ - bnv_qt_include_dir=$bnv_qt_include_dir \ - bnv_qt_bin_dir=$bnv_qt_bin_dir \ - bnv_qt_LIBS=\"$bnv_qt_LIBS\"" - fi - -fi - eval "$bnv_cv_have_qt" - fi # all $bnv_qt_* are set - fi # $have_qt reflects the system status - if test x"$have_qt" = xyes; then - QT_CXXFLAGS="-I$bnv_qt_include_dir" - if test x"$bnv_qt_lib" = xqt-mt; then - QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT" - fi - QT_DIR="$bnv_qt_dir" - QT_LIBS="$bnv_qt_LIBS" - # If bnv_qt_dir is defined, utilities are expected to be in the - # bin subdirectory - if test x"$bnv_qt_dir" != x; then - if test -x "$bnv_qt_dir/bin/uic"; then - QT_UIC="$bnv_qt_dir/bin/uic" - else - # Old versions of Qt don't have uic - QT_UIC= - fi - QT_MOC="$bnv_qt_dir/bin/moc" - else - # Or maybe we are told where to look for the utilities - if test x"$bnv_qt_bin_dir" != x; then - if test -x "$bnv_qt_bin_dir/uic"; then - QT_UIC="$bnv_qt_bin_dir/uic" - else - # Old versions of Qt don't have uic - QT_UIC= - fi - QT_MOC="$bnv_qt_bin_dir/moc" - else - # Last possibility is that they are in $PATH - QT_UIC="`which uic`" - QT_MOC="`which moc`" - fi - fi - # All variables are defined, report the result - echo "$as_me:$LINENO: result: $have_qt: - QT_CXXFLAGS=$QT_CXXFLAGS - QT_DIR=$QT_DIR - QT_LIBS=$QT_LIBS - QT_UIC=$QT_UIC - QT_MOC=$QT_MOC" >&5 -echo "${ECHO_T}$have_qt: - QT_CXXFLAGS=$QT_CXXFLAGS - QT_DIR=$QT_DIR - QT_LIBS=$QT_LIBS - QT_UIC=$QT_UIC - QT_MOC=$QT_MOC" >&6 - else - # Qt was not found - QT_CXXFLAGS= - QT_DIR= - QT_LIBS= - QT_UIC= - QT_MOC= - echo "$as_me:$LINENO: result: $have_qt" >&5 -echo "${ECHO_T}$have_qt" >&6 - fi - - - - - - - #### Being paranoid: - if test x"$have_qt" = xyes; then - echo "$as_me:$LINENO: checking correct functioning of Qt installation" >&5 -echo $ECHO_N "checking correct functioning of Qt installation... $ECHO_C" >&6 - if test "${bnv_cv_qt_test_result+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat > bnv_qt_test.h << EOF -#include -class Test : public QObject -{ -Q_OBJECT -public: - Test() {} - ~Test() {} -public slots: - void receive() {} -signals: - void send(); -}; -EOF - - cat > bnv_qt_main.$ac_ext << EOF -#include "bnv_qt_test.h" -#include -int main( int argc, char **argv ) -{ - QApplication app( argc, argv ); - Test t; - QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) ); -} -EOF - - bnv_cv_qt_test_result="failure" - bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" - { (eval echo "$as_me:$LINENO: \"$bnv_try_1\"") >&5 - (eval $bnv_try_1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - if test x"$ac_status" != x0; then - echo "$bnv_err_1" >&5 - echo "configure: could not run $QT_MOC on:" >&5 - cat bnv_qt_test.h >&5 - else - bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" - { (eval echo "$as_me:$LINENO: \"$bnv_try_2\"") >&5 - (eval $bnv_try_2) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - if test x"$ac_status" != x0; then - echo "$bnv_err_2" >&5 - echo "configure: could not compile:" >&5 - cat moc_bnv_qt_test.$ac_ext >&5 - else - bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>/dev/null" - { (eval echo "$as_me:$LINENO: \"$bnv_try_3\"") >&5 - (eval $bnv_try_3) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - if test x"$ac_status" != x0; then - echo "$bnv_err_3" >&5 - echo "configure: could not compile:" >&5 - cat bnv_qt_main.$ac_ext >&5 - else - bnv_try_4="$CXX $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o $QT_LIBS >/dev/null 2>/dev/null" - { (eval echo "$as_me:$LINENO: \"$bnv_try_4\"") >&5 - (eval $bnv_try_4) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - if test x"$ac_status" != x0; then - echo "$bnv_err_4" >&5 - else - bnv_cv_qt_test_result="success" - fi - fi - fi - fi - -fi - echo "$as_me:$LINENO: result: $bnv_cv_qt_test_result" >&5 -echo "${ECHO_T}$bnv_cv_qt_test_result" >&6; - if test x"$bnv_cv_qt_test_result" = "xfailure"; then - { { echo "$as_me:$LINENO: error: Failed to find matching components of a complete - Qt installation. Try using more options, - see ./configure --help." >&5 -echo "$as_me: error: Failed to find matching components of a complete - Qt installation. Try using more options, - see ./configure --help." >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f bnv_qt_test.h moc_bnv_qt_test.$ac_ext moc_bnv_qt_test.o \ - bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main - fi - - -QTDIR="$QT_DIR" -CFLAGS="$CFLAGS $QT_CXXFLAGS" -CPPFLAGS="$CPPFLAGS $QT_CXXFLAGS" -LIBS="$LIBS $QT_LIBS" - - -# --- OpenGL --- - - - - - - echo "$as_me:$LINENO: checking for OpenGL" >&5 -echo $ECHO_N "checking for OpenGL... $ECHO_C" >&6 -if test "${mdl_cv_have_OpenGL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - # Check whether --enable-Mesa or --disable-Mesa was given. -if test "${enable_Mesa+set}" = set; then - enableval="$enable_Mesa" - use_Mesa=$enableval -else - use_Mesa=yes -fi; - - if test x"$use_Mesa" = xyes; then - GL_search_list="MesaGL GL" - GLU_search_list="MesaGLU GLU" - GLX_search_list="MesaGLX GLX" - else - GL_search_list="GL MesaGL" - GLU_search_list="GLU MesaGLU" - GLX_search_list="GLX MesaGLX" - fi - - - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -if test x"$no_x" != xyes; then - GL_CFLAGS="$X_CFLAGS" - GL_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -fi - GL_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$GL_CFLAGS" - - GL_save_LIBS="$LIBS" - LIBS="$GL_X_LIBS" - - - # Save the "AC_MSG_RESULT file descriptor" to FD 8. - exec 8>&6 - - # Temporarily turn off AC_MSG_RESULT so that the user gets pretty - # messages. - exec 6>/dev/null - - echo "$as_me:$LINENO: checking for library containing glAccum" >&5 -echo $ECHO_N "checking for library containing glAccum... $ECHO_C" >&6 -if test "${ac_cv_search_glAccum+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_glAccum=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glAccum (); -int -main () -{ -glAccum (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_glAccum="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_glAccum" = no; then - for ac_lib in $GL_search_list; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glAccum (); -int -main () -{ -glAccum (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_glAccum="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_glAccum" >&5 -echo "${ECHO_T}$ac_cv_search_glAccum" >&6 -if test "$ac_cv_search_glAccum" != no; then - test "$ac_cv_search_glAccum" = "none required" || LIBS="$ac_cv_search_glAccum $LIBS" - have_GL=yes -else - have_GL=no -fi - - echo "$as_me:$LINENO: checking for library containing gluBeginCurve" >&5 -echo $ECHO_N "checking for library containing gluBeginCurve... $ECHO_C" >&6 -if test "${ac_cv_search_gluBeginCurve+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_gluBeginCurve=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gluBeginCurve (); -int -main () -{ -gluBeginCurve (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_gluBeginCurve="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_gluBeginCurve" = no; then - for ac_lib in $GLU_search_list; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gluBeginCurve (); -int -main () -{ -gluBeginCurve (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_gluBeginCurve="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_gluBeginCurve" >&5 -echo "${ECHO_T}$ac_cv_search_gluBeginCurve" >&6 -if test "$ac_cv_search_gluBeginCurve" != no; then - test "$ac_cv_search_gluBeginCurve" = "none required" || LIBS="$ac_cv_search_gluBeginCurve $LIBS" - have_GLU=yes -else - have_GLU=no -fi - - echo "$as_me:$LINENO: checking for library containing glXChooseVisual" >&5 -echo $ECHO_N "checking for library containing glXChooseVisual... $ECHO_C" >&6 -if test "${ac_cv_search_glXChooseVisual+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_glXChooseVisual=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glXChooseVisual (); -int -main () -{ -glXChooseVisual (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_glXChooseVisual="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_glXChooseVisual" = no; then - for ac_lib in $GLX_search_list; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glXChooseVisual (); -int -main () -{ -glXChooseVisual (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_glXChooseVisual="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_glXChooseVisual" >&5 -echo "${ECHO_T}$ac_cv_search_glXChooseVisual" >&6 -if test "$ac_cv_search_glXChooseVisual" != no; then - test "$ac_cv_search_glXChooseVisual" = "none required" || LIBS="$ac_cv_search_glXChooseVisual $LIBS" - have_GLX=yes -else - have_GLX=no -fi - - echo "$as_me:$LINENO: checking for library containing glutInit" >&5 -echo $ECHO_N "checking for library containing glutInit... $ECHO_C" >&6 -if test "${ac_cv_search_glutInit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_glutInit=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glutInit (); -int -main () -{ -glutInit (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_glutInit="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_glutInit" = no; then - for ac_lib in glut; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glutInit (); -int -main () -{ -glutInit (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_glutInit="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_glutInit" >&5 -echo "${ECHO_T}$ac_cv_search_glutInit" >&6 -if test "$ac_cv_search_glutInit" != no; then - test "$ac_cv_search_glutInit" = "none required" || LIBS="$ac_cv_search_glutInit $LIBS" - have_glut=yes -else - have_glut=no -fi - - - - - # Restore pretty messages. - exec 6>&8 - - if test -n "$LIBS"; then - mdl_cv_have_OpenGL=yes - GL_LIBS="$LIBS" - - - else - mdl_cv_have_OpenGL=no - GL_CFLAGS= - fi - - GL_X_LIBS= - - LIBS="$GL_save_LIBS" - CPPFLAGS="$GL_save_CPPFLAGS" - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - mdl_cv_GL_CFLAGS="$GL_CFLAGS" - mdl_cv_GL_LIBS="$GL_LIBS" - mdl_cv_have_GL="$have_GL" - mdl_cv_have_GLU="$have_GLU" - mdl_cv_have_GLX="$have_GLX" - mdl_cv_have_glut="$have_glut" - -fi -echo "$as_me:$LINENO: result: $mdl_cv_have_OpenGL" >&5 -echo "${ECHO_T}$mdl_cv_have_OpenGL" >&6 - GL_CFLAGS="$mdl_cv_GL_CFLAGS" - GL_LIBS="$mdl_cv_GL_LIBS" - have_GL="$mdl_cv_have_GL" - have_GLU="$mdl_cv_have_GLU" - have_GLX="$mdl_cv_have_GLX" - have_glut="$mdl_cv_have_glut" - -echo "$as_me:$LINENO: checking for GL" >&5 -echo $ECHO_N "checking for GL... $ECHO_C" >&6 -if test "x$have_GL" = "xyes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: no GL library found" >&5 -echo "$as_me: error: no GL library found" >&2;} - { (exit 1); exit 1; }; } -fi -echo "$as_me:$LINENO: checking for GLU" >&5 -echo $ECHO_N "checking for GLU... $ECHO_C" >&6 -if test "x$have_GLU" = "xyes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: no GLU library found" >&5 -echo "$as_me: error: no GLU library found" >&2;} - { (exit 1); exit 1; }; } -fi -echo "$as_me:$LINENO: checking for glut" >&5 -echo $ECHO_N "checking for glut... $ECHO_C" >&6 -if test "x$have_glut" = "xyes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: no glut library found" >&5 -echo "$as_me: error: no glut library found" >&2;} - { (exit 1); exit 1; }; } -fi - - -# Checks for features -# --- ALSA --- -echo "$as_me:$LINENO: checking whether to enable ALSA" >&5 -echo $ECHO_N "checking whether to enable ALSA... $ECHO_C" >&6 -# Check whether --enable-alsa or --disable-alsa was given. -if test "${enable_alsa+set}" = set; then - enableval="$enable_alsa" - enable_alsa=$enableval -else - enable_alsa=yes -fi; -if test "x$enable_alsa" = "xyes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - alsa_save_CFLAGS="$CFLAGS" -alsa_save_LDFLAGS="$LDFLAGS" -alsa_save_LIBS="$LIBS" -alsa_found=yes - - -# Check whether --with-alsa-prefix or --without-alsa-prefix was given. -if test "${with_alsa_prefix+set}" = set; then - withval="$with_alsa_prefix" - alsa_prefix="$withval" -else - alsa_prefix="" -fi; - - -# Check whether --with-alsa-inc-prefix or --without-alsa-inc-prefix was given. -if test "${with_alsa_inc_prefix+set}" = set; then - withval="$with_alsa_inc_prefix" - alsa_inc_prefix="$withval" -else - alsa_inc_prefix="" -fi; - -# Check whether --enable-alsatest or --disable-alsatest was given. -if test "${enable_alsatest+set}" = set; then - enableval="$enable_alsatest" - enable_alsatest="$enableval" -else - enable_alsatest=yes -fi; - -echo "$as_me:$LINENO: checking for ALSA CFLAGS" >&5 -echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6 -if test "$alsa_inc_prefix" != "" ; then - ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="$CFLAGS -I$alsa_inc_prefix" -fi -echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 -echo "${ECHO_T}$ALSA_CFLAGS" >&6 - -echo "$as_me:$LINENO: checking for ALSA LDFLAGS" >&5 -echo $ECHO_N "checking for ALSA LDFLAGS... $ECHO_C" >&6 -if test "$alsa_prefix" != "" ; then - ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" - LDFLAGS="$LDFLAGS $ALSA_LIBS" -fi - -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -LIBS="$ALSA_LIBS $LIBS" -echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 -echo "${ECHO_T}$ALSA_LIBS" >&6 - -min_alsa_version=0.9 -echo "$as_me:$LINENO: checking for libasound headers version >= $min_alsa_version" >&5 -echo $ECHO_N "checking for libasound headers version >= $min_alsa_version... $ECHO_C" >&6 -no_alsa="" - alsa_min_major_version=`echo $min_alsa_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - alsa_min_minor_version=`echo $min_alsa_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - alsa_min_micro_version=`echo $min_alsa_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include - -int -main () -{ - -/* ensure backward compatibility */ -#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) -#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR -#endif -#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) -#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR -#endif -#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) -#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR -#endif - -# if(SND_LIB_MAJOR > $alsa_min_major_version) - exit(0); -# else -# if(SND_LIB_MAJOR < $alsa_min_major_version) -# error not present -# endif - -# if(SND_LIB_MINOR > $alsa_min_minor_version) - exit(0); -# else -# if(SND_LIB_MINOR < $alsa_min_minor_version) -# error not present -# endif - -# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) -# error not present -# endif -# endif -# endif -exit(0); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: found." >&5 -echo "${ECHO_T}found." >&6 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: result: not present." >&5 -echo "${ECHO_T}not present." >&6 - { { echo "$as_me:$LINENO: error: Sufficiently new version of libasound not found." >&5 -echo "$as_me: error: Sufficiently new version of libasound not found." >&2;} - { (exit 1); exit 1; }; } - alsa_found=no - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -if test "x$enable_alsatest" = "xyes"; then - -echo "$as_me:$LINENO: checking for snd_ctl_open in -lasound" >&5 -echo $ECHO_N "checking for snd_ctl_open in -lasound... $ECHO_C" >&6 -if test "${ac_cv_lib_asound_snd_ctl_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lasound $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char snd_ctl_open (); -int -main () -{ -snd_ctl_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_asound_snd_ctl_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_asound_snd_ctl_open=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_ctl_open" >&5 -echo "${ECHO_T}$ac_cv_lib_asound_snd_ctl_open" >&6 -if test $ac_cv_lib_asound_snd_ctl_open = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBASOUND 1 -_ACEOF - - LIBS="-lasound $LIBS" - -else - { { echo "$as_me:$LINENO: error: No linkable libasound was found." >&5 -echo "$as_me: error: No linkable libasound was found." >&2;} - { (exit 1); exit 1; }; } - alsa_found=no - -fi - -fi - -if test "x$alsa_found" = "xyes" ; then - CXXFLAGS="$CXXFLAGS -DCAPTURE_ALSA" - LIBS=`echo $LIBS | sed 's/-lasound//g'` - LIBS=`echo $LIBS | sed 's/ //'` - LIBS="-lasound $LIBS" -fi -if test "x$alsa_found" = "xno" ; then - : - CFLAGS="$alsa_save_CFLAGS" - LDFLAGS="$alsa_save_LDFLAGS" - LIBS="$alsa_save_LIBS" - ALSA_CFLAGS="" - ALSA_LIBS="" -fi - - - - -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -# --- OSS --- -echo "$as_me:$LINENO: checking whether to enable OSS" >&5 -echo $ECHO_N "checking whether to enable OSS... $ECHO_C" >&6 -# Check whether --enable-oss or --disable-oss was given. -if test "${enable_oss+set}" = set; then - enableval="$enable_oss" - enable_oss=$enableval -else - enable_oss=yes -fi; -if test "x$enable_oss" = "xyes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - CXXFLAGS="$CXXFLAGS -DCAPTURE_OSS" - if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 -echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 -echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to the fmit lists. ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_soundcard_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 - -fi -if test $ac_cv_header_sys_soundcard_h = yes; then - : -else - { { echo "$as_me:$LINENO: error: OSS header not found." >&5 -echo "$as_me: error: OSS header not found." >&2;} - { (exit 1); exit 1; }; } -fi - - -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -# --- JACK --- -echo "$as_me:$LINENO: checking whether to enable JACK" >&5 -echo $ECHO_N "checking whether to enable JACK... $ECHO_C" >&6 -# Check whether --enable-jack or --disable-jack was given. -if test "${enable_jack+set}" = set; then - enableval="$enable_jack" - enable_jack=$enableval -else - enable_jack=yes -fi; -if test "x$enable_jack" = "xyes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - CXXFLAGS="$CXXFLAGS -DCAPTURE_JACK" - if test "${ac_cv_header_jack_jack_h+set}" = set; then - echo "$as_me:$LINENO: checking for jack/jack.h" >&5 -echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6 -if test "${ac_cv_header_jack_jack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_jack_jack_h" >&5 -echo "${ECHO_T}$ac_cv_header_jack_jack_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking jack/jack.h usability" >&5 -echo $ECHO_N "checking jack/jack.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking jack/jack.h presence" >&5 -echo $ECHO_N "checking jack/jack.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: jack/jack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jack/jack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jack/jack.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jack/jack.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jack/jack.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jack/jack.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jack/jack.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jack/jack.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jack/jack.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to the fmit lists. ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for jack/jack.h" >&5 -echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6 -if test "${ac_cv_header_jack_jack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_jack_jack_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_jack_jack_h" >&5 -echo "${ECHO_T}$ac_cv_header_jack_jack_h" >&6 - -fi -if test $ac_cv_header_jack_jack_h = yes; then - : -else - { { echo "$as_me:$LINENO: error: JACK headers not found." >&5 -echo "$as_me: error: JACK headers not found." >&2;} - { (exit 1); exit 1; }; } -fi - - - -echo "$as_me:$LINENO: checking for main in -ljack" >&5 -echo $ECHO_N "checking for main in -ljack... $ECHO_C" >&6 -if test "${ac_cv_lib_jack_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljack $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_jack_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_jack_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jack_main" >&5 -echo "${ECHO_T}$ac_cv_lib_jack_main" >&6 -if test $ac_cv_lib_jack_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBJACK 1 -_ACEOF - - LIBS="-ljack $LIBS" - -else - { { echo "$as_me:$LINENO: error: JACK library not found." >&5 -echo "$as_me: error: JACK library not found." >&2;} - { (exit 1); exit 1; }; } -fi - -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -# --- PortAudio --- -echo "$as_me:$LINENO: checking whether to enable PortAudio" >&5 -echo $ECHO_N "checking whether to enable PortAudio... $ECHO_C" >&6 -# Check whether --enable-portaudio or --disable-portaudio was given. -if test "${enable_portaudio+set}" = set; then - enableval="$enable_portaudio" - enable_portaudio=$enableval -else - enable_portaudio=no -fi; -if test "x$enable_portaudio" = "xyes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - CXXFLAGS="$CXXFLAGS -DCAPTURE_PORTAUDIO" - if test "${ac_cv_header_portaudio_h+set}" = set; then - echo "$as_me:$LINENO: checking for portaudio.h" >&5 -echo $ECHO_N "checking for portaudio.h... $ECHO_C" >&6 -if test "${ac_cv_header_portaudio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_portaudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_portaudio_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking portaudio.h usability" >&5 -echo $ECHO_N "checking portaudio.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking portaudio.h presence" >&5 -echo $ECHO_N "checking portaudio.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: portaudio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: portaudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: portaudio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: portaudio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: portaudio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: portaudio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: portaudio.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: portaudio.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: portaudio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: portaudio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------- ## -## Report this to the fmit lists. ## -## ------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for portaudio.h" >&5 -echo $ECHO_N "checking for portaudio.h... $ECHO_C" >&6 -if test "${ac_cv_header_portaudio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_portaudio_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_portaudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_portaudio_h" >&6 - -fi -if test $ac_cv_header_portaudio_h = yes; then - : -else - { { echo "$as_me:$LINENO: error: PortAudio header not found." >&5 -echo "$as_me: error: PortAudio header not found." >&2;} - { (exit 1); exit 1; }; } -fi - - - -echo "$as_me:$LINENO: checking for main in -lportaudio" >&5 -echo $ECHO_N "checking for main in -lportaudio... $ECHO_C" >&6 -if test "${ac_cv_lib_portaudio_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lportaudio $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_portaudio_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_portaudio_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_portaudio_main" >&5 -echo "${ECHO_T}$ac_cv_lib_portaudio_main" >&6 -if test $ac_cv_lib_portaudio_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPORTAUDIO 1 -_ACEOF - - LIBS="-lportaudio $LIBS" - -else - { { echo "$as_me:$LINENO: error: PortAudio library not found." >&5 -echo "$as_me: error: PortAudio library not found." >&2;} - { (exit 1); exit 1; }; } -fi - -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - ac_config_files="$ac_config_files Makefile m4/Makefile libs/Makefile libs/CppAddons/Makefile libs/Music/Makefile ui/Makefile src/Makefile src/modules/Makefile tr/Makefile" - - - -echo "$as_me:$LINENO: checking packager string" >&5 -echo $ECHO_N "checking packager string... $ECHO_C" >&6 -# Check whether --enable-packager-string or --disable-packager-string was given. -if test "${enable_packager_string+set}" = set; then - enableval="$enable_packager_string" - enable_packager_string=$enableval -else - enable_packager_string="" -fi; -if test -n "$enable_packager_string"; then - echo "$as_me:$LINENO: result: $enable_packager_string" >&5 -echo "${ECHO_T}$enable_packager_string" >&6 - -cat >>confdefs.h <<_ACEOF -#define PACKAGER_STRING "${enable_packager_string}" -_ACEOF - -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by fmit $as_me 0.97.7, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -fmit config.status 0.97.7 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2003 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# -# INIT-COMMANDS section. -# - -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - -_ACEOF - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; - "libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; - "libs/CppAddons/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/CppAddons/Makefile" ;; - "libs/Music/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/Music/Makefile" ;; - "ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES ui/Makefile" ;; - "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;; - "tr/Makefile" ) CONFIG_FILES="$CONFIG_FILES tr/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@ac_prefix@,$ac_prefix,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@EGREP@,$EGREP,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@QT_CXXFLAGS@,$QT_CXXFLAGS,;t t -s,@QT_DIR@,$QT_DIR,;t t -s,@QT_LIBS@,$QT_LIBS,;t t -s,@QT_UIC@,$QT_UIC,;t t -s,@QT_MOC@,$QT_MOC,;t t -s,@GL_CFLAGS@,$GL_CFLAGS,;t t -s,@GL_LIBS@,$GL_LIBS,;t t -s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t -s,@ALSA_LIBS@,$ALSA_LIBS,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file - fi - else - cat $tmp/config.h - rm -f $tmp/config.h - fi -# Compute $ac_file's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $ac_file | $ac_file:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } - - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done - ;; - esac -done -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - - -echo "" -echo "Now type 'make', followed by 'make install' as root." -echo "" - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 703b1bb..0000000 --- a/configure.ac +++ /dev/null @@ -1,190 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.59) -AC_INIT(fmit, 0.97.7) -AM_CONFIG_HEADER(config.h) -AC_PREFIX_DEFAULT(/usr/local/) -AM_INIT_AUTOMAKE([no-define dist-bzip2]) - -AC_MSG_CHECKING(whether to enable debugging) -AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging (default=no)]) -if test "x$enable_debug" = "xyes"; then - CXXFLAGS="$CPPFLAGS -g -DDEBUG" - AC_MSG_RESULT(yes) -else - CXXFLAGS="$CPPFLAGS -O3 -ffast-math" - AC_MSG_RESULT(no) -fi - -# Set default installation prefix. -AC_PREFIX_DEFAULT(/usr/local) -ac_prefix=$prefix -if test "x$ac_prefix" = "xNONE"; then - ac_prefix=$ac_default_prefix -fi -AC_SUBST(ac_prefix) -AC_DEFINE_UNQUOTED(PREFIX, ["$ac_prefix"], [Installation prefix.]) - -# Checks for programs. -AC_PROG_RANLIB -AC_PROG_CC -AC_PROG_CPP -AC_PROG_CXX -AC_PROG_CXXCPP -AC_PROG_GCC_TRADITIONAL -AC_PROG_INSTALL - -# Checks for languages. -AC_LANG_C -AC_LANG_CPLUSPLUS - -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([stdlib.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE -AC_C_VOLATILE -AC_TYPE_SIZE_T -AC_CXX_NAMESPACES -AC_CXX_HAVE_STL -AC_CXX_HAVE_NUMERIC_LIMITS -AC_CXX_HAVE_SSTREAM -AC_CXX_TEMPLATES -AC_CXX_EXCEPTIONS -AC_CXX_HAVE_COMPLEX - -# Checks for library functions. -AC_TYPE_SIGNAL -AC_CHECK_FUNCS([pow sqrt]) - -AC_CHECK_HEADERS([fftw3.h]) -AC_CHECK_LIB(fftw3, fftw_plan_dft_1d) - -# --- Qt --- -BNV_HAVE_QT - -QTDIR="$QT_DIR" -CFLAGS="$CFLAGS $QT_CXXFLAGS" -CPPFLAGS="$CPPFLAGS $QT_CXXFLAGS" -LIBS="$LIBS $QT_LIBS" - -dnl AC_CACHE_CHECK([for Qt library version >= 3.2], -dnl ac_qtlib_version, [ -dnl AC_TRY_LINK([#include "qglobal.h"], [ -dnl #if QT_VERSION < 0x030200 -dnl #error Qt library 3.2 or greater required. -dnl #endif -dnl ], -dnl ac_qtlib_version="yes", [ -dnl echo "no; Qt 3.2 or greater is required" -dnl exit -dnl ]) -dnl ]) - -# --- OpenGL --- -MDL_HAVE_OPENGL -AC_MSG_CHECKING(for GL) -if test "x$have_GL" = "xyes"; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) - AC_MSG_ERROR(no GL library found) -fi -AC_MSG_CHECKING(for GLU) -if test "x$have_GLU" = "xyes"; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) - AC_MSG_ERROR(no GLU library found) -fi -AC_MSG_CHECKING(for glut) -if test "x$have_glut" = "xyes"; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) - AC_MSG_ERROR(no glut library found) -fi - - -# Checks for features -# --- ALSA --- -AC_MSG_CHECKING(whether to enable ALSA) -AC_ARG_ENABLE(alsa, - AC_HELP_STRING([--enable-alsa],[turn on ALSA support (default=yes)]), - [enable_alsa=$enableval],[enable_alsa=yes]) -if test "x$enable_alsa" = "xyes"; then - AC_MSG_RESULT(yes) - AM_PATH_ALSA(0.9,[CXXFLAGS="$CXXFLAGS -DCAPTURE_ALSA"]) -else - AC_MSG_RESULT(no) -fi - -# --- OSS --- -AC_MSG_CHECKING(whether to enable OSS) -AC_ARG_ENABLE(oss, - AC_HELP_STRING([--enable-oss],[turn on OSS support (default=yes)]), - [enable_oss=$enableval],[enable_oss=yes]) -if test "x$enable_oss" = "xyes"; then - AC_MSG_RESULT(yes) - CXXFLAGS="$CXXFLAGS -DCAPTURE_OSS" - AC_CHECK_HEADER(sys/soundcard.h,,AC_MSG_ERROR([OSS header not found.])) -else - AC_MSG_RESULT(no) -fi - -# --- JACK --- -AC_MSG_CHECKING(whether to enable JACK) -AC_ARG_ENABLE(jack, - AC_HELP_STRING([--enable-jack],[turn on JACK support (default=yes)]), - [enable_jack=$enableval],[enable_jack=yes]) -if test "x$enable_jack" = "xyes"; then - AC_MSG_RESULT(yes) - CXXFLAGS="$CXXFLAGS -DCAPTURE_JACK" - AC_CHECK_HEADER(jack/jack.h,,AC_MSG_ERROR([JACK headers not found.])) - AC_CHECK_LIB(jack, main,,AC_MSG_ERROR([JACK library not found.])) -else - AC_MSG_RESULT(no) -fi - -# --- PortAudio --- -AC_MSG_CHECKING(whether to enable PortAudio) -AC_ARG_ENABLE(portaudio, - AC_HELP_STRING([--enable-portaudio],[turn on PortAudio support (default=no)]), - [enable_portaudio=$enableval],[enable_portaudio=no]) -if test "x$enable_portaudio" = "xyes"; then - AC_MSG_RESULT(yes) - CXXFLAGS="$CXXFLAGS -DCAPTURE_PORTAUDIO" - AC_CHECK_HEADER(portaudio.h,,AC_MSG_ERROR([PortAudio header not found.])) - AC_CHECK_LIB(portaudio, main,,AC_MSG_ERROR([PortAudio library not found.])) -else - AC_MSG_RESULT(no) -fi - -AC_CONFIG_FILES([Makefile m4/Makefile libs/Makefile libs/CppAddons/Makefile - libs/Music/Makefile ui/Makefile src/Makefile src/modules/Makefile - tr/Makefile]) - -dnl CFLAGS="$CFLAGS -pg" -dnl CPPFLAGS="$CPPFLAGS -pg" - -AC_MSG_CHECKING(packager string) -AC_ARG_ENABLE(packager-string, - AC_HELP_STRING([--enable-packager-string=NAME],[add references of the packager in the about box]), - [enable_packager_string=$enableval],[enable_packager_string=""]) -if test -n "$enable_packager_string"; then - AC_MSG_RESULT($enable_packager_string) - AC_DEFINE_UNQUOTED(PACKAGER_STRING,"${enable_packager_string}",[References of the packager in the about box]) -else - AC_MSG_RESULT(no) -fi - -AC_OUTPUT - -echo "" -echo "Now type 'make', followed by 'make install' as root." -echo "" - diff --git a/depcomp b/depcomp deleted file mode 100755 index 04701da..0000000 --- a/depcomp +++ /dev/null @@ -1,530 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2005-07-09.11 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. - -# 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - stat=$? - - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - outname="$stripped.o" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/fmit.desktop b/fmit.desktop index c5a3e90..16a6115 100644 --- a/fmit.desktop +++ b/fmit.desktop @@ -1,7 +1,15 @@ [Desktop Entry] Type=Application -Name=fmit -Comment=Music instrument tuner +Name=FMIT +GenericName=Musical Instrument Tuner +GenericName[de]=Stimmgerät für Musikinstrumente +GenericName[fr]=Accordeur d'instrument de musique +Comment=Tune musical instruments +Comment[de]=Musikinstrumente stimmen +Comment[fr]=Accorde un instrument de musique +Icon=fmit +TryExec=fmit Exec=fmit -Icon=mix_mic -Categories=Qt;AudioVideo +Terminal=false +Categories=Tuner;Audio;AudioVideo;Qt; +StartupNotify=true diff --git a/install-sh b/install-sh deleted file mode 100755 index 4d4a951..0000000 --- a/install-sh +++ /dev/null @@ -1,323 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2005-05-14.22 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit $?;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit $?;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/libs/CppAddons/AUTHORS b/libs/CppAddons/AUTHORS index e24d612..b40b226 100644 --- a/libs/CppAddons/AUTHORS +++ b/libs/CppAddons/AUTHORS @@ -1 +1 @@ -Gilles Degottex [gilles.degottex@net2000.ch] +Gilles Degottex [gilles.degottex@gmail.com] diff --git a/libs/CppAddons/CAMath.h b/libs/CppAddons/CAMath.h index 294ce8d..d711a8c 100644 --- a/libs/CppAddons/CAMath.h +++ b/libs/CppAddons/CAMath.h @@ -33,6 +33,7 @@ namespace Math template inline TypeData sgn(TypeData a) {return (a<0)?-1:1;} static const double Pi = 2*acos(0); + static const double Pi2 = 2*Pi; static const float fPi = 2*acos(0); static const double E = exp(1); diff --git a/libs/CppAddons/CMakeLists.txt b/libs/CppAddons/CMakeLists.txt new file mode 100644 index 0000000..407503e --- /dev/null +++ b/libs/CppAddons/CMakeLists.txt @@ -0,0 +1,13 @@ +SET(libCppAddons_SRCS + CAMath.cpp + Random.cpp +) + +INCLUDE_DIRECTORIES( + ../../libs + ${CMAKE_CURRENT_BINARY_DIR} +) + +set(CMAKE_CXX_FLAGS "-Wall -ansi -pedantic") + +add_library(CppAddons STATIC ${libCppAddons_SRCS}) diff --git a/libs/CppAddons/Doxyfile b/libs/CppAddons/Doxyfile new file mode 100644 index 0000000..f993c85 --- /dev/null +++ b/libs/CppAddons/Doxyfile @@ -0,0 +1,225 @@ +# Doxyfile 1.3.7 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = libCppAddons +PROJECT_NUMBER = +OUTPUT_DIRECTORY = ./doc/ +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = ./Average.h \ + ./Collections.h \ + ./Comparable.h \ + ./CyclicValue.h \ + ./Errors.h \ + ./Math.h \ + ./Observer.h \ + ./RTTI.h \ + ./Random.h \ + ./RangedValue.h \ + ./Singleton.h \ + ./Stream.h \ + ./StringAddons.h \ + ./Time.h +FILE_PATTERNS = +RECURSIVE = NO +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = YES +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 0 +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO diff --git a/libs/CppAddons/Fit.cpp b/libs/CppAddons/Fit.cpp deleted file mode 100644 index 6a45d18..0000000 --- a/libs/CppAddons/Fit.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2007 "Gilles Degottex" - -// This file is part of "CppAddons" - -// "CppAddons" is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation; either version 2.1 of the License, or -// (at your option) any later version. -// -// "CppAddons" 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 Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser 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 "Fit.h" -#include - -void Math::FitParabola(double x1, double y1, double x2, double y2, double x3, double y3, - double& a, double& b, double& c, double& xapex, double& yapex) -{ - assert(x1!=x2 && x1!=x3 && x2!=x3); - - double h31 = (y3-y1)/(x3-x1); - double h21 = (y2-y1)/(x2-x1); - - a = (h31-h21)/(x3-x2); - b = h21 - a*(x2+x1); - c = y1 - a*x1*x1 - b*x1; - - xapex = -b/2/a; - yapex = c - b*b/4/a; -} diff --git a/libs/CppAddons/Fit.h b/libs/CppAddons/Fit.h index 4ced5f4..a0cc638 100644 --- a/libs/CppAddons/Fit.h +++ b/libs/CppAddons/Fit.h @@ -21,8 +21,21 @@ namespace Math { - void FitParabola(double x1, double y1, double x2, double y2, double x3, double y3, - double& a, double& b, double& c, double& xapex, double& yapex); + inline void FitParabola(double x1, double y1, double x2, double y2, double x3, double y3, + double& a, double& b, double& c, double& xapex, double& yapex) + { + assert(x1!=x2 && x1!=x3 && x2!=x3); + + double h31 = (y3-y1)/(x3-x1); + double h21 = (y2-y1)/(x2-x1); + + a = (h31-h21)/(x3-x2); + b = h21 - a*(x2+x1); + c = y1 - a*x1*x1 - b*x1; + + xapex = -b/2/a; + yapex = c - b*b/4/a; + } } #endif diff --git a/libs/CppAddons/Makefile.am b/libs/CppAddons/Makefile.am deleted file mode 100644 index a28f494..0000000 --- a/libs/CppAddons/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -lib_LIBRARIES = libCppAddons.a -AM_CXXFLAGS = -Wall -ansi -pedantic -libCppAddons_a_SOURCES = CAMath.cpp Random.cpp Fit.cpp -EXTRA_DIST = *.h diff --git a/libs/CppAddons/Makefile.in b/libs/CppAddons/Makefile.in deleted file mode 100644 index 22d2abb..0000000 --- a/libs/CppAddons/Makefile.in +++ /dev/null @@ -1,442 +0,0 @@ -# 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 = : -subdir = libs/CppAddons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS \ - COPYING TODO -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -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)" -libLIBRARIES_INSTALL = $(INSTALL_DATA) -LIBRARIES = $(lib_LIBRARIES) -AR = ar -ARFLAGS = cru -libCppAddons_a_AR = $(AR) $(ARFLAGS) -libCppAddons_a_LIBADD = -am_libCppAddons_a_OBJECTS = CAMath.$(OBJEXT) Random.$(OBJEXT) \ - Fit.$(OBJEXT) -libCppAddons_a_OBJECTS = $(am_libCppAddons_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -SOURCES = $(libCppAddons_a_SOURCES) -DIST_SOURCES = $(libCppAddons_a_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -lib_LIBRARIES = libCppAddons.a -AM_CXXFLAGS = -Wall -ansi -pedantic -libCppAddons_a_SOURCES = CAMath.cpp Random.cpp Fit.cpp -EXTRA_DIST = *.h -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 libs/CppAddons/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu libs/CppAddons/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-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - p=$(am__strip_dir) \ - echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ - $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) -libCppAddons.a: $(libCppAddons_a_OBJECTS) $(libCppAddons_a_DEPENDENCIES) - -rm -f libCppAddons.a - $(libCppAddons_a_AR) libCppAddons.a $(libCppAddons_a_OBJECTS) $(libCppAddons_a_LIBADD) - $(RANLIB) libCppAddons.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CAMath.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Fit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Random.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -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 $(LIBRARIES) -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-libLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-libLIBRARIES - -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 - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLIBRARIES ctags distclean distclean-compile \ - distclean-generic 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-libLIBRARIES install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLIBRARIES - -# 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 --git a/libs/Makefile.am b/libs/Makefile.am deleted file mode 100644 index 58e04ae..0000000 --- a/libs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = CppAddons Music diff --git a/libs/Makefile.in b/libs/Makefile.in deleted file mode 100644 index 1dbeac8..0000000 --- a/libs/Makefile.in +++ /dev/null @@ -1,459 +0,0 @@ -# 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 = : -subdir = libs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = CppAddons Music -all: all-recursive - -.SUFFIXES: -$(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 libs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu libs/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 -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -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: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - 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: ctags-recursive $(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 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -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-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive 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-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# 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 --git a/libs/Music/AUTHORS b/libs/Music/AUTHORS index ffd5abe..5606760 100644 --- a/libs/Music/AUTHORS +++ b/libs/Music/AUTHORS @@ -1 +1 @@ -Gilles Degottex \ No newline at end of file +Gilles Degottex \ No newline at end of file diff --git a/libs/Music/BubbleAlgo.cpp b/libs/Music/BubbleAlgo.cpp new file mode 100644 index 0000000..bf3c628 --- /dev/null +++ b/libs/Music/BubbleAlgo.cpp @@ -0,0 +1,352 @@ +// Copyright 2004 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "BubbleAlgo.h" + +#include +#include +#include +#include +#include +using namespace std; +#include +using namespace Math; + +#include "Music.h" + +#define MUSIC_DEBUG +#ifdef MUSIC_DEBUG + #define LOG(a) a +#else + #define LOG(a) +#endif + + +namespace Music +{ + int gcd(int a, int b) + { + if (b == 0) return a; + + return gcd(b, a%b); + } + int gcd(vector v) + { + if(v.empty()) return -1; + + int s = v[0]; + for(size_t i=1; i(0.0, c*j)) * d * win_sinc(j/double(m_waves[s].size()), gauss_factor)/u; + + complex b(0.0,0.0); + for(int i=s-1; i>=0; i--) + { + for(size_t l=0; l& buff) + { + m_wave_length = 0; + + if(buff.size()=f) + if(gcds0) cerr<<"(pos:"<<100*err_drop_t/err_drop/n<<"%)"; + cerr<<",conv="<0) cerr<<"(pos:"<<100*score_drop_t/score_drop/n<<"%)"; + cerr<<",sgn="<0) cerr<<"(pos:"<<100*sgn_drop_t/sgn_drop/n<<"%)"; + cerr<<",mult="<0) cerr<<"(pos:"<<100*mult_drop_t/mult_drop/n<<"%)"; + cerr<<"]"<err_threshold +// || normm(m_bubbles[m_wave_length].conv) +#include +#include +#include +#include +using namespace std; +#include "Algorithm.h" +#include "Correlation.h" + +namespace Music +{ + class BubbleAlgo : public Algorithm + { + typedef double Type; + + size_t m_wave_length; + size_t m_min_length; + size_t m_max_length; + Type m_error_threshold; + Type m_conv_threshold; + + struct Bubble + { + size_t s; + size_t count; + size_t length; + Type score; + Type err; + complex conv; + size_t n; + size_t f; + bool todrop; + size_t gcd_count; + Bubble(size_t as=0) : s(as), count(0), score(0.0), err(0.0), conv(complex(0.0,0.0)), n(0), todrop(false), gcd_count(0) {} + }; + + vector m_bubbles; + vector< vector > > m_waves; + vector< vector > m_waves_best; + map > m_sort; + map > m_best_set; + + Type diff(const deque& buff, size_t i, size_t j) {return abs(buff[i] - buff[j]);} + + void setMinMaxLength(size_t min_length, size_t max_length) + {m_min_length=min_length; m_max_length=max_length;} + + protected: + void init(); + virtual void AFreqChanged() {init();} + virtual void samplingRateChanged() {init();} + virtual void semitoneBoundsChanged() {init();} + + public: + BubbleAlgo(); + + virtual int getSampleAlgoLatency() const {return 2*m_waves.back().size();} + + void apply(const deque& buff); + + virtual bool hasNoteRecognized() const {return m_wave_length!=0;} + virtual int getFondamentalWaveLength() const {return m_wave_length;} + void setErrorThreshold(double threshold) {m_error_threshold = threshold;} + void setConvolutionThreshold(double threshold) {m_conv_threshold = threshold;} + + virtual ~BubbleAlgo() {} + }; +} + +#endif + diff --git a/libs/Music/CMakeLists.txt b/libs/Music/CMakeLists.txt new file mode 100644 index 0000000..47f7a60 --- /dev/null +++ b/libs/Music/CMakeLists.txt @@ -0,0 +1,25 @@ +SET(libMusic_SRCS + Algorithm.cpp + Convolution.cpp + CumulativeDiff.cpp + FreqAnalysis.cpp + Music.cpp + TimeAnalysis.cpp + CumulativeDiffAlgo.cpp + MultiCumulativeDiffAlgo.cpp + CombedFT.cpp + CFFTW3.cpp + SPWindow.cpp + Filter.cpp + Autocorrelation.cpp + LPC.cpp +) + +INCLUDE_DIRECTORIES( + ../../libs + ${CMAKE_CURRENT_BINARY_DIR} +) + +set(CMAKE_CXX_FLAGS "-Wall") + +add_library(Music STATIC ${libMusic_SRCS}) diff --git a/libs/Music/COPYING b/libs/Music/COPYING index 5b6e7c6..3caebab 100644 --- a/libs/Music/COPYING +++ b/libs/Music/COPYING @@ -1,221 +1,397 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. The precise terms and conditions for copying, distribution and -modification follow. +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - a) You must cause the modified files to carry prominent notices + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, +identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of +on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. +entire whole, and thus to each and every part regardless of who wrote +it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or -collective works based on the Program. +collective works based on the Library. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are +distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. +the Library or works based on it. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to +You are not responsible for enforcing compliance by third parties with this License. - - 7. If, as a consequence of a court judgment or allegation of patent + + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. +refrain entirely from distribution of the Library. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is +integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that @@ -225,116 +401,104 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in + + 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Libraries - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. - + Copyright (C) - 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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if +school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. - , 1 April 1989 + , 1 April 1990 Ty Coon, President of Vice -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. +That's all there is to it! + + diff --git a/libs/Music/Doxyfile b/libs/Music/Doxyfile new file mode 100644 index 0000000..9b76646 --- /dev/null +++ b/libs/Music/Doxyfile @@ -0,0 +1,220 @@ +# Doxyfile 1.3.7 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = libMusic +PROJECT_NUMBER = +OUTPUT_DIRECTORY = ./doc/ +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_CLASSES = YES +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = YES +SHOW_INCLUDE_FILES = NO +INLINE_INFO = YES +SORT_MEMBER_DOCS = NO +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = ./Convolution.h \ + ./Correlation.h \ + ./Instrument.h \ + ./Music.h \ + ./ScoreGenerator.h \ + ./Algorithm.h \ + ./TimeAnalysis.h \ + ./FreqAnalysis.h \ + ./omidistream.h +FILE_PATTERNS = +RECURSIVE = NO +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = YES +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = YES +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = NO +HAVE_DOT = YES +CLASS_GRAPH = YES +COLLABORATION_GRAPH = NO +UML_LOOK = NO +TEMPLATE_RELATIONS = YES +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = NO +CALL_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 0 +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO diff --git a/libs/Music/DummyMonoQuantizer.cpp b/libs/Music/DummyMonoQuantizer.cpp new file mode 100644 index 0000000..323ddce --- /dev/null +++ b/libs/Music/DummyMonoQuantizer.cpp @@ -0,0 +1,72 @@ +// Copyright 2005 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "MonoQuantizer.h" + +#include +using namespace std; +#include +using namespace Music; +#include "DummyMonoQuantizer.h" + +DummyMonoQuantizer::DummyMonoQuantizer() +{ + m_confidence = 1.0; +} + +void DummyMonoQuantizer::quantize(double freq) +{ +// cerr << "DummyMonoQuantizer::quantize " << freq << endl; + + double current_time = m_time.elapsed(); + + double current_center_freq = h2f(f2h(freq)); + m_avg_freq = freq; + + if(m_current_center_freq==0.0) + { + if(current_center_freq>0.0) + { + m_current_center_freq = current_center_freq; + m_duration.start(); + emit(noteStarted(m_current_center_freq, 0.0)); + } + } + else + { + if(current_center_freq==0.0) + { + m_current_center_freq = current_center_freq; + emit(noteFinished(m_current_center_freq, 0.0)); + } + else if(m_current_center_freq != current_center_freq) + { + emit(noteFinished(m_current_center_freq, 0.0)); + m_current_center_freq = current_center_freq; + m_duration.start(); + emit(noteStarted(m_current_center_freq, 0.0)); + } + } +} + +void DummyMonoQuantizer::reset() +{ + quantize(0.0); + m_avg_freq = 0.0; +} diff --git a/libs/Music/DummyMonoQuantizer.h b/libs/Music/DummyMonoQuantizer.h new file mode 100644 index 0000000..472c440 --- /dev/null +++ b/libs/Music/DummyMonoQuantizer.h @@ -0,0 +1,45 @@ +// Copyright 2005 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 + + +#ifndef _DUMMYMONOQUANTIZER_H_ +#define _DUMMYMONOQUANTIZER_H_ + +#include +using namespace std; +#include +#include +#include +using namespace Music; +#include "MonoQuantizer.h" + +class DummyMonoQuantizer : public MonoQuantizer +{ + QTime m_time; + QTime m_duration; + + public: + DummyMonoQuantizer(); + + virtual void quantize(double freq); + virtual void reset(); + + virtual ~DummyMonoQuantizer(){} +}; + +#endif // _DUMMYMONOQUANTIZER_H_ diff --git a/libs/Music/Filter.cpp b/libs/Music/Filter.cpp index 3a5434d..21b60e2 100644 --- a/libs/Music/Filter.cpp +++ b/libs/Music/Filter.cpp @@ -24,6 +24,11 @@ using namespace std; using namespace Math; #include "Music.h" +#include +#include +#include + +// DOESN'T WORK // b = fir1(32,[0.00001 0.23]); vector Music::fir1_lowpass(int n, double cutoff) { @@ -37,6 +42,7 @@ vector Music::fir1_lowpass(int n, double cutoff) return b; } +// DOESN'T WORK vector Music::fir1_highpass(int n, double cutoff) { vector b(n); @@ -57,17 +63,55 @@ vector Music::fir1_highpass(int n, double cutoff) return b; } +// cutoff in ]0;0.5[ where 0.5 is the Nyquist frequency vector Music::fir1_bandpass(int n, double low_cutoff, double high_cutoff) { - vector b(n, 0.0); - - if(low_cutoff>high_cutoff) - return b; - - vector lowf = fir1_lowpass(n, low_cutoff); - vector highf = fir1_highpass(n, high_cutoff); - - return conv(lowf, highf); + double *weights, *desired, *bands; + double *h; + int i; + + bands = (double *)malloc(6 * sizeof(double)); + weights = (double *)malloc(3 * sizeof(double)); + desired = (double *)malloc(3 * sizeof(double)); + h = (double *)malloc(1000 * sizeof(double)); + + desired[0] = 1; + desired[1] = 1; + desired[2] = 0; + + weights[0] = 10; + weights[1] = 1; + weights[2] = 10; + + bands[0] = 0; + bands[1] = 0.1; + bands[2] = 0.2; + bands[3] = 0.3; + bands[4] = 0.35; + bands[5] = 0.5; +// bands[0] = 0; +// bands[1] = low_cutoff/2; +// bands[2] = low_cutoff; +// bands[3] = high_cutoff; +// bands[4] = 0.5*(high_cutoff+0.5); +// bands[5] = 0.5; + + remez(h, n, 3, bands, desired, weights, BANDPASS); + + vector hv(n); + + for (i=0; i& imp_res) @@ -86,7 +130,7 @@ double Music::FIRRTFilter::operator()(double v) if(m_to_filter.size()>=m_imp_res.size()) { - // convolve + // convolve for(size_t i=0; i bands[0])) + bands[0] = delf; + + j=0; + for (band=0; band < numband; band++) + { + Grid[j] = bands[2*band]; + lowf = bands[2*band]; + highf = bands[2*band + 1]; + k = (int)((highf - lowf)/delf + 0.5); /* .5 for rounding */ + for (i=0; i (0.5 - delf)) && + (numtaps % 2)) + { + Grid[*gridsize-1] = 0.5-delf; + } +} + + +/******************** + * InitialGuess + *============== + * Places Extremal Frequencies evenly throughout the dense grid. + * + * + * INPUT: + * ------ + * int r - 1/2 the number of filter coefficients + * int gridsize - Number of elements in the dense frequency grid + * + * OUTPUT: + * ------- + * int Ext[] - Extremal indexes to dense frequency grid [r+1] + ********************/ + +void InitialGuess(int r, int Ext[], int gridsize) +{ + int i; + + for (i=0; i<=r; i++) + Ext[i] = i * (gridsize-1) / r; +} + + +/*********************** + * CalcParms + *=========== + * + * + * INPUT: + * ------ + * int r - 1/2 the number of filter coefficients + * int Ext[] - Extremal indexes to dense frequency grid [r+1] + * double Grid[] - Frequencies (0 to 0.5) on the dense grid [gridsize] + * double D[] - Desired response on the dense grid [gridsize] + * double W[] - Weight function on the dense grid [gridsize] + * + * OUTPUT: + * ------- + * double ad[] - 'b' in Oppenheim & Schafer [r+1] + * double x[] - [r+1] + * double y[] - 'C' in Oppenheim & Schafer [r+1] + ***********************/ + +void CalcParms(int r, int Ext[], double Grid[], double D[], double W[], + double ad[], double x[], double y[]) +{ + int i, j, k, ld; + double sign, xi, delta, denom, numer; + +/* + * Find x[] + */ + for (i=0; i<=r; i++) + x[i] = cos(Pi2 * Grid[Ext[i]]); + +/* + * Calculate ad[] - Oppenheim & Schafer eq 7.132 + */ + ld = (r-1)/15 + 1; /* Skips around to avoid round errors */ + for (i=0; i<=r; i++) + { + denom = 1.0; + xi = x[i]; + for (j=0; j0.0) && (E[0]>E[1])) || + ((E[0]<0.0) && (E[0]=E[i-1]) && (E[i]>E[i+1]) && (E[i]>0.0)) || + ((E[i]<=E[i-1]) && (E[i]0.0) && (E[j]>E[j-1])) || + ((E[j]<0.0) && (E[j] 0) + { + if (E[foundExt[0]] > 0.0) + up = 1; /* first one is a maxima */ + else + up = 0; /* first one is a minima */ + + l=0; + alt = 1; + for (j=1; j 0.0)) + up = 1; /* switch to a maxima */ + else + { + alt = 0; + break; /* Ooops, found two non-alternating */ + } /* extrema. Delete smallest of them */ + } /* if the loop finishes, all extrema are alternating */ + +/* + * If there's only one extremal and all are alternating, + * delete the smallest of the first/last extremals. + */ + if ((alt) && (extra == 1)) + { + if (fabs(E[foundExt[k-1]]) < fabs(E[foundExt[0]])) + l = foundExt[k-1]; /* Delete last extremal */ + else + l = foundExt[0]; /* Delete first extremal */ + } + + for (j=l; j max) + max = current; + } + if (((max-min)/max) < 0.0001) + return 1; + return 0; +} + +/******************** + * remez + *======= + * Calculates the optimal (in the Chebyshev/minimax sense) + * FIR filter impulse response given a set of band edges, + * the desired reponse on those bands, and the weight given to + * the error in those bands. + * + * INPUT: + * ------ + * int numtaps - Number of filter coefficients + * int numband - Number of bands in filter specification + * double bands[] - User-specified band edges [2 * numband] + * double des[] - User-specified band responses [numband] + * double weight[] - User-specified error weights [numband] + * int type - Type of filter + * + * OUTPUT: + * ------- + * double h[] - Impulse response of final filter [numtaps] + ********************/ + +void Music::remez(double h[], int numtaps, + int numband, double bands[], double des[], double weight[], + int type) +{ + double *Grid, *W, *D, *E; + int i, iter, gridsize, r, *Ext; + double *taps, c; + double *x, *y, *ad; + int symmetry; + + if (type == BANDPASS) + symmetry = POSITIVE; + else + symmetry = NEGATIVE; + + r = numtaps/2; /* number of extrema */ + if ((numtaps%2) && (symmetry == POSITIVE)) + r++; + +/* + * Predict dense grid size in advance for memory allocation + * .5 is so we round up, not truncate + */ + gridsize = 0; + for (i=0; i 0.0001) + W[i] = W[i]/Grid[i]; + } + } + +/* + * For odd or Negative symmetry filters, alter the + * D[] and W[] according to Parks McClellan + */ + if (symmetry == POSITIVE) + { + if (numtaps % 2 == 0) + { + for (i=0; i fir1_lowpass(int n, double cutoff); std::vector fir1_highpass(int n, double cutoff); std::vector fir1_bandpass(int n, double low_cutoff, double high_cutoff); @@ -50,7 +91,7 @@ namespace Music public: FIRRTFilter(){m_imp_res=std::vector(1, 1.0);} FIRRTFilter(std::vector& imp_res); - void setImpulseResponse(std::vector& imp_res) {m_imp_res=imp_res;} + void setImpulseResponse(std::vector imp_res) {m_imp_res=imp_res;} virtual int getLength() {return m_imp_res.size();} diff --git a/libs/Music/FreqAnalysis.cpp b/libs/Music/FreqAnalysis.cpp index ed526dc..2bbb4f2 100644 --- a/libs/Music/FreqAnalysis.cpp +++ b/libs/Music/FreqAnalysis.cpp @@ -133,9 +133,6 @@ namespace Music double FundFreqRefinementOfHarmonicStruct(const vector >& spectrum, double approx_f0, int nb_harm, double used_zp) { - double approx_f0_rel = approx_f0*spectrum.size()/double(GetSamplingRate()); - assert(approx_f0_rel>1 && approx_f0_rel<=spectrum.size()/2-1); - vector harms = GetHarmonicStruct(spectrum, approx_f0, nb_harm, used_zp, 0.2); if(harms.empty()) @@ -144,7 +141,7 @@ namespace Music double sum_f0 = 0.0; for(size_t i=0; i +#include +#include +#include +using namespace std; +#include +using namespace Math; +#include "Music.h" + +namespace Music +{ + +#define MAX_NB_FREQ 24 +#define MAX_NB_HARM 7 +#define MAX_RDM_HT -12 +#define MIN_RDM_HT 12 + +//! an abstract instrument +struct Instrument +{ + virtual vector< Math::polar >* getFreqs(){return NULL;} + + virtual double gen_value(int k, double phase=0.0)=0; + + virtual ~Instrument(){} +}; + +//! an harmonic instrument +/*! + * une fondamentale choisie dans un interval et des composantes harmoniques + */ +struct HarmInstrument : Instrument +{ + int m_dataBySecond; + double m_time; + vector< Math::polar > m_freqs; + int m_base_ht; + double m_base_freq; + + HarmInstrument(int dataBySecond, double AFreq, int nb_harm=int((rand()/RAND_MAX)*MAX_NB_HARM), int min_rdm_ht=-12, int max_rdm_ht=12) + : m_dataBySecond(dataBySecond) + , m_time(0.0) + , m_freqs(nb_harm+1) + , m_base_ht(int(min_rdm_ht+(rand()/RAND_MAX)*(max_rdm_ht-min_rdm_ht+1))) + , m_base_freq(h2f(m_base_ht, AFreq)) + { + for(size_t i=0; i(Random::s_random.nextDouble(), 2*Math::Pi*Random::s_random.nextDouble()); + + // s'il n'y a pas de composantes, ça ne sert à rien de choisir une amplitude au hazard pour la fondamentale + if(m_freqs.size()==1) + m_freqs[0].mod = 1.0; + + // la fondamentale doit avoir une amplitude minimale + m_freqs[0].mod = m_freqs[0].mod*0.8 + 0.2; + } + + HarmInstrument(int dataBySecond, vector< Math::polar >& freqs, double base_freq) + : m_dataBySecond(dataBySecond) + , m_time(0.0) + , m_freqs(freqs) + , m_base_freq(base_freq) + { + } + + virtual vector< Math::polar >* getFreqs(){return &m_freqs;} + + virtual double gen_value(int k, double phase=0.0) + { + double value = 0.0; + + for(size_t i=0; i m_data; + + double m_time; + + int m_dataBySecond; + double m_AFreq; + + WaveInstrument(int dataBySecond, double AFreq, const string& file_name) + : m_time(0.0) + , m_dataBySecond(dataBySecond) + , m_AFreq(AFreq) + { + ifstream file(file_name.c_str()); + + assert(file.is_open()); + + double index; + double value; + file >> index; + file >> value; + while(!file.eof()) + { + m_data.push_back(value); + + file >> index; + file >> value; + } + } + + WaveInstrument(int dataBySecond, double AFreq, const deque& data) + : m_data(data.size()) + , m_time(0.0) + , m_dataBySecond(dataBySecond) + , m_AFreq(AFreq) + { + for(size_t i=0; i& data) + : m_data(data) + , m_time(0.0) + , m_dataBySecond(dataBySecond) + , m_AFreq(AFreq) + { + } + + virtual double gen_value(int k, double phase=0.0) + { + double f = h2f(k, m_AFreq); + + int i = int(f*(m_time+phase)*m_data.size()/(2*Math::Pi))%m_data.size(); + + m_time += 2*Math::Pi/m_dataBySecond; + + return m_data[i]; + } +}; + +/* faux instrument: les composantes devraient toujours être des harmoniques +*/ +struct FreqInstrument : Instrument +{ + static double get_freq(double lowest_freq, int i, double AFreq) + { + return h2f(int(f2h(lowest_freq, AFreq)+i), AFreq); + } + + int m_dataBySecond; + double m_AFreq; + double m_time; + vector< Math::polar > m_freqs; + double m_lowest_freq; + + virtual vector< Math::polar >* getFreqs(){return &m_freqs;} + + FreqInstrument(int dataBySecond, double AFreq, double lowest_freq, int nb_freq=int((rand()/RAND_MAX)*MAX_NB_FREQ)) + : m_dataBySecond(dataBySecond) + , m_AFreq(AFreq) + , m_time(0.0) + , m_freqs(nb_freq) + , m_lowest_freq(lowest_freq) + { + // cout << "FreqInstrument::FreqInstrument" << endl; + + for(size_t i=0; i((rand()/RAND_MAX), Math::Pi*(rand()/RAND_MAX)); + + // s'il n'y a pas de composantes, ça ne sert à rien de choisir une amplitude au hazard pour la fondamentale + if(m_freqs.size()==1) + m_freqs[0].mod = 1.0; + + m_freqs[1].mod = 0.0; // TEMP + + // la fondamentale doit avoir une amplitude minimale + m_freqs[0].mod = m_freqs[0].mod*0.8 + 0.2; + + // rajoute un bruit sur la vitesse + double upper_freq = h2f(1, m_lowest_freq); + double lower_freq = h2f(-1, m_lowest_freq); + cout << "m_lowest_freq=" << m_lowest_freq << " upper_freq="< " << m_lowest_freq << endl; + + // cout << "/FreqInstrument::FreqInstrument" << endl; + } + + FreqInstrument(int dataBySecond, double AFreq, vector< Math::polar >& freqs, double lowest_freq) + : m_dataBySecond(dataBySecond) + , m_AFreq(AFreq) + , m_time(0.0) + , m_freqs(freqs) + , m_lowest_freq(lowest_freq) + { + } + + virtual double gen_value(int k, double phase=0.0) + { + // cout << "FreqInstrument::gen_value" << endl; + + double value = 0.0; + + for(size_t i=0; i +using namespace std; +#include +using namespace Music; +#include "LatencyMonoQuantizer.h" + +LatencyMonoQuantizer::LatencyMonoQuantizer() +{ + m_latency = 125; // ms + + m_time.start(); +} + +void LatencyMonoQuantizer::quantize(double freq) +{ +// cerr << "LatencyMonoQuantizer::quantize " << freq << " m_states=" << m_states.size() << endl; + + double current_time = m_time.elapsed(); + + m_states.push_front(State(current_time, freq)); + + double current_center_freq = h2f(f2h(freq)); + int max_dens = 1; + m_avg_freq = freq; + map densities; + for(int i=0; i::iterator it=densities.find(cf); + if(it==densities.end()) + densities.insert(make_pair(cf,Note(m_states[i].m_freq))); + else + { + it->second.m_avg_freq *= it->second.m_dens; + it->second.m_avg_freq += m_states[i].m_freq; + it->second.m_dens++; + it->second.m_avg_freq /= it->second.m_dens; + if(it->second.m_dens>max_dens) + { + max_dens = it->second.m_dens; + current_center_freq = it->first; + m_avg_freq = it->second.m_avg_freq; + } + } + } + +// cerr << m_current_center_freq << ", " << current_center_freq << ", " << m_avg_freq << ", max_dens=" << max_dens << ", m_states.size()=" << m_states.size() << endl; + + m_confidence = double(max_dens)/m_states.size(); + + // if a density is strong enough + if(m_confidence>m_min_confidence) + { + if(m_current_center_freq==0.0) + { + if(current_center_freq>0.0) + { + m_current_center_freq = current_center_freq; + m_duration.start(); + double lag = (current_time-m_states.back().m_time)*m_min_confidence; + m_duration.addMSecs(int(lag)); + emit(noteStarted(m_current_center_freq, -lag)); + } + } + else + { + if(current_center_freq==0.0) + { + m_current_center_freq = current_center_freq; + double lag = (current_time-m_states.back().m_time)*m_min_confidence; + emit(noteFinished(m_current_center_freq, -lag)); + } + else if(m_current_center_freq != current_center_freq) + { + double lag = (current_time-m_states.back().m_time)/2.0; // TODO pas forcément a fait 2 ~bruit + emit(noteFinished(m_current_center_freq, -lag)); + m_current_center_freq = current_center_freq; + m_duration.start(); + m_duration.addMSecs(int(lag)); + emit(noteStarted(m_current_center_freq, -lag)); + } + } + } + else if(m_current_center_freq>0.0) + { + m_current_center_freq = 0.0; + double lag = (current_time-m_states.back().m_time)*m_min_confidence; + emit(noteFinished(m_current_center_freq, -lag)); + } + + while(!m_states.empty() && (current_time-m_states.back().m_time>m_latency)) + m_states.pop_back(); +} + +void LatencyMonoQuantizer::reset() +{ + quantize(0.0); + m_avg_freq = 0.0; + m_states.clear(); + m_confidence = 1.0; +} diff --git a/libs/Music/LatencyMonoQuantizer.h b/libs/Music/LatencyMonoQuantizer.h new file mode 100644 index 0000000..f32f5e8 --- /dev/null +++ b/libs/Music/LatencyMonoQuantizer.h @@ -0,0 +1,66 @@ +// Copyright 2005 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 + + +#ifndef _LATENCYMONOQUANTIZER_H_ +#define _LATENCYMONOQUANTIZER_H_ + +#include +using namespace std; +#include +#include +#include +using namespace Music; +#include "MonoQuantizer.h" + +class LatencyMonoQuantizer : public MonoQuantizer +{ + QTime m_time; + + //! in millis + float m_latency; + + struct State{ + double m_time; + double m_freq; + double m_confidence; + State(double t, double f, double c=1.0) : m_time(t), m_freq(f), m_confidence(c) {} + }; + deque m_states; + + struct Note{ + int m_dens; + double m_avg_freq; + Note(double f) : m_dens(1), m_avg_freq(f) {} + }; + + QTime m_duration; + + public: + LatencyMonoQuantizer(); + + void setLatency(float latency) {m_latency=latency;} + double getLatency() {return m_latency;} + + virtual void quantize(double freq); + virtual void reset(); + + virtual ~LatencyMonoQuantizer(){} +}; + +#endif // _LATENCYMONOQUANTIZER_H_ diff --git a/libs/Music/Makefile.am b/libs/Music/Makefile.am deleted file mode 100644 index 74e1786..0000000 --- a/libs/Music/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -lib_LIBRARIES = libMusic.a -AM_CXXFLAGS = -Wall -I../../libs -libMusic_a_SOURCES = Algorithm.cpp Convolution.cpp CumulativeDiff.cpp FreqAnalysis.cpp Music.cpp TimeAnalysis.cpp CumulativeDiffAlgo.cpp MultiCumulativeDiffAlgo.cpp CombedFT.cpp CFFTW3.cpp SPWindow.cpp Filter.cpp Autocorrelation.cpp LPC.cpp -EXTRA_DIST = *.h diff --git a/libs/Music/Makefile.in b/libs/Music/Makefile.in deleted file mode 100644 index d0d1829..0000000 --- a/libs/Music/Makefile.in +++ /dev/null @@ -1,457 +0,0 @@ -# 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 = : -subdir = libs/Music -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS \ - COPYING TODO -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -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)" -libLIBRARIES_INSTALL = $(INSTALL_DATA) -LIBRARIES = $(lib_LIBRARIES) -AR = ar -ARFLAGS = cru -libMusic_a_AR = $(AR) $(ARFLAGS) -libMusic_a_LIBADD = -am_libMusic_a_OBJECTS = Algorithm.$(OBJEXT) Convolution.$(OBJEXT) \ - CumulativeDiff.$(OBJEXT) FreqAnalysis.$(OBJEXT) \ - Music.$(OBJEXT) TimeAnalysis.$(OBJEXT) \ - CumulativeDiffAlgo.$(OBJEXT) MultiCumulativeDiffAlgo.$(OBJEXT) \ - CombedFT.$(OBJEXT) CFFTW3.$(OBJEXT) SPWindow.$(OBJEXT) \ - Filter.$(OBJEXT) Autocorrelation.$(OBJEXT) LPC.$(OBJEXT) -libMusic_a_OBJECTS = $(am_libMusic_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -SOURCES = $(libMusic_a_SOURCES) -DIST_SOURCES = $(libMusic_a_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -lib_LIBRARIES = libMusic.a -AM_CXXFLAGS = -Wall -I../../libs -libMusic_a_SOURCES = Algorithm.cpp Convolution.cpp CumulativeDiff.cpp FreqAnalysis.cpp Music.cpp TimeAnalysis.cpp CumulativeDiffAlgo.cpp MultiCumulativeDiffAlgo.cpp CombedFT.cpp CFFTW3.cpp SPWindow.cpp Filter.cpp Autocorrelation.cpp LPC.cpp -EXTRA_DIST = *.h -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 libs/Music/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu libs/Music/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-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - p=$(am__strip_dir) \ - echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ - $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) -libMusic.a: $(libMusic_a_OBJECTS) $(libMusic_a_DEPENDENCIES) - -rm -f libMusic.a - $(libMusic_a_AR) libMusic.a $(libMusic_a_OBJECTS) $(libMusic_a_LIBADD) - $(RANLIB) libMusic.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Algorithm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Autocorrelation.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CFFTW3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CombedFT.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Convolution.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CumulativeDiff.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CumulativeDiffAlgo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Filter.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreqAnalysis.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LPC.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiCumulativeDiffAlgo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Music.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SPWindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeAnalysis.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -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 $(LIBRARIES) -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-libLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-libLIBRARIES - -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 - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLIBRARIES ctags distclean distclean-compile \ - distclean-generic 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-libLIBRARIES install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLIBRARIES - -# 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 --git a/libs/Music/MonoQuantizer.cpp b/libs/Music/MonoQuantizer.cpp new file mode 100644 index 0000000..0e687db --- /dev/null +++ b/libs/Music/MonoQuantizer.cpp @@ -0,0 +1,38 @@ +// Copyright 2006,2007 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "MonoQuantizer.h" + +#include +using namespace std; +#include +using namespace Music; + +MonoQuantizer::MonoQuantizer() +{ + m_min_confidence = 0.0; + + m_confidence = 1.0; + m_current_center_freq = 0.0; + m_avg_freq = 0.0; +} + +MonoQuantizer::~MonoQuantizer() +{ +} diff --git a/libs/Music/MonoQuantizer.h b/libs/Music/MonoQuantizer.h new file mode 100644 index 0000000..5babe72 --- /dev/null +++ b/libs/Music/MonoQuantizer.h @@ -0,0 +1,65 @@ +// Copyright 2005 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 + + +#ifndef _MONOQUANTIZER_H_ +#define _MONOQUANTIZER_H_ + +#include +using namespace std; +#include +#include +#include +using namespace Music; + +class MonoQuantizer : public QObject +{ + Q_OBJECT + + protected: + double m_min_confidence; + + double m_confidence; + double m_current_center_freq; // nearest semi-tone + double m_avg_freq; // precise frequency + + public: + MonoQuantizer(); + + double getMinConfidence() {return m_min_confidence;} + void setMinConfidence(float min_confidence) {m_min_confidence=min_confidence;} + double getConfidence() {return m_confidence;} +// int getMinStoredRecon() {return m_min_stored_recon;} + bool isPlaying() {return m_current_center_freq>0.0;} + double getCenterFrequency() {return m_current_center_freq;} + double getAverageFrequency() {return m_avg_freq;} + + virtual void quantize(double freq)=0; + virtual void reset()=0; + + virtual ~MonoQuantizer(); + + signals: + void noteStarted(double freq, double dt); + void noteFinished(double freq, double dt); +// void notePlayed(double freq, double duration, double dt); + +// public slots: +}; + +#endif // _MONOQUANTIZER_H_ diff --git a/libs/Music/Music.h b/libs/Music/Music.h index e319851..022932a 100644 --- a/libs/Music/Music.h +++ b/libs/Music/Music.h @@ -25,6 +25,7 @@ #include #include #include +#include using namespace std; #include #include @@ -102,29 +103,20 @@ namespace Music if (relFreq < s_semitones[1]) { if (s_semitones[1] / relFreq > relFreq / s_semitones[0]) - { return 0; - } else - { return 1; - } } else { int i; for (i = 2; i < 12; i += 1) - { if (relFreq < s_semitones[i]) { break; } - } + if (s_semitones[i] / relFreq > relFreq / s_semitones[i - 1]) - { return i - 1; - } else - { return i; - } } } // TODO VERIF @@ -281,7 +273,23 @@ namespace Music return -1; } - std::vector conv(const std::vector& u, const std::vector& v); + //! convert amplitude to dB + template + TYPE lp(TYPE value) + { + return 20*log10(abs(value)); +// return 20*log10(abs(value)+numeric_limits::epsilon()); + } + + //! convert dB to amplitude + // TODO cannot create a template so easily because the pow10 is not defined for all types + inline double invlp(double value) + { + return pow10(value/20.0); +// return pow(TYPE(10), value/TYPE(20)); + } + + std::vector conv(const std::vector& u, const std::vector& v); // TODO freq reffinement } diff --git a/libs/Music/Note.cpp b/libs/Music/Note.cpp new file mode 100644 index 0000000..04e80ed --- /dev/null +++ b/libs/Music/Note.cpp @@ -0,0 +1,62 @@ +// Copyright 2007 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "Note.h" + +void Note::init() +{ + min_err = numeric_limits::max(); + max_err = -numeric_limits::max(); + avg_err = 0.0f; +} +Note::Note(int h) + : ht(h) +{ + init(); +} +Note::Note(int h, int num, int den) + : ht(h) +{ + init(); + factor = QString::number(num)+"/"+QString::number(den); +} +Note::Note(int h, float cents) + : ht(h) +{ + init(); + factor = QString::number(cents); +} +QString Note::getName() const +{ + return Music::h2n(ht)+factor; +} +void Note::addAnalysis(float err, float volume) +{ + min_err = (errmax_err)?err:max_err; + + if(!errors.empty()) + avg_err *= errors.size(); + + errors.push_back(err); + + avg_err += err; + avg_err /= errors.size(); + + volumes.push_back(volume); +} diff --git a/libs/Music/Quantizer.cpp b/libs/Music/Quantizer.cpp new file mode 100644 index 0000000..1e6a6c0 --- /dev/null +++ b/libs/Music/Quantizer.cpp @@ -0,0 +1,122 @@ +// Copyright 2005 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "Quantizer.h" + +#include +using namespace std; +#include +using namespace Music; +#include + +Quantizer::Quantizer(float tolerance, float min_density) +{ + m_min_ht = -48; + m_channels.resize(97); + + m_tolerance = tolerance; + m_min_density = min_density; + + m_time.start(); +} + +void Quantizer::quantize(const vector hts, int min_ht) +{ + double current_time = m_time.elapsed(); + + m_min_stored_recon = 1000000; + for(size_t ht=0; htm_tolerance)) + m_channels[rht].old_states.pop_back(); + } +} + +void Quantizer::update(int rht) +{ + Channel& channel = m_channels[rht]; + + if(!channel.old_states.empty()) + { + // compute density + int dens = 0; + for(size_t i=0; im_min_density) + { + if(channel.state==Channel::QC_NOTHING) + { + channel.state = Channel::QC_STARTING; + channel.duration.start(); + channel.lag.start(); + } + + if(channel.state==Channel::QC_STARTING) + { + if(channel.lag.elapsed()>m_tolerance) + { + channel.state = Channel::QC_PLAYING; + channel.last_tag = Random::s_random.nextInt(); + MFireEvent(noteStarted(channel.last_tag, rht+m_min_ht, -channel.lag.elapsed())); + } + } + + if(channel.state==Channel::QC_PLAYING) + channel.lag.start(); + } + else + { + if(channel.state==Channel::QC_STARTING) + channel.state = Channel::QC_NOTHING; + else if(channel.state==Channel::QC_PLAYING && channel.lag.elapsed()>m_tolerance) + { + channel.state = Channel::QC_NOTHING; + MFireEvent(noteFinished(channel.last_tag, rht+m_min_ht, -channel.lag.elapsed())); + MFireEvent(notePlayed(rht+m_min_ht, channel.duration.elapsed()-channel.lag.elapsed(), -channel.lag.elapsed()-channel.duration.elapsed())); + } + } + } +} + +void Quantizer::cutAll() +{ + m_min_stored_recon = 0; + for(size_t ht=0; ht +#include +#include +#include +using namespace std; +#include +#include +using namespace Music; +#include + +struct QuantizerListener : Listener +{ + virtual void noteStarted(int tag, int ht, double dt) {todo("noteStarted");} + virtual void noteFinished(int tag, int ht, double dt) {todo("noteFinished");} + virtual void notePlayed(int ht, double duration, double dt) {todo("notePlayed");} +}; + +/*! + a function object for merging small note events into note events with a duration. + - Fill small holes where the note should appears + - Ignore notes which are too small + */ +class Quantizer : public Talker +{ + QTime m_time; + + //! in millis + float m_tolerance; + float m_min_density; + + struct State{ + double time; + bool play; + State(double t, bool p) : time(t), play(p) {} + }; + struct Channel{ + deque old_states; + enum{QC_NOTHING, QC_STARTING, QC_PLAYING} state; + QTime lag; + QTime duration; + double reliability; + int last_tag; + Channel() : state(QC_NOTHING) {} + }; + int m_min_ht; + + public: + Quantizer(float tolerance=1, float min_density=0.5); + + double getTolerance() {return m_tolerance;} + void setTolerance(float tolerance) {m_tolerance=tolerance;} + double getMinDensity() {return m_min_density;} + void setMinDensity(float min_density) {m_min_density=min_density;} + + void quantize(const vector hts, int min_ht); + void update(int ht); + + int m_min_stored_recon; + int getMinStoredRecon(){return m_min_stored_recon;} + + int getNbChannels() {return m_channels.size();} + int getSemitoneMin() {return m_min_ht;} + vector m_channels; + + void cutAll(); + + double getLatency() {return m_tolerance;} + + virtual ~Quantizer(){} +}; + +#endif // _QUANTIZER_H_ + diff --git a/libs/Music/README b/libs/Music/README new file mode 100644 index 0000000..67b5eaf --- /dev/null +++ b/libs/Music/README @@ -0,0 +1,64 @@ + + +------------------------------ For YAMakefile user ----------------------------- +Here are some information about the tool used for managing this project + +Common goals [and alias] + clean + distclean + maintainer-clean [burn] + backup + archive [dist pkg] + make a tar.bz2 archive with working directory + (as it is, without cleaning/removing any file) + install + uninstall + check + check for tools/SDKs/libraries + should be runned before 'make' + configure + set compilation features and run check goal + rpm + build a Mandrake rpm + (maybe compatible with other distributions) + copyright + add Copyright names to source files + copyright names in '"': (ex. "Linda Fiorentino") + to add a name fast in all sources: + make COPYRIGHT_AUTHOR="Claire Forlani" copyright + use COPYRIGHT_FILES for completing source file list + use COPYRIGHT_COMMENT to set comment symbole + to add license statement for unrecognized file type: + make COPYRIGHT_FILES=main.cpp COPYRIGHT_COMMENT="//" copyright + license + add License statement to source files + COPYING [copying] + generate the COPYING file with the license set by LICENSE variable + see http://www.opensource.org/licenses and 'make check' for your choice + INSTALL (the file !) + generate the INSTALL file for standard installation instructions for + a project using YAMakefile + yam-unroll + remove yam install depedency by generating Makefile.unroll + execute: yam -uk -t YAM_TYPE + +How to use features + nothing tell better than a sample: + CONFIGURE_AVAILABLE_FEATURES += "gui, BUILD_GUI, build the graphical, user interface" "arts, USE_ARTS, use arts sound server" + +Some usefull information + + Auto set variable criterias + + GCC_MODE + check if a 'main.*(.*int.*,.*char\*.*)' is present in sources + GCC_QT + check if a '^#include.*qapplication.h>' exist + GCC_QT_USE_THREAD + check if a '^\#include.*qthread.h>' exist + QT_OBJECTS + grep -al 'Q_OBJECT' *.h + +Known bugs + in any ways, file names containing whitespace are unsupported + diff --git a/libs/Music/ScoreGenerator.cpp b/libs/Music/ScoreGenerator.cpp new file mode 100644 index 0000000..2d4d95c --- /dev/null +++ b/libs/Music/ScoreGenerator.cpp @@ -0,0 +1,95 @@ +// Copyright 2004 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "ScoreGenerator.h" + +#include +//#include +//#include +//#include +using namespace std; + +#include +//#include +//using namespace String; +#include + +#include "Music.h" + +namespace Music +{ + +void GenerateScore( vector& buffer, // the score's wav + vector< vector >& score, // the score + double lenght, // lenght of the score in seconds : R+* + int dataBySecond, // number of data by second : ~{11000, 22000, 44100} + double AFreq, // frequency of A : ~440.0 + int minHT, // minimum halftone : Z // TODO <0 + int maxHT, // maximum halftone : Z + int nbNotes, // number of notes in lenght : N* + int nbVoice) // number of voices : N* +{ + static Random rdm; + + int size = int(lenght*dataBySecond); + int nbHT = maxHT-minHT+1; + int note_size = size / nbNotes; + cout << "AFreq=" << AFreq << " dataBySecond=" << dataBySecond << endl; + cout << "nbNotes=" << nbNotes << " lenght=" << lenght << " minHT=" << minHT << " maxHT=" << maxHT << endl; + cout << "size=" << size << " nbHT=" << nbHT << " nbVoice=" << nbVoice << endl; + + cout << "make score ... \t\t" << flush; +// int n=0; + for(int i=0; i hs(nbVoice); + for(size_t v=0; v +#include +#include +#include +#include +using namespace std; + +#include +#include +//#include + +#include "Music.h" +#include "Instrument.h" + +namespace Music +{ + +//! generate a randomly generated score with \ref Instrument +/*! + * \param buffer the outputed wave + * \param score the corresponding outputed score + * \param instrs the instruments + * \param lenght lenght of the score in seconds : R+* + * \param dataBySecond number of data by second : ~{11000, 22000, 44100} + * \param AFreq frequency of the A3 : ~440.0 + * \param minHT minimum halftone : Z // TODO <0 + * \param maxHT maximum halftone : Z + * \param nbNotes maximum number of notes in lenght : N* + * \param nbInstr maximum number of instruments played at the same time : N* +*/ +inline void GenerateScoreFromInstruments( + deque& buffer, + vector< vector >& score, + vector& instrs, + double lenght, + int dataBySecond, + double AFreq, + int minHT, + int maxHT, + int nbNotes, + int nbInstr) +{ + int size = int(lenght*dataBySecond); + int nbHT = maxHT-minHT+1; + int note_size = size / nbNotes; + // cout << "AFreq=" << AFreq << " dataBySecond=" << dataBySecond << endl; + // cout << "nbNotes=" << nbNotes << " lenght=" << lenght << " minHT=" << minHT << " maxHT=" << maxHT << endl; + // cout << "size=" << size << " nbHT=" << nbHT << endl; + + // TODO compute upHT so every harm are present in the range of minHT maxHT + // int maxNbHarm = 0; + // for(int i=0; igetFreqs()!=NULL) + // { + // int n = instrs[i]->getFreqs()->size(); + // maxNbHarm = std::max(maxNbHarm, n); + // } + // } + // int upHT = (int)f2h(AFreq*(maxNbHarm+1), AFreq); + // if(upHT>maxHT-minHT) throw string("not enough HT for covering all harmonics"); + // cout << upHT << endl; + + // cout << "make score ... " << instrs.size() << endl; + int t=0; + if(score.size()!=(size_t)(nbNotes*note_size)) + score.resize(nbNotes*note_size); + + assert((size_t)nbInstr<=instrs.size()); + + for(int i=0; i hs(instrs.size()); + vector< Math::polar > ps(instrs.size()); + vector play(instrs.size()); + for(size_t w=0; wgetFreqs()->size()), AFreq); +// int up = instrs[v]->getFreqs()->size(); + int up = 36; +// cout << "up=" << up << endl; +// assert(up(Random::s_random.nextDouble()/nbInstr, Random::s_random.nextDouble()*2*Math::Pi); +// ps[v] = Math::polar(1.0/nbInstr, g_random.nextDouble()*2*Math::Pi); +// cout << "halftone choosen " << hs[v] << endl; + } + +// cout << ps[v].mod << " "; + } +// cout << endl; + +// if(i==5)hs[0]=-12; +// else hs[0]=-48; + +// for(int v=0; v hs(nbVoice); + for(size_t v=0; v decals(nbVoice); + for(size_t v=0; v +using namespace std; + +namespace Music +{ + queue note::s_free_tags; + map note::s_tags; + + unsigned char note::getFreeTag() + { + if(s_free_tags.empty()) + for(unsigned char c=1; c<255; c++) + s_free_tags.push(c); + + unsigned char tag = s_free_tags.front(); + s_free_tags.pop(); + + return tag; + } + note::note(unsigned char n, double t, double duration) + { + snd_seq_ev_clear(&m_ev); + + m_ev.type = SND_SEQ_EVENT_NOTE; + m_ev.flags = SND_SEQ_TIME_STAMP_REAL|SND_SEQ_TIME_MODE_ABS|SND_SEQ_EVENT_LENGTH_FIXED|SND_SEQ_PRIORITY_NORMAL; + m_ev.time.time.tv_sec = (unsigned int)t; + m_ev.time.time.tv_nsec = (unsigned int)((t-(unsigned int)t)*1000000000); + m_ev.queue = ~SND_SEQ_QUEUE_DIRECT; + m_ev.tag = getFreeTag(); + m_ev.data.note.note = n; + m_ev.data.note.velocity = 64; + m_ev.data.note.off_velocity = 64; + m_ev.data.note.duration = (unsigned int)(duration*1000); + } + + note_on::note_on() + { + snd_seq_ev_clear(&m_ev); + } + note_on::note_on(unsigned char n, double t) + { + snd_seq_ev_clear(&m_ev); + + m_ev.type = SND_SEQ_EVENT_NOTEON; + m_ev.flags = SND_SEQ_EVENT_LENGTH_FIXED|SND_SEQ_PRIORITY_NORMAL; + if(t==MIDI_TIME_DIRECT) m_ev.queue = SND_SEQ_QUEUE_DIRECT; + else + { + m_ev.flags |= SND_SEQ_TIME_STAMP_REAL|SND_SEQ_TIME_MODE_ABS; + m_ev.queue = ~SND_SEQ_QUEUE_DIRECT; + m_ev.time.time.tv_sec = (unsigned int)t; + m_ev.time.time.tv_nsec = (unsigned int)((t-(unsigned int)t)*1000000000); + } + m_ev.tag = getFreeTag(); + m_ev.data.note.note = n; + m_ev.data.note.velocity = 64; + + addNote(m_ev.tag, n); + +// cerr << "note_off::note_on tag=" << int(m_ev.tag) << " note=" << int(m_ev.data.note.note) << " time=" << t << endl; + } + note_off::note_off(const note_on& n_on, double t) + { + snd_seq_ev_clear(&m_ev); + + m_ev.type = SND_SEQ_EVENT_NOTEOFF; + m_ev.flags = SND_SEQ_EVENT_LENGTH_FIXED|SND_SEQ_PRIORITY_NORMAL; + if(t==MIDI_TIME_DIRECT) m_ev.queue = SND_SEQ_QUEUE_DIRECT; + else + { + m_ev.flags |= SND_SEQ_TIME_STAMP_REAL|SND_SEQ_TIME_MODE_ABS; + m_ev.queue = ~SND_SEQ_QUEUE_DIRECT; + m_ev.time.time.tv_sec = (unsigned int)t; + m_ev.time.time.tv_nsec = (unsigned int)((t-(unsigned int)t)*1000000000); + } + m_ev.tag = n_on.getTag(); + m_ev.data.note.note = n_on.m_ev.data.note.note; + m_ev.data.note.velocity = 64; + } + + omidistream::omidistream(string name, double tempo, unsigned char channel) + : m_seq(NULL) + , m_queue(0) + , m_port(0) + , m_channel(channel) + , m_A3Index(69) + { + int err = snd_seq_open(&m_seq, "default", SND_SEQ_OPEN_OUTPUT, 0); + if (err < 0) throw string("snd_seq_open: ")+snd_strerror(err); + + snd_seq_set_client_name(m_seq, name.c_str()); + + m_port = snd_seq_create_simple_port(m_seq, (name+" port").c_str(), + SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ, SND_SEQ_PORT_TYPE_MIDI_GENERIC); + + // cout << "client built: " << snd_seq_client_id(m_seq) << ":" << m_port << endl; + + m_queue = snd_seq_alloc_named_queue(m_seq, (name+" queue").c_str()); + snd_seq_queue_tempo_t* queue_tempo; + snd_seq_queue_tempo_alloca(&queue_tempo); + snd_seq_queue_tempo_set_tempo(queue_tempo, (unsigned int)(60*1000000/tempo)); // 60 BPM + snd_seq_queue_tempo_set_ppq(queue_tempo, 48); // 48 PPQ + snd_seq_set_queue_tempo(m_seq, m_queue, queue_tempo); + // cout << "Queue built and temperized: " << m_queue << endl; + snd_seq_start_queue(m_seq, m_queue, NULL); + } + + omidistream::~omidistream() + { + snd_seq_stop_queue(m_seq, m_queue, NULL); + } + + omidistream& omidistream::operator<<(note n) + { + // n.ev.source.client = snd_seq_client_id(m_seq); + snd_seq_ev_set_source(&(n.m_ev), m_port); + snd_seq_ev_set_subs(&(n.m_ev)); + n.m_ev.data.note.channel = m_channel; + if(n.m_ev.queue!=SND_SEQ_QUEUE_DIRECT) + n.m_ev.queue = m_queue; + + if(n.m_ev.type!=SND_SEQ_EVENT_NOTEON) + { + note::s_free_tags.push(n.m_ev.tag); + note::s_tags.erase(n.m_ev.tag); + } + + int err = snd_seq_event_output(m_seq, &n.m_ev); + if(err<0) throw string("operator<<(note) snd_seq_event_output: ")+string(snd_strerror(err)); + + return *this; + } + + omidistream& omidistream::drain() + { + int err = snd_seq_drain_output(m_seq); + if(err<0) throw string("::omidistream::drain() snd_seq_drain_output: ")+string(snd_strerror(err)); + + return *this; + } + + omidistream& drain(omidistream& str) + { + return str.drain(); + } +}; + diff --git a/libs/Music/omidistream.h b/libs/Music/omidistream.h new file mode 100644 index 0000000..45102c6 --- /dev/null +++ b/libs/Music/omidistream.h @@ -0,0 +1,153 @@ +// Copyright 2004 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 + + +#ifndef _omidistream_h_ +#define _omidistream_h_ + +#include +#include +#include +using namespace std; +#include + +namespace Music +{ + class omidistream; + +#define MIDI_TIME_DIRECT -1.0 + + //! a simple note (and an abstract one) + class note + { + friend class omidistream; + public: + static queue s_free_tags; + static map s_tags; + + protected: + static unsigned char getFreeTag(); + static void addNote(unsigned char tag, unsigned char note) {s_tags.insert(make_pair(tag, note));} + static unsigned char getNote(unsigned char tag) {return (*(s_tags.find(tag))).second;} + + snd_seq_event_t m_ev; + + note(){} + + public: + //! unique ctor + /*! no direct send can be used ! TODO do it ... + * + * \param n the pitch [0,127] + * \param duration duration of the note {seconds} + * \param t absolute time when the note must be played {seconds} + */ + note(unsigned char n, double duration=1.0, double t=MIDI_TIME_DIRECT); + + //! return the internal tag of the note + unsigned char getTag() const {return m_ev.tag;} + }; + + //! a starting note + class note_on : public note + { + friend class omidistream; + friend class note_off; + + public: + //! build a note on event + /*! + * \param n the pitch [0,127] + * \param t absolute time when the note must be played {seconds} + * \param pTag pTage the returning unique identifier of the note + */ + note_on(unsigned char n, double t=MIDI_TIME_DIRECT); + + //! build an empty note on event + note_on(); + }; + + //! a ending note + class note_off : public note + { + friend class omidistream; + + public: + //! build a note off event from the on event + /*! + * \param n_on the starting event + * \param t absolute time when the note must be played {seconds} + */ + note_off(const note_on& n_on, double t=MIDI_TIME_DIRECT); + }; + + //! a midi stream for outputing notes in the midi alsa sequencer + /*! sample:\n\n + * omidistream str("test lib", 60);\n + * str << note(64, 0) << note(64, 0.5) << note(64, 1) << note(66, 1.5) << note(68, 2, 2) << note(66, 3, 2) << note(64, 4) << note(68, 4.5) << note(66, 5) << note(66, 5.5) << note(64, 6, 2) << drain;\n + * sleep(10);\n + */ + class omidistream + { + friend class note; + + snd_seq_t* m_seq; + int m_queue; + int m_port; + unsigned char m_channel; + int m_A3Index; + + public: + + //! unique ctor + /*! + * \param name a name for the stream (shown in aconnect) + * \param tempo the starting tempo of the whole stream {BPM (beats per minutes)} + * \param channel midi channel where the note must be thrown [1,?] + */ + omidistream(std::string name, double tempo, unsigned char channel=1); + + //! return the unique identifier of the alsa midi client + int getAlsaMidiID() {return snd_seq_client_id(m_seq);} + + //! return the index of A3 in MIDI standard (69 by default) + int getA3Index() {return m_A3Index;} + + //! return the alsa midi port associated to the output sequencer + int getPort() {return m_port;} + + //! manualy flush the stream + omidistream& drain(); + + //! output a note in the stream + omidistream& operator<<(note n); + inline omidistream& operator<<(note_on n){return operator<<((note)n);} + inline omidistream& operator<<(note_off n){return operator<<((note)n);} + + //! stream operator for modifiers + template omidistream& operator<<(Fn fn){fn(*this);return *this;} + + ~omidistream(); + }; + + //! stream flushing modifier + omidistream& drain(omidistream& str); +} + +#endif // _omidistream_h_ + diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index 7bcfad9..0000000 --- a/m4/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = *.m4 diff --git a/m4/Makefile.in b/m4/Makefile.in deleted file mode 100644 index 9489834..0000000 --- a/m4/Makefile.in +++ /dev/null @@ -1,303 +0,0 @@ -# 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 = : -subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = *.m4 -all: all-am - -.SUFFIXES: -$(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 m4/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu m4/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 -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 -installdirs: -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 mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic 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-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# 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 --git a/m4/ac_cxx_exceptions.m4 b/m4/ac_cxx_exceptions.m4 deleted file mode 100644 index c604efc..0000000 --- a/m4/ac_cxx_exceptions.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl @synopsis AC_CXX_EXCEPTIONS -dnl -dnl If the C++ compiler supports exceptions handling (try, -dnl throw and catch), define HAVE_EXCEPTIONS. -dnl -dnl @version $Id: ac_cxx_exceptions.m4,v 1.1 2005/01/07 02:52:49 norwin Exp $ -dnl @author Todd Veldhuizen and Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_EXCEPTIONS], -[AC_CACHE_CHECK(whether the compiler supports exceptions, -ac_cv_cxx_exceptions, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE(,[try { throw 1; } catch (int i) { return i; }], - ac_cv_cxx_exceptions=yes, ac_cv_cxx_exceptions=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_exceptions" = yes; then - AC_DEFINE(HAVE_EXCEPTIONS,,[define if the compiler supports exceptions]) -fi -]) diff --git a/m4/ac_cxx_have_complex.m4 b/m4/ac_cxx_have_complex.m4 deleted file mode 100644 index 85d5b7e..0000000 --- a/m4/ac_cxx_have_complex.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_COMPLEX -dnl -dnl If the compiler has complex, define HAVE_COMPLEX. -dnl -dnl @version $Id: ac_cxx_have_complex.m4,v 1.1 2005/01/07 02:52:49 norwin Exp $ -dnl @author Todd Veldhuizen and Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_HAVE_COMPLEX], -[AC_CACHE_CHECK(whether the compiler has complex, -ac_cv_cxx_have_complex, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[complex a; complex b; return 0;], - ac_cv_cxx_have_complex=yes, ac_cv_cxx_have_complex=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_complex" = yes; then - AC_DEFINE(HAVE_COMPLEX,,[define if the compiler has complex]) -fi -]) diff --git a/m4/ac_cxx_have_numeric_limits.m4 b/m4/ac_cxx_have_numeric_limits.m4 deleted file mode 100644 index 617857a..0000000 --- a/m4/ac_cxx_have_numeric_limits.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_NUMERIC_LIMITS -dnl -dnl If the compiler has numeric_limits, define HAVE_NUMERIC_LIMITS. -dnl -dnl @version $Id: ac_cxx_have_numeric_limits.m4,v 1.1 2005/01/07 02:52:49 norwin Exp $ -dnl @author Todd Veldhuizen and Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_HAVE_NUMERIC_LIMITS], -[AC_CACHE_CHECK(whether the compiler has numeric_limits, -ac_cv_cxx_have_numeric_limits, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[double e = numeric_limits::epsilon(); return 0;], - ac_cv_cxx_have_numeric_limits=yes, ac_cv_cxx_have_numeric_limits=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_numeric_limits" = yes; then - AC_DEFINE(HAVE_NUMERIC_LIMITS,,[define if the compiler has numeric_limits]) -fi -]) diff --git a/m4/ac_cxx_have_sstream.m4 b/m4/ac_cxx_have_sstream.m4 deleted file mode 100644 index 3e58b19..0000000 --- a/m4/ac_cxx_have_sstream.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_SSTREAM -dnl -dnl If the C++ library has a working stringstream, define HAVE_SSTREAM. -dnl -dnl @author Ben Stanley -dnl @version $Id: ac_cxx_have_sstream.m4,v 1.1 2005/01/07 02:52:49 norwin Exp $ -dnl -AC_DEFUN([AC_CXX_HAVE_SSTREAM], -[AC_CACHE_CHECK(whether the compiler has stringstream, -ac_cv_cxx_have_sstream, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[stringstream message; message << "Hello"; return 0;], - ac_cv_cxx_have_sstream=yes, ac_cv_cxx_have_sstream=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_sstream" = yes; then - AC_DEFINE(HAVE_SSTREAM,,[define if the compiler has stringstream]) -fi -]) diff --git a/m4/ac_cxx_have_stl.m4 b/m4/ac_cxx_have_stl.m4 deleted file mode 100644 index c27cada..0000000 --- a/m4/ac_cxx_have_stl.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_STL -dnl -dnl If the compiler supports the Standard Template Library, define HAVE_STL. -dnl -dnl @version $Id: ac_cxx_have_stl.m4,v 1.1 2005/01/07 02:52:49 norwin Exp $ -dnl @author Todd Veldhuizen and Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_HAVE_STL], -[AC_CACHE_CHECK(whether the compiler supports Standard Template Library, -ac_cv_cxx_have_stl, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[list x; x.push_back(5); -list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;], - ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_stl" = yes; then - AC_DEFINE(HAVE_STL,,[define if the compiler supports Standard Template Library]) -fi -]) diff --git a/m4/ac_cxx_namespaces.m4 b/m4/ac_cxx_namespaces.m4 deleted file mode 100644 index d915b0b..0000000 --- a/m4/ac_cxx_namespaces.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl @synopsis AC_CXX_NAMESPACES -dnl -dnl If the compiler can prevent names clashes using namespaces, define -dnl HAVE_NAMESPACES. -dnl -dnl @version $Id: ac_cxx_namespaces.m4,v 1.1 2005/01/07 02:52:49 norwin Exp $ -dnl @author Todd Veldhuizen and Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_NAMESPACES], -[AC_CACHE_CHECK(whether the compiler implements namespaces, -ac_cv_cxx_namespaces, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], - [using namespace Outer::Inner; return i;], - ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_namespaces" = yes; then - AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) -fi -]) diff --git a/m4/ac_cxx_templates.m4 b/m4/ac_cxx_templates.m4 deleted file mode 100644 index 6743abe..0000000 --- a/m4/ac_cxx_templates.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl @synopsis AC_CXX_TEMPLATES -dnl -dnl If the compiler supports basic templates, define HAVE_TEMPLATES. -dnl -dnl @version $Id: ac_cxx_templates.m4,v 1.1 2005/01/07 02:52:49 norwin Exp $ -dnl @author Todd Veldhuizen and Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_TEMPLATES], -[AC_CACHE_CHECK(whether the compiler supports basic templates, -ac_cv_cxx_templates, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([template class A {public:A(){}}; -template void f(const A& ){}],[ -A d; A i; f(d); f(i); return 0;], - ac_cv_cxx_templates=yes, ac_cv_cxx_templates=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_templates" = yes; then - AC_DEFINE(HAVE_TEMPLATES,,[define if the compiler supports basic templates]) -fi -]) diff --git a/m4/bnv_have_qt.m4 b/m4/bnv_have_qt.m4 deleted file mode 100644 index 51d2b95..0000000 --- a/m4/bnv_have_qt.m4 +++ /dev/null @@ -1,431 +0,0 @@ -dnl Copyright (C) 2001, 2002, 2003, 2005, 2006 Bastiaan Veelo - -dnl THANKS! This code includes bug fixes and contributions made by: -dnl Tim McClarren, -dnl Dennis R. Weilert, -dnl Qingning Huo, -dnl Brian Mingus, -dnl Jens Hannemann, -dnl Pavel Roskin, -dnl Scott J. Bertin. - -dnl ChangeLog -dnl 2006-03-12 * Hide output of ls and fix an m4 quoting problem (due to Scott J. Bertin). -dnl 2006-02-13 * Check compiler return value instead of parsing the error stream, -dnl which detected warnings as false negatives (due to Jens Hannemann). -dnl 2006-02-02 * Spelling of "Success". -dnl * Fixed unsave test for $bnv_qt_lib without quotes. -dnl * Put dnl in front of all comments. -dnl * Changed -l$bnv_qt_lib_dir into -L$bnv_qt_lib_dir (all due to Pavel Roskin). -dnl 2006-01-19 * Support for 64bit architectures. -dnl * Updated documentation. -dnl 2006-01-18: * Fix "cat: bnv_qt_test.c: No such file or directory" (due to Jens Hannemann). -dnl * Hide output of failing ls. -dnl 2006-01-11: * Check in /Developer on Mac OS X; Check in $QTDIR (due to Brian Mingus). - -dnl Calls BNV_PATH_QT_DIRECT (contained in this file) as a subroutine. -AC_DEFUN([BNV_HAVE_QT], -[ - AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PATH_X]) - AC_REQUIRE([AC_PATH_XTRA]) - - AC_MSG_CHECKING(for Qt) - - AC_ARG_WITH([Qt-dir], - [ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the - installation instructions of Trolltech. Header - files are in DIR/include, binary utilities are - in DIR/bin. The library is in DIR/lib, unless - --with-Qt-lib-dir is also set.]) - AC_ARG_WITH([Qt-include-dir], - [ --with-Qt-include-dir=DIR - Qt header files are in DIR]) - AC_ARG_WITH([Qt-bin-dir], - [ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR]) - AC_ARG_WITH([Qt-lib-dir], - [ --with-Qt-lib-dir=DIR The Qt library is in DIR]) - AC_ARG_WITH([Qt-lib], - [ --with-Qt-lib=LIB Use -lLIB to link with the Qt library]) - if test x"$with_Qt_dir" = x"no" || - test x"$with_Qt_include-dir" = x"no" || - test x"$with_Qt_bin_dir" = x"no" || - test x"$with_Qt_lib_dir" = x"no" || - test x"$with_Qt_lib" = x"no"; then - # user disabled Qt. Leave cache alone. - have_qt="User disabled Qt." - else - # "yes" is a bogus option - if test x"$with_Qt_dir" = xyes; then - with_Qt_dir= - fi - if test x"$with_Qt_include_dir" = xyes; then - with_Qt_include_dir= - fi - if test x"$with_Qt_bin_dir" = xyes; then - with_Qt_bin_dir= - fi - if test x"$with_Qt_lib_dir" = xyes; then - with_Qt_lib_dir= - fi - if test x"$with_Qt_lib" = xyes; then - with_Qt_lib= - fi - # No Qt unless we discover otherwise - have_qt=no - # Check whether we are requested to link with a specific version - if test x"$with_Qt_lib" != x; then - bnv_qt_lib="$with_Qt_lib" - fi - # Check whether we were supplied with an answer already - if test x"$with_Qt_dir" != x; then - have_qt=yes - bnv_qt_dir="$with_Qt_dir" - bnv_qt_include_dir="$with_Qt_dir/include" - bnv_qt_bin_dir="$with_Qt_dir/bin" - bnv_qt_lib_dir="$with_Qt_dir/lib" - # Only search for the lib if the user did not define one already - if test x"$bnv_qt_lib" = x; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # Use cached value or do search, starting with suggestions from - # the command line - AC_CACHE_VAL(bnv_cv_have_qt, - [ - # We are not given a solution and there is no cached value. - bnv_qt_dir=NO - bnv_qt_include_dir=NO - bnv_qt_lib_dir=NO - if test x"$bnv_qt_lib" = x; then - bnv_qt_lib=NO - fi - BNV_PATH_QT_DIRECT - if test "$bnv_qt_dir" = NO || - test "$bnv_qt_include_dir" = NO || - test "$bnv_qt_lib_dir" = NO || - test "$bnv_qt_lib" = NO; then - # Problem with finding complete Qt. Cache the known absence of Qt. - bnv_cv_have_qt="have_qt=no" - else - # Record where we found Qt for the cache. - bnv_cv_have_qt="have_qt=yes \ - bnv_qt_dir=$bnv_qt_dir \ - bnv_qt_include_dir=$bnv_qt_include_dir \ - bnv_qt_bin_dir=$bnv_qt_bin_dir \ - bnv_qt_LIBS=\"$bnv_qt_LIBS\"" - fi - ])dnl - eval "$bnv_cv_have_qt" - fi # all $bnv_qt_* are set - fi # $have_qt reflects the system status - if test x"$have_qt" = xyes; then - QT_CXXFLAGS="-I$bnv_qt_include_dir" - if test x"$bnv_qt_lib" = xqt-mt; then - QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT" - fi - QT_DIR="$bnv_qt_dir" - QT_LIBS="$bnv_qt_LIBS" - # If bnv_qt_dir is defined, utilities are expected to be in the - # bin subdirectory - if test x"$bnv_qt_dir" != x; then - if test -x "$bnv_qt_dir/bin/uic"; then - QT_UIC="$bnv_qt_dir/bin/uic" - else - # Old versions of Qt don't have uic - QT_UIC= - fi - QT_MOC="$bnv_qt_dir/bin/moc" - else - # Or maybe we are told where to look for the utilities - if test x"$bnv_qt_bin_dir" != x; then - if test -x "$bnv_qt_bin_dir/uic"; then - QT_UIC="$bnv_qt_bin_dir/uic" - else - # Old versions of Qt don't have uic - QT_UIC= - fi - QT_MOC="$bnv_qt_bin_dir/moc" - else - # Last possibility is that they are in $PATH - QT_UIC="`which uic`" - QT_MOC="`which moc`" - fi - fi - # All variables are defined, report the result - AC_MSG_RESULT([$have_qt: - QT_CXXFLAGS=$QT_CXXFLAGS - QT_DIR=$QT_DIR - QT_LIBS=$QT_LIBS - QT_UIC=$QT_UIC - QT_MOC=$QT_MOC]) - else - # Qt was not found - QT_CXXFLAGS= - QT_DIR= - QT_LIBS= - QT_UIC= - QT_MOC= - AC_MSG_RESULT($have_qt) - fi - AC_SUBST(QT_CXXFLAGS) - AC_SUBST(QT_DIR) - AC_SUBST(QT_LIBS) - AC_SUBST(QT_UIC) - AC_SUBST(QT_MOC) - - #### Being paranoid: - if test x"$have_qt" = xyes; then - AC_MSG_CHECKING(correct functioning of Qt installation) - AC_CACHE_VAL(bnv_cv_qt_test_result, - [ - cat > bnv_qt_test.h << EOF -#include -class Test : public QObject -{ -Q_OBJECT -public: - Test() {} - ~Test() {} -public slots: - void receive() {} -signals: - void send(); -}; -EOF - - cat > bnv_qt_main.$ac_ext << EOF -#include "bnv_qt_test.h" -#include -int main( int argc, char **argv ) -{ - QApplication app( argc, argv ); - Test t; - QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) ); -} -EOF - - bnv_cv_qt_test_result="failure" - bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_1) - if test x"$ac_status" != x0; then - echo "$bnv_err_1" >&AC_FD_CC - echo "configure: could not run $QT_MOC on:" >&AC_FD_CC - cat bnv_qt_test.h >&AC_FD_CC - else - bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_2) - if test x"$ac_status" != x0; then - echo "$bnv_err_2" >&AC_FD_CC - echo "configure: could not compile:" >&AC_FD_CC - cat moc_bnv_qt_test.$ac_ext >&AC_FD_CC - else - bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_3) - if test x"$ac_status" != x0; then - echo "$bnv_err_3" >&AC_FD_CC - echo "configure: could not compile:" >&AC_FD_CC - cat bnv_qt_main.$ac_ext >&AC_FD_CC - else - bnv_try_4="$CXX $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o $QT_LIBS >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_4) - if test x"$ac_status" != x0; then - echo "$bnv_err_4" >&AC_FD_CC - else - bnv_cv_qt_test_result="success" - fi - fi - fi - fi - ])dnl AC_CACHE_VAL bnv_cv_qt_test_result - AC_MSG_RESULT([$bnv_cv_qt_test_result]); - if test x"$bnv_cv_qt_test_result" = "xfailure"; then - AC_MSG_ERROR([Failed to find matching components of a complete - Qt installation. Try using more options, - see ./configure --help.]) - fi - - rm -f bnv_qt_test.h moc_bnv_qt_test.$ac_ext moc_bnv_qt_test.o \ - bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main - fi -]) - -dnl Internal subroutine of BNV_HAVE_QT -dnl Set bnv_qt_dir bnv_qt_include_dir bnv_qt_bin_dir bnv_qt_lib_dir bnv_qt_lib -AC_DEFUN([BNV_PATH_QT_DIRECT], -[ - ## Binary utilities ## - if test x"$with_Qt_bin_dir" != x; then - bnv_qt_bin_dir=$with_Qt_bin_dir - fi - ## Look for header files ## - if test x"$with_Qt_include_dir" != x; then - bnv_qt_include_dir="$with_Qt_include_dir" - else - # The following header file is expected to define QT_VERSION. - qt_direct_test_header=qglobal.h - # Look for the header file in a standard set of common directories. - bnv_include_path_list=" - /usr/include - `ls -dr ${QTDIR}/include 2>/dev/null` - `ls -dr /usr/include/qt* 2>/dev/null` - `ls -dr /usr/lib/qt*/include 2>/dev/null` - `ls -dr /usr/local/qt*/include 2>/dev/null` - `ls -dr /opt/qt*/include 2>/dev/null` - `ls -dr /Developer/qt*/include 2>/dev/null` - " - for bnv_dir in $bnv_include_path_list; do - if test -r "$bnv_dir/$qt_direct_test_header"; then - bnv_dirs="$bnv_dirs $bnv_dir" - fi - done - # Now look for the newest in this list - bnv_prev_ver=0 - for bnv_dir in $bnv_dirs; do - bnv_this_ver=`egrep -w '#define QT_VERSION' $bnv_dir/$qt_direct_test_header | sed s/'#define QT_VERSION'//` - if expr $bnv_this_ver '>' $bnv_prev_ver > /dev/null; then - bnv_qt_include_dir=$bnv_dir - bnv_prev_ver=$bnv_this_ver - fi - done - fi dnl Found header files. - - # Are these headers located in a traditional Trolltech installation? - # That would be $bnv_qt_include_dir stripped from its last element: - bnv_possible_qt_dir=`dirname $bnv_qt_include_dir` - if (test -x $bnv_possible_qt_dir/bin/moc) && - ((ls $bnv_possible_qt_dir/lib/libqt* > /dev/null 2>/dev/null) || - (ls $bnv_possible_qt_dir/lib64/libqt* > /dev/null 2>/dev/null)); then - # Then the rest is a piece of cake - bnv_qt_dir=$bnv_possible_qt_dir - bnv_qt_bin_dir="$bnv_qt_dir/bin" - if test x"$with_Qt_lib_dir" != x; then - bnv_qt_lib_dir="$with_Qt_lib_dir" - else - if (test -d $bnv_qt_dir/lib64); then - bnv_qt_lib_dir="$bnv_qt_dir/lib64" - else - bnv_qt_lib_dir="$bnv_qt_dir/lib" - fi - fi - # Only look for lib if the user did not supply it already - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # There is no valid definition for $QTDIR as Trolltech likes to see it - bnv_qt_dir= - ## Look for Qt library ## - if test x"$with_Qt_lib_dir" != x; then - bnv_qt_lib_dir="$with_Qt_lib_dir" - # Only look for lib if the user did not supply it already - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - else - # Normally, when there is no traditional Trolltech installation, - # the library is installed in a place where the linker finds it - # automatically. - # If the user did not define the library name, try with qt - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib=qt - fi - qt_direct_test_header=qapplication.h - qt_direct_test_main=" - int argc; - char ** argv; - QApplication app(argc,argv); - " - # See if we find the library without any special options. - # Don't add top $LIBS permanently yet - bnv_save_LIBS="$LIBS" - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - bnv_qt_LIBS="$LIBS" - bnv_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="-I$bnv_qt_include_dir" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # That did not work. Try the multi-threaded version - echo "Non-critical error, please neglect the above." >&AC_FD_CC - bnv_qt_lib=qt-mt - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # That did not work. Try the OpenGL version - echo "Non-critical error, please neglect the above." >&AC_FD_CC - bnv_qt_lib=qt-gl - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # That did not work. Maybe a library version I don't know about? - echo "Non-critical error, please neglect the above." >&AC_FD_CC - # Look for some Qt lib in a standard set of common directories. - bnv_dir_list=" - `echo $bnv_qt_includes | sed ss/includess` - /lib - /usr/lib64 - /usr/lib - /usr/local/lib64 - /usr/local/lib - /opt/lib64 - /opt/lib - `ls -dr /usr/lib64/qt* 2>/dev/null` - `ls -dr /usr/lib64/qt*/lib64 2>/dev/null` - `ls -dr /usr/lib/qt* 2>/dev/null` - `ls -dr /usr/local/qt* 2>/dev/null` - `ls -dr /opt/qt* 2>/dev/null` - " - for bnv_dir in $bnv_dir_list; do - if ls $bnv_dir/libqt* >/dev/null 2>/dev/null; then - # Gamble that it's the first one... - bnv_qt_lib="`ls $bnv_dir/libqt* | sed -n 1p | - sed s@$bnv_dir/lib@@ | sed s/[[.]].*//`" - bnv_qt_lib_dir="$bnv_dir" - break - fi - done - # Try with that one - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # Leave bnv_qt_lib_dir defined - ]) - ]) - ]) - ]) - if test x"$bnv_qt_lib_dir" != x; then - bnv_qt_LIBS="-L$bnv_qt_lib_dir $LIBS" - else - bnv_qt_LIBS="$LIBS" - fi - LIBS="$bnv_save_LIBS" - CXXFLAGS="$bnv_save_CXXFLAGS" - fi dnl $with_Qt_lib_dir was not given - fi dnl Done setting up for non-traditional Trolltech installation -]) \ No newline at end of file diff --git a/m4/mdl_have_opengl.m4 b/m4/mdl_have_opengl.m4 deleted file mode 100644 index cda023b..0000000 --- a/m4/mdl_have_opengl.m4 +++ /dev/null @@ -1,97 +0,0 @@ -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/mdl_have_opengl.html -dnl -AC_DEFUN([MDL_HAVE_OPENGL], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PATH_X]) - AC_REQUIRE([AC_PATH_XTRA]) - - AC_CACHE_CHECK([for OpenGL], mdl_cv_have_OpenGL, - [ -dnl Check for Mesa first, unless we were asked not to. -dnl AC_ARG_WITH(Mesa, AC_HELP_STRING([--with-Mesa],[Prefer the Mesa library over a vendors native OpenGL library (default=yes)])) - AC_ARG_ENABLE(Mesa, - AC_HELP_STRING([--enable-Mesa],[Prefer the Mesa library - over a vendors native OpenGL library (default=yes)]), - [use_Mesa=$enableval], [use_Mesa=yes]) - - if test x"$use_Mesa" = xyes; then - GL_search_list="MesaGL GL" - GLU_search_list="MesaGLU GLU" - GLX_search_list="MesaGLX GLX" - else - GL_search_list="GL MesaGL" - GLU_search_list="GLU MesaGLU" - GLX_search_list="GLX MesaGLX" - fi - - AC_LANG_SAVE - AC_LANG_C - -dnl If we are running under X11 then add in the appropriate libraries. -if test x"$no_x" != xyes; then -dnl Add everything we need to compile and link X programs to GL_X_CFLAGS -dnl and GL_X_LIBS. - GL_CFLAGS="$X_CFLAGS" - GL_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -fi - GL_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$GL_CFLAGS" - - GL_save_LIBS="$LIBS" - LIBS="$GL_X_LIBS" - - - # Save the "AC_MSG_RESULT file descriptor" to FD 8. - exec 8>&AC_FD_MSG - - # Temporarily turn off AC_MSG_RESULT so that the user gets pretty - # messages. - exec AC_FD_MSG>/dev/null - - AC_SEARCH_LIBS(glAccum, $GL_search_list, have_GL=yes, have_GL=no) - AC_SEARCH_LIBS(gluBeginCurve, $GLU_search_list, have_GLU=yes, have_GLU=no) - AC_SEARCH_LIBS(glXChooseVisual, $GLX_search_list, have_GLX=yes, have_GLX=no) - AC_SEARCH_LIBS(glutInit, glut, have_glut=yes, have_glut=no) - - - - # Restore pretty messages. - exec AC_FD_MSG>&8 - - if test -n "$LIBS"; then - mdl_cv_have_OpenGL=yes - GL_LIBS="$LIBS" - AC_SUBST(GL_CFLAGS) - AC_SUBST(GL_LIBS) - else - mdl_cv_have_OpenGL=no - GL_CFLAGS= - fi - -dnl Reset GL_X_LIBS regardless, since it was just a temporary variable -dnl and we don't want to be global namespace polluters. - GL_X_LIBS= - - LIBS="$GL_save_LIBS" - CPPFLAGS="$GL_save_CPPFLAGS" - - AC_LANG_RESTORE - -dnl bugfix: dont forget to cache this variables, too - mdl_cv_GL_CFLAGS="$GL_CFLAGS" - mdl_cv_GL_LIBS="$GL_LIBS" - mdl_cv_have_GL="$have_GL" - mdl_cv_have_GLU="$have_GLU" - mdl_cv_have_GLX="$have_GLX" - mdl_cv_have_glut="$have_glut" - ]) - GL_CFLAGS="$mdl_cv_GL_CFLAGS" - GL_LIBS="$mdl_cv_GL_LIBS" - have_GL="$mdl_cv_have_GL" - have_GLU="$mdl_cv_have_GLU" - have_GLX="$mdl_cv_have_GLX" - have_glut="$mdl_cv_have_glut" -]) -dnl endof bugfix -ainan diff --git a/meanquar.scl b/meanquar.scl new file mode 100644 index 0000000..947aa75 --- /dev/null +++ b/meanquar.scl @@ -0,0 +1,17 @@ +! meanquar.scl +! +1/4-comma meantone scale. Pietro Aaron's temperament (1523) + 12 +! + 76.04900 + 193.15686 + 310.26471 + 5/4 + 503.42157 + 579.47057 + 696.57843 + 25/16 + 889.73529 + 1006.84314 + 1082.89214 + 2/1 diff --git a/missing b/missing deleted file mode 100755 index 894e786..0000000 --- a/missing +++ /dev/null @@ -1,360 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2005-06-08.21 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/src/AutoQSettings.cpp b/src/AutoQSettings.cpp index 6725b02..476a432 100644 --- a/src/AutoQSettings.cpp +++ b/src/AutoQSettings.cpp @@ -16,23 +16,56 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#include using namespace std; #include #include "AutoQSettings.h" AutoQSettings::AutoQSettings(const QString& domain, const QString& product, const QString& setting_version) + : QSettings(QSettings::UserScope, domain, product) { - setPath(domain, product); beginGroup(QString("/")+product+setting_version+"/"); + cerr << "AutoQSettings: " << fileName().toStdString() << endl; +} + +void AutoQSettings::add(QCheckBox* el) +{ + assert(el->objectName()!=""); + m_elements_checkbox.push_back(el); +} +void AutoQSettings::add(QSpinBox* el) +{ + assert(el->objectName()!=""); + m_elements_spinbox.push_back(el); +} +void AutoQSettings::add(QLineEdit* el) +{ + assert(el->objectName()!=""); + m_elements_lineedit.push_back(el); +} +void AutoQSettings::add(QComboBox* el) +{ + assert(el->objectName()!=""); + m_elements_combobox.push_back(el); +} +void AutoQSettings::add(QGroupBox* el) +{ + assert(el->objectName()!=""); + m_elements_qgroupbox.push_back(el); +} +void AutoQSettings::add(QRadioButton* el) +{ + assert(el->objectName()!=""); + m_elements_qradiobutton.push_back(el); } void AutoQSettings::save(QCheckBox* el) { - writeEntry(el->name(), el->isChecked()); + setValue(el->objectName(), el->isChecked()); } void AutoQSettings::load(QCheckBox* el) { - el->setChecked(readBoolEntry(el->name(), el->isChecked())); + el->setChecked(value(el->objectName(), el->isChecked()).toBool()); } void AutoQSettings::save() @@ -40,22 +73,22 @@ void AutoQSettings::save() beginGroup("Auto/"); for(list::iterator it=m_elements_checkbox.begin(); it!=m_elements_checkbox.end(); it++) - writeEntry((*it)->name(), (*it)->isChecked()); + setValue((*it)->objectName(), (*it)->isChecked()); for(list::iterator it=m_elements_spinbox.begin(); it!=m_elements_spinbox.end(); it++) - writeEntry((*it)->name(), (*it)->value()); + setValue((*it)->objectName(), (*it)->value()); for(list::iterator it=m_elements_lineedit.begin(); it!=m_elements_lineedit.end(); it++) - writeEntry((*it)->name(), (*it)->text()); + setValue((*it)->objectName(), (*it)->text()); for(list::iterator it=m_elements_combobox.begin(); it!=m_elements_combobox.end(); it++) - writeEntry((*it)->name(), (*it)->currentItem()); + setValue((*it)->objectName(), (*it)->currentIndex()); for(list::iterator it=m_elements_qgroupbox.begin(); it!=m_elements_qgroupbox.end(); it++) - writeEntry((*it)->name(), (*it)->isChecked()); + setValue((*it)->objectName(), (*it)->isChecked()); for(list::iterator it=m_elements_qradiobutton.begin(); it!=m_elements_qradiobutton.end(); it++) - writeEntry((*it)->name(), (*it)->isChecked()); + setValue((*it)->objectName(), (*it)->isChecked()); endGroup(); } @@ -64,22 +97,22 @@ void AutoQSettings::load() beginGroup("Auto/"); for(list::iterator it=m_elements_checkbox.begin(); it!=m_elements_checkbox.end(); it++) - (*it)->setChecked(readBoolEntry((*it)->name(), (*it)->isChecked())); + (*it)->setChecked(value((*it)->objectName(), (*it)->isChecked()).toBool()); for(list::iterator it=m_elements_spinbox.begin(); it!=m_elements_spinbox.end(); it++) - (*it)->setValue(readNumEntry((*it)->name(), (*it)->value())); + (*it)->setValue(value((*it)->objectName(), (*it)->value()).toInt()); for(list::iterator it=m_elements_lineedit.begin(); it!=m_elements_lineedit.end(); it++) - (*it)->setText(readEntry((*it)->name(), ((*it)->text()))); + (*it)->setText(value((*it)->objectName(), ((*it)->text())).toString()); for(list::iterator it=m_elements_combobox.begin(); it!=m_elements_combobox.end(); it++) - (*it)->setCurrentItem(readNumEntry((*it)->name(), (*it)->currentItem())); + (*it)->setCurrentIndex(value((*it)->objectName(), (*it)->currentIndex()).toInt()); for(list::iterator it=m_elements_qgroupbox.begin(); it!=m_elements_qgroupbox.end(); it++) - (*it)->setChecked(readBoolEntry((*it)->name(), (*it)->isChecked())); + (*it)->setChecked(value((*it)->objectName(), (*it)->isChecked()).toBool()); for(list::iterator it=m_elements_qradiobutton.begin(); it!=m_elements_qradiobutton.end(); it++) - (*it)->setChecked(readBoolEntry((*it)->name(), (*it)->isChecked())); + (*it)->setChecked(value((*it)->objectName(), (*it)->isChecked()).toBool()); endGroup(); } @@ -88,16 +121,22 @@ void AutoQSettings::clear() beginGroup("Auto/"); for(list::iterator it=m_elements_checkbox.begin(); it!=m_elements_checkbox.end(); it++) - removeEntry((*it)->name()); + remove((*it)->objectName()); for(list::iterator it=m_elements_spinbox.begin(); it!=m_elements_spinbox.end(); it++) - removeEntry((*it)->name()); + remove((*it)->objectName()); for(list::iterator it=m_elements_lineedit.begin(); it!=m_elements_lineedit.end(); it++) - removeEntry((*it)->name()); + remove((*it)->objectName()); for(list::iterator it=m_elements_combobox.begin(); it!=m_elements_combobox.end(); it++) - removeEntry((*it)->name()); + remove((*it)->objectName()); - endGroup(); + for(list::iterator it=m_elements_qgroupbox.begin(); it!=m_elements_qgroupbox.end(); it++) + remove((*it)->objectName()); + + for(list::iterator it=m_elements_qradiobutton.begin(); it!=m_elements_qradiobutton.end(); it++) + remove((*it)->objectName()); + + endGroup(); } diff --git a/src/AutoQSettings.h b/src/AutoQSettings.h index 99ebcc6..40bafaa 100644 --- a/src/AutoQSettings.h +++ b/src/AutoQSettings.h @@ -16,6 +16,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#ifndef _AutoQSettings_h_ +#define _AutoQSettings_h_ + #include #include #include @@ -38,12 +41,12 @@ class AutoQSettings : public QSettings public: AutoQSettings(const QString& domain, const QString& product, const QString& setting_version); - void add(QCheckBox* el) {assert(el->name()!=""); m_elements_checkbox.push_back(el);} - void add(QSpinBox* el) {assert(el->name()!=""); m_elements_spinbox.push_back(el);} - void add(QLineEdit* el) {assert(el->name()!=""); m_elements_lineedit.push_back(el);} - void add(QComboBox* el) {assert(el->name()!=""); m_elements_combobox.push_back(el);} - void add(QGroupBox* el) {assert(el->name()!=""); m_elements_qgroupbox.push_back(el);} - void add(QRadioButton* el) {assert(el->name()!=""); m_elements_qradiobutton.push_back(el);} + void add(QCheckBox* el); + void add(QSpinBox* el); + void add(QLineEdit* el); + void add(QComboBox* el); + void add(QGroupBox* el); + void add(QRadioButton* el); void save(QCheckBox* el); void load(QCheckBox* el); @@ -52,3 +55,5 @@ class AutoQSettings : public QSettings void load(); void clear(); }; + +#endif // _AutoQSettings_h_ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..7a4acd7 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,64 @@ +FILE(GLOB fmit_SRCS + AutoQSettings.cpp + CaptureThread.cpp + CaptureThreadImplOSS.cpp + CaptureThreadImplPortAudio.cpp + CaptureThreadImplJACK.cpp + CaptureThreadImplALSA.cpp + CustomInstrumentTunerForm.cpp + DummyMonoQuantizer.cpp + LatencyMonoQuantizer.cpp + MonoQuantizer.cpp + main.cpp +) +FILE(GLOB fmit_UI_SRC + ../ui/ConfigForm.ui + ../ui/InstrumentTunerForm.ui +) +FILE(GLOB fmit_MOC_CLASSES + CaptureThread.h + CustomInstrumentTunerForm.h + MonoQuantizer.h +) +SET(fmit_QRC_SRC + fmit.qrc +) + +QT4_WRAP_UI(fmit_UI_H ${fmit_UI_SRC}) + +QT4_WRAP_CPP(fmit_SRCS_MOC ${fmit_MOC_CLASSES}) + +QT4_ADD_RESOURCES(fmit_RESOURCES ${fmit_QRC_SRC}) + +SET (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${fmit_SRCS} ${fmit_UI_SRC} ${fmit_MOC_CLASSES} PARENT_SCOPE) + +INCLUDE_DIRECTORIES( + ../libs + ${CMAKE_CURRENT_BINARY_DIR} + ${OSS_INCLUDE_DIR} + ${ALSA_INCLUDES} + ${PORTAUDIO_INCLUDE_DIRS} + ${JACK_INCLUDE_DIRS} +) + +IF (UPDATE_TRANSLATIONS) + QT4_CREATE_TRANSLATION(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES}) +ELSE (UPDATE_TRANSLATIONS) + QT4_ADD_TRANSLATION(QM_FILES ${TRANSLATIONS_FILES}) +ENDIF (UPDATE_TRANSLATIONS) +ADD_CUSTOM_TARGET (translations_target DEPENDS ${QM_FILES}) + +ADD_EXECUTABLE(fmit ${fmit_UI_H} ${fmit_SRCS_MOC} ${fmit_SRCS} ${fmit_RESOURCES} ${QM_FILES}) + +TARGET_LINK_LIBRARIES(fmit + CppAddons Music + fmit_modules + ${QT_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${FFTW3_LIBRARIES} + ${ALSA_LIBRARIES} + ${PORTAUDIO_LIBRARIES} + ${JACK_LIBRARIES} +) + +INSTALL(TARGETS fmit DESTINATION bin) # Install FMIT binary + +INSTALL (FILES ${QM_FILES} DESTINATION share/fmit/tr)# Install translation files diff --git a/src/CaptureThread.cpp b/src/CaptureThread.cpp index 5c6f86b..9b93303 100644 --- a/src/CaptureThread.cpp +++ b/src/CaptureThread.cpp @@ -42,9 +42,11 @@ void AddValue2ChannelFirst(CaptureThreadImpl* impl, double value, int i) void AddValue2ChannelMix(CaptureThreadImpl* impl, double value, int i) { if(i%2==0) - impl->m_capture_thread->m_values.push_front(value); + impl->m_tmp_value = value; +// impl->m_capture_thread->m_values.push_front(value); else - impl->m_capture_thread->m_values[0] = (impl->m_capture_thread->m_values[0]+value)/2.0; + impl->m_capture_thread->m_values.push_front((impl->m_tmp_value+value)/2.0); +// impl->m_capture_thread->m_values[0] = (impl->m_capture_thread->m_values[0]+value)/2.0; } void AddValue1Channel(CaptureThreadImpl* impl, double value, int i) { @@ -102,7 +104,7 @@ void CaptureThread::autoDetectTransport() { m_current_impl = impl; - cerr << "using " << m_current_impl->m_name << endl; + cerr << "using " << m_current_impl->m_name.toStdString() << endl; if(m_current_impl->m_name!=old_name) emit(transportChanged(m_current_impl->m_name)); @@ -120,7 +122,7 @@ void CaptureThread::autoDetectTransport() } void CaptureThread::selectTransport(const QString& name) { - cerr << "CaptureThread: INFO: using " << name << " transport" << endl; + cerr << "CaptureThread: INFO: using " << name.toStdString() << " transport" << endl; if(getCurrentTransport() && name==getCurrentTransport()->getName()) return; bool was_capturing = isCapturing(); @@ -138,7 +140,7 @@ void CaptureThread::selectTransport(const QString& name) if(impl==NULL) { - cerr << "CaptureThread: ERROR: unknown transport '" << name << "'" << endl; + cerr << "CaptureThread: ERROR: unknown transport '" << name.toStdString() << "'" << endl; throw QString("CaptureThread: ERROR: unknown transport '")+name+"'"; } @@ -155,7 +157,7 @@ void CaptureThread::selectTransport(int index) assert(index>=0 && indexgetName() << " transport" << endl; + cerr << "CaptureThread: INFO: change transport to " << m_impls[index]->getName().toStdString() << " transport" << endl; bool was_capturing = isCapturing(); if(was_capturing) @@ -176,7 +178,7 @@ void CaptureThread::listTransports() { cerr << "CaptureThread: INFO: Built in transports" << endl; for(vector::iterator it=m_impls.begin(); it!=m_impls.end(); it++) - cerr << "CaptureThread: INFO: " << (*it)->getStatus() << " " << (*it)->m_name << " " << (*it)->m_descr << endl; + cerr << "CaptureThread: INFO: " << (*it)->getStatus().toStdString() << " " << (*it)->m_name.toStdString() << " " << (*it)->m_descr.toStdString() << endl; } const CaptureThreadImpl* CaptureThread::getCurrentTransport() const { @@ -368,1177 +370,3 @@ void CaptureThreadImpl::setFormatDescrsAndFns(int format_size, bool format_signe cerr << "CaptureThread: INFO: format is " << (m_format_signed?"signed":"unsigned") << " " << (m_format_float?"float":"integer") << " " << m_format_size*8 << "bits with " << m_channel_count << " channel(s)" << endl; } - -// ------------------------------ ALSA implementation ---------------------------- -#ifdef CAPTURE_ALSA - -#define ALSA_BUFF_SIZE 1024 - -void alsa_error_handler(const char *file, int line, const char *function, int err, const char *fmt, ...) -{ - cerr << "alsa_error_handler: " << file << ":" << line << " " << function << " err=" << err << endl; -} - -CaptureThreadImplALSA::CaptureThreadImplALSA(CaptureThread* capture_thread) - : CaptureThreadImpl(capture_thread, "ALSA", QString("Advanced Linux Sound Architecture (lib:")+snd_asoundlib_version()+")") -{ - m_alsa_capture_handle = NULL; - m_alsa_hw_params = NULL; - m_alsa_buffer = NULL; - m_format = SND_PCM_FORMAT_UNKNOWN; - - m_source = "hw:0"; - - m_alive = true; - m_in_run = false; - m_loop = false; - -// snd_lib_error_set_handler(alsa_error_handler); -} - -bool CaptureThreadImplALSA::is_available() -{ - if(m_alsa_capture_handle==NULL) - { - try - { - int err = -1; - if((err=snd_pcm_open(&m_alsa_capture_handle, m_source.latin1(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) - { - if(err==-19) // TODO risks of changes for the error code - throw QString("invalid source '")+m_source+"'"; - else if(err==-16) - throw QString("device '")+m_source+"' busy"; - else - throw QString("cannot open pcm: ")+QString(snd_strerror(err)); - } - } - catch(QString error) - { - m_alsa_capture_handle = NULL; - - m_status = "N/A ("+error+")"; - - return false; - } - - if(m_alsa_capture_handle!=NULL) - { - snd_pcm_close(m_alsa_capture_handle); - m_alsa_capture_handle = NULL; - } - } - - m_status = "OK"; - - // cerr << "CaptureThread: INFO: ALSA seems available" << endl; - - return true; -} - -void CaptureThreadImplALSA::startCapture() -{ - if(!running()) - start(); - - m_loop = true; - - m_wait_for_start = true; - while(m_wait_for_start) // some implementations take a long time to start - msleep(10); -} -void CaptureThreadImplALSA::stopCapture() -{ - m_loop = false; - - while(m_in_run) - msleep(10); -} - -void CaptureThreadImplALSA::set_params(bool test) -{ -// cerr << "ALSA: Recognized sample formats are" << endl; -// for (int k = 0; k < SND_PCM_FORMAT_LAST; ++(unsigned long) k) { -// const char *s = snd_pcm_format_name((snd_pcm_format_t)k); -// if (s) cerr << s << endl; -// } - int err=0; - - if(m_source=="") - throw QString("ALSA: set the source first"); - if((err=snd_pcm_open(&m_alsa_capture_handle, m_source.latin1(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) - { - // cerr << "err=" << err << ":" << snd_strerror(err) << endl; - - if(err==-19) // TODO risks of changes for the error code - throw QString("ALSA: Invalid Source '")+m_source+"'"; - else if(err==-16) - throw QString("ALSA: Device '")+m_source+"' busy"; - else - throw QString("ALSA: Cannot open pcm: ")+QString(snd_strerror(err)); - } - - snd_pcm_hw_params_alloca(&m_alsa_hw_params); - - if((err=snd_pcm_hw_params_any(m_alsa_capture_handle, m_alsa_hw_params)) < 0) - throw QString("ALSA: cannot initialize hardware parameter structure (")+QString(snd_strerror(err))+")"; - - if((err=snd_pcm_hw_params_set_access(m_alsa_capture_handle, m_alsa_hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) - throw QString("ALSA: cannot set access type (")+QString(snd_strerror(err))+")"; - - if(!test) - { - // Formats - if(m_format==-1) - { - list formats; - formats.push_back(SND_PCM_FORMAT_S16); formats.push_back(SND_PCM_FORMAT_U16); - formats.push_back(SND_PCM_FORMAT_S8); formats.push_back(SND_PCM_FORMAT_U8); - - err = -1; - while(err<0) - { - if(formats.empty()) - throw QString("ALSA: cannot set any format (")+QString(snd_strerror(err))+")"; - - m_format = formats.front(); - cerr << "CaptureThread: INFO: ALSA: try to set format to " << snd_pcm_format_description(m_format) << flush; - err=snd_pcm_hw_params_set_format(m_alsa_capture_handle, m_alsa_hw_params, m_format); - - if(err<0) cerr << " failed" << endl; - else cerr << " success" << endl; - - formats.pop_front(); - } - } - else - { - if((err=snd_pcm_hw_params_set_format(m_alsa_capture_handle, m_alsa_hw_params, m_format))<0) - { - QString err_msg = QString("ALSA: cannot set format (")+QString(snd_strerror(err))+")"; - cerr << "CaptureThread: ERROR: " << err_msg << endl; - } - } - - // Channel count - unsigned int channel_count = 1; - if((err=snd_pcm_hw_params_set_channels_near(m_alsa_capture_handle, m_alsa_hw_params, &channel_count)) < 0) - { - QString err_msg = QString("ALSA: cannot set channel count (")+QString(snd_strerror(err))+")"; - cerr << "CaptureThread: WARNING: " << err_msg << endl; - } - if(channel_count>1) - { - QString err_msg = QString("ALSA: cannot set channel count to one (")+QString::number(channel_count)+" instead)"; - cerr << "CaptureThread: WARNING: " << err_msg << endl; - } - - setFormatDescrsAndFns(snd_pcm_format_width(m_format)/8, snd_pcm_format_signed(m_format), false, channel_count); - } - - if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX || m_sampling_rate==CaptureThread::SAMPLING_RATE_UNKNOWN) - { - int old_sampling_rate = m_sampling_rate; - - cerr << "CaptureThread: INFO: ALSA: sampling rate set to max or undefined, try to determinate it." << endl; - - list sampling_rates; - sampling_rates.push_front(8000); sampling_rates.push_front(11025); sampling_rates.push_front(16000); - sampling_rates.push_front(22050); sampling_rates.push_front(24000); sampling_rates.push_front(32000); - sampling_rates.push_front(44100); sampling_rates.push_front(48000); sampling_rates.push_front(96000); - - err = -1; - while(err<0) - { - if(sampling_rates.empty()) - throw QString("ALSA: cannot set any sample rate (")+QString(snd_strerror(err))+")"; - - m_sampling_rate = sampling_rates.front(); - cerr << "CaptureThread: INFO: ALSA: try to set sampling rate to " << m_sampling_rate << flush; - unsigned int rrate = m_sampling_rate; - err = snd_pcm_hw_params_set_rate(m_alsa_capture_handle, m_alsa_hw_params, rrate, 0); - - if(err<0) cerr << " failed" << endl; - else cerr << " success" << endl; - - sampling_rates.pop_front(); - } - - if(old_sampling_rate!=m_sampling_rate) - m_capture_thread->emitSamplingRateChanged(); - } - else - { - int err; - int dir = 0; - unsigned int rrate = m_sampling_rate; - if((err = snd_pcm_hw_params_set_rate_near(m_alsa_capture_handle, m_alsa_hw_params, &rrate, &dir))<0) - throw QString("ALSA: cannot set sampling rate (")+QString(snd_strerror(err))+")"; - if(m_sampling_rate!=rrate) - m_capture_thread->emitSamplingRateChanged(); - m_sampling_rate = rrate; - } - - if((err=snd_pcm_hw_params(m_alsa_capture_handle, m_alsa_hw_params)) < 0) - throw QString("ALSA: cannot set parameters (")+QString(snd_strerror(err))+")"; -} - -void CaptureThreadImplALSA::setSamplingRate(int value) -{ -// cerr << "CaptureThreadImplALSA::setSamplingRate " << value << endl; - - assert(value>0 || value==CaptureThread::SAMPLING_RATE_MAX); - - if(m_sampling_rate!=value || value==CaptureThread::SAMPLING_RATE_MAX) - { - bool was_running = m_capture_thread->isCapturing(); - if(was_running) m_capture_thread->stopCapture(); - - m_sampling_rate = value; - - if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX) - { - try - { - set_params(true); - } - catch(QString error) - { - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } - - // it was just for testing - capture_finished(); - } - else - m_capture_thread->emitSamplingRateChanged(); - - if(was_running) m_capture_thread->startCapture(); - } - -// cerr << "~CaptureThreadImplALSA::setSamplingRate" << endl; -} - -void CaptureThreadImplALSA::capture_init() -{ - set_params(); - - snd_pcm_nonblock(m_alsa_capture_handle, 0); - - m_alsa_buffer = new char[m_channel_count*ALSA_BUFF_SIZE*snd_pcm_format_width(m_format)/8]; - - int err=0; - - if((err=snd_pcm_prepare(m_alsa_capture_handle)) < 0) - throw QString("ALSA: cannot prepare audio interface for use (")+QString(snd_strerror(err))+")"; -} -void CaptureThreadImplALSA::capture_loop() -{ -// cerr << "CaptureThreadImplALSA::capture_loop" << endl; - - m_wait_for_start = false; - while(m_loop) - { - int ret_val = snd_pcm_readi(m_alsa_capture_handle, m_alsa_buffer, ALSA_BUFF_SIZE); - if(ret_val<0) - { - cerr << "CaptureThread: WARNING: ALSA: " << snd_strerror(ret_val) << endl; - while((ret_val = snd_pcm_prepare(m_alsa_capture_handle)) < 0) - { - msleep(1000); - cerr << QString("ALSA: cannot prepare audio interface (")+QString(snd_strerror(ret_val))+")" << endl; -// throw QString("ALSA: cannot prepare audio interface (")+QString(snd_strerror(ret_val))+")"; - } - } - else - { - if(!m_capture_thread->m_pause) - { - m_capture_thread->m_lock.lock(); - -// cerr << "CaptureThreadImplALSA::capture_loop " << m_capture_thread->m_values.size() << endl; - - for(int i=0; im_packet_size = ret_val; - if(m_capture_thread->m_ext_lock) - { - m_capture_thread->m_packet_size_sll = 0; - m_capture_thread->m_ext_lock = false; - } - m_capture_thread->m_packet_size_sll += ret_val; - - m_capture_thread->m_lock.unlock(); - } - } - } - -// cerr << "~CaptureThreadImplALSA::capture_loop" << endl; -} -void CaptureThreadImplALSA::capture_finished() -{ - if(m_alsa_buffer!=NULL) - { - delete[] m_alsa_buffer; - m_alsa_buffer = NULL; - } - - if(m_alsa_capture_handle!=NULL) - { - snd_pcm_hw_free(m_alsa_capture_handle); - snd_pcm_close(m_alsa_capture_handle); - m_alsa_capture_handle = NULL; - } -} - -void CaptureThreadImplALSA::run() -{ -// cerr << "CaptureThread: INFO: ALSA: capture thread entered" << endl; - -// while(m_alive) // TODO need to keep alsa thread alive to let PortAudio working after ALSA !! - { - while(m_alive && !m_loop) - msleep(10); - - m_in_run = true; - - try - { - // cerr << "CaptureThread: INFO: capture thread running" << endl; - - capture_init(); - - m_capture_thread->m_capturing = true; - m_capture_thread->emitCaptureStarted(); - m_capture_thread->emitCaptureToggled(true); - - capture_loop(); - - m_capture_thread->m_capturing = false; - m_capture_thread->emitCaptureStoped(); - m_capture_thread->emitCaptureToggled(false); - } - catch(QString error) - { - m_loop = false; - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } - m_wait_for_start = false; - - capture_finished(); - - m_in_run = false; - - // cerr << "CaptureThread: INFO: capture thread stop running" << endl; - } - -// cerr << "CaptureThread: INFO: ALSA: capture thread exited" << endl; -} - -CaptureThreadImplALSA::~CaptureThreadImplALSA() -{ -// cerr << "CaptureThreadImplALSA::~CaptureThreadImplALSA" << endl; - - m_alive = false; - - stopCapture(); - - while(running()) - msleep(10); - -// cerr << "~CaptureThreadImplALSA::~CaptureThreadImplALSA" << endl; -} - -#endif - -// ------------------------------ JACK implementation ---------------------------- -#ifdef CAPTURE_JACK -CaptureThreadImplJACK::CaptureThreadImplJACK(CaptureThread* capture_thread) -: CaptureThreadImpl(capture_thread, "JACK", "Jack Audio Connection Kit") -{ - m_jack_client = NULL; - m_jack_port = NULL; -} - -bool CaptureThreadImplJACK::is_available() -{ - if(m_jack_client==NULL) - { - try - { - m_jack_client = jack_client_new((m_capture_thread->m_name+"_test").latin1()); - if(m_jack_client==NULL) - throw QString("unknown reason"); - } - catch(QString error) - { - m_jack_client = NULL; - m_status = "N/A"; - return false; - } - capture_finished(); - } - - m_status = "available"; - - return true; -} - -void CaptureThreadImplJACK::setSamplingRate(int value) -{ - cerr << "CaptureThread: ERROR: JACK: setSamplingRate not available with JACK ! change the JACK server sampling rate instead" << endl; -} - -void CaptureThreadImplJACK::startCapture() -{ - try - { - capture_init(); - } - catch(QString error) - { - capture_finished(); - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } -} -void CaptureThreadImplJACK::stopCapture() -{ - try - { - capture_finished(); - } - catch(QString error) - { - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } -} - -void CaptureThreadImplJACK::JackShutdown(void* arg){((CaptureThreadImplJACK*)arg)->jackShutdown();} -void CaptureThreadImplJACK::jackShutdown() -{ - m_jack_client = NULL; - - m_capture_thread->emitError("JACK: server shutdown !"); -} - -int CaptureThreadImplJACK::JackSampleRate(jack_nframes_t nframes, void* arg){return ((CaptureThreadImplJACK*)arg)->jackSampleRate(nframes);} -int CaptureThreadImplJACK::jackSampleRate(jack_nframes_t nframes) -{ - if(m_sampling_rate!=int(nframes)) - { - m_sampling_rate = nframes; - m_capture_thread->emitSamplingRateChanged(); - } - - return 0; -} - -int CaptureThreadImplJACK::JackProcess(jack_nframes_t nframes, void* arg){return ((CaptureThreadImplJACK*)arg)->jackProcess(nframes);} -int CaptureThreadImplJACK::jackProcess(jack_nframes_t nframes) -{ -// cerr << "'" << nframes << "'" << endl; - - if(m_capture_thread->m_pause || !m_capture_thread->m_capturing || nframes<=0) return 0; - - void* pin = jack_port_get_buffer(m_jack_port, nframes); - - if(!pin) return 0; - - jack_default_audio_sample_t* in = (jack_default_audio_sample_t*)pin; - - m_capture_thread->m_lock.lock(); - - for(jack_nframes_t i=0; im_values.push_front(in[i]); - - m_capture_thread->m_lock.unlock(); - - m_capture_thread->m_packet_size = nframes; - if(m_capture_thread->m_ext_lock) - { - m_capture_thread->m_packet_size_sll = 0; - m_capture_thread->m_ext_lock = false; - } - m_capture_thread->m_packet_size_sll += nframes; - - return 0; -} - -void CaptureThreadImplJACK::capture_init() -{ - m_jack_client = jack_client_new(m_capture_thread->m_name.latin1()); - if(!m_jack_client) - throw QString("JACK: cannot create client, JACK deamon is running ?"); - - jack_set_process_callback(m_jack_client, JackProcess, (void*)this); - jack_on_shutdown(m_jack_client, JackShutdown, (void*)this); - jack_set_error_function(jack_error_callback); - jack_set_sample_rate_callback(m_jack_client, JackSampleRate, (void*)this); - - int err=0; - if((err=jack_activate(m_jack_client))!=0) - throw QString("JACK: cannot activate client"); - - setFormatDescrsAndFns(sizeof(jack_default_audio_sample_t), true, true, 1); - - m_jack_port = jack_port_register(m_jack_client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput,0); - - if(m_source!="") - if((err=jack_connect(m_jack_client, m_source.latin1(), (m_capture_thread->m_name+":input").latin1()))!=0) - m_capture_thread->emitError(QString("JACK: Invalid source '")+m_source+"'"); - - int old_sampling_rate = m_sampling_rate; - m_sampling_rate = jack_get_sample_rate(m_jack_client); - if(m_sampling_rate!=old_sampling_rate) - m_capture_thread->emitSamplingRateChanged(); - - m_capture_thread->m_capturing = true; - m_capture_thread->emitCaptureStarted(); - m_capture_thread->emitCaptureToggled(true); -} -void CaptureThreadImplJACK::capture_finished() -{ -// cerr << "CaptureThreadImplJACK::capture_finished" << endl; - - if(m_jack_client!=NULL) - { - jack_client_close(m_jack_client); - m_jack_client = NULL; - - m_capture_thread->m_capturing = false; - m_capture_thread->emitCaptureStoped(); - m_capture_thread->emitCaptureToggled(false); - } -} -#endif - -// ------------------------------ PortAudio implementation ---------------------------- -#ifdef CAPTURE_PORTAUDIO -CaptureThreadImplPortAudio::CaptureThreadImplPortAudio(CaptureThread* capture_thread) - : CaptureThreadImpl(capture_thread, "PortAudio", QString("Portable cross-platform Audio API (lib:")+Pa_GetVersionText()+"["+QString::number(Pa_GetVersion())+"])") -{ - m_stream = NULL; - - m_source = "default"; -} - -bool CaptureThreadImplPortAudio::is_available() -{ - if(!m_stream) - { - try - { - m_err = Pa_Initialize(); - if(m_err != paNoError) throw QString("PortAudio: is_available:Pa_Initialize ")+Pa_GetErrorText(m_err); - - PaError err; - int numDevices; - - numDevices = Pa_GetDeviceCount(); - if(numDevices < 0) - throw QString("PortAudio: is_available:Pa_GetDeviceCount ")+Pa_GetErrorText(numDevices); - else if(numDevices == 0) - throw QString("PortAudio: is_available:Pa_GetDeviceCount no devices available")+Pa_GetErrorText(numDevices); - -/* const PaDeviceInfo *deviceInfo; - - for(int i=0; iname << endl; - cerr << deviceInfo->defaultSampleRate << endl; - }*/ - } - catch(QString error) - { - Pa_Terminate(); - m_stream = NULL; - m_status = "N/A"; - return false; - } - capture_finished(); - } - - m_status = "OK"; - - return true; -} - -void CaptureThreadImplPortAudio::setSamplingRate(int value) -{ -// cerr << "CaptureThreadImplPortAudio::setSamplingRate " << value << endl; - - assert(value>0 || value==CaptureThread::SAMPLING_RATE_MAX); - - if(m_sampling_rate!=value || value==CaptureThread::SAMPLING_RATE_MAX) - { - bool was_running = m_capture_thread->isCapturing(); - if(was_running) m_capture_thread->stopCapture(); - - m_sampling_rate = value; - - if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX) - { - try - { - set_params(true); - } - catch(QString error) - { - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } - - try{ - // it was just for testing - capture_finished(); - } - catch(QString error) - { - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } - } - else - m_capture_thread->emitSamplingRateChanged(); - - if(was_running) m_capture_thread->startCapture(); - } - -// cerr << "~CaptureThreadImplPortAudio::setSamplingRate" << endl; -} - -int CaptureThreadImplPortAudio::PortAudioCallback( const void *inputBuffer, void *outputBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo* timeInfo, - PaStreamCallbackFlags statusFlags, - void *userData ) -{((CaptureThreadImplPortAudio*)userData)->portAudioCallback(inputBuffer, framesPerBuffer, timeInfo, statusFlags);} -int CaptureThreadImplPortAudio::portAudioCallback(const void *inputBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo* timeInfo, - PaStreamCallbackFlags statusFlags) -{ - if(m_capture_thread->m_pause) - return 0; - - m_capture_thread->m_lock.lock(); - - float *in = (float*)inputBuffer; - - for(unsigned long i=0; im_values.push_front(*in++); -// addValue(*in++, i, m_channel_count); // TODO - - m_capture_thread->m_packet_size = framesPerBuffer; - if(m_capture_thread->m_ext_lock) - { - m_capture_thread->m_packet_size_sll = 0; - m_capture_thread->m_ext_lock = false; - } - m_capture_thread->m_packet_size_sll += framesPerBuffer; - - m_capture_thread->m_lock.unlock(); - - return 0; -} - -void CaptureThreadImplPortAudio::set_params(bool test) -{ - m_err = Pa_Initialize(); - if(m_err != paNoError) throw QString("PortAudio: set_params:Pa_Initialize ")+Pa_GetErrorText(m_err); - - PaStreamParameters params; - params.device = paNoDevice; - params.channelCount = 1; - params.sampleFormat = paFloat32; - params.suggestedLatency = 0; - params.hostApiSpecificStreamInfo = NULL; - - if(m_source!="default") // TODO hum hum - { - int numDevices = Pa_GetDeviceCount(); - const PaDeviceInfo* deviceInfo; - int index = -1; - for(int i=0; params.device==paNoDevice && iname)==m_source) - params.device = i; - } - - if(params.device==paNoDevice) - cerr << "CaptureThread: INFO: PortAudio: cannot determine selected source \"" << m_source << "\"" << endl; - } - - if(!test) - { - if(params.device==paNoDevice) - cerr << "CaptureThread: INFO: PortAudio: using default device" << endl; - else - cerr << "CaptureThread: INFO: PortAudio: using \"" << m_source << "\"" << endl; - - setFormatDescrsAndFns(4, true, true, 1); - } - - if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX || m_sampling_rate==CaptureThread::SAMPLING_RATE_UNKNOWN) - { - int old_sampling_rate = m_sampling_rate; - - cerr << "CaptureThread: INFO: PortAudio: sampling rate set to max or undefined, try to determinate it." << endl; - - list sampling_rates; - sampling_rates.push_front(8000); sampling_rates.push_front(11025); sampling_rates.push_front(16000); - sampling_rates.push_front(22050); sampling_rates.push_front(24000); sampling_rates.push_front(32000); - sampling_rates.push_front(44100); sampling_rates.push_front(48000); sampling_rates.push_front(96000); - - m_err = -1; - while(m_err!=paNoError) - { - if(sampling_rates.empty()) - throw QString("PortAudio: cannot set any sample rate (")+Pa_GetErrorText(m_err)+")"; - - m_err = Pa_Initialize(); - if(m_err != paNoError) throw QString("PortAudio: set_params:Pa_Initialize ")+Pa_GetErrorText(m_err); - - m_sampling_rate = sampling_rates.front(); - cerr << "CaptureThread: INFO: PortAudio: try to set sampling rate to " << m_sampling_rate << flush; - -// cerr << "nbc1 " << params.channelCount << endl; - - if(params.device==paNoDevice) - m_err = Pa_OpenDefaultStream(&m_stream, 1, 0, paFloat32, m_sampling_rate, 0, PortAudioCallback, this); - else - m_err = Pa_OpenStream(&m_stream, ¶ms, NULL, m_sampling_rate, 0, paNoFlag, PortAudioCallback, this); - - if(m_err != paNoError) cerr << " failed" << endl; - else cerr << " success" << endl; - - sampling_rates.pop_front(); - } - - if(old_sampling_rate!=m_sampling_rate) - m_capture_thread->emitSamplingRateChanged(); - } - else - { -// cerr << "nbc2 " << params.channelCount << endl; -// cerr << "dev2 " << params.device << "/" << paNoDevice << endl; - - if(params.device==paNoDevice) - { - m_err = Pa_OpenDefaultStream(&m_stream, 1, 0, paFloat32, m_sampling_rate, 0, PortAudioCallback, this); - if(m_err != paNoError) - throw QString("PortAudio: set_params:Pa_OpenDefaultStream ")+Pa_GetErrorText(m_err); - } - else - { - m_err = Pa_OpenStream(&m_stream, ¶ms, NULL, m_sampling_rate, 0, paNoFlag, PortAudioCallback, this); - if(m_err != paNoError) - throw QString("PortAudio: set_params:Pa_OpenStream ")+Pa_GetErrorText(m_err); - } - } -} - -void CaptureThreadImplPortAudio::capture_init() -{ - set_params(false); - - m_err = Pa_StartStream(m_stream); - if(m_err != paNoError) - throw QString("PortAudio: capture_init:Pa_StartStream ")+Pa_GetErrorText(m_err); - - m_capture_thread->m_capturing = true; - m_capture_thread->emitCaptureStarted(); - m_capture_thread->emitCaptureToggled(true); -} -void CaptureThreadImplPortAudio::capture_finished() -{ - if(m_stream) - { - if(!Pa_IsStreamStopped(m_stream)) - { - m_err = Pa_StopStream(m_stream); - if(m_err != paNoError) throw QString("PortAudio: capture_finished: ")+Pa_GetErrorText(m_err); - } - - if(m_stream) - { - m_err = Pa_CloseStream(m_stream); - if(m_err != paNoError) throw QString("PortAudio: capture_finished: ")+Pa_GetErrorText(m_err); - } - - m_stream = NULL; - - m_capture_thread->m_capturing = false; - m_capture_thread->emitCaptureStoped(); - m_capture_thread->emitCaptureToggled(false); - } - - m_err = Pa_Terminate(); -// if(m_err != paNoError) throw QString("PortAudio: capture_finished: ")+Pa_GetErrorText(m_err); -} -void CaptureThreadImplPortAudio::startCapture() -{ - try - { - capture_init(); - } - catch(QString error) - { - capture_finished(); - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } -} -void CaptureThreadImplPortAudio::stopCapture() -{ - try - { - capture_finished(); - } - catch(QString error) - { - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } -} -CaptureThreadImplPortAudio::~CaptureThreadImplPortAudio() -{ - stopCapture(); -} - -#endif - -// ------------------------------ OSS implementation ---------------------------- -#ifdef CAPTURE_OSS -#include -#include -#include -#include -#include -#include -#include - - -#define OSS_BUFF_SIZE 1024 - -CaptureThreadImplOSS::CaptureThreadImplOSS(CaptureThread* capture_thread) - : CaptureThreadImpl(capture_thread, "OSS", QString("Open Sound System")) -{ - m_fd_in = 0; - m_oss_buffer = NULL; - m_format = -1; - - m_source = "/dev/dsp"; - - // oss_sysinfo si; // definition ?? -// ioctl(m_fd_in, OSS_SYSINFO, &si); -// m_fd_in = open(m_source, O_RDONLY, 0)); -// m_descr = QString("Open Sound System (")+QString::number(SOUND_VERSION, 16)+":"+si.version+")"); -// close(m_fd_in); -// m_fd_in = 0; - m_descr = QString("Open Sound System (lib:")+QString::number(SOUND_VERSION, 16)+")"; - - m_alive = true; - m_in_run = false; - m_loop = false; -} - -bool CaptureThreadImplOSS::is_available() -{ - if(m_fd_in==0) - { - try - { - if((m_fd_in = open (m_source.latin1(), O_RDONLY, 0)) == -1) - throw QString(strerror(errno)); - } - catch(QString error) - { - m_fd_in = 0; - - m_status = "N/A ("+error+")"; - - return false; - } - - capture_finished(); - } - - m_status = "OK"; - - // cerr << "CaptureThread: INFO: OSS seems available" << endl; - - return true; -} - -void CaptureThreadImplOSS::startCapture() -{ - if(!running()) - start(); - - m_loop = true; - - m_wait_for_start = true; - while(m_wait_for_start) // some implementations take a long time to start - msleep(10); -} -void CaptureThreadImplOSS::stopCapture() -{ - m_loop = false; - - while(m_in_run) - msleep(10); -} - -void CaptureThreadImplOSS::set_params(bool test) -{ - if(m_source=="") - throw QString("OSS: set the source first"); - if((m_fd_in = open (m_source.latin1(), O_RDONLY, 0))==-1) - throw QString("OSS: ")+QString(strerror(errno)); - - if(!test) - { - if(m_format==-1) - { - // Formats - m_format = AFMT_S16_NE; /* Native 16 bits */ - if(ioctl(m_fd_in, SNDCTL_DSP_SETFMT, &m_format)==-1) - throw QString("OSS: cannot set format (")+strerror(errno)+")"; - - if(m_format != AFMT_S16_NE) - throw QString("OSS: cannot set format to signed 16bits"); - } - else - { - if(ioctl(m_fd_in, SNDCTL_DSP_SETFMT, &m_format)==-1) - throw QString("OSS: cannot set format (")+strerror(errno)+")"; - } - - m_format_size = 2; - m_format_signed = true; - m_format_float = false; - - // Channel count - unsigned int channel_count = 1; - if(ioctl(m_fd_in, SNDCTL_DSP_CHANNELS, &channel_count)==-1) - throw QString("OSS: cannot set channel count to 1 (")+strerror(errno)+")"; - - if(channel_count != 1) - throw QString("OSS: the device doesn't support mono mode"); - - /* if(m_channel_count>1) // TODO - { - QString err_msg = QString("OSS: cannot set channel count to one (")+QString::number(m_channel_count)+" instead)"; - cerr << "CaptureThread: WARNING: " << err_msg << endl; - }*/ - - setFormatDescrsAndFns(2, true, false, channel_count); - } - - if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX || m_sampling_rate==CaptureThread::SAMPLING_RATE_UNKNOWN) - { - int old_sampling_rate = m_sampling_rate; - - cerr << "CaptureThread: INFO: OSS: sampling rate set to max or undefined, try to determinate it." << endl; - - list sampling_rates; - sampling_rates.push_front(8000); sampling_rates.push_front(11025); sampling_rates.push_front(16000); - sampling_rates.push_front(22050); sampling_rates.push_front(24000); sampling_rates.push_front(32000); - sampling_rates.push_front(44100); sampling_rates.push_front(48000); sampling_rates.push_front(96000); - - int err = -1; - while(err<0) - { - if(sampling_rates.empty()) - throw QString("OSS: cannot set any sample rate (")+strerror(errno)+")"; - - m_sampling_rate = sampling_rates.front(); - cerr << "CaptureThread: INFO: OSS: try to set sampling rate to " << m_sampling_rate << flush; - err = ioctl(m_fd_in, SNDCTL_DSP_SPEED, &m_sampling_rate); - - if(err==-1) cerr << " failed" << endl; - else cerr << " success" << endl; - - sampling_rates.pop_front(); - } - - if(old_sampling_rate!=m_sampling_rate) - m_capture_thread->emitSamplingRateChanged(); - } - else - { - if(ioctl(m_fd_in, SNDCTL_DSP_SPEED, &m_sampling_rate)==-1) - throw QString("OSS: cannot set sampling rate (")+QString(strerror(errno))+")"; - } -} - -void CaptureThreadImplOSS::setSamplingRate(int value) -{ -// cerr << "CaptureThreadImplOSS::setSamplingRate " << value << endl; - - assert(value>0 || value==CaptureThread::SAMPLING_RATE_MAX); - - if(m_sampling_rate!=value || value==CaptureThread::SAMPLING_RATE_MAX) - { - bool was_running = m_capture_thread->isCapturing(); - if(was_running) m_capture_thread->stopCapture(); - - m_sampling_rate = value; - - if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX) - { - try - { - set_params(true); - } - catch(QString error) - { - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } - - // it was just for testing - capture_finished(); - } - else - m_capture_thread->emitSamplingRateChanged(); - - if(was_running) m_capture_thread->startCapture(); - } - -// cerr << "~CaptureThreadImplOSS::setSamplingRate" << endl; -} - -void CaptureThreadImplOSS::capture_init() -{ - set_params(false); - - m_oss_buffer = new char[m_channel_count*OSS_BUFF_SIZE*16/8]; -} -void CaptureThreadImplOSS::capture_loop() -{ -// cerr << "CaptureThreadImplOSS::capture_loop" << endl; - - bool format_signed = true; - int l=0; - - m_wait_for_start = false; - while(m_loop) - { - int ret_val = read(m_fd_in, m_oss_buffer, sizeof(m_oss_buffer)); - - if(ret_val==-1) - { - cerr << "CaptureThread: WARNING: OSS: " << strerror(errno) << endl; - msleep(1000); // TODO which behavior ? -// m_loop = false;// TODO which behavior ? - } - else - { - ret_val /= m_format_size; - - if(!m_capture_thread->m_pause) - { - m_capture_thread->m_lock.lock(); - - for(int i=0; im_packet_size = ret_val; - if(m_capture_thread->m_ext_lock) - { - m_capture_thread->m_packet_size_sll = 0; - m_capture_thread->m_ext_lock = false; - } - m_capture_thread->m_packet_size_sll += ret_val; - - m_capture_thread->m_lock.unlock(); - } - } - } - -// cerr << "~CaptureThreadImplOSS::capture_loop" << endl; -} -void CaptureThreadImplOSS::capture_finished() -{ - if(m_oss_buffer!=NULL) - { - delete[] m_oss_buffer; - m_oss_buffer = NULL; - } - - if(m_fd_in!=0) - { - close(m_fd_in); - m_fd_in = 0; - } -} - -void CaptureThreadImplOSS::run() -{ -// cerr << "CaptureThread: INFO: OSS: capture thread entered" << endl; - -// while(m_alive) // TODO ?? need to keep oss thread alive to let PortAudio working after ALSA ?? - { - while(m_alive && !m_loop) - msleep(10); - - m_in_run = true; - - try - { - // cerr << "CaptureThread: INFO: capture thread running" << endl; - - capture_init(); - - m_capture_thread->m_capturing = true; - m_capture_thread->emitCaptureStarted(); - m_capture_thread->emitCaptureToggled(true); - - capture_loop(); - - m_capture_thread->m_capturing = false; - m_capture_thread->emitCaptureStoped(); - m_capture_thread->emitCaptureToggled(false); - } - catch(QString error) - { - m_loop = false; - cerr << "CaptureThread: ERROR: " << error << endl; - m_capture_thread->emitError(error); - } - m_wait_for_start = false; - - capture_finished(); - - m_in_run = false; - - // cerr << "CaptureThread: INFO: capture thread stop running" << endl; - } - -// cerr << "CaptureThread: INFO: OSS: capture thread exited" << endl; -} - -CaptureThreadImplOSS::~CaptureThreadImplOSS() -{ -// cerr << "CaptureThreadImplOSS::~CaptureThreadImplOSS" << endl; - - m_alive = false; - - stopCapture(); - - while(running()) - msleep(10); - -// cerr << "~CaptureThreadImplOSS::~CaptureThreadImplOSS" << endl; -} - -#endif diff --git a/src/CaptureThread.h b/src/CaptureThread.h index ea7f707..15c285f 100644 --- a/src/CaptureThread.h +++ b/src/CaptureThread.h @@ -63,7 +63,8 @@ class CaptureThreadImpl virtual void stopCapture()=0; virtual bool is_available()=0; - double (*decodeValue)(void* buffer, int i); + double m_tmp_value; // used when two channels have to be mixed down + double (*decodeValue)(void* buffer, int i); // not used for JACK void (*addValue)(CaptureThreadImpl* impl, double value, int i); void setFormatDescrsAndFns(int format_size, bool format_signed, bool format_float, int channel_count); @@ -121,21 +122,34 @@ class CaptureThreadImplALSA : public CaptureThreadImpl, public QThread #ifdef CAPTURE_JACK #include -class CaptureThreadImplJACK : public CaptureThreadImpl +#include +class CaptureThreadImplJACK : public CaptureThreadImpl, public QThread { static int JackProcess(jack_nframes_t nframes, void* arg); static void JackShutdown(void* arg); static int JackSampleRate(jack_nframes_t nframes, void* arg); + jack_ringbuffer_t* m_ringbuffer; jack_client_t* m_jack_client; jack_port_t* m_jack_port; int jackSampleRate(jack_nframes_t nframes); int jackProcess(jack_nframes_t nframes); void jackShutdown(); - void capture_init(); + // view + volatile bool m_alive; + volatile bool m_in_run; + + // control + volatile bool m_loop; + volatile bool m_wait_for_start; + + void capture_init(); + void capture_loop(); void capture_finished(); + virtual void run(); + public: CaptureThreadImplJACK(CaptureThread* capture_thread); @@ -143,6 +157,8 @@ class CaptureThreadImplJACK : public CaptureThreadImpl virtual void startCapture(); virtual void stopCapture(); virtual bool is_available(); + + ~CaptureThreadImplJACK(); }; #endif diff --git a/src/CaptureThreadImplALSA.cpp b/src/CaptureThreadImplALSA.cpp new file mode 100644 index 0000000..775e997 --- /dev/null +++ b/src/CaptureThreadImplALSA.cpp @@ -0,0 +1,421 @@ +// Copyright 2004 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "CaptureThread.h" + +#include +#include +#include +#include +#include +#include +#include +#include +using namespace std; + +// ------------------------------ ALSA implementation ---------------------------- +#ifdef CAPTURE_ALSA + +#define ALSA_BUFF_SIZE 1024 + +void alsa_error_handler(const char *file, int line, const char *function, int err, const char *fmt, ...) +{ + cerr << "alsa_error_handler: " << file << ":" << line << " " << function << " err=" << err << endl; +} + +CaptureThreadImplALSA::CaptureThreadImplALSA(CaptureThread* capture_thread) + : CaptureThreadImpl(capture_thread, "ALSA", QString("Advanced Linux Sound Architecture (lib:")+snd_asoundlib_version()+")") +{ + m_alsa_capture_handle = NULL; + m_alsa_hw_params = NULL; + m_alsa_buffer = NULL; + m_format = SND_PCM_FORMAT_UNKNOWN; + + m_source = "default"; // was hw:0 + + m_alive = true; + m_in_run = false; + m_loop = false; + +// snd_lib_error_set_handler(alsa_error_handler); +} + +bool CaptureThreadImplALSA::is_available() +{ + if(m_alsa_capture_handle==NULL) + { + try + { + int err = -1; + if((err=snd_pcm_open(&m_alsa_capture_handle, m_source.toAscii().constData(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) + { + if(err==-19) // TODO risks of changes for the error code + throw QString("invalid source '")+m_source+"'"; + else if(err==-16) + throw QString("device '")+m_source+"' busy"; + else + throw QString("cannot open pcm: ")+QString(snd_strerror(err)); + } + } + catch(QString error) + { + m_alsa_capture_handle = NULL; + + m_status = "N/A ("+error+")"; + + return false; + } + + if(m_alsa_capture_handle!=NULL) + { + snd_pcm_close(m_alsa_capture_handle); + m_alsa_capture_handle = NULL; + } + } + + m_status = "OK"; + + // cerr << "CaptureThread: INFO: ALSA seems available" << endl; + + return true; +} + +void CaptureThreadImplALSA::startCapture() +{ + if(!isRunning()) + start(); + + m_loop = true; + + m_wait_for_start = true; + while(m_wait_for_start) // some implementations take a long time to start + msleep(10); +} +void CaptureThreadImplALSA::stopCapture() +{ + m_loop = false; + + while(m_in_run) + msleep(10); +} + +void CaptureThreadImplALSA::set_params(bool test) +{ +// cerr << "ALSA: Recognized sample formats are" << endl; +// for (int k = 0; k < SND_PCM_FORMAT_LAST; ++(unsigned long) k) { +// const char *s = snd_pcm_format_name((snd_pcm_format_t)k); +// if (s) cerr << s << endl; +// } + int err=0; + + if(m_source=="") + throw QString("ALSA: set the source first"); + if((err=snd_pcm_open(&m_alsa_capture_handle, m_source.toAscii().constData(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) + { + // cerr << "err=" << err << ":" << snd_strerror(err) << endl; + + if(err==-19) // TODO risks of changes for the error code + throw QString("ALSA: Invalid Source '")+m_source+"'"; + else if(err==-16) + throw QString("ALSA: Device '")+m_source+"' busy"; + else + throw QString("ALSA: Cannot open pcm: ")+QString(snd_strerror(err)); + } + + snd_pcm_hw_params_alloca(&m_alsa_hw_params); + + if((err=snd_pcm_hw_params_any(m_alsa_capture_handle, m_alsa_hw_params)) < 0) + throw QString("ALSA: cannot initialize hardware parameter structure (")+QString(snd_strerror(err))+")"; + + if((err=snd_pcm_hw_params_set_access(m_alsa_capture_handle, m_alsa_hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) + throw QString("ALSA: cannot set access type (")+QString(snd_strerror(err))+")"; + + if(!test) + { + // Formats + if(m_format==-1) + { + list formats; + formats.push_back(SND_PCM_FORMAT_S16); formats.push_back(SND_PCM_FORMAT_U16); + formats.push_back(SND_PCM_FORMAT_S8); formats.push_back(SND_PCM_FORMAT_U8); + + err = -1; + while(err<0) + { + if(formats.empty()) + throw QString("ALSA: cannot set any format (")+QString(snd_strerror(err))+")"; + + m_format = formats.front(); + cerr << "CaptureThread: INFO: ALSA: try to set format to " << snd_pcm_format_description(m_format) << flush; + err=snd_pcm_hw_params_set_format(m_alsa_capture_handle, m_alsa_hw_params, m_format); + + if(err<0) cerr << " failed" << endl; + else cerr << " success" << endl; + + formats.pop_front(); + } + } + else + { + if((err=snd_pcm_hw_params_set_format(m_alsa_capture_handle, m_alsa_hw_params, m_format))<0) + { + QString err_msg = QString("ALSA: cannot set format (")+QString(snd_strerror(err))+")"; + cerr << "CaptureThread: ERROR: " << err_msg.toStdString() << endl; + } + } + + // Channel count + unsigned int channel_count = 1; + if((err=snd_pcm_hw_params_set_channels_near(m_alsa_capture_handle, m_alsa_hw_params, &channel_count)) < 0) + { + QString err_msg = QString("ALSA: cannot set channel count (")+QString(snd_strerror(err))+")"; + cerr << "CaptureThread: WARNING: " << err_msg.toStdString() << endl; + } + if(channel_count>1) + { + QString err_msg = QString("ALSA: cannot set channel count to one (")+QString::number(channel_count)+" instead)"; + cerr << "CaptureThread: WARNING: " << err_msg.toStdString() << endl; + } + + setFormatDescrsAndFns(snd_pcm_format_width(m_format)/8, snd_pcm_format_signed(m_format), false, channel_count); + } + + if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX || m_sampling_rate==CaptureThread::SAMPLING_RATE_UNKNOWN) + { + int old_sampling_rate = m_sampling_rate; + + cerr << "CaptureThread: INFO: ALSA: sampling rate set to max or undefined, try to determinate it." << endl; + + list sampling_rates; + sampling_rates.push_front(8000); sampling_rates.push_front(11025); sampling_rates.push_front(16000); + sampling_rates.push_front(22050); sampling_rates.push_front(24000); sampling_rates.push_front(32000); + sampling_rates.push_front(44100); + + err = -1; + while(err<0) + { + if(sampling_rates.empty()) + throw QString("ALSA: cannot set any sample rate (")+QString(snd_strerror(err))+")"; + + m_sampling_rate = sampling_rates.front(); + cerr << "CaptureThread: INFO: ALSA: try sampling rate " << m_sampling_rate << " ..." << flush; + unsigned int rrate = m_sampling_rate; + err = snd_pcm_hw_params_set_rate(m_alsa_capture_handle, m_alsa_hw_params, rrate, 0); + + if(err<0) cerr << " failed" << endl; + else cerr << " success" << endl; + + sampling_rates.pop_front(); + } + + if(old_sampling_rate!=m_sampling_rate) + m_capture_thread->emitSamplingRateChanged(); + } + else + { + int err; + int dir = 0; + unsigned int rrate = m_sampling_rate; + if((err = snd_pcm_hw_params_set_rate_near(m_alsa_capture_handle, m_alsa_hw_params, &rrate, &dir))<0) + throw QString("ALSA: cannot set sampling rate (")+QString(snd_strerror(err))+")"; + if(m_sampling_rate!=rrate) + m_capture_thread->emitSamplingRateChanged(); + m_sampling_rate = rrate; + } + + if((err=snd_pcm_hw_params(m_alsa_capture_handle, m_alsa_hw_params)) < 0) + throw QString("ALSA: cannot set parameters (")+QString(snd_strerror(err))+")"; +} + +void CaptureThreadImplALSA::setSamplingRate(int value) +{ +// cerr << "CaptureThreadImplALSA::setSamplingRate " << value << endl; + + assert(value>0 || value==CaptureThread::SAMPLING_RATE_MAX); + + if(m_sampling_rate!=value || value==CaptureThread::SAMPLING_RATE_MAX) + { + bool was_running = m_capture_thread->isCapturing(); + if(was_running) m_capture_thread->stopCapture(); + + m_sampling_rate = value; + + if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX) + { + try + { + set_params(true); + } + catch(QString error) + { + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } + + // it was just for testing + capture_finished(); + } + else + m_capture_thread->emitSamplingRateChanged(); + + if(was_running) m_capture_thread->startCapture(); + } + +// cerr << "~CaptureThreadImplALSA::setSamplingRate" << endl; +} + +void CaptureThreadImplALSA::capture_init() +{ + set_params(); + + snd_pcm_nonblock(m_alsa_capture_handle, 0); + + m_alsa_buffer = new char[m_channel_count*ALSA_BUFF_SIZE*snd_pcm_format_width(m_format)/8]; + + int err=0; + + if((err=snd_pcm_prepare(m_alsa_capture_handle)) < 0) + throw QString("ALSA: cannot prepare audio interface for use (")+QString(snd_strerror(err))+")"; +} +void CaptureThreadImplALSA::capture_loop() +{ +// cerr << "CaptureThreadImplALSA::capture_loop" << endl; + + m_wait_for_start = false; + while(m_loop) + { + int ret_val = snd_pcm_readi(m_alsa_capture_handle, m_alsa_buffer, ALSA_BUFF_SIZE); + if (ret_val == -ESTRPIPE) + continue; + + if(ret_val<0) + { + cerr << "CaptureThread: WARNING: ALSA: " << snd_strerror(ret_val) << endl; + while((ret_val = snd_pcm_prepare(m_alsa_capture_handle)) < 0) + { + if (ret_val == -ESTRPIPE) + continue; + + msleep(1000); + cerr << "ALSA: cannot prepare audio interface (" << snd_strerror(ret_val) << ")" << endl; +// throw QString("ALSA: cannot prepare audio interface (")+QString(snd_strerror(ret_val))+")"; + } + } + else + { + if(!m_capture_thread->m_pause) + { + m_capture_thread->m_lock.lock(); + +// cerr << "CaptureThreadImplALSA::capture_loop " << m_capture_thread->m_values.size() << endl; + + for(int i=0; im_packet_size = ret_val; + if(m_capture_thread->m_ext_lock) + { + m_capture_thread->m_packet_size_sll = 0; + m_capture_thread->m_ext_lock = false; + } + m_capture_thread->m_packet_size_sll += ret_val; + + m_capture_thread->m_lock.unlock(); + } + } + } + +// cerr << "~CaptureThreadImplALSA::capture_loop" << endl; +} +void CaptureThreadImplALSA::capture_finished() +{ + if(m_alsa_buffer!=NULL) + { + delete[] m_alsa_buffer; + m_alsa_buffer = NULL; + } + + if(m_alsa_capture_handle!=NULL) + { + snd_pcm_hw_free(m_alsa_capture_handle); + snd_pcm_close(m_alsa_capture_handle); + m_alsa_capture_handle = NULL; + } +} + +void CaptureThreadImplALSA::run() +{ +// cerr << "CaptureThread: INFO: ALSA: capture thread entered" << endl; + +// while(m_alive) // TODO need to keep alsa thread alive to let PortAudio working after ALSA !! + { + while(m_alive && !m_loop) + msleep(10); + + m_in_run = true; + + try + { + // cerr << "CaptureThread: INFO: capture thread running" << endl; + + capture_init(); + + m_capture_thread->m_capturing = true; + m_capture_thread->emitCaptureStarted(); + m_capture_thread->emitCaptureToggled(true); + + capture_loop(); + + m_capture_thread->m_capturing = false; + m_capture_thread->emitCaptureStoped(); + m_capture_thread->emitCaptureToggled(false); + } + catch(QString error) + { + m_loop = false; + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } + m_wait_for_start = false; + + capture_finished(); + + m_in_run = false; + + // cerr << "CaptureThread: INFO: capture thread stop running" << endl; + } + +// cerr << "CaptureThread: INFO: ALSA: capture thread exited" << endl; +} + +CaptureThreadImplALSA::~CaptureThreadImplALSA() +{ +// cerr << "CaptureThreadImplALSA::~CaptureThreadImplALSA" << endl; + + m_alive = false; + + stopCapture(); + + while(isRunning()) + msleep(10); + +// cerr << "~CaptureThreadImplALSA::~CaptureThreadImplALSA" << endl; +} + +#endif diff --git a/src/CaptureThreadImplJACK.cpp b/src/CaptureThreadImplJACK.cpp new file mode 100644 index 0000000..0e08ab9 --- /dev/null +++ b/src/CaptureThreadImplJACK.cpp @@ -0,0 +1,319 @@ +// Copyright 2004 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "CaptureThread.h" + +#include +#include +#include +#include +#include +#include +#include +#include +using namespace std; + +// ------------------------------ JACK implementation ---------------------------- +#ifdef CAPTURE_JACK + +#define JACK_BUFF_SIZE 1024 + +const size_t g_jack_sample_size = sizeof(jack_default_audio_sample_t); + +CaptureThreadImplJACK::CaptureThreadImplJACK(CaptureThread* capture_thread) +: CaptureThreadImpl(capture_thread, "JACK", "Jack Audio Connection Kit") +{ + m_jack_client = NULL; + m_jack_port = NULL; + m_ringbuffer = NULL; + + m_alive = true; + m_in_run = false; + m_loop = false; +} + +bool CaptureThreadImplJACK::is_available() +{ + if(m_jack_client==NULL) + { + try + { + //m_jack_client = jack_client_new((m_capture_thread->m_name+"_test").latin1()); + m_jack_client = jack_client_open((m_capture_thread->m_name+"_test").toAscii().constData(), JackNoStartServer, NULL); + if(m_jack_client==NULL) + throw QString("unknown reason"); + } + catch(QString error) + { + m_jack_client = NULL; + m_status = "N/A"; + return false; + } + capture_finished(); + } + + m_status = "available"; + + return true; +} + +void CaptureThreadImplJACK::setSamplingRate(int value) +{ + cerr << "CaptureThread: ERROR: JACK: setSamplingRate not available with JACK ! change the JACK server sampling rate instead" << endl; +} + +void CaptureThreadImplJACK::startCapture() +{ + if(!isRunning()) + start(); + + m_loop = true; + + m_wait_for_start = true; + while(m_wait_for_start) // some implementations take a long time to start + msleep(50); +} +void CaptureThreadImplJACK::stopCapture() +{ + m_loop = false; + + while(m_in_run) + msleep(50); +} + +void CaptureThreadImplJACK::JackShutdown(void* arg){((CaptureThreadImplJACK*)arg)->jackShutdown();} +void CaptureThreadImplJACK::jackShutdown() +{ +// cerr << "CaptureThreadImplJACK::jackShutdown" << endl; + + m_jack_client = NULL; + m_jack_port = NULL; + if(m_ringbuffer) + { + jack_ringbuffer_free(m_ringbuffer); + m_ringbuffer = NULL; + } + + m_capture_thread->emitError("JACK: server shutdown !"); +// cerr << "~CaptureThreadImplJACK::jackShutdown" << endl; +} + +int CaptureThreadImplJACK::JackSampleRate(jack_nframes_t nframes, void* arg){return ((CaptureThreadImplJACK*)arg)->jackSampleRate(nframes);} +int CaptureThreadImplJACK::jackSampleRate(jack_nframes_t nframes) +{ + if(m_sampling_rate!=int(nframes)) + { + if(m_ringbuffer) + jack_ringbuffer_free(m_ringbuffer); + m_ringbuffer = jack_ringbuffer_create(g_jack_sample_size*nframes); // one second buffer + + m_sampling_rate = nframes; + m_capture_thread->emitSamplingRateChanged(); + } + + return 0; +} + +int CaptureThreadImplJACK::JackProcess(jack_nframes_t nframes, void* arg){return ((CaptureThreadImplJACK*)arg)->jackProcess(nframes);} +int CaptureThreadImplJACK::jackProcess(jack_nframes_t nframes) +{ +// cerr << "CaptureThreadImplJACK::jackProcess '" << nframes << "'" << endl; + + if(!m_jack_client || !m_jack_port || !m_ringbuffer) return 0; + if(m_capture_thread->m_pause || !m_capture_thread->m_capturing || nframes<=0) return 0; + + void* pin = jack_port_get_buffer(m_jack_port, nframes); + + if(!pin) return 0; + + jack_default_audio_sample_t* in = (jack_default_audio_sample_t*)pin; + + int characters_written = jack_ringbuffer_write(m_ringbuffer, (const char *) ((void *) (in)), g_jack_sample_size*nframes); + if (characters_written < g_jack_sample_size*nframes) + cerr << "CaptureThreadImplJACK::jackProcess Can not write all frames: ringbuffer full?" << endl; + +// int toread = jack_ringbuffer_read_space(m_ringbuffer); +// cerr << "CaptureThreadImplJACK::jackProcess " << characters_written/g_jack_sample_size << " values written, " << toread/g_jack_sample_size << " to read" << endl; + +// cerr << "~CaptureThreadImplJACK::jackProcess" << endl; + + return 0; +} + +void CaptureThreadImplJACK::capture_init() +{ + m_jack_client = jack_client_open(m_capture_thread->m_name.toAscii().constData(), JackNoStartServer, NULL); + if(!m_jack_client) + throw QString("JACK: cannot create client, JACK deamon is running ?"); + + jack_set_process_callback(m_jack_client, JackProcess, (void*)this); + jack_on_shutdown(m_jack_client, JackShutdown, (void*)this); + jack_set_sample_rate_callback(m_jack_client, JackSampleRate, (void*)this); + + cerr << "CaptureThread: INFO: JACK: sampling rate=" << jack_get_sample_rate(m_jack_client) << endl; + m_ringbuffer = jack_ringbuffer_create(g_jack_sample_size*jack_get_sample_rate(m_jack_client)); // one second buffer + + int err=0; + if((err=jack_activate(m_jack_client))!=0) + throw QString("JACK: cannot activate client"); + + setFormatDescrsAndFns(g_jack_sample_size, true, true, 1); + + m_jack_port = jack_port_register(m_jack_client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput,0); + + if(m_source!="") + { + QString dest = QString(jack_get_client_name(m_jack_client))+":input"; + cerr << "CaptureThread: INFO: JACK: auto-connect '" << m_source.toStdString() << "' with '" << dest.toStdString() << "'" << endl; + if((err=jack_connect(m_jack_client, m_source.toAscii().constData(), dest.toAscii().constData()))!=0) + m_capture_thread->emitError(QString("JACK: Invalid source '")+m_source+"'"); + } + + int old_sampling_rate = m_sampling_rate; + m_sampling_rate = jack_get_sample_rate(m_jack_client); + if(m_sampling_rate!=old_sampling_rate) + m_capture_thread->emitSamplingRateChanged(); + + m_capture_thread->m_capturing = true; + m_capture_thread->emitCaptureStarted(); + m_capture_thread->emitCaptureToggled(true); +} +void CaptureThreadImplJACK::capture_loop() +{ +// cerr << "CaptureThreadImplJACK::capture_loop " << g_jack_sample_size << endl; + + char dest[JACK_BUFF_SIZE*g_jack_sample_size]; + + m_wait_for_start = false; + while(m_loop && m_jack_client && m_jack_port && m_ringbuffer) + { +// cerr << "CaptureThreadImplJACK::capture_loop toread=" << toread/g_jack_sample_size << endl; + int read = jack_ringbuffer_read(m_ringbuffer, dest, JACK_BUFF_SIZE*g_jack_sample_size); + if(read>0) + { + if(!m_capture_thread->m_pause) + { +// cerr << "CaptureThreadImplJACK::capture_loop locking" << endl; + m_capture_thread->m_lock.lock(); + +// int toread = jack_ringbuffer_read_space(m_ringbuffer); +// cerr << "CaptureThreadImplJACK::capture_loop in deque='" << m_capture_thread->m_values.size() << "' still toread=" << toread/g_jack_sample_size << endl; + + if(g_jack_sample_size==4) + for(int i=0; i<(read/g_jack_sample_size); i++) + addValue(this, (double)(((float*)dest)[i]), i); + else if(g_jack_sample_size==8) + for(int i=0; i<(read/g_jack_sample_size); i++) + addValue(this, (double)(((double*)dest)[i]), i); + + m_capture_thread->m_packet_size = (read/g_jack_sample_size); + if(m_capture_thread->m_ext_lock) + { + m_capture_thread->m_packet_size_sll = 0; + m_capture_thread->m_ext_lock = false; + } + m_capture_thread->m_packet_size_sll += (read/g_jack_sample_size); + + m_capture_thread->m_lock.unlock(); +// cerr << "CaptureThreadImplJACK::capture_loop unlocked" << endl; + } + } + else + msleep(10); + } + +// cerr << "~CaptureThreadImplJACK::capture_loop" << endl; +} +void CaptureThreadImplJACK::capture_finished() +{ +// cerr << "CaptureThreadImplJACK::capture_finished" << endl; + + if(m_jack_client!=NULL) + { + jack_client_close(m_jack_client); + m_jack_client = NULL; + if(m_ringbuffer) + { + jack_ringbuffer_free(m_ringbuffer); + m_ringbuffer = NULL; + } + + m_capture_thread->m_capturing = false; + m_capture_thread->emitCaptureStoped(); + m_capture_thread->emitCaptureToggled(false); + } +} +void CaptureThreadImplJACK::run() +{ +// cerr << "CaptureThread: INFO: JACK: capture thread entered" << endl; + +// while(m_alive) // TODO need to keep alsa thread alive to let PortAudio working after ALSA !! TODO same for JACK ??? + { + while(m_alive && !m_loop) + msleep(50); + + m_in_run = true; + + try + { +// cerr << "CaptureThread: INFO: JACK: capture thread running" << endl; + + capture_init(); + + m_capture_thread->m_capturing = true; + m_capture_thread->emitCaptureStarted(); + m_capture_thread->emitCaptureToggled(true); + + capture_loop(); + + m_capture_thread->m_capturing = false; + m_capture_thread->emitCaptureStoped(); + m_capture_thread->emitCaptureToggled(false); + } + catch(QString error) + { + m_loop = false; + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } + m_wait_for_start = false; + + capture_finished(); + + m_in_run = false; + +// cerr << "CaptureThread: INFO: JACK: capture thread stop running" << endl; + } + +// cerr << "CaptureThread: INFO: JACK: capture thread exited" << endl; +} +CaptureThreadImplJACK::~CaptureThreadImplJACK() +{ +// cerr << "CaptureThreadImplJACK::~CaptureThreadImplJACK" << endl; + + m_alive = false; + + stopCapture(); + + while(isRunning()) + msleep(50); + +// cerr << "~CaptureThreadImplJACK::~CaptureThreadImplJACK" << endl; +} +#endif diff --git a/src/CaptureThreadImplOSS.cpp b/src/CaptureThreadImplOSS.cpp new file mode 100644 index 0000000..e401e3d --- /dev/null +++ b/src/CaptureThreadImplOSS.cpp @@ -0,0 +1,357 @@ +// Copyright 2004 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "CaptureThread.h" + +#include +#include +#include +#include +#include +#include +#include +#include +using namespace std; + +// ------------------------------ OSS implementation ---------------------------- +#ifdef CAPTURE_OSS +#include +#include +#include +#include +#include +#include +#include + +#define OSS_BUFF_SIZE 1024 + +CaptureThreadImplOSS::CaptureThreadImplOSS(CaptureThread* capture_thread) + : CaptureThreadImpl(capture_thread, "OSS", QString("Open Sound System")) +{ + m_fd_in = 0; + m_oss_buffer = NULL; + m_format = -1; + + m_source = "/dev/dsp"; + + // oss_sysinfo si; // definition ?? +// ioctl(m_fd_in, OSS_SYSINFO, &si); +// m_fd_in = open(m_source, O_RDONLY, 0)); +// m_descr = QString("Open Sound System (")+QString::number(SOUND_VERSION, 16)+":"+si.version+")"); +// close(m_fd_in); +// m_fd_in = 0; + m_descr = QString("Open Sound System (lib:")+QString::number(SOUND_VERSION, 16)+")"; + + m_alive = true; + m_in_run = false; + m_loop = false; +} + +bool CaptureThreadImplOSS::is_available() +{ + if(m_fd_in==0) + { + try + { + if((m_fd_in = open (m_source.toAscii().constData(), O_RDONLY, 0)) == -1) + throw QString(strerror(errno)); + } + catch(QString error) + { + m_fd_in = 0; + + m_status = "N/A ("+error+")"; + + return false; + } + + capture_finished(); + } + + m_status = "OK"; + + // cerr << "CaptureThread: INFO: OSS seems available" << endl; + + return true; +} + +void CaptureThreadImplOSS::startCapture() +{ + if(!isRunning()) + start(); + + m_loop = true; + + m_wait_for_start = true; + while(m_wait_for_start) // some implementations take a long time to start + msleep(10); +} +void CaptureThreadImplOSS::stopCapture() +{ + m_loop = false; + + while(m_in_run) + msleep(10); +} + +void CaptureThreadImplOSS::set_params(bool test) +{ + if(m_source=="") + throw QString("OSS: set the source first"); + if((m_fd_in = open (m_source.toAscii().constData(), O_RDONLY, 0))==-1) + throw QString("OSS: ")+QString(strerror(errno)); + + if(!test) + { + if(m_format==-1) + { + // Formats + m_format = AFMT_S16_NE; /* Native 16 bits */ + if(ioctl(m_fd_in, SNDCTL_DSP_SETFMT, &m_format)==-1) + throw QString("OSS: cannot set format (%1)").arg(strerror(errno)); + + if(m_format != AFMT_S16_NE) + throw QString("OSS: cannot set format to signed 16bits"); + } + else + { + if(ioctl(m_fd_in, SNDCTL_DSP_SETFMT, &m_format)==-1) + throw QString("OSS: cannot set format (%1)").arg(strerror(errno)); + } + + m_format_size = 2; + m_format_signed = true; + m_format_float = false; + + // Channel count + unsigned int channel_count = 1; + if(ioctl(m_fd_in, SNDCTL_DSP_CHANNELS, &channel_count)==-1) + throw QString("OSS: cannot set channel count to 1 (%1)").arg(strerror(errno)); + + if(channel_count != 1) + throw QString("OSS: the device doesn't support mono mode"); + + /* if(m_channel_count>1) // TODO + { + QString err_msg = QString("OSS: cannot set channel count to one (")+QString::number(m_channel_count)+" instead)"; + cerr << "CaptureThread: WARNING: " << err_msg << endl; + }*/ + + setFormatDescrsAndFns(2, true, false, channel_count); + } + + if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX || m_sampling_rate==CaptureThread::SAMPLING_RATE_UNKNOWN) + { + int old_sampling_rate = m_sampling_rate; + + cerr << "CaptureThread: INFO: OSS: sampling rate set to max or undefined, try to determinate it." << endl; + + list sampling_rates; + sampling_rates.push_front(8000); sampling_rates.push_front(11025); sampling_rates.push_front(16000); + sampling_rates.push_front(22050); sampling_rates.push_front(24000); sampling_rates.push_front(32000); + sampling_rates.push_front(44100); + + int err = -1; + while(err<0) + { + if(sampling_rates.empty()) + throw QString("OSS: cannot set any sample rate (%1)").arg(strerror(errno)); + + m_sampling_rate = sampling_rates.front(); + cerr << "CaptureThread: INFO: OSS: try sampling rate " << m_sampling_rate << " ..." << flush; + err = ioctl(m_fd_in, SNDCTL_DSP_SPEED, &m_sampling_rate); + + if(err==-1) cerr << " failed" << endl; + else cerr << " success" << endl; + + sampling_rates.pop_front(); + } + + if(old_sampling_rate!=m_sampling_rate) + m_capture_thread->emitSamplingRateChanged(); + } + else + { + if(ioctl(m_fd_in, SNDCTL_DSP_SPEED, &m_sampling_rate)==-1) + throw QString("OSS: cannot set sampling rate (")+QString(strerror(errno))+")"; + } +} + +void CaptureThreadImplOSS::setSamplingRate(int value) +{ +// cerr << "CaptureThreadImplOSS::setSamplingRate " << value << endl; + + assert(value>0 || value==CaptureThread::SAMPLING_RATE_MAX); + + if(m_sampling_rate!=value || value==CaptureThread::SAMPLING_RATE_MAX) + { + bool was_running = m_capture_thread->isCapturing(); + if(was_running) m_capture_thread->stopCapture(); + + m_sampling_rate = value; + + if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX) + { + try + { + set_params(true); + } + catch(QString error) + { + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } + + // it was just for testing + capture_finished(); + } + else + m_capture_thread->emitSamplingRateChanged(); + + if(was_running) m_capture_thread->startCapture(); + } + +// cerr << "~CaptureThreadImplOSS::setSamplingRate" << endl; +} + +void CaptureThreadImplOSS::capture_init() +{ + set_params(false); + + m_oss_buffer = new char[m_channel_count*OSS_BUFF_SIZE*16/8]; +} +void CaptureThreadImplOSS::capture_loop() +{ +// cerr << "CaptureThreadImplOSS::capture_loop" << endl; + + bool format_signed = true; + int l=0; + + m_wait_for_start = false; + while(m_loop) + { + int ret_val = read(m_fd_in, m_oss_buffer, sizeof(m_oss_buffer)); + + if(ret_val==-1) + { + cerr << "CaptureThread: WARNING: OSS: " << strerror(errno) << endl; + msleep(1000); // TODO which behavior ? +// m_loop = false;// TODO which behavior ? + } + else + { + ret_val /= m_format_size; + + if(!m_capture_thread->m_pause) + { + m_capture_thread->m_lock.lock(); + + for(int i=0; im_packet_size = ret_val; + if(m_capture_thread->m_ext_lock) + { + m_capture_thread->m_packet_size_sll = 0; + m_capture_thread->m_ext_lock = false; + } + m_capture_thread->m_packet_size_sll += ret_val; + + m_capture_thread->m_lock.unlock(); + } + } + } + +// cerr << "~CaptureThreadImplOSS::capture_loop" << endl; +} +void CaptureThreadImplOSS::capture_finished() +{ + if(m_oss_buffer!=NULL) + { + delete[] m_oss_buffer; + m_oss_buffer = NULL; + } + + if(m_fd_in!=0) + { + close(m_fd_in); + m_fd_in = 0; + } +} + +void CaptureThreadImplOSS::run() +{ +// cerr << "CaptureThread: INFO: OSS: capture thread entered" << endl; + +// while(m_alive) // TODO ?? need to keep oss thread alive to let PortAudio working after ALSA ?? + { + while(m_alive && !m_loop) + msleep(10); + + m_in_run = true; + + try + { + // cerr << "CaptureThread: INFO: capture thread running" << endl; + + capture_init(); + + m_capture_thread->m_capturing = true; + m_capture_thread->emitCaptureStarted(); + m_capture_thread->emitCaptureToggled(true); + + capture_loop(); + + m_capture_thread->m_capturing = false; + m_capture_thread->emitCaptureStoped(); + m_capture_thread->emitCaptureToggled(false); + } + catch(QString error) + { + m_loop = false; + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } + m_wait_for_start = false; + + capture_finished(); + + m_in_run = false; + + // cerr << "CaptureThread: INFO: capture thread stop running" << endl; + } + +// cerr << "CaptureThread: INFO: OSS: capture thread exited" << endl; +} + +CaptureThreadImplOSS::~CaptureThreadImplOSS() +{ +// cerr << "CaptureThreadImplOSS::~CaptureThreadImplOSS" << endl; + + m_alive = false; + + stopCapture(); + + while(isRunning()) + msleep(10); + +// cerr << "~CaptureThreadImplOSS::~CaptureThreadImplOSS" << endl; +} + +#endif diff --git a/src/CaptureThreadImplPortAudio.cpp b/src/CaptureThreadImplPortAudio.cpp new file mode 100644 index 0000000..b2e93ed --- /dev/null +++ b/src/CaptureThreadImplPortAudio.cpp @@ -0,0 +1,325 @@ +// Copyright 2004 "Gilles Degottex" + +// This file is part of "Music" + +// "Music" is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// "Music" 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser 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 "CaptureThread.h" + +#include +#include +#include +#include +#include +#include +#include +using namespace std; + +// ------------------------------ PortAudio implementation ---------------------------- +#ifdef CAPTURE_PORTAUDIO +CaptureThreadImplPortAudio::CaptureThreadImplPortAudio(CaptureThread* capture_thread) + : CaptureThreadImpl(capture_thread, "PortAudio", QString("Portable cross-platform Audio API (lib:")+Pa_GetVersionText()+"["+QString::number(Pa_GetVersion())+"])") +{ + m_stream = NULL; + + m_source = "default"; +} + +bool CaptureThreadImplPortAudio::is_available() +{ + if(!m_stream) + { + try + { + m_err = Pa_Initialize(); + if(m_err != paNoError) throw QString("PortAudio: is_available:Pa_Initialize ")+Pa_GetErrorText(m_err); + + int numDevices; + + numDevices = Pa_GetDeviceCount(); + if(numDevices < 0) + throw QString("PortAudio: is_available:Pa_GetDeviceCount ")+Pa_GetErrorText(numDevices); + else if(numDevices == 0) + throw QString("PortAudio: is_available:Pa_GetDeviceCount no devices available")+Pa_GetErrorText(numDevices); + +/* const PaDeviceInfo *deviceInfo; + + for(int i=0; iname << endl; + cerr << deviceInfo->defaultSampleRate << endl; + }*/ + } + catch(QString error) + { + Pa_Terminate(); + m_stream = NULL; + m_status = "N/A"; + return false; + } + capture_finished(); + } + + m_status = "OK"; + + return true; +} + +void CaptureThreadImplPortAudio::setSamplingRate(int value) +{ +// cerr << "CaptureThreadImplPortAudio::setSamplingRate " << value << endl; + + assert(value>0 || value==CaptureThread::SAMPLING_RATE_MAX); + + if(m_sampling_rate!=value || value==CaptureThread::SAMPLING_RATE_MAX) + { + bool was_running = m_capture_thread->isCapturing(); + if(was_running) m_capture_thread->stopCapture(); + + m_sampling_rate = value; + + if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX) + { + try + { + set_params(true); + } + catch(QString error) + { + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } + + try{ + // it was just for testing + capture_finished(); + } + catch(QString error) + { + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } + } + else + m_capture_thread->emitSamplingRateChanged(); + + if(was_running) m_capture_thread->startCapture(); + } + +// cerr << "~CaptureThreadImplPortAudio::setSamplingRate" << endl; +} + +int CaptureThreadImplPortAudio::PortAudioCallback( const void *inputBuffer, void *outputBuffer, + unsigned long framesPerBuffer, + const PaStreamCallbackTimeInfo* timeInfo, + PaStreamCallbackFlags statusFlags, + void *userData ) +{return ((CaptureThreadImplPortAudio*)userData)->portAudioCallback(inputBuffer, framesPerBuffer, timeInfo, statusFlags);} +int CaptureThreadImplPortAudio::portAudioCallback(const void *inputBuffer, + unsigned long framesPerBuffer, + const PaStreamCallbackTimeInfo* timeInfo, + PaStreamCallbackFlags statusFlags) +{ + if(m_capture_thread->m_pause) + return 0; + + m_capture_thread->m_lock.lock(); + + float *in = (float*)inputBuffer; + + for(unsigned long i=0; im_values.push_front(*in++); +// addValue(*in++, i, m_channel_count); // TODO + + m_capture_thread->m_packet_size = framesPerBuffer; + if(m_capture_thread->m_ext_lock) + { + m_capture_thread->m_packet_size_sll = 0; + m_capture_thread->m_ext_lock = false; + } + m_capture_thread->m_packet_size_sll += framesPerBuffer; + + m_capture_thread->m_lock.unlock(); + + return 0; +} + +void CaptureThreadImplPortAudio::set_params(bool test) +{ + m_err = Pa_Initialize(); + if(m_err != paNoError) throw QString("PortAudio: set_params:Pa_Initialize ")+Pa_GetErrorText(m_err); + + PaStreamParameters params; + params.device = paNoDevice; + params.channelCount = 1; + params.sampleFormat = paFloat32; + params.suggestedLatency = 0; + params.hostApiSpecificStreamInfo = NULL; + + if(m_source!="default") // TODO hum hum + { + int numDevices = Pa_GetDeviceCount(); + const PaDeviceInfo* deviceInfo; + for(int i=0; params.device==paNoDevice && iname)==m_source) + params.device = i; + } + + if(params.device==paNoDevice) + cerr << "CaptureThread: INFO: PortAudio: cannot determine selected source \"" << m_source.toStdString() << "\"" << endl; + } + + if(!test) + { + if(params.device==paNoDevice) + cerr << "CaptureThread: INFO: PortAudio: using default device" << endl; + else + cerr << "CaptureThread: INFO: PortAudio: using \"" << m_source.toStdString() << "\"" << endl; + + setFormatDescrsAndFns(4, true, true, 1); // TODO do something if nbchannel=1 not supported + } + + if(m_sampling_rate==CaptureThread::SAMPLING_RATE_MAX || m_sampling_rate==CaptureThread::SAMPLING_RATE_UNKNOWN) + { + int old_sampling_rate = m_sampling_rate; + + cerr << "CaptureThread: INFO: PortAudio: sampling rate set to max or undefined, try to determinate it." << endl; + + list sampling_rates; + sampling_rates.push_front(8000); sampling_rates.push_front(11025); sampling_rates.push_front(16000); + sampling_rates.push_front(22050); sampling_rates.push_front(24000); sampling_rates.push_front(32000); + sampling_rates.push_front(44100); + + m_err = -1; + while(m_err!=paNoError) + { + if(sampling_rates.empty()) + throw QString("PortAudio: cannot set any sample rate (")+Pa_GetErrorText(m_err)+")"; + + m_err = Pa_Initialize(); + if(m_err != paNoError) throw QString("PortAudio: set_params:Pa_Initialize ")+Pa_GetErrorText(m_err); + + m_sampling_rate = sampling_rates.front(); + cerr << "CaptureThread: INFO: PortAudio: try sampling rate " << m_sampling_rate << " ..." << flush; + +// cerr << "nbc1 " << params.channelCount << endl; + + if(params.device==paNoDevice) + m_err = Pa_OpenDefaultStream(&m_stream, 1, 0, paFloat32, m_sampling_rate, 0, PortAudioCallback, this); + else + m_err = Pa_OpenStream(&m_stream, ¶ms, NULL, m_sampling_rate, 0, paNoFlag, PortAudioCallback, this); + + if(m_err != paNoError) cerr << " failed" << endl; + else cerr << " success" << endl; + + sampling_rates.pop_front(); + } + + if(old_sampling_rate!=m_sampling_rate) + m_capture_thread->emitSamplingRateChanged(); + } + else + { +// cerr << "nbc2 " << params.channelCount << endl; +// cerr << "dev2 " << params.device << "/" << paNoDevice << endl; + + if(params.device==paNoDevice) + { + m_err = Pa_OpenDefaultStream(&m_stream, 1, 0, paFloat32, m_sampling_rate, 0, PortAudioCallback, this); + if(m_err != paNoError) + throw QString("PortAudio: set_params:Pa_OpenDefaultStream ")+Pa_GetErrorText(m_err); + } + else + { + m_err = Pa_OpenStream(&m_stream, ¶ms, NULL, m_sampling_rate, 0, paNoFlag, PortAudioCallback, this); + if(m_err != paNoError) + throw QString("PortAudio: set_params:Pa_OpenStream ")+Pa_GetErrorText(m_err); + } + } +} + +void CaptureThreadImplPortAudio::capture_init() +{ + set_params(false); + + m_err = Pa_StartStream(m_stream); + if(m_err != paNoError) + throw QString("PortAudio: capture_init:Pa_StartStream ")+Pa_GetErrorText(m_err); + + m_capture_thread->m_capturing = true; + m_capture_thread->emitCaptureStarted(); + m_capture_thread->emitCaptureToggled(true); +} +void CaptureThreadImplPortAudio::capture_finished() +{ + if(m_stream) + { + if(!Pa_IsStreamStopped(m_stream)) + { + m_err = Pa_StopStream(m_stream); + if(m_err != paNoError) throw QString("PortAudio: capture_finished: ")+Pa_GetErrorText(m_err); + } + + if(m_stream) + { + m_err = Pa_CloseStream(m_stream); + if(m_err != paNoError) throw QString("PortAudio: capture_finished: ")+Pa_GetErrorText(m_err); + } + + m_stream = NULL; + + m_capture_thread->m_capturing = false; + m_capture_thread->emitCaptureStoped(); + m_capture_thread->emitCaptureToggled(false); + } + + m_err = Pa_Terminate(); +// if(m_err != paNoError) throw QString("PortAudio: capture_finished: ")+Pa_GetErrorText(m_err); +} +void CaptureThreadImplPortAudio::startCapture() +{ + try + { + capture_init(); + } + catch(QString error) + { + capture_finished(); + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } +} +void CaptureThreadImplPortAudio::stopCapture() +{ + try + { + capture_finished(); + } + catch(QString error) + { + cerr << "CaptureThread: ERROR: " << error.toStdString() << endl; + m_capture_thread->emitError(error); + } +} +CaptureThreadImplPortAudio::~CaptureThreadImplPortAudio() +{ + stopCapture(); +} + +#endif diff --git a/src/CustomInstrumentTunerForm.cpp b/src/CustomInstrumentTunerForm.cpp index e5a70d5..d639cd8 100644 --- a/src/CustomInstrumentTunerForm.cpp +++ b/src/CustomInstrumentTunerForm.cpp @@ -43,21 +43,30 @@ using namespace std; #include #include -#include +#include #include - +#include +#include +#include #include using namespace Music; #include "modules/View.h" CustomInstrumentTunerForm::CustomInstrumentTunerForm() -: m_capture_thread("fmit") -, m_timer_refresh(this, "m_timer_refresh") +: m_config_form(this) +, m_capture_thread("fmit") +, m_timer_refresh(this) , m_algo_combedfft(NULL) , m_range_filter(&m_dummy_range_filter) , m_quantizer(&m_latency_quantizer) -, m_settings("gillesdegottex.ch", "fmit", "009700") // not necessarily equal to the soft version +, m_settings("fmit", "fmit", "009801") // not necessarily equal to the soft version { + setupUi(this); + + /*QWidgetAction* viewsCaption = new QWidgetAction(ui_tbViews); + viewsCaption->setDefaultWidget(new QLabel(tr("Views"), ui_tbViews)); + ui_tbViews->addAction(viewsCaption);*/ + View::s_settings = &m_settings; m_settings.add(m_config_form.ui_chkFullScreen); m_settings.add(m_config_form.ui_chkAutoSaveOnExit); @@ -117,7 +126,7 @@ CustomInstrumentTunerForm::CustomInstrumentTunerForm() m_algo_combedfft = new CombedFT(); for(int i=0; iinsertItem(m_capture_thread.getTransports()[i]->getName()); + m_config_form.ui_cbTransports->addItem(m_capture_thread.getTransports()[i]->getName()); if(m_capture_thread.getTransports().empty()) QMessageBox::critical(this, "Error", "Please compile me with a capture system ..."); @@ -148,15 +157,15 @@ CustomInstrumentTunerForm::CustomInstrumentTunerForm() m_dialTune = new DialView(centralWidget()); ui_dialTuneLayout->addWidget(m_dialTune); - m_glGraph = new GLGraph("Graph", centralWidget()); + m_glGraph = new GLGraph(centralWidget()); connect(m_glGraph->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); connect(m_glGraph->setting_spinMaxHeight, SIGNAL(valueChanged(int)), this, SLOT(update_views())); - m_glGraph->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_glGraph->setting_show); ui_graphLayout->addWidget(m_glGraph); m_glErrorHistory = new GLErrorHistory(centralWidget()); connect(m_glErrorHistory->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); - m_glErrorHistory->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_glErrorHistory->setting_show); ui_errorLayout->addWidget(m_glErrorHistory); // link scales @@ -168,7 +177,7 @@ CustomInstrumentTunerForm::CustomInstrumentTunerForm() m_glVolumeHistory = new GLVolumeHistory(centralWidget()); connect(m_config_form.ui_spinVolumeTreshold, SIGNAL(valueChanged(int)), m_glVolumeHistory, SLOT(setVolumeTreshold(int))); connect(m_glVolumeHistory->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); - m_glVolumeHistory->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_glVolumeHistory->setting_show); ui_volumeLayout->addWidget(m_glVolumeHistory); // link keep settings @@ -178,28 +187,28 @@ CustomInstrumentTunerForm::CustomInstrumentTunerForm() m_glSample = new GLSample(centralWidget()); connect(m_glSample->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); - m_glSample->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_glSample->setting_show); ui_sampleLayout->addWidget(m_glSample); m_glFreqStruct = new GLFreqStruct(centralWidget()); connect(m_glFreqStruct->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); - m_glFreqStruct->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_glFreqStruct->setting_show); ui_formantsLayout->addWidget(m_glFreqStruct); m_glFT = new GLFT(centralWidget()); connect(m_glFT->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); - m_glFT->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_glFT->setting_show); ui_FT->addWidget(m_glFT); m_microtonalView = new MicrotonalView(centralWidget()); connect(m_microtonalView->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); connect(m_microtonalView, SIGNAL(tuningFreqChanged(float)), this, SLOT(tuningFreqChanged(float))); - m_microtonalView->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_microtonalView->setting_show); ui_microtonalLayout->addWidget(m_microtonalView); m_glStatistics = new GLStatistics(centralWidget()); connect(m_glStatistics->setting_show, SIGNAL(toggled(bool)), this, SLOT(update_views())); - m_glStatistics->setting_show->addTo(ui_tbViews); + ui_tbViews->addAction(m_glStatistics->setting_show); ui_microtonalLayout->addWidget(m_glStatistics); connect(m_dialTune->setting_spinScale, SIGNAL(valueChanged(int)), m_glStatistics->setting_spinScale, SLOT(setValue(int))); @@ -210,7 +219,8 @@ CustomInstrumentTunerForm::CustomInstrumentTunerForm() connect(m_dialTune->setting_showTolerance, SIGNAL(toggled(bool)), m_glStatistics->setting_showTolerance, SLOT(setOn(bool))); connect(m_glStatistics->setting_showTolerance, SIGNAL(toggled(bool)), m_dialTune->setting_showTolerance, SLOT(setOn(bool))); - connect(m_config_form.buttonOk, SIGNAL(clicked()), this, SLOT(configure_ok())); + connect(&m_config_form, SIGNAL(accepted()), this, SLOT(configure_ok())); + connect(&m_config_form, SIGNAL(rejected()), this, SLOT(configure_cancel())); connect(m_config_form.ui_btnRestoreFactorySettings, SIGNAL(clicked()), this, SLOT(restoreFactorySettings())); connect(m_config_form.ui_spinMinHT, SIGNAL(valueChanged(int)), this, SLOT(noteRangeChanged())); connect(m_config_form.ui_spinMaxHT, SIGNAL(valueChanged(int)), this, SLOT(noteRangeChanged())); @@ -238,14 +248,16 @@ CustomInstrumentTunerForm::CustomInstrumentTunerForm() m_time.start(); connect((QObject*)&m_timer_refresh, SIGNAL(timeout()), this, SLOT(refresh())); m_timer_refresh.start(m_config_form.ui_spinRefreshTime->value()); + +// cerr << __FILE__ << " " << __LINE__ << endl; } void CustomInstrumentTunerForm::transportChanged(const QString& name) { selectTransport(name); - if(m_capture_thread.getCurrentTransportIndex()!=m_config_form.ui_cbTransports->currentItem()) - m_config_form.ui_cbTransports->setCurrentItem(m_capture_thread.getCurrentTransportIndex()); + if(m_capture_thread.getCurrentTransportIndex()!=m_config_form.ui_cbTransports->currentIndex()) + m_config_form.ui_cbTransports->setCurrentIndex(m_capture_thread.getCurrentTransportIndex()); } void CustomInstrumentTunerForm::selectTransport(const QString& name) { @@ -286,26 +298,32 @@ void CustomInstrumentTunerForm::noteRangeChanged() { // cerr << "CustomInstrumentTunerForm::noteRangeChanged" << endl; - m_config_form.ui_txtMinHT->setText(h2n(m_config_form.ui_spinMinHT->value())+" = "+QString::number(h2f(m_config_form.ui_spinMinHT->value()))+" hz"); - m_config_form.ui_txtMaxHT->setText(h2n(m_config_form.ui_spinMaxHT->value())+" = "+QString::number(h2f(m_config_form.ui_spinMaxHT->value()))+" hz"); + m_config_form.ui_txtMinHT->setText(QString::fromStdString(h2n(m_config_form.ui_spinMinHT->value())) + " = " + QString::number(h2f(m_config_form.ui_spinMinHT->value())) + " hz"); + m_config_form.ui_txtMaxHT->setText(QString::fromStdString(h2n(m_config_form.ui_spinMaxHT->value())) + " = " + QString::number(h2f(m_config_form.ui_spinMaxHT->value())) + " hz"); } void CustomInstrumentTunerForm::errorRaised(const QString& error) { // cerr << "CustomInstrumentTunerForm::errorRaised " << error << endl; - statusBar()->message(QString("ERROR: ")+error); + statusBar()->showMessage(QString("ERROR: ")+error); - ui_lblSoundStability->setBackgroundColor(QColor(180,74,74)); + QPalette palette; + palette.setColor(ui_lblSoundStability->backgroundRole(), QColor(180,74,74)); + ui_lblSoundStability->setPalette(palette); } void CustomInstrumentTunerForm::samplingRateChanged(int sampling_rate) { -// cerr << "CustomInstrumentTunerForm::samplingRateChanged " << sampling_rate << endl; + cerr << "CustomInstrumentTunerForm::samplingRateChanged " << sampling_rate << endl; Music::SetSamplingRate(sampling_rate); - m_rect_range_filter.reset(int(GetSamplingRate()/h2f(GetSemitoneMin()))); + m_rect_range_filter.reset(int(GetSamplingRate()/2000.0)); +// m_fir_range_filter.setImpulseResponse(fir1_lowpass(400, 2/400)); +// m_rect_range_filter.reset(int(GetSamplingRate()/h2f(GetSemitoneMin()))); + m_glFT->spinWinLengthChanged(m_glFT->setting_winlen->value()); + m_glFT->setSamplingRate(sampling_rate); if(m_config_form.ui_cbTransports->currentText()=="JACK") m_config_form.ui_lblJACKSamplingRate->setText(QString::number(sampling_rate)); @@ -314,7 +332,7 @@ void CustomInstrumentTunerForm::samplingRateChanged(int sampling_rate) void CustomInstrumentTunerForm::ui_spinAFreq_valueChanged(int AFreq) { double A = AFreq; - if(m_config_form.ui_chkShowA4Offset->isOn()) + if(m_config_form.ui_chkShowA4Offset->isChecked()) A = h2f(ui_spinA3Offset->value()*1/100.0f, A); Music::SetAFreq(A); // cerr << A << endl; @@ -322,7 +340,7 @@ void CustomInstrumentTunerForm::ui_spinAFreq_valueChanged(int AFreq) void CustomInstrumentTunerForm::ui_spinAOffset_valueChanged(int offset) { double A = ui_spinAFreq->value(); - if(m_config_form.ui_chkShowA4Offset->isOn()) + if(m_config_form.ui_chkShowA4Offset->isChecked()) A = h2f(offset*1/100.0f, ui_spinAFreq->value()); Music::SetAFreq(A); // cerr << A << endl; @@ -337,7 +355,7 @@ void CustomInstrumentTunerForm::tuningFreqChanged(float freq) if(m_compared_freq!=0.0f) { ui_txtNoteFreq->display(m_compared_freq); - ui_txtNote->setText(h2n(f2h(m_compared_freq))); + ui_txtNote->setText(QString::fromStdString(h2n(f2h(m_compared_freq)))); } } else @@ -371,15 +389,16 @@ void CustomInstrumentTunerForm::refresh() QColor ok_color(83,165,105); // 1/{time between refresh} = {nb refresh by seconds} - // limit the nb new data by fs/{nb refresh by seconds} - // add 1 to {nb refresh by second} to eventualy recover lags + // limit the nb of new data by fs/{nb refresh by seconds} + // add 1 to {nb refresh by second} to eventualy recover small lags + // (a big lag is managed by m_values.size()>getPacketSizeSinceLastLock()) int limit = int( m_capture_thread.getSamplingRate() / (1.0/(m_config_form.ui_spinRefreshTime->value()/1000.0) - 1)); // cerr << "REFRESH "; m_capture_thread.lock(); - double max_amplitude = 0.0; +// cerr << "CustomInstrumentTunerForm::refresh locked, values to read=" << m_capture_thread.m_values.size() << endl; int nb_new_data = 0; while(!m_capture_thread.m_values.empty() && (m_capture_thread.m_values.size()>m_capture_thread.getPacketSizeSinceLastLock() || nb_new_dataaddValue(value); if(m_glFT) m_glFT->buff.push_front(value); @@ -398,6 +415,7 @@ void CustomInstrumentTunerForm::refresh() nb_new_data++; } m_capture_thread.unlock(); +// cerr << "CustomInstrumentTunerForm::refresh unlocked" << endl; // cerr << endl; @@ -412,15 +430,19 @@ void CustomInstrumentTunerForm::refresh() // ------- Analysis stage ------- // if something goes wrong in the capture system - if(nb_new_data==0 || m_algo_combedfft==NULL - || elapsed_time>8*m_config_form.ui_spinRefreshTime->value()) - ui_lblSoundStability->setBackgroundColor(capture_failed_color); + if(nb_new_data==0 || m_algo_combedfft==NULL || elapsed_time>8*m_config_form.ui_spinRefreshTime->value()) + { + QPalette palette; + palette.setColor(ui_lblSoundStability->backgroundRole(), capture_failed_color); + ui_lblSoundStability->setPalette(palette); + } else { m_algo_combedfft->apply(m_queue); + // TODO hem ... use energy double max_component = 20*log10(m_algo_combedfft->getComponentsMax()); - ui_pgbVolume->setProgress(100+int(max_component)); + ui_pgbVolume->setValue(100+int(max_component)); double freq = 0.0; if(m_algo_combedfft->hasNoteRecognized()) @@ -451,13 +473,31 @@ void CustomInstrumentTunerForm::refresh() m_quantizer->quantize(freq); if(!m_quantizer->isPlaying()) - ui_lblSoundStability->setBackgroundColor(empty_color); + { + QPalette palette; + palette.setColor(ui_lblSoundStability->backgroundRole(), empty_color); + ui_lblSoundStability->setPalette(palette); + } else { + // Use 100ms rect window + int max_amplitude_limit = min(m_queue.size(),size_t(m_capture_thread.getSamplingRate()*100.0/1000)); + double max_amplitude = 0.0; + for(int i=0;i=1.0) - ui_lblSoundStability->setBackgroundColor(prb_color); + { + QPalette palette; + palette.setColor(ui_lblSoundStability->backgroundRole(), prb_color); + ui_lblSoundStability->setPalette(palette); + } else - ui_lblSoundStability->setBackgroundColor(ok_color); + { + QPalette palette; + palette.setColor(ui_lblSoundStability->backgroundRole(), ok_color); + ui_lblSoundStability->setPalette(palette); + } m_freq = m_quantizer->getAverageFrequency(); m_error = f2hf(m_freq, m_compared_freq); @@ -496,12 +536,12 @@ void CustomInstrumentTunerForm::noteStarted(double freq, double dt) // cerr << "CustomInstrumentTunerForm::noteStarted " << freq << "," << dt << endl; // set the compared freq - if(m_microtonalView->setting_show->isOn() && m_microtonalView->hasTuningFreqSelected()) + if(m_microtonalView->setting_show->isChecked() && m_microtonalView->hasTuningFreqSelected()) m_compared_freq = m_microtonalView->getTuningFreq(); else m_compared_freq = m_quantizer->getCenterFrequency(); // h2f(f2h(freq)); - if(m_microtonalView->setting_show->isOn() && m_microtonalView->hasTuningFreqSelected()) + if(m_microtonalView->setting_show->isChecked() && m_microtonalView->hasTuningFreqSelected()) { ui_txtNoteFreq->display(int(m_microtonalView->getTuningFreq()*100)/100.0); ui_txtNote->setText(m_microtonalView->getTuningNoteName()); @@ -519,7 +559,7 @@ void CustomInstrumentTunerForm::noteStarted(double freq, double dt) else { ui_txtNoteFreq->display(m_compared_freq); - ui_txtNote->setText(h2n(f2h(m_compared_freq))); + ui_txtNote->setText(QString::fromStdString(h2n(f2h(m_compared_freq)))); m_glErrorHistory->addNote(GLErrorHistory::Note(f2h(m_compared_freq))); m_glVolumeHistory->addNote(GLVolumeHistory::Note(f2h(m_compared_freq))); } @@ -532,7 +572,7 @@ void CustomInstrumentTunerForm::noteFinished(double freq, double dt) void CustomInstrumentTunerForm::refresh_data_sample() { - if(m_freq==0.0f || !m_glSample->setting_show->isOn()) + if(m_freq==0.0f || !m_glSample->setting_show->isChecked()) { m_glSample->clear(); return; @@ -547,7 +587,7 @@ void CustomInstrumentTunerForm::refresh_data_harmonics() { if(!(m_algo_combedfft!=NULL && m_freq>0.0f && - m_glFreqStruct->setting_show->isOn())) + m_glFreqStruct->setting_show->isChecked())) return; vector harms = GetHarmonicStruct(m_algo_combedfft->m_plan.out, m_freq, m_glFreqStruct->m_components.size(), m_algo_combedfft->getZeroPaddingFactor()); @@ -570,28 +610,28 @@ void CustomInstrumentTunerForm::refresh_views() // m_dialTune->repaint(); - if(m_glGraph->setting_show->isOn()) + if(m_glGraph->setting_show->isChecked()) m_glGraph->updateGL(); - if(m_glErrorHistory->setting_show->isOn()) + if(m_glErrorHistory->setting_show->isChecked()) m_glErrorHistory->updateGL(); - if(m_glVolumeHistory->setting_show->isOn()) + if(m_glVolumeHistory->setting_show->isChecked()) m_glVolumeHistory->updateGL(); - if(m_microtonalView->setting_show->isOn()) + if(m_microtonalView->setting_show->isChecked()) m_microtonalView->update(); - if(m_glSample->setting_show->isOn()) + if(m_glSample->setting_show->isChecked()) m_glSample->updateGL(); - if(m_glFreqStruct->setting_show->isOn()) + if(m_glFreqStruct->setting_show->isChecked()) m_glFreqStruct->updateGL(); - if(m_glFT->setting_show->isOn()) + if(m_glFT->setting_show->isChecked()) m_glFT->updateGL(); - if(m_glStatistics->setting_show->isOn()) + if(m_glStatistics->setting_show->isChecked()) m_glStatistics->updateGL(); m_time_refresh_views.start(); @@ -599,40 +639,38 @@ void CustomInstrumentTunerForm::refresh_views() void CustomInstrumentTunerForm::keyPressEvent(QKeyEvent * e) { - if(e->key()==Key_F) + if(e->key()==Qt::Key_F) toggleFullScreen(); } void CustomInstrumentTunerForm::resizeEvent(QResizeEvent* e) { update_views(); - - InstrumentTunerForm::resizeEvent(e); } void CustomInstrumentTunerForm::update_views() { - if( !m_glGraph->setting_show->isOn() && - !m_glErrorHistory->setting_show->isOn() && - !m_glVolumeHistory->setting_show->isOn() && - !m_glSample->setting_show->isOn() && - !m_glFreqStruct->setting_show->isOn() && - !m_glFT->setting_show->isOn()) + if( !m_glGraph->setting_show->isChecked() && + !m_glErrorHistory->setting_show->isChecked() && + !m_glVolumeHistory->setting_show->isChecked() && + !m_glSample->setting_show->isChecked() && + !m_glFreqStruct->setting_show->isChecked() && + !m_glFT->setting_show->isChecked()) m_dialTune->setMaximumWidth(size().width()); else m_dialTune->setMaximumWidth(ui_rightLayout->minimumSize().width()); - if(m_glGraph->setting_show->isOn() && - !m_glErrorHistory->setting_show->isOn() && - !m_glVolumeHistory->setting_show->isOn() && - !m_glSample->setting_show->isOn() && - !m_glFreqStruct->setting_show->isOn() && - !m_glFT->setting_show->isOn()) + if(m_glGraph->setting_show->isChecked() && + !m_glErrorHistory->setting_show->isChecked() && + !m_glVolumeHistory->setting_show->isChecked() && + !m_glSample->setting_show->isChecked() && + !m_glFreqStruct->setting_show->isChecked() && + !m_glFT->setting_show->isChecked()) m_glGraph->setMaximumHeight(size().height()); else m_glGraph->setMaximumHeight(m_glGraph->setting_spinMaxHeight->value()); - if(!m_glErrorHistory->setting_show->isOn() && !m_glVolumeHistory->setting_show->isOn()) + if(!m_glErrorHistory->setting_show->isChecked() && !m_glVolumeHistory->setting_show->isChecked()) ui_btnKeepErrorHistory->hide(); else ui_btnKeepErrorHistory->show(); @@ -640,18 +678,23 @@ void CustomInstrumentTunerForm::update_views() void CustomInstrumentTunerForm::configure() { + // Checking PortAudio devices while capturing using ALSA seems to crash ALSA + // thus, stop everything while configuring and capture again when exiting the configuration panel + m_capture_thread.stopCapture(); + noteRangeChanged(); if(m_capture_thread.getCurrentTransportIndex()count()); - m_config_form.ui_cbTransports->setCurrentItem(m_capture_thread.getCurrentTransportIndex()); + m_config_form.ui_cbTransports->setCurrentIndex(m_capture_thread.getCurrentTransportIndex()); #ifdef CAPTURE_JACK // TODO set descr m_config_form.ui_grpJACK->setTitle(m_capture_thread.getTransport("JACK")->getDescription()); m_config_form.ui_lblJACKSamplingRate->setText(QString::number(m_capture_thread.getSamplingRate())); #endif + #ifdef CAPTURE_PORTAUDIO - m_config_form.ui_grpPortAudio->setTitle(m_capture_thread.getTransport("PortAudio")->getDescription()); + m_config_form.ui_grpPortAudio->setTitle(m_capture_thread.getTransport("PortAudio")->getDescription()); m_config_form.ui_spinPortAudioSamplingRate->setValue(m_capture_thread.getSamplingRate()); if(m_capture_thread.getTransport("PortAudio")) { @@ -662,27 +705,27 @@ void CustomInstrumentTunerForm::configure() if(err != paNoError) throw QString("PortAudio: CustomInstrumentTunerForm::configure:Pa_Initialize ")+Pa_GetErrorText(err); int numDevices = Pa_GetDeviceCount(); - int current_index = -1; m_config_form.ui_cbPortAudioDeviceName->clear(); - m_config_form.ui_cbPortAudioDeviceName->insertItem("default"); const PaDeviceInfo* deviceInfo; for(int i=0; iinsertItem(QString(deviceInfo->name)); + m_config_form.ui_cbPortAudioDeviceName->addItem(QString(deviceInfo->name)); if(QString(deviceInfo->name)==m_capture_thread.getTransport("PortAudio")->getSource()) - current_index = i+1; + current_index = i; } - m_config_form.ui_cbPortAudioDeviceName->setCurrentItem(current_index); + if(current_index!=-1) + m_config_form.ui_cbPortAudioDeviceName->setCurrentIndex(current_index); } catch(QString error) { - cerr << "CustomInstrumentTunerForm: ERROR: " << error << endl; + cerr << "CustomInstrumentTunerForm: ERROR: " << error.toStdString() << endl; } Pa_Terminate(); } #endif + #ifdef CAPTURE_ALSA m_config_form.ui_grpALSA->setTitle(m_capture_thread.getTransport("ALSA")->getDescription()); m_config_form.ui_spinALSASamplingRate->setValue(m_capture_thread.getSamplingRate()); @@ -692,12 +735,17 @@ void CustomInstrumentTunerForm::configure() m_config_form.ui_spinOSSSamplingRate->setValue(m_capture_thread.getSamplingRate()); #endif - m_config_form.adjustSize(); + m_config_form.adjustSize(); m_config_form.show(); } +void CustomInstrumentTunerForm::configure_cancel() +{ + if(!pauseAction->isChecked() && !m_capture_thread.isCapturing()) + m_capture_thread.startCapture(); +} void CustomInstrumentTunerForm::configure_ok() { - switch(m_config_form.ui_cbTuning->currentItem()) + switch(m_config_form.ui_cbTuning->currentIndex()) { case 0: SetTuning(CHROMATIC); @@ -719,19 +767,19 @@ void CustomInstrumentTunerForm::configure_ok() break; } - if(m_config_form.ui_cbTonality->currentItem()==0) SetTonality(0); - else if(m_config_form.ui_cbTonality->currentItem()==1) SetTonality(+2); + if(m_config_form.ui_cbTonality->currentIndex()==0) SetTonality(0); + else if(m_config_form.ui_cbTonality->currentIndex()==1) SetTonality(+2); else SetTonality(-3); - if(m_config_form.ui_cbNotesName->currentItem()==0) SetNotesName(LOCAL_ANGLO); + if(m_config_form.ui_cbNotesName->currentIndex()==0) SetNotesName(LOCAL_ANGLO); else SetNotesName(LOCAL_LATIN); m_microtonalView->notesNameChanged(); m_microtonalView->setAFreq(Music::GetAFreq()); SetSemitoneBounds(m_config_form.ui_spinMinHT->value(), m_config_form.ui_spinMaxHT->value()); - ui_spinA3Offset->setShown(m_config_form.ui_chkShowA4Offset->isOn()); - ui_lblA3Offset->setShown(m_config_form.ui_chkShowA4Offset->isOn()); + ui_spinA3Offset->setShown(m_config_form.ui_chkShowA4Offset->isChecked()); + ui_lblA3Offset->setShown(m_config_form.ui_chkShowA4Offset->isChecked()); // if(m_note!=-1000) // ui_txtNote->setText(h2n(m_note)); @@ -785,18 +833,21 @@ void CustomInstrumentTunerForm::configure_ok() m_capture_thread.setSamplingRate(m_config_form.ui_spinOSSSamplingRate->value()); } #endif - m_timer_refresh.changeInterval(m_config_form.ui_spinRefreshTime->value()); + m_timer_refresh.setInterval(m_config_form.ui_spinRefreshTime->value()); // Views - m_glGraph->m_treshold = pow(10, m_config_form.ui_spinVolumeTreshold->value()/20.0); + m_glGraph->m_treshold = invlp(m_config_form.ui_spinVolumeTreshold->value()); m_glGraph->clearValues(); // cerr << "c" << endl; if(m_config_form.ui_grpRangeFiltering->isChecked()) { +// cout << "set filters " << GetSamplingRate() << endl; +// m_rect_range_filter.reset(int(GetSamplingRate()/6000.0)); m_rect_range_filter.reset(int(GetSamplingRate()/h2f(GetSemitoneMin()))); -// m_fir_range_filter.setImpulseResponse(fir1_highpass(int(GetSamplingRate()/h2f(GetSemitoneMin())), )); +// m_fir_range_filter.setImpulseResponse(fir1_bandpass(104, 2*1000.0/GetSamplingRate(), 2*2000.0/GetSamplingRate())); +// m_fir_range_filter.setImpulseResponse(fir1_highpass(int(GetSamplingRate()/h2f(GetSemitoneMin())), 0.5)); if(m_config_form.ui_rdRangeFilteringRectangular->isChecked()) m_range_filter = &m_rect_range_filter; @@ -809,9 +860,9 @@ void CustomInstrumentTunerForm::configure_ok() m_algo_combedfft->setWindowFactor(m_config_form.ui_spinWindowSizeFactor->value()); // m_glFT->m_zp_factor = m_config_form.ui_spinWindowSizeFactor->value(); m_algo_combedfft->useAudibilityRatio(m_config_form.ui_chkAlgoUseSubHarmTresh->isChecked()); - m_algo_combedfft->setAudibilityRatio(pow(10, -m_config_form.ui_spinCombedFFTAudibilityRatio->value()/20.0)); - m_algo_combedfft->setAmplitudeTreshold(pow(10, m_config_form.ui_spinVolumeTreshold->value()/20.0)); - m_algo_combedfft->setComponentTreshold(pow(10, m_config_form.ui_spinVolumeTreshold->value()/20.0)); + m_algo_combedfft->setAudibilityRatio(invlp(-m_config_form.ui_spinCombedFFTAudibilityRatio->value())); + m_algo_combedfft->setAmplitudeTreshold(invlp(double(m_config_form.ui_spinVolumeTreshold->value()))); + m_algo_combedfft->setComponentTreshold(invlp(double(m_config_form.ui_spinVolumeTreshold->value()))); // cerr << "d" << endl; @@ -825,9 +876,9 @@ void CustomInstrumentTunerForm::configure_ok() else m_quantizer = &m_dummy_quantizer; -// cerr << pow(10, -m_config_form.ui_spinCombedFFTAudibilityRatio->value()/20.0) << endl; +// cerr << invlp(-m_config_form.ui_spinCombedFFTAudibilityRatio->value()) << endl; - if(!pauseAction->isOn() && !m_capture_thread.isCapturing()) + if(!pauseAction->isChecked() && !m_capture_thread.isCapturing()) m_capture_thread.startCapture(); } @@ -837,36 +888,38 @@ void CustomInstrumentTunerForm::saveSettings() View::saveAll(); // views - m_settings.writeEntry("width", width()); - m_settings.writeEntry("height", height()); - m_settings.writeEntry("ui_tbViews", ui_tbViews->isShown()); - m_settings.writeEntry("ui_tbButtons", ui_tbButtons->isShown()); + m_settings.setValue("width", width()); + m_settings.setValue("height", height()); + //m_settings.setValue("ui_tbViews", QVariant(ui_tbViews->isVisible())); + //m_settings.setValue("ui_tbButtons", ui_tbButtons->isVisible()); // sound capture - m_settings.writeEntry(m_config_form.ui_cbTransports->name(), m_config_form.ui_cbTransports->currentText()); + m_settings.setValue(m_config_form.ui_cbTransports->objectName(), m_config_form.ui_cbTransports->currentText()); #ifdef CAPTURE_PORTAUDIO - m_settings.writeEntry(m_config_form.ui_cbPortAudioDeviceName->name(), m_config_form.ui_cbPortAudioDeviceName->currentText()); + m_settings.setValue(m_config_form.ui_cbPortAudioDeviceName->objectName(), m_config_form.ui_cbPortAudioDeviceName->currentText()); #endif } void CustomInstrumentTunerForm::loadSettings() { +// cerr << __FILE__ << ":" << __LINE__ << endl; + m_settings.load(); View::loadAll(); // views - resize(m_settings.readNumEntry("width", 800), m_settings.readNumEntry("height", 600)); - ui_tbViews->setShown(m_settings.readBoolEntry("ui_tbViews", ui_tbViews->isShown())); - ui_tbButtons->setShown(m_settings.readBoolEntry("ui_tbButtons", ui_tbButtons->isShown())); + resize(m_settings.value("width", 800).toInt(), m_settings.value("height", 600).toInt()); + //ui_tbViews->setVisible(m_settings.value("ui_tbViews", ui_tbViews->isVisible()).toBool()); + //ui_tbButtons->setVisible(m_settings.value("ui_tbButtons", ui_tbButtons->isVisible()).toBool()); // sound capture - QString saved_transport = m_settings.readEntry(m_config_form.ui_cbTransports->name(), ""); + QString saved_transport = m_settings.value(m_config_form.ui_cbTransports->objectName(), "").toString(); if(saved_transport!="") for(int i=0; icount(); i++) - if(m_config_form.ui_cbTransports->text(i)==saved_transport) - m_config_form.ui_cbTransports->setCurrentItem(i); + if(m_config_form.ui_cbTransports->itemText(i)==saved_transport) + m_config_form.ui_cbTransports->setCurrentIndex(i); + #ifdef CAPTURE_PORTAUDIO -// cerr << "read: " << m_settings.readEntry("ui_cbPortAudioDeviceName", "default") << endl; - QString saved_device = m_settings.readEntry(m_config_form.ui_cbPortAudioDeviceName->name(), "default"); + QString saved_device = m_settings.value(m_config_form.ui_cbPortAudioDeviceName->objectName(), "default").toString(); try { PaError err; @@ -874,21 +927,21 @@ void CustomInstrumentTunerForm::loadSettings() if(err != paNoError) throw QString("PortAudio: CustomInstrumentTunerForm::loadSettings:Pa_Initialize ")+Pa_GetErrorText(err); int numDevices = Pa_GetDeviceCount(); - - int current_index = 0; +// cerr << "PortAudio devices:"<< endl; + int saved_index = -1; m_config_form.ui_cbPortAudioDeviceName->clear(); - m_config_form.ui_cbPortAudioDeviceName->insertItem("default"); const PaDeviceInfo* deviceInfo; for(int i=0; iinsertItem(QString(deviceInfo->name)); +// cerr << " " << QString(deviceInfo->name).toStdString() << endl; + m_config_form.ui_cbPortAudioDeviceName->addItem(QString(deviceInfo->name)); if(QString(deviceInfo->name)==saved_device) - current_index = i+1; + saved_index = i; } - if(current_indexcount()) - m_config_form.ui_cbPortAudioDeviceName->setCurrentItem(current_index); - } + if(saved_index!=-1) + m_config_form.ui_cbPortAudioDeviceName->setCurrentIndex(saved_index); + } catch(QString error) { // cerr << "CustomInstrumentTunerForm: ERROR: " << error << endl; @@ -904,12 +957,13 @@ void CustomInstrumentTunerForm::restoreFactorySettings() m_settings.clear(); View::clearAllSettings(); - m_settings.removeEntry("width"); - m_settings.removeEntry("height"); - m_settings.removeEntry("ui_tbViews"); - m_settings.removeEntry("ui_tbButtons"); + m_settings.remove("width"); + m_settings.remove("height"); + m_settings.remove("ui_cbTransports"); + //m_settings.remove("ui_tbViews"); + //m_settings.remove("ui_tbButtons"); - m_settings.removeEntry(m_config_form.ui_cbPortAudioDeviceName->name()); + m_settings.remove(m_config_form.ui_cbPortAudioDeviceName->objectName()); QMessageBox::information(this, tr("Restore Factory Settings"), tr("You can now restart FMIT to get back factory settings"), QMessageBox::Ok, QMessageBox::NoButton); } @@ -923,7 +977,7 @@ void CustomInstrumentTunerForm::helpAbout() text += tr("

Website:

homepage: http://home.gna.org/fmit"); text += tr("

development site: http://gna.org/projects/fmit"); text += tr("

donation link: http://home.gna.org/fmit/donation.html"); - text += tr("

Author:

Gilles Degottex [gilles.degottex@net2000.ch]"); + text += tr("

Author:

Gilles Degottex gilles.degottex@gmail.com"); #ifdef PACKAGER_STRING if(PACKAGER_STRING!="") text += tr("

Packager:

")+QString(PACKAGER_STRING).replace(QChar('<'),"[").replace(QChar('>'),"]"); @@ -931,35 +985,47 @@ void CustomInstrumentTunerForm::helpAbout() QDialog about_dlg(this); - QTextEdit* textEdit1; + QTextBrowser* textBrowser1; QPushButton* pushButton1; QVBoxLayout* Form2Layout; QHBoxLayout* layout1; QSpacerItem* spacer1; QSpacerItem* spacer2; - about_dlg.setName( tr("about_box") ); - about_dlg.setCaption( tr("About Free Music Instrument Tuner") ); - Form2Layout = new QVBoxLayout( &about_dlg, 11, 6, "Form2Layout"); + about_dlg.setObjectName( tr("about_box") ); + about_dlg.setWindowTitle( tr("About Free Music Instrument Tuner") ); + + Form2Layout = new QVBoxLayout( &about_dlg ); + Form2Layout->setMargin(11); + Form2Layout->setSpacing(6); + about_dlg.setLayout( Form2Layout ); - textEdit1 = new QTextEdit( &about_dlg, "textEdit1" ); - textEdit1->setText(text); - textEdit1->setReadOnly(true); - Form2Layout->addWidget( textEdit1 ); + textBrowser1 = new QTextBrowser( &about_dlg ); + textBrowser1->setHtml(text); + textBrowser1->setOpenExternalLinks(true); + textBrowser1->setWordWrapMode(QTextOption::NoWrap); + textBrowser1->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + textBrowser1->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + textBrowser1->document()->adjustSize(); + textBrowser1->setMinimumSize(textBrowser1->document()->size().toSize() + QSize(10, 10)); + Form2Layout->addWidget( textBrowser1 ); + + layout1 = new QHBoxLayout(); + layout1->setMargin(0); + layout1->setSpacing(6); - layout1 = new QHBoxLayout( 0, 0, 6, "layout1"); spacer1 = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); layout1->addItem( spacer1 ); - pushButton1 = new QPushButton( &about_dlg, "pushButton1" ); - pushButton1->setText( tr( "OK" ) ); + pushButton1 = new QPushButton(&about_dlg); + pushButton1->setText( tr( "&OK" ) ); layout1->addWidget( pushButton1 ); connect(pushButton1, SIGNAL(clicked()), &about_dlg, SLOT(close())); + spacer2 = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); layout1->addItem( spacer2 ); + Form2Layout->addLayout( layout1 ); - about_dlg.resize( QSize(400, textEdit1->heightForWidth(400)+100) ); -// about_dlg.clearWState( WState_Polished ); about_dlg.exec(); } diff --git a/src/CustomInstrumentTunerForm.h b/src/CustomInstrumentTunerForm.h index 13d696a..431daa6 100644 --- a/src/CustomInstrumentTunerForm.h +++ b/src/CustomInstrumentTunerForm.h @@ -21,9 +21,9 @@ #ifndef _CustomInstrumentTunerForm_h_ #define _CustomInstrumentTunerForm_h_ -#include "InstrumentTunerForm.h" +#include "ui_InstrumentTunerForm.h" -#include "config.h" +// #include "config.h" #include using namespace std; @@ -40,7 +40,7 @@ using namespace std; using namespace Music; #include "AutoQSettings.h" #include "CaptureThread.h" -#include "ConfigForm.h" +#include "ui_ConfigForm.h" #include "LatencyMonoQuantizer.h" #include "DummyMonoQuantizer.h" #include "modules/DialView.h" @@ -53,15 +53,25 @@ using namespace Music; #include "modules/GLFT.h" #include "modules/GLStatistics.h" -class CustomInstrumentTunerForm : public InstrumentTunerForm +class CustomConfigForm : public QDialog, public Ui_ConfigForm +{ + Q_OBJECT + +public: + CustomConfigForm(QWidget* parent = 0) + { + setupUi(this); + } +}; + +class CustomInstrumentTunerForm : public QMainWindow, public Ui_InstrumentTunerForm { Q_OBJECT public: - ConfigForm m_config_form; + CustomConfigForm m_config_form; CaptureThread m_capture_thread; - virtual void pause(bool on); CombedFT* m_algo_combedfft; DialView* m_dialTune; @@ -84,30 +94,14 @@ class CustomInstrumentTunerForm : public InstrumentTunerForm CustomInstrumentTunerForm(); AutoQSettings m_settings; void loadSettings(); - virtual void saveSettings(); - virtual void restoreFactorySettings(); virtual void resizeEvent(QResizeEvent* e); virtual void keyPressEvent(QKeyEvent * e); - virtual void update_views(); - virtual void configure(); - virtual void configure_ok(); - virtual void errorRaised(const QString& error); - virtual void samplingRateChanged(int sampling_rate); - virtual void noteRangeChanged(); - virtual void transportChanged(const QString& name); - virtual void selectTransport(const QString & name); - virtual void autoDetectTransport(); - virtual void tuningFreqChanged(float); - virtual void ui_spinAFreq_valueChanged(int); - virtual void ui_spinAOffset_valueChanged(int); - void toggleFullScreen(); QTime m_time_refresh; QTime m_time_refresh_views; - void refresh(); QTimer m_timer_refresh; double m_last_refresh; @@ -121,16 +115,35 @@ class CustomInstrumentTunerForm : public InstrumentTunerForm LatencyMonoQuantizer m_latency_quantizer; DummyMonoQuantizer m_dummy_quantizer; MonoQuantizer* m_quantizer; - virtual void noteStarted(double freq, double dt); - virtual void noteFinished(double freq, double dt); virtual void refresh_views(); void refresh_data_sample(); void refresh_data_harmonics(); // the main function +public slots: virtual void helpAbout(); + virtual void configure(); + virtual void pause(bool on); + virtual void ui_spinAFreq_valueChanged(int); + virtual void ui_spinAOffset_valueChanged(int); + virtual void saveSettings(); + virtual void samplingRateChanged(int sampling_rate); + virtual void errorRaised(const QString& error); + virtual void transportChanged(const QString& name); + virtual void noteStarted(double freq, double dt); + virtual void noteFinished(double freq, double dt); + virtual void update_views(); + virtual void tuningFreqChanged(float); + virtual void configure_ok(); + virtual void configure_cancel(); + virtual void restoreFactorySettings(); + virtual void noteRangeChanged(); + virtual void selectTransport(const QString & name); + virtual void autoDetectTransport(); + void refresh(); +public: ~CustomInstrumentTunerForm(); }; diff --git a/src/LatencyMonoQuantizer.cpp b/src/LatencyMonoQuantizer.cpp index 5122cb2..578e375 100644 --- a/src/LatencyMonoQuantizer.cpp +++ b/src/LatencyMonoQuantizer.cpp @@ -20,6 +20,7 @@ #include "MonoQuantizer.h" #include +#include using namespace std; #include using namespace Music; diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index c88dc2b..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -SUBDIRS = modules - -bin_PROGRAMS = fmit -fmit_SOURCES = CaptureThread.cpp main.cpp CustomInstrumentTunerForm.cpp MonoQuantizer.cpp LatencyMonoQuantizer.cpp DummyMonoQuantizer.cpp AutoQSettings.cpp -nodist_fmit_SOURCES = CaptureThread_moc.cpp CustomInstrumentTunerForm_moc.cpp MonoQuantizer_moc.cpp ../ui/ConfigForm_moc.cpp ../ui/InstrumentTunerForm_moc.cpp ../ui/ConfigForm.cpp ../ui/InstrumentTunerForm.cpp -AM_CXXFLAGS = -I../libs -I../ui -DQT_THREAD_SUPPORT $(GL_CFLAGS) -fmit_LDADD = modules/libmodules.a ../libs/Music/libMusic.a ../libs/CppAddons/libCppAddons.a $(GL_LIBS) $(LD_LIBRARY) -lm -lfftw3 -EXTRA_DIST = *.h -CLEANFILES = *_moc.cpp *_moc.o - -%_moc.cpp: %.h - $(QT_MOC) $< > $@ diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index bfd5e5c..0000000 --- a/src/Makefile.in +++ /dev/null @@ -1,621 +0,0 @@ -# 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 = : -bin_PROGRAMS = fmit$(EXEEXT) -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_fmit_OBJECTS = CaptureThread.$(OBJEXT) main.$(OBJEXT) \ - CustomInstrumentTunerForm.$(OBJEXT) MonoQuantizer.$(OBJEXT) \ - LatencyMonoQuantizer.$(OBJEXT) DummyMonoQuantizer.$(OBJEXT) \ - AutoQSettings.$(OBJEXT) -nodist_fmit_OBJECTS = CaptureThread_moc.$(OBJEXT) \ - CustomInstrumentTunerForm_moc.$(OBJEXT) \ - MonoQuantizer_moc.$(OBJEXT) ConfigForm_moc.$(OBJEXT) \ - InstrumentTunerForm_moc.$(OBJEXT) ConfigForm.$(OBJEXT) \ - InstrumentTunerForm.$(OBJEXT) -fmit_OBJECTS = $(am_fmit_OBJECTS) $(nodist_fmit_OBJECTS) -am__DEPENDENCIES_1 = -fmit_DEPENDENCIES = modules/libmodules.a ../libs/Music/libMusic.a \ - ../libs/CppAddons/libCppAddons.a $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -SOURCES = $(fmit_SOURCES) $(nodist_fmit_SOURCES) -DIST_SOURCES = $(fmit_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = modules -fmit_SOURCES = CaptureThread.cpp main.cpp CustomInstrumentTunerForm.cpp MonoQuantizer.cpp LatencyMonoQuantizer.cpp DummyMonoQuantizer.cpp AutoQSettings.cpp -nodist_fmit_SOURCES = CaptureThread_moc.cpp CustomInstrumentTunerForm_moc.cpp MonoQuantizer_moc.cpp ../ui/ConfigForm_moc.cpp ../ui/InstrumentTunerForm_moc.cpp ../ui/ConfigForm.cpp ../ui/InstrumentTunerForm.cpp -AM_CXXFLAGS = -I../libs -I../ui -DQT_THREAD_SUPPORT $(GL_CFLAGS) -fmit_LDADD = modules/libmodules.a ../libs/Music/libMusic.a ../libs/CppAddons/libCppAddons.a $(GL_LIBS) $(LD_LIBRARY) -lm -lfftw3 -EXTRA_DIST = *.h -CLEANFILES = *_moc.cpp *_moc.o -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .cpp .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 src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/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-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -fmit$(EXEEXT): $(fmit_OBJECTS) $(fmit_DEPENDENCIES) - @rm -f fmit$(EXEEXT) - $(CXXLINK) $(fmit_LDFLAGS) $(fmit_OBJECTS) $(fmit_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AutoQSettings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CaptureThread.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CaptureThread_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigForm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigForm_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CustomInstrumentTunerForm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CustomInstrumentTunerForm_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DummyMonoQuantizer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InstrumentTunerForm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InstrumentTunerForm_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LatencyMonoQuantizer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MonoQuantizer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MonoQuantizer_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -ConfigForm_moc.o: ../ui/ConfigForm_moc.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ConfigForm_moc.o -MD -MP -MF "$(DEPDIR)/ConfigForm_moc.Tpo" -c -o ConfigForm_moc.o `test -f '../ui/ConfigForm_moc.cpp' || echo '$(srcdir)/'`../ui/ConfigForm_moc.cpp; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/ConfigForm_moc.Tpo" "$(DEPDIR)/ConfigForm_moc.Po"; else rm -f "$(DEPDIR)/ConfigForm_moc.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/ConfigForm_moc.cpp' object='ConfigForm_moc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ConfigForm_moc.o `test -f '../ui/ConfigForm_moc.cpp' || echo '$(srcdir)/'`../ui/ConfigForm_moc.cpp - -ConfigForm_moc.obj: ../ui/ConfigForm_moc.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ConfigForm_moc.obj -MD -MP -MF "$(DEPDIR)/ConfigForm_moc.Tpo" -c -o ConfigForm_moc.obj `if test -f '../ui/ConfigForm_moc.cpp'; then $(CYGPATH_W) '../ui/ConfigForm_moc.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/ConfigForm_moc.cpp'; fi`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/ConfigForm_moc.Tpo" "$(DEPDIR)/ConfigForm_moc.Po"; else rm -f "$(DEPDIR)/ConfigForm_moc.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/ConfigForm_moc.cpp' object='ConfigForm_moc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ConfigForm_moc.obj `if test -f '../ui/ConfigForm_moc.cpp'; then $(CYGPATH_W) '../ui/ConfigForm_moc.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/ConfigForm_moc.cpp'; fi` - -InstrumentTunerForm_moc.o: ../ui/InstrumentTunerForm_moc.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InstrumentTunerForm_moc.o -MD -MP -MF "$(DEPDIR)/InstrumentTunerForm_moc.Tpo" -c -o InstrumentTunerForm_moc.o `test -f '../ui/InstrumentTunerForm_moc.cpp' || echo '$(srcdir)/'`../ui/InstrumentTunerForm_moc.cpp; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/InstrumentTunerForm_moc.Tpo" "$(DEPDIR)/InstrumentTunerForm_moc.Po"; else rm -f "$(DEPDIR)/InstrumentTunerForm_moc.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/InstrumentTunerForm_moc.cpp' object='InstrumentTunerForm_moc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InstrumentTunerForm_moc.o `test -f '../ui/InstrumentTunerForm_moc.cpp' || echo '$(srcdir)/'`../ui/InstrumentTunerForm_moc.cpp - -InstrumentTunerForm_moc.obj: ../ui/InstrumentTunerForm_moc.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InstrumentTunerForm_moc.obj -MD -MP -MF "$(DEPDIR)/InstrumentTunerForm_moc.Tpo" -c -o InstrumentTunerForm_moc.obj `if test -f '../ui/InstrumentTunerForm_moc.cpp'; then $(CYGPATH_W) '../ui/InstrumentTunerForm_moc.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/InstrumentTunerForm_moc.cpp'; fi`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/InstrumentTunerForm_moc.Tpo" "$(DEPDIR)/InstrumentTunerForm_moc.Po"; else rm -f "$(DEPDIR)/InstrumentTunerForm_moc.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/InstrumentTunerForm_moc.cpp' object='InstrumentTunerForm_moc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InstrumentTunerForm_moc.obj `if test -f '../ui/InstrumentTunerForm_moc.cpp'; then $(CYGPATH_W) '../ui/InstrumentTunerForm_moc.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/InstrumentTunerForm_moc.cpp'; fi` - -ConfigForm.o: ../ui/ConfigForm.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ConfigForm.o -MD -MP -MF "$(DEPDIR)/ConfigForm.Tpo" -c -o ConfigForm.o `test -f '../ui/ConfigForm.cpp' || echo '$(srcdir)/'`../ui/ConfigForm.cpp; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/ConfigForm.Tpo" "$(DEPDIR)/ConfigForm.Po"; else rm -f "$(DEPDIR)/ConfigForm.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/ConfigForm.cpp' object='ConfigForm.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ConfigForm.o `test -f '../ui/ConfigForm.cpp' || echo '$(srcdir)/'`../ui/ConfigForm.cpp - -ConfigForm.obj: ../ui/ConfigForm.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ConfigForm.obj -MD -MP -MF "$(DEPDIR)/ConfigForm.Tpo" -c -o ConfigForm.obj `if test -f '../ui/ConfigForm.cpp'; then $(CYGPATH_W) '../ui/ConfigForm.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/ConfigForm.cpp'; fi`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/ConfigForm.Tpo" "$(DEPDIR)/ConfigForm.Po"; else rm -f "$(DEPDIR)/ConfigForm.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/ConfigForm.cpp' object='ConfigForm.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ConfigForm.obj `if test -f '../ui/ConfigForm.cpp'; then $(CYGPATH_W) '../ui/ConfigForm.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/ConfigForm.cpp'; fi` - -InstrumentTunerForm.o: ../ui/InstrumentTunerForm.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InstrumentTunerForm.o -MD -MP -MF "$(DEPDIR)/InstrumentTunerForm.Tpo" -c -o InstrumentTunerForm.o `test -f '../ui/InstrumentTunerForm.cpp' || echo '$(srcdir)/'`../ui/InstrumentTunerForm.cpp; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/InstrumentTunerForm.Tpo" "$(DEPDIR)/InstrumentTunerForm.Po"; else rm -f "$(DEPDIR)/InstrumentTunerForm.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/InstrumentTunerForm.cpp' object='InstrumentTunerForm.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InstrumentTunerForm.o `test -f '../ui/InstrumentTunerForm.cpp' || echo '$(srcdir)/'`../ui/InstrumentTunerForm.cpp - -InstrumentTunerForm.obj: ../ui/InstrumentTunerForm.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InstrumentTunerForm.obj -MD -MP -MF "$(DEPDIR)/InstrumentTunerForm.Tpo" -c -o InstrumentTunerForm.obj `if test -f '../ui/InstrumentTunerForm.cpp'; then $(CYGPATH_W) '../ui/InstrumentTunerForm.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/InstrumentTunerForm.cpp'; fi`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/InstrumentTunerForm.Tpo" "$(DEPDIR)/InstrumentTunerForm.Po"; else rm -f "$(DEPDIR)/InstrumentTunerForm.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../ui/InstrumentTunerForm.cpp' object='InstrumentTunerForm.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InstrumentTunerForm.obj `if test -f '../ui/InstrumentTunerForm.cpp'; then $(CYGPATH_W) '../ui/InstrumentTunerForm.cpp'; else $(CYGPATH_W) '$(srcdir)/../ui/InstrumentTunerForm.cpp'; fi` -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -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: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - 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: ctags-recursive $(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 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -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: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -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-recursive - -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: install-binPROGRAMS - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-binPROGRAMS clean-generic clean-recursive ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am - - -%_moc.cpp: %.h - $(QT_MOC) $< > $@ -# 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 --git a/src/fmit.qrc b/src/fmit.qrc new file mode 100644 index 0000000..1cf4143 --- /dev/null +++ b/src/fmit.qrc @@ -0,0 +1,10 @@ + + + ../ui/images/config.png + ../ui/images/configForm.png + ../ui/images/fmit.png + ../ui/images/helpAbout.png + ../ui/images/pause.png + ../ui/images/saveSettings.png + + diff --git a/src/main.cpp b/src/main.cpp index fc565bb..c841ef4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,13 +17,15 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#include "config.h" +// #include "config.h" +#include #include using namespace std; #include #include #include +#include #include #include @@ -70,8 +72,11 @@ int main(int argc, char** argv) // cerr << "LANG=" << QTextCodec::locale() << endl; - QTranslator tr_fmit(0); - tr_fmit.load(QString(PACKAGE_NAME)+"_"+QTextCodec::locale(), QString(PREFIX)+"/"+PACKAGE_NAME+"/tr"); + QTranslator tr_fmit; + QString trFile = QString("fmit_") + QLocale::system().name(); + QString trPath = QString(PREFIX) + QString("/share/fmit/tr"); + cerr << "Looking up translation '" << trFile.toStdString() << "' in '" << trPath.toStdString() << "'" << endl; + tr_fmit.load(trFile, trPath); a.installTranslator(&tr_fmit); g_main_form = new CustomInstrumentTunerForm(); diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt new file mode 100644 index 0000000..cdb72f7 --- /dev/null +++ b/src/modules/CMakeLists.txt @@ -0,0 +1,34 @@ +FILE(GLOB fmit_MODULE_SRCS + DialView.cpp + GLErrorHistory.cpp + GLFreqStruct.cpp + GLFT.cpp + GLGraph.cpp + GLSample.cpp + GLStatistics.cpp + GLVolumeHistory.cpp + MicrotonalView.cpp + View.cpp +) +FILE(GLOB fmit_MODULE_MOC_CLASSES + DialView.h + GLErrorHistory.h + GLFreqStruct.h + GLFT.h + GLGraph.h + GLSample.h + GLStatistics.h + GLVolumeHistory.h + MicrotonalView.h +) + +QT4_WRAP_CPP(fmit_MODULE_SRCS_MOC ${fmit_MODULE_MOC_CLASSES}) + +SET (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${fmit_MODULE_SRCS} ${fmit_MODULE_MOC_CLASSES} PARENT_SCOPE) + +INCLUDE_DIRECTORIES( + ../../libs + ${CMAKE_CURRENT_BINARY_DIR} +) + +ADD_LIBRARY(fmit_modules STATIC ${fmit_MODULE_SRCS_MOC} ${fmit_MODULE_SRCS}) diff --git a/src/modules/DialView.cpp b/src/modules/DialView.cpp index 0be471e..576e712 100644 --- a/src/modules/DialView.cpp +++ b/src/modules/DialView.cpp @@ -3,70 +3,82 @@ #include using namespace std; #include -#include +#include #include #include +#include +#include #include DialView::DialView(QWidget* parent) -: QFrame(parent, "DialView") -, View("Dial", this) +: QFrame(parent) +, View(tr("Dial"), this) { m_error = 0.0f; m_min_error = 0.0f; m_max_error = 0.0f; // settings - setting_showTolerance = new QAction(this); - setting_showTolerance->setMenuText(tr("Show tolerance")); - setting_showTolerance->setToggleAction(true); - setting_showTolerance->setOn(true); + setting_showTolerance = new QAction(tr("Show tolerance"), this); + setting_showTolerance->setCheckable(true); + setting_showTolerance->setChecked(true); connect(setting_showTolerance, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_showTolerance->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_showTolerance); - setting_showTrace = new QAction(this); - setting_showTrace->setMenuText(tr("Show trace")); - setting_showTrace->setToggleAction(true); - setting_showTrace->setOn(true); + setting_showTrace = new QAction(tr("Show trace"), this); + setting_showTrace->setCheckable(true); + setting_showTrace->setChecked(true); connect(setting_showTrace, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_showTrace->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_showTrace); - setting_useCents = new QAction(this); - setting_useCents->setMenuText(tr("Use cents")); - setting_useCents->setToggleAction(true); - setting_useCents->setOn(true); + setting_useCents = new QAction(tr("Use cents"), this); + setting_useCents->setCheckable(true); + setting_useCents->setChecked(true); connect(setting_useCents, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_useCents->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_useCents); - m_popup_menu.insertItem(new Title(tr("Scale range"), &m_popup_menu)); - setting_spinScale = new QSpinBox(5, 100, 1, &m_popup_menu); + QHBoxLayout* scaleActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* scaleActionTitle = new QLabel(tr("Scale range"), &m_popup_menu); + scaleActionLayout->addWidget(scaleActionTitle); + + setting_spinScale = new QSpinBox(&m_popup_menu); + setting_spinScale->setMinimum(5); + setting_spinScale->setMaximum(100); + setting_spinScale->setSingleStep(1); setting_spinScale->setValue(50); - QToolTip::add(setting_spinScale, tr("Scale range (in cents)")); + setting_spinScale->setToolTip(tr("Scale range (in cents)")); connect(setting_spinScale, SIGNAL(valueChanged(int)), this, SLOT(update())); - m_popup_menu.insertItem(setting_spinScale); + scaleActionLayout->addWidget(setting_spinScale); + + QWidget* scaleActionWidget = new QWidget(&m_popup_menu); + scaleActionWidget->setLayout(scaleActionLayout); + + QWidgetAction* scaleAction = new QWidgetAction(&m_popup_menu); + scaleAction->setDefaultWidget(scaleActionWidget); + m_popup_menu.addAction(scaleAction); } void DialView::save() { - s_settings->writeEntry("showTolerance", setting_showTolerance->isOn()); - s_settings->writeEntry("showTrace", setting_showTrace->isOn()); - s_settings->writeEntry("useCents", setting_useCents->isOn()); - s_settings->writeEntry("spinScale", setting_spinScale->value()); + s_settings->setValue("showTolerance", setting_showTolerance->isChecked()); + s_settings->setValue("showTrace", setting_showTrace->isChecked()); + s_settings->setValue("useCents", setting_useCents->isChecked()); + s_settings->setValue("spinScale", setting_spinScale->value()); } void DialView::load() { - setting_showTolerance->setOn(s_settings->readBoolEntry("showTolerance", setting_showTolerance->isOn())); - setting_showTrace->setOn(s_settings->readBoolEntry("showTrace", setting_showTrace->isOn())); - setting_useCents->setOn(s_settings->readBoolEntry("useCents", setting_useCents->isOn())); - - setting_spinScale->setValue(s_settings->readNumEntry("spinScale", setting_spinScale->value())); + setting_showTolerance->setChecked(s_settings->value("showTolerance", setting_showTolerance->isChecked()).toBool()); + setting_showTrace->setChecked(s_settings->value("showTrace", setting_showTrace->isChecked()).toBool()); + setting_useCents->setChecked(s_settings->value("useCents", setting_useCents->isChecked()).toBool()); + setting_spinScale->setValue(s_settings->value("spinScale", setting_spinScale->value()).toInt()); } void DialView::clearSettings() { - s_settings->removeEntry("showTolerance"); - s_settings->removeEntry("showTrace"); - s_settings->removeEntry("useCents"); - s_settings->removeEntry("spinScale"); + s_settings->remove("showTolerance"); + s_settings->remove("showTrace"); + s_settings->remove("useCents"); + s_settings->remove("spinScale"); } void DialView::drawTextTickCent(QPainter& p, int bigw, int bigh, int r) @@ -157,13 +169,13 @@ void DialView::setError(float error) repaint(); } -void DialView::drawContents(QPainter* pp) +void DialView::paintEvent(QPaintEvent* event) { - QPainter& p = *pp; + QPainter p(this); float human_tol = Music::f2hf(441.0,440.0); // TODO float scale; - if(setting_useCents->isOn()) + if(setting_useCents->isChecked()) scale = 50.0f/setting_spinScale->value(); else scale = int(50/setting_spinScale->value()); @@ -174,7 +186,7 @@ void DialView::drawContents(QPainter* pp) QPoint c(width()/2,height()); QPoint unity_center = c+QPoint(p.fontMetrics().width("cent"),0); QString unity; - if(setting_useCents->isOn()) unity = "cents"; + if(setting_useCents->isChecked()) unity = "cents"; else unity = "1/x"; if(height()>width()) { @@ -203,14 +215,14 @@ void DialView::drawContents(QPainter* pp) // pen1.setStyle(Qt::DashLine); // pen1.setWidth(2); p.setPen(pen1); - if(setting_showTolerance->isOn()) + if(setting_showTolerance->isChecked()) { float pie_deg = (150.0f/180.0f)*scale*human_tol*180; p.drawPie(-pie_width,-pie_height,2*pie_width,2*pie_height, int((90-pie_deg)*16),int(2*pie_deg*16)); } // draw min max - if((m_error>-1.0f && m_error<1.0f) && setting_showTrace->isOn() && m_max_error-m_min_error>0.0) + if((m_error>-1.0f && m_error<1.0f) && setting_showTrace->isChecked() && m_max_error-m_min_error>0.0) { int line_width = ticks_size/4; int mm_height = pie_height - line_width/2; @@ -226,7 +238,7 @@ void DialView::drawContents(QPainter* pp) // draw text marks p.setPen(QColor(0,0,0)); - if(setting_useCents->isOn()) + if(setting_useCents->isChecked()) { int grad = 10; if(setting_spinScale->value() <= 25) grad=5; @@ -251,7 +263,7 @@ void DialView::drawContents(QPainter* pp) int sh = bigh-p.fontMetrics().height()-ticks_size; int bw = sw + ticks_size; int bh = sh + ticks_size; - if(setting_useCents->isOn()) + if(setting_useCents->isChecked()) { drawTicksCent(p, bigw, bigh, 10, ticks_size, ticks_size); drawTicksCent(p, bigw, bigh, 5, ticks_size, int(ticks_size * 0.6)); @@ -284,6 +296,4 @@ void DialView::drawContents(QPainter* pp) p.setPen(pen2); p.drawLine(mid_point, final_point); } - - p.flush(); } diff --git a/src/modules/DialView.h b/src/modules/DialView.h index 35ebbf7..b5aad49 100644 --- a/src/modules/DialView.h +++ b/src/modules/DialView.h @@ -6,12 +6,12 @@ // 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. -// +// // "fmit" 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 @@ -29,7 +29,7 @@ class DialView : public QFrame, public View { Q_OBJECT - virtual void drawContents(QPainter* p); + virtual void paintEvent(QPaintEvent* event); virtual void mouseReleaseEvent(QMouseEvent* e){View::mouseReleaseEvent(e);} void drawTextTickCent(QPainter& p, int bigw, int bigh, int r); void drawTicksCent(QPainter& p, int bigw, int bigh, int r, int ticks_size, int h); diff --git a/src/modules/GLErrorHistory.cpp b/src/modules/GLErrorHistory.cpp index 3ae6b23..e7207b9 100644 --- a/src/modules/GLErrorHistory.cpp +++ b/src/modules/GLErrorHistory.cpp @@ -175,6 +175,8 @@ using namespace std; #include #include #include +#include +#include #include void GLErrorHistory::Note::init() @@ -202,7 +204,7 @@ GLErrorHistory::Note::Note(int h, float cents) } QString GLErrorHistory::Note::getName() const { - return Music::h2n(ht)+factor; + return QString::fromStdString(Music::h2n(ht))+factor; } void GLErrorHistory::Note::addError(float err) { @@ -219,74 +221,73 @@ void GLErrorHistory::Note::addError(float err) } GLErrorHistory::GLErrorHistory(QWidget* parent) -: QGLWidget(parent, "GLErrorHistory") -, View("Error history", this) +: QGLWidget(parent) +, View(tr("Error history"), this) { // settings - QImage img; + QPixmap img; img.loadFromData(g_icon_error_graph, sizeof(g_icon_error_graph), "PNG"); - setting_show->setIconSet(QIconSet(QImage(img))); - setting_show->setOn(true); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(true); - setting_keep = new QAction(this); - setting_keep->setMenuText(tr("Keep previous notes")); - setting_keep->setToggleAction(true); - setting_keep->setOn(false); + setting_keep = new QAction(tr("Keep previous notes"), this); + setting_keep->setCheckable(true); + setting_keep->setChecked(false); connect(setting_keep, SIGNAL(toggled(bool)), this, SLOT(keepPreviousNotes(bool))); -// setting_keep->addTo(&m_popup_menu); - - ui_notesNameMenu = new QPopupMenu(this); - ui_notesNameMenu->insertItem(tr("Anglo-saxon"), Music::LOCAL_ANGLO); - ui_notesNameMenu->connectItem(int(Music::LOCAL_ANGLO), this, SLOT(selectNotesNames(int))); - ui_notesNameMenu->insertItem(tr("Latin"), Music::LOCAL_LATIN); - ui_notesNameMenu->connectItem(int(Music::LOCAL_LATIN), this, SLOT(selectNotesNames(int))); - ui_notesNameMenu->setCheckable(true); - ui_notesNameMenu->setItemChecked(int(Music::GetNotesName()), true); -// m_popup_menu.insertItem("Notes names", ui_notesNameMenu); - - setting_useCents = new QAction(this); - setting_useCents->setMenuText(tr("Use cents")); - setting_useCents->setToggleAction(true); - setting_useCents->setOn(true); + m_popup_menu.addAction(setting_keep); + + setting_useCents = new QAction(tr("Use cents"), this); + setting_useCents->setCheckable(true); + setting_useCents->setChecked(true); connect(setting_useCents, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_useCents->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_useCents); + + QHBoxLayout* scaleActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* scaleActionTitle = new QLabel(tr("Scale range"), &m_popup_menu); + scaleActionLayout->addWidget(scaleActionTitle); - m_popup_menu.insertItem(new Title(tr("Scale range"), &m_popup_menu)); - setting_spinScale = new QSpinBox(5, 50, 1, &m_popup_menu); + setting_spinScale = new QSpinBox(&m_popup_menu); + setting_spinScale->setMinimum(5); + setting_spinScale->setMaximum(50); + setting_spinScale->setSingleStep(1); setting_spinScale->setValue(50); - QToolTip::add(setting_spinScale, tr("Scale range (in cents)")); + setting_spinScale->setToolTip(tr("Scale range (in cents)")); connect(setting_spinScale, SIGNAL(valueChanged(int)), this, SLOT(update())); - m_popup_menu.insertItem(setting_spinScale); + scaleActionLayout->addWidget(setting_spinScale); + + QWidget* scaleActionWidget = new QWidget(&m_popup_menu); + scaleActionWidget->setLayout(scaleActionLayout); + + QWidgetAction* scaleAction = new QWidgetAction(&m_popup_menu); + scaleAction->setDefaultWidget(scaleActionWidget); + m_popup_menu.addAction(scaleAction); } void GLErrorHistory::save() { - s_settings->writeEntry("keep", setting_keep->isOn()); -// s_settings->writeEntry("notesNames", int(Music::GetNotesName())); - s_settings->writeEntry("useCents", setting_useCents->isOn()); - s_settings->writeEntry("spinScale", setting_spinScale->value()); + s_settings->setValue("keep", setting_keep->isChecked()); + s_settings->setValue("useCents", setting_useCents->isChecked()); + s_settings->setValue("spinScale", setting_spinScale->value()); } void GLErrorHistory::load() { - setting_keep->setOn(s_settings->readBoolEntry("keep", setting_keep->isOn())); -// selectNotesNames(s_settings->readNumEntry("notesNames", int(Music::GetNotesName()))); - setting_useCents->setOn(s_settings->readBoolEntry("useCents", setting_useCents->isOn())); - setting_spinScale->setValue(s_settings->readNumEntry("spinScale", setting_spinScale->value())); + setting_keep->setChecked(s_settings->value("keep", setting_keep->isChecked()).toBool()); + setting_useCents->setChecked(s_settings->value("useCents", setting_useCents->isChecked()).toBool()); + setting_spinScale->setValue(s_settings->value("spinScale", setting_spinScale->value()).toInt()); } void GLErrorHistory::clearSettings() { -// cerr << "GLErrorHistory::clearSettings" << endl; - s_settings->removeEntry("keep"); - s_settings->removeEntry("notesNames"); - s_settings->removeEntry("useCents"); - s_settings->removeEntry("spinScale"); + s_settings->remove("keep"); + s_settings->remove("useCents"); + s_settings->remove("spinScale"); } void GLErrorHistory::addNote(GLErrorHistory::Note note) { m_notes.push_back(note); - if(!setting_keep->isOn()) + if(!setting_keep->isChecked()) while(m_notes.size()>1) m_notes.pop_front(); } @@ -302,16 +303,6 @@ void GLErrorHistory::keepPreviousNotes(bool keep) m_notes.pop_front(); } -void GLErrorHistory::selectNotesNames(int id) -{ - for(int i=0; icount()); i++) - ui_notesNameMenu->setItemChecked(ui_notesNameMenu->idAt(i), id==ui_notesNameMenu->idAt(i)); - - Music::SetNotesName((Music::NotesName)id); - - updateGL(); -} - void GLErrorHistory::initializeGL() { // Set the clear color to black @@ -352,8 +343,9 @@ void GLErrorHistory::drawTextTickCent(int r, int dy) if(i>=0) txt = QString(" ")+txt; if(i==0) txt = QString(" ")+txt; glRasterPos2i(2, int(height()*i/100.0f*scale) + height()/2 - dy); - for(size_t i=0; iisOn()) + if(setting_useCents->isChecked()) { glBegin(GL_LINES); float gray = 0.87; @@ -420,7 +412,7 @@ void GLErrorHistory::paintGL() // text marks float gray = 0.5; glColor3f(gray, gray, gray); - if(setting_useCents->isOn()) + if(setting_useCents->isChecked()) { int grad = 10; if(setting_spinScale->value() <= 25) grad=5; @@ -430,25 +422,25 @@ void GLErrorHistory::paintGL() else { string sfraq, sufraq; - sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*2).latin1(); + sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*2).toStdString(); sfraq = string("+")+sufraq; glRasterPos2i(2, 3*height()/4-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); sfraq = string("-")+sufraq; glRasterPos2i(2, height()/4-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); - sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*4).latin1(); + sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*4).toStdString(); sfraq = string("+")+sufraq; glRasterPos2i(2, 5*height()/8-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); sfraq = string("-")+sufraq; glRasterPos2i(2, 3*height()/8-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); } // errors @@ -478,18 +470,18 @@ void GLErrorHistory::paintGL() } // the note name - string str = m_notes[i].getName(); + string str = m_notes[i].getName().toStdString(); glColor3f(0.0,0.0,1.0); glRasterPos2f(x+2, 2); for(size_t c=0; cisOn()) + if(setting_useCents->isChecked()) { float scale = 50.0f/setting_spinScale->value(); glVertex2f(x, int(scale*m_notes[i].errors[0]*height()) + height()/2); diff --git a/src/modules/GLErrorHistory.h b/src/modules/GLErrorHistory.h index dc97e72..e22a580 100644 --- a/src/modules/GLErrorHistory.h +++ b/src/modules/GLErrorHistory.h @@ -66,7 +66,6 @@ class GLErrorHistory : public QGLWidget, public View QAction* setting_keep; QAction* setting_useCents; QSpinBox* setting_spinScale; - QPopupMenu* ui_notesNameMenu; virtual void save(); virtual void load(); virtual void clearSettings(); @@ -76,7 +75,6 @@ class GLErrorHistory : public QGLWidget, public View void paintGL(); void resizeGL( int w, int h ); void keepPreviousNotes(bool keep); - void selectNotesNames(int id); }; #endif // _GLErrorHistory_h_ diff --git a/src/modules/GLFT.cpp b/src/modules/GLFT.cpp index bbde0d6..42071f7 100644 --- a/src/modules/GLFT.cpp +++ b/src/modules/GLFT.cpp @@ -16,6 +16,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// TODO zoom with a rectangle + #include "GLFT.h" static const unsigned char g_icon_FT[] = { @@ -168,6 +170,9 @@ static const unsigned char g_icon_FT[] = { using namespace std; #include #include +#include +#include +#include #include #include #include @@ -176,80 +181,122 @@ using namespace Music; using namespace Math; GLFT::GLFT(QWidget* parent) -: QGLWidget(parent, "GLFT") -, View("Fourier Transform", this) +: QGLWidget(parent) +, View(tr("Fourier Transform"), this) , m_components_max(1.0) { m_start_move_mouse = true; - m_x = 0; - m_y = 0; - m_z = 0.0; - m_zp_factor = 4; // actually, actuellement, not zero-padding but win-size-factor + m_os = 2; // over sampling factor // settings - QImage img; + QPixmap img; img.loadFromData(g_icon_FT, sizeof(g_icon_FT), "PNG"); - setting_show->setIconSet(QIconSet(QImage(img))); - setting_show->setOn(false); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(false); hide(); - setting_autoScale = new QAction(this); - setting_autoScale->setMenuText(tr("Auto scale")); - setting_autoScale->setToggleAction(true); - connect(setting_autoScale, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_autoScale->setOn(true); - setting_autoScale->addTo(&m_popup_menu); - - setting_db_scale = new QAction(this); - setting_db_scale->setMenuText(tr("dB scale")); - setting_db_scale->setToggleAction(true); - connect(setting_db_scale, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_db_scale->setOn(true); - setting_db_scale->addTo(&m_popup_menu); - - m_popup_menu.insertItem(new Title(tr("Size"), &m_popup_menu)); - setting_spinNumComponents = new QSpinBox(1, 65536, 1, &m_popup_menu); - setting_spinNumComponents->setValue(8192); - m_components.resize(setting_spinNumComponents->value()); - QToolTip::add(setting_spinNumComponents, tr("Size")); - connect(setting_spinNumComponents, SIGNAL(valueChanged(int)), this, SLOT(spinNumComponentsChanged(int))); - m_popup_menu.insertItem(setting_spinNumComponents); - m_popup_menu.insertItem(new Title(tr("- Press left mouse button and move mouse to zoom"), &m_popup_menu)); - m_popup_menu.insertItem(new Title(tr("- Press SHIFT key, left mouse button and move mouse to move view"), &m_popup_menu)); - m_popup_menu.insertItem(new Title(tr("- Double-click to reset view"), &m_popup_menu)); - - m_plan.resize(setting_spinNumComponents->value()); - m_components.resize(m_plan.size()/2, 0.0); - win = hann(m_plan.size()); + setting_db_scale = new QAction(tr("dB scale"), this); + setting_db_scale->setCheckable(true); + connect(setting_db_scale, SIGNAL(toggled(bool)), this, SLOT(dBScaleChanged(bool))); + setting_db_scale->setChecked(true); + m_popup_menu.addAction(setting_db_scale); + resetaxis(); + + QHBoxLayout* sizeActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* sizeActionTitle = new QLabel(tr("Size"), &m_popup_menu); + sizeActionLayout->addWidget(sizeActionTitle); + + setting_winlen = new QSpinBox(&m_popup_menu); + setting_winlen->setObjectName("setting_winlen"); + setting_winlen->setMinimum(1); + setting_winlen->setMaximum(1000); + setting_winlen->setSingleStep(1); + setting_winlen->setValue(20); + setting_winlen->setSuffix(" ms"); + setting_winlen->setToolTip(tr("window length")); + connect(setting_winlen, SIGNAL(valueChanged(int)), this, SLOT(spinWinLengthChanged(int))); + sizeActionLayout->addWidget(setting_winlen); + + QWidget* sizeActionWidget = new QWidget(&m_popup_menu); + sizeActionWidget->setLayout(sizeActionLayout); + + QWidgetAction* sizeAction = new QWidgetAction(&m_popup_menu); + sizeAction->setDefaultWidget(sizeActionWidget); + m_popup_menu.addAction(sizeAction); + + QWidgetAction* helpCaption01 = new QWidgetAction(&m_popup_menu); + helpCaption01->setDefaultWidget(new Title(tr("- Press left mouse button to move the view"), &m_popup_menu)); + m_popup_menu.addAction(helpCaption01); + QWidgetAction* helpCaption02 = new QWidgetAction(&m_popup_menu); + helpCaption02->setDefaultWidget(new Title(tr("- Press SHIFT key and left mouse button to zoom in and out"), &m_popup_menu)); + m_popup_menu.addAction(helpCaption02); + QWidgetAction* helpCaption03 = new QWidgetAction(&m_popup_menu); + helpCaption03->setDefaultWidget(new Title(tr("- Double-click to reset the view"), &m_popup_menu)); + m_popup_menu.addAction(helpCaption03); + + s_settings->add(setting_winlen); + + spinWinLengthChanged(setting_winlen->value()); } -void GLFT::save() +void GLFT::refreshGraph() { - s_settings->writeEntry("spinNumComponents", setting_spinNumComponents->value()); + while(int(buff.size())>m_plan.size()) + buff.pop_back(); } -void GLFT::load() + +void GLFT::setSamplingRate(int sr) { - setting_spinNumComponents->setValue(s_settings->readNumEntry("spinNumComponents", setting_spinNumComponents->value())); + m_maxf=sr/2; } -void GLFT::clearSettings() + +void GLFT::resetaxis() { - s_settings->removeEntry("spinNumComponents"); -} + m_minf=0; + m_maxf=Music::GetSamplingRate()/2; // sr is surely -1 because not yet defined -void GLFT::refreshGraph() + if(setting_db_scale->isChecked()) + { + m_minA = -50; // [dB] + m_maxA = 100; // [dB] + } + else + { + m_maxA = 1; // [amplitude] + } +} +void GLFT::dBScaleChanged(bool db) { - while(int(buff.size())>m_plan.size()) - buff.pop_back(); + resetaxis(); + update(); } -void GLFT::spinNumComponentsChanged(int num) +void GLFT::spinWinLengthChanged(int num) { - m_plan.resize(int(m_zp_factor*num)); - m_components.resize(m_plan.size()/2); - win = hann(num); - - cerr << "GLFT: INFO: window size=" << win.size() << " FFT size=" << m_plan.size() << endl; + if(Music::GetSamplingRate()>0) + { + // Create window + int winlen = int(num/1000.0*Music::GetSamplingRate()); + win = hann(winlen); + double win_sum = 0.0; + // normalize the window in energy + for(size_t i=0; ix() - old_x; int dy = e->y() - old_y; - if(Qt::LeftButton & e->state()) + if(Qt::LeftButton & e->buttons()) { - if(Qt::ShiftButton & e->state()) + if(Qt::ShiftModifier & e->modifiers()) { - m_x += dx; - m_y -= dy; + double f = (m_maxf-m_minf)*double(m_press_x)/width()+m_minf; + double zx = double(m_press_x-e->x())/width(); + zx = pow(8, zx); + m_minf = f - zx*(f-m_press_minf); + m_maxf = f + zx*(m_press_maxf-f); } else { - m_z += dx/100.0; - if(m_z<0.0) m_z = 0.0; + m_minf -= (m_maxf-m_minf)*dx/width(); + m_maxf -= (m_maxf-m_minf)*dx/width(); + + if(setting_db_scale->isChecked()) + { + m_minA += (m_maxA-m_minA)*dy/height(); + m_maxA += (m_maxA-m_minA)*dy/height(); + } + else + m_maxA -= m_maxA*double(dy)/height(); } updateGL(); @@ -316,19 +378,22 @@ void GLFT::paintGL() { glClear(GL_COLOR_BUFFER_BIT); - if(int(buff.size())>=m_plan.size()) + if(win.size()>0 && int(buff.size())>=m_plan.size()) { + // Use last samples while(int(buff.size())>m_plan.size()) buff.pop_back(); + int sr = Music::GetSamplingRate(); + +// cout << m_plan.size() << endl; + // name - string str = tr("Fourier Transform"); + string str = tr("Fourier Transform").toStdString(); glColor3f(0.75,0.75,0.75); glRasterPos2i(2, height()-20); for(size_t i = 0; i < str.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str[i]); - - int scale_height = 0; + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, (unsigned char)str[i]); for(int i=0; iisOn()) - m_components[i] = 100+20*log10(m_components[i]); - m_components_max = max(m_components_max, m_components[i]); - } - -// cerr << m_components_max << endl; - - double scale_factor = 1.0; - if(setting_autoScale->isOn() && m_components_max>0.0) - scale_factor = 1.0/m_components_max; -// cerr << scale_factor << endl; - - // bars - glBegin(GL_QUADS); - float step = float(width())/m_components.size() + m_z; - int space = (step>2)?1:0; - for(size_t i=0; isetIconSet(QIconSet(QImage(img))); - setting_show->setOn(false); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(false); hide(); - m_popup_menu.insertItem(new Title(tr("Number of harmonics"), &m_popup_menu)); - setting_spinNumComponents = new QSpinBox(1, 128, 1, &m_popup_menu); - setting_spinNumComponents->setValue(16); + QHBoxLayout* numComponentsActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* numComponentsActionTitle = new QLabel(tr("Number of harmonics"), &m_popup_menu); + numComponentsActionLayout->addWidget(numComponentsActionTitle); + + setting_spinNumComponents = new QSpinBox(&m_popup_menu); + setting_spinNumComponents->setMinimum(1); + setting_spinNumComponents->setMaximum(128); + setting_spinNumComponents->setSingleStep(1); + setting_spinNumComponents->setValue(16); m_components.resize(setting_spinNumComponents->value()); - QToolTip::add(setting_spinNumComponents, tr("Number of harmonics")); + setting_spinNumComponents->setToolTip(tr("Number of harmonics")); connect(setting_spinNumComponents, SIGNAL(valueChanged(int)), this, SLOT(spinNumComponentsChanged(int))); - m_popup_menu.insertItem(setting_spinNumComponents); + numComponentsActionLayout->addWidget(setting_spinNumComponents); + + QWidget* numComponentsActionWidget = new QWidget(&m_popup_menu); + numComponentsActionWidget->setLayout(numComponentsActionLayout); + + QWidgetAction* numComponentsAction = new QWidgetAction(&m_popup_menu); + numComponentsAction->setDefaultWidget(numComponentsActionWidget); + m_popup_menu.addAction(numComponentsAction); for(size_t i=0; iwriteEntry("spinNumComponents", setting_spinNumComponents->value()); + s_settings->setValue("spinNumComponents", setting_spinNumComponents->value()); } void GLFreqStruct::load() { - setting_spinNumComponents->setValue(s_settings->readNumEntry("spinNumComponents", setting_spinNumComponents->value())); + setting_spinNumComponents->setValue(s_settings->value("spinNumComponents", setting_spinNumComponents->value()).toInt()); } void GLFreqStruct::clearSettings() { - s_settings->removeEntry("spinNumComponents"); + s_settings->remove("spinNumComponents"); } void GLFreqStruct::spinNumComponentsChanged(int num) @@ -235,11 +251,11 @@ void GLFreqStruct::paintGL() glClear(GL_COLOR_BUFFER_BIT); // name - string str = tr("Harmonics"); + string str = tr("Harmonics").toStdString(); glColor3f(0.75,0.75,0.75); glRasterPos2i(2, height()-20); for(size_t i = 0; i < str.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, (unsigned char)str[i]); int scale_height = 12; @@ -273,10 +289,10 @@ void GLFreqStruct::paintGL() glRasterPos2i(int((i+0.5)*step)-3, 2); // string str = StringAddons::toString(i+1); - string str = QString::number(i+1); + string str = QString::number(i+1).toStdString(); for(size_t i = 0; i < str.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_10, str[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_10, (unsigned char)str[i]); } glFlush(); diff --git a/src/modules/GLGraph.cpp b/src/modules/GLGraph.cpp index e3e5086..8f48367 100644 --- a/src/modules/GLGraph.cpp +++ b/src/modules/GLGraph.cpp @@ -195,81 +195,123 @@ static const unsigned char g_icon_graph[] = { using namespace std; #include #include +#include +#include #include #include using namespace Music; -GLGraph::GLGraph(const QString& name, QWidget* parent) -: QGLWidget(parent, "GLGraph") -, View(name, this) +GLGraph::GLGraph(QWidget* parent) +: QGLWidget(parent) +, View(tr("Captured Sound"), this) , m_skip(1) , m_new_values(false) { // settings - QImage img; + QPixmap img; img.loadFromData(g_icon_graph, sizeof(g_icon_graph), "PNG"); - setting_show->setIconSet(QIconSet(QImage(img))); - setting_show->setOn(true); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(true); - setting_showWaveForm = new QAction(this); - setting_showWaveForm->setMenuText(tr("Show Wave Form")); - setting_showWaveForm->setToggleAction(true); + setting_showWaveForm = new QAction(tr("Show Wave Form"), this); + setting_showWaveForm->setCheckable(true); connect(setting_showWaveForm, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_showWaveForm->setOn(true); - setting_showWaveForm->addTo(&m_popup_menu); + setting_showWaveForm->setChecked(true); + m_popup_menu.addAction(setting_showWaveForm); - setting_autoScale = new QAction(this); - setting_autoScale->setMenuText(tr("Auto scale")); - setting_autoScale->setToggleAction(true); + setting_autoScale = new QAction(tr("Auto scale"), this); + setting_autoScale->setCheckable(true); connect(setting_autoScale, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_autoScale->setOn(false); - setting_autoScale->addTo(&m_popup_menu); + setting_autoScale->setChecked(false); + m_popup_menu.addAction(setting_autoScale); - m_popup_menu.insertItem(new Title(tr("Scale factor"), &m_popup_menu)); - setting_spinScaleFactor = new QSpinBox(1, 1000, 10, &m_popup_menu); - QToolTip::add(setting_spinScaleFactor, tr("Scale factor")); + QHBoxLayout* scaleFactorActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* scaleFactorActionTitle = new QLabel(tr("Scale factor"), &m_popup_menu); + scaleFactorActionLayout->addWidget(scaleFactorActionTitle); + + setting_spinScaleFactor = new QSpinBox(&m_popup_menu); + setting_spinScaleFactor->setMinimum(1); + setting_spinScaleFactor->setMaximum(1000); + setting_spinScaleFactor->setSingleStep(10); + setting_spinScaleFactor->setToolTip(tr("Scale factor")); setting_spinScaleFactor->setValue(1000); connect(setting_spinScaleFactor, SIGNAL(valueChanged(int)), this, SLOT(update())); - m_popup_menu.insertItem(setting_spinScaleFactor); + scaleFactorActionLayout->addWidget(setting_spinScaleFactor); + + QWidget* scaleFactorActionWidget = new QWidget(&m_popup_menu); + scaleFactorActionWidget->setLayout(scaleFactorActionLayout); + + QWidgetAction* scaleFactorAction = new QWidgetAction(&m_popup_menu); + scaleFactorAction->setDefaultWidget(scaleFactorActionWidget); + m_popup_menu.addAction(scaleFactorAction); + + QHBoxLayout* durationActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* durationActionTitle = new QLabel(tr("Duration"), &m_popup_menu); + durationActionLayout->addWidget(durationActionTitle); - m_popup_menu.insertItem(new Title(tr("Duration"), &m_popup_menu)); - setting_spinDuration = new QSpinBox(20, 120000, 100, &m_popup_menu); - QToolTip::add(setting_spinDuration, tr("Duration")); + setting_spinDuration = new QSpinBox(&m_popup_menu); + setting_spinDuration->setMinimum(20); + setting_spinDuration->setMaximum(120000); + setting_spinDuration->setSingleStep(100); + setting_spinDuration->setToolTip(tr("Duration")); setting_spinDuration->setValue(10000); connect(setting_spinDuration, SIGNAL(valueChanged(int)), this, SLOT(update())); - m_popup_menu.insertItem(setting_spinDuration); + durationActionLayout->addWidget(setting_spinDuration); - m_popup_menu.insertItem(new Title(tr("Max height"), &m_popup_menu)); - setting_spinMaxHeight = new QSpinBox(10, 100000, 1, &m_popup_menu); - QToolTip::add(setting_spinMaxHeight, tr("Max height")); + QWidget* durationActionWidget = new QWidget(&m_popup_menu); + durationActionWidget->setLayout(durationActionLayout); + + QWidgetAction* durationAction = new QWidgetAction(&m_popup_menu); + durationAction->setDefaultWidget(durationActionWidget); + m_popup_menu.addAction(durationAction); + + QHBoxLayout* maxHeightActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* maxHeightActionTitle = new QLabel(tr("Max height"), &m_popup_menu); + maxHeightActionLayout->addWidget(maxHeightActionTitle); + + setting_spinMaxHeight = new QSpinBox(&m_popup_menu); + setting_spinMaxHeight->setMinimum(10); + setting_spinMaxHeight->setMaximum(100000); + setting_spinMaxHeight->setSingleStep(1); + setting_spinMaxHeight->setToolTip(tr("Max height")); setting_spinMaxHeight->setValue(50); - m_popup_menu.insertItem(setting_spinMaxHeight); + maxHeightActionLayout->addWidget(setting_spinMaxHeight); + + QWidget* maxHeightActionWidget = new QWidget(&m_popup_menu); + maxHeightActionWidget->setLayout(maxHeightActionLayout); + + QWidgetAction* maxHeightAction = new QWidgetAction(&m_popup_menu); + maxHeightAction->setDefaultWidget(maxHeightActionWidget); + m_popup_menu.addAction(maxHeightAction); } void GLGraph::save() { - s_settings->writeEntry("showWaveForm", setting_showWaveForm->isOn()); - s_settings->writeEntry("autoScale", setting_autoScale->isOn()); - s_settings->writeEntry("setting_spinScaleFactor", setting_spinScaleFactor->value()); - s_settings->writeEntry("spinDuration", setting_spinDuration->value()); - s_settings->writeEntry("spinMaxHeight", setting_spinMaxHeight->value()); + s_settings->setValue("showWaveForm", setting_showWaveForm->isChecked()); + s_settings->setValue("autoScale", setting_autoScale->isChecked()); + s_settings->setValue("setting_spinScaleFactor", setting_spinScaleFactor->value()); + s_settings->setValue("spinDuration", setting_spinDuration->value()); + s_settings->setValue("spinMaxHeight", setting_spinMaxHeight->value()); } void GLGraph::load() { - setting_showWaveForm->setOn(s_settings->readBoolEntry("showWaveForm", setting_showWaveForm->isOn())); - setting_autoScale->setOn(s_settings->readBoolEntry("autoScale", setting_autoScale->isOn())); - setting_spinScaleFactor->setValue(s_settings->readNumEntry("setting_spinScaleFactor", setting_spinScaleFactor->value())); - setting_spinDuration->setValue(s_settings->readNumEntry("spinDuration", setting_spinDuration->value())); - setting_spinMaxHeight->setValue(s_settings->readNumEntry("spinMaxHeight", setting_spinMaxHeight->value())); + setting_showWaveForm->setChecked(s_settings->value("showWaveForm", setting_showWaveForm->isChecked()).toBool()); + setting_autoScale->setChecked(s_settings->value("autoScale", setting_autoScale->isChecked()).toBool()); + setting_spinScaleFactor->setValue(s_settings->value("setting_spinScaleFactor", setting_spinScaleFactor->value()).toInt()); + setting_spinDuration->setValue(s_settings->value("spinDuration", setting_spinDuration->value()).toInt()); + setting_spinMaxHeight->setValue(s_settings->value("spinMaxHeight", setting_spinMaxHeight->value()).toInt()); } void GLGraph::clearSettings() { // cerr << "GLGraph::clearSettings" << endl; - s_settings->removeEntry("showWaveForm"); - s_settings->removeEntry("autoScale"); - s_settings->removeEntry("setting_spinScaleFactor"); - s_settings->removeEntry("spinDuration"); - s_settings->removeEntry("spinMaxHeight"); + s_settings->remove("showWaveForm"); + s_settings->remove("autoScale"); + s_settings->remove("setting_spinScaleFactor"); + s_settings->remove("spinDuration"); + s_settings->remove("spinMaxHeight"); } void GLGraph::initializeGL() @@ -391,13 +433,13 @@ void GLGraph::base_paint(float graph_gray) int width = QGLWidget::width(); // name - string str = tr("Captured Sound"); + string str = tr("Captured Sound").toStdString(); glColor3f(0.75,0.75,0.75); glRasterPos2i(2, height()-14); for(size_t i = 0; i < str.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)str[i]); - if(setting_showWaveForm->isOn() && !m_queue.empty()) + if(setting_showWaveForm->isChecked() && !m_queue.empty()) { // horiz line glBegin(GL_LINES); @@ -409,7 +451,7 @@ void GLGraph::base_paint(float graph_gray) m_queue_amplitude = 0.0; double scale_factor; - if(setting_autoScale->isOn()) + if(setting_autoScale->isChecked()) { if(m_skip<2) for(size_t i=0; i #include #include +#include +#include GLSample::GLSample(QWidget* parent) -: QGLWidget(parent, "GLSample") -, View("Wave form", this) +: QGLWidget(parent) +, View(tr("Wave form"), this) , m_max_value(1.0) { // settings - QImage img; + QPixmap img; img.loadFromData(g_icon_sample, sizeof(g_icon_sample), "PNG"); - setting_show->setIconSet(QIconSet(QImage(img))); - setting_show->setOn(false); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(false); hide(); - setting_hasFading = new QAction(this); - setting_hasFading->setMenuText(tr("Show fading")); - setting_hasFading->setToggleAction(true); + setting_hasFading = new QAction(tr("Show fading"), this); + setting_hasFading->setCheckable(true); connect(setting_hasFading, SIGNAL(toggled(bool)), this, SLOT(updateGL())); - setting_hasFading->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_hasFading); - m_popup_menu.insertItem(new Title(tr("Number of fading"), &m_popup_menu)); - setting_spinNumFading = new QSpinBox(1, 10000, 1, &m_popup_menu); + QHBoxLayout* numFadingActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* numFadingActionTitle = new QLabel(tr("Number of fading"), &m_popup_menu); + numFadingActionLayout->addWidget(numFadingActionTitle); + + setting_spinNumFading = new QSpinBox(&m_popup_menu); + setting_spinNumFading->setMinimum(1); + setting_spinNumFading->setMaximum(10000); + setting_spinNumFading->setSingleStep(1); setting_spinNumFading->setValue(20); - QToolTip::add(setting_spinNumFading, tr("Number of fading")); + setting_spinNumFading->setToolTip(tr("Number of fading")); connect(setting_spinNumFading, SIGNAL(valueChanged(int)), this, SLOT(updateGL())); - m_popup_menu.insertItem(setting_spinNumFading); + numFadingActionLayout->addWidget(setting_spinNumFading); + + QWidget* numFadingActionWidget = new QWidget(&m_popup_menu); + numFadingActionWidget->setLayout(numFadingActionLayout); + + QWidgetAction* numFadingAction = new QWidgetAction(&m_popup_menu); + numFadingAction->setDefaultWidget(numFadingActionWidget); + m_popup_menu.addAction(numFadingAction); } void GLSample::save() { - s_settings->writeEntry("hasFading", setting_hasFading->isOn()); - s_settings->writeEntry("spinNumFading", setting_spinNumFading->value()); + s_settings->setValue("hasFading", setting_hasFading->isChecked()); + s_settings->setValue("spinNumFading", setting_spinNumFading->value()); } void GLSample::load() { - setting_hasFading->setOn(s_settings->readBoolEntry("hasFading", setting_hasFading->isOn())); - setting_spinNumFading->setValue(s_settings->readNumEntry("spinNumFading", setting_spinNumFading->value())); + setting_hasFading->setChecked(s_settings->value("hasFading", setting_hasFading->isChecked()).toBool()); + setting_spinNumFading->setValue(s_settings->value("spinNumFading", setting_spinNumFading->value()).toInt()); } void GLSample::clearSettings() { - s_settings->removeEntry("hasFading"); - s_settings->removeEntry("spinNumFading"); + s_settings->remove("hasFading"); + s_settings->remove("spinNumFading"); } GLSample::Sample::Sample(double t, const deque& d) @@ -217,7 +232,7 @@ void GLSample::add(double time, const deque& data) { m_samples.push_front(Sample(time, data)); - if(setting_hasFading->isOn()) + if(setting_hasFading->isChecked()) while(!m_samples.empty() && int(m_samples.size())>setting_spinNumFading->value()) m_samples.pop_back(); else @@ -241,11 +256,11 @@ void GLSample::paintGL() glClear(GL_COLOR_BUFFER_BIT); // name - string str = tr("Wave form"); + string str = tr("Wave form").toStdString(); glColor3f(0.75,0.75,0.75); glRasterPos2i(2, height()-20); for(size_t i = 0; i < str.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, (unsigned char)str[i]); // horiz lines glBegin(GL_LINES); @@ -264,7 +279,7 @@ void GLSample::paintGL() for(int j=m_samples.size()-1; j>=0; j--) { m_max_value = max(m_max_value, abs(m_samples[j].max_value)); - if(!setting_hasFading->isOn()) j=-1; + if(!setting_hasFading->isChecked()) j=-1; } for(int j=m_samples.size()-1; j>=0; j--) @@ -282,7 +297,7 @@ void GLSample::paintGL() glEnd(); } - if(!setting_hasFading->isOn()) j=-1; + if(!setting_hasFading->isChecked()) j=-1; } } diff --git a/src/modules/GLSample.h b/src/modules/GLSample.h index 497816e..7696e84 100644 --- a/src/modules/GLSample.h +++ b/src/modules/GLSample.h @@ -6,12 +6,12 @@ // 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. -// +// // "fmit" 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 diff --git a/src/modules/GLStatistics.cpp b/src/modules/GLStatistics.cpp index 52df0b7..f468d11 100644 --- a/src/modules/GLStatistics.cpp +++ b/src/modules/GLStatistics.cpp @@ -178,6 +178,8 @@ using namespace std; #include #include #include +#include +#include #include void GLStatistics::AverageNote::init() @@ -209,7 +211,7 @@ GLStatistics::AverageNote::AverageNote(int h, float cents) } QString GLStatistics::AverageNote::getName() const { - return Music::h2n(ht)+factor; + return QString::fromStdString(Music::h2n(ht))+factor; } void GLStatistics::AverageNote::addErr(float err) { @@ -229,22 +231,35 @@ void GLStatistics::AverageNote::addErr(float err) } if(errs.size()>1) { - err_std /= errs.size()-1; // unbiased estimation of the variance + err_std /= errs.size()-1; // unbiased estimation of the variance err_std = sqrt(err_std); } } void GLStatistics::addNote(int ht, float err) { - if(isHidden() && !setting_keep_hidden->isOn()) + m_current_ht = ht; + + if(isHidden() && !setting_keep_hidden->isChecked()) return; - if(htminValue() || ht>setting_scale_max->maxValue()) + if(htminimum() || ht>setting_scale_max->maximum()) return; // cerr << "ht=" << ht << endl; - if(setting_scale_auto->isOn()) + if(!setting_scale_auto->isChecked()) + { + resizeScale(); + + // drop ht outside of scale + if(htvalue() || ht>setting_scale_max->value()) + return; + + // add note + m_avg_notes[ht-setting_scale_min->value()].addErr(err); + } + else { if(m_avg_notes.empty()) { @@ -291,118 +306,209 @@ void GLStatistics::addNote(int ht, float err) } void GLStatistics::addNote(int ht, int num, int den, float err) { + m_current_ht = ht; } void GLStatistics::addNote(int ht, float cents, float err) { + m_current_ht = ht; +} + +void GLStatistics::resizeScale() +{ + if(setting_scale_auto->isChecked() || setting_scale_max->value()-setting_scale_min->value()+1<1) + return; + + if(m_avg_notes.size()==0 || m_avg_notes[0].ht!=setting_scale_min->value() || m_avg_notes[m_avg_notes.size()-1].ht!=setting_scale_max->value()) + { + vector avg_notes(setting_scale_max->value()-setting_scale_min->value()+1); + for(int i=0; ivalue(); + if(in>=0 && invalue()+i; + m_avg_notes = avg_notes; + } } GLStatistics::GLStatistics(QWidget* parent) -: QGLWidget(parent, "GLStatistics") -, View("Statistics", this) +: QGLWidget(parent) +, View(tr("Statistics"), this) { // settings - QImage img; + QPixmap img; img.loadFromData(g_icon_statistics, sizeof(g_icon_statistics), "PNG"); - setting_show->setIconSet(QIconSet(QImage(img))); - setting_show->setOn(false); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(false); hide(); - setting_reset = new QAction(this); - setting_reset->setMenuText(tr("Reset statistics")); + setting_reset = new QAction(tr("Reset statistics"), this); + setting_reset->setShortcut('r'); connect(setting_reset, SIGNAL(activated()), this, SLOT(reset())); - setting_reset->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_reset); - setting_keep_hidden = new QAction(this); - setting_keep_hidden->setMenuText(tr("Keep notes when hidden")); - setting_keep_hidden->setToggleAction(true); - setting_keep_hidden->setOn(false); + setting_keep_hidden = new QAction(tr("Keep notes when hidden"), this); + setting_keep_hidden->setCheckable(true); + setting_keep_hidden->setChecked(false); connect(setting_keep_hidden, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_keep_hidden->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_keep_hidden); + + QHBoxLayout* keepActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* keepActionTitle = new QLabel(tr("Keep n values"), &m_popup_menu); + keepActionLayout->addWidget(keepActionTitle); - setting_show_std = new QAction(this); - setting_show_std->setMenuText(tr("Show standard deviation")); - setting_show_std->setToggleAction(true); - setting_show_std->setOn(true); - setting_show_std->setEnabled(true); + setting_keep_n_values = new QSpinBox(&m_popup_menu); + setting_keep_n_values->setObjectName("setting_keep_n_values"); + setting_keep_n_values->setMinimum(1); + setting_keep_n_values->setMaximum(500); + setting_keep_n_values->setSingleStep(3); + setting_keep_n_values->setValue(100); + setting_keep_n_values->setToolTip(tr("Keep this number of values in the computation of the statistics")); + connect(setting_keep_n_values, SIGNAL(valueChanged(int)), this, SLOT(update())); + keepActionLayout->addWidget(setting_keep_n_values); + + QWidget* keepActionWidget = new QWidget(&m_popup_menu); + keepActionWidget->setLayout(keepActionLayout); + + QWidgetAction* keepAction = new QWidgetAction(&m_popup_menu); + keepAction->setDefaultWidget(keepActionWidget); + m_popup_menu.addAction(keepAction); + + setting_keep_n_values->setEnabled(false); + s_settings->add(setting_keep_n_values); + + setting_show_std = new QAction(tr("Show standard deviation"), this); + setting_show_std->setCheckable(true); + setting_show_std->setChecked(true); connect(setting_show_std, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_show_std->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_show_std); - setting_scale_auto = new QAction(this); - setting_scale_auto->setMenuText(tr("Scale auto")); - setting_scale_auto->setToggleAction(true); - setting_scale_auto->setOn(true); + setting_scale_auto = new QAction(tr("Scale auto"), this); + setting_scale_auto->setCheckable(true); + setting_scale_auto->setChecked(true); setting_scale_auto->setEnabled(false); connect(setting_scale_auto, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_scale_auto->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_scale_auto); + + QHBoxLayout* scaleMinActionLayout = new QHBoxLayout(&m_popup_menu); - m_popup_menu.insertItem(new Title(tr("Scale min"), &m_popup_menu)); - setting_scale_min = new QSpinBox(-96, 96, 1, &m_popup_menu); - setting_scale_min->setValue(0); - QToolTip::add(setting_scale_min, tr("Scale min value (in semi-tones)")); + QLabel* scaleMinActionTitle = new QLabel(tr("Scale min"), &m_popup_menu); + scaleMinActionLayout->addWidget(scaleMinActionTitle); + + setting_scale_min = new QSpinBox(&m_popup_menu); + setting_scale_min->setObjectName("setting_scale_min"); + setting_scale_min->setMinimum(-96); + setting_scale_min->setMaximum(96); + setting_scale_min->setSingleStep(6); + setting_scale_min->setValue(-12); + setting_scale_min->setToolTip(tr("Scale min value (in semi-tones)")); connect(setting_scale_min, SIGNAL(valueChanged(int)), this, SLOT(update())); - m_popup_menu.insertItem(setting_scale_min); - setting_scale_min->setEnabled(false); + scaleMinActionLayout->addWidget(setting_scale_min); + + QWidget* scaleMinActionWidget = new QWidget(&m_popup_menu); + scaleMinActionWidget->setLayout(scaleMinActionLayout); - m_popup_menu.insertItem(new Title(tr("Scale max"), &m_popup_menu)); - setting_scale_max = new QSpinBox(-96, 96, 1, &m_popup_menu); - setting_scale_max->setValue(0); - QToolTip::add(setting_scale_max, tr("Scale max value (in semi-tones)")); + QWidgetAction* scaleMinAction = new QWidgetAction(&m_popup_menu); + scaleMinAction->setDefaultWidget(scaleMinActionWidget); + m_popup_menu.addAction(scaleMinAction); + + setting_scale_min->setEnabled(false); + s_settings->add(setting_scale_min); + connect(setting_scale_auto, SIGNAL(toggled(bool)), setting_scale_min, SLOT(setDisabled(bool))); + connect(setting_scale_min, SIGNAL(valueChanged(int)), this, SLOT(resizeScale())); + + QHBoxLayout* scaleMaxActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* scaleMaxActionTitle = new QLabel(tr("Scale max"), &m_popup_menu); + scaleMaxActionLayout->addWidget(scaleMaxActionTitle); + + setting_scale_max = new QSpinBox(&m_popup_menu); + setting_scale_max->setObjectName("setting_scale_max"); + setting_scale_max->setMinimum(-96); + setting_scale_max->setMaximum(96); + setting_scale_max->setSingleStep(6); + setting_scale_max->setValue(+12); + setting_scale_max->setToolTip(tr("Scale max value (in semi-tones)")); connect(setting_scale_max, SIGNAL(valueChanged(int)), this, SLOT(update())); - m_popup_menu.insertItem(setting_scale_max); + scaleMaxActionLayout->addWidget(setting_scale_max); + + QWidget* scaleMaxActionWidget = new QWidget(&m_popup_menu); + scaleMaxActionWidget->setLayout(scaleMaxActionLayout); + + QWidgetAction* scaleMaxAction = new QWidgetAction(&m_popup_menu); + scaleMaxAction->setDefaultWidget(scaleMaxActionWidget); + m_popup_menu.addAction(scaleMaxAction); + setting_scale_max->setEnabled(false); + s_settings->add(setting_scale_max); + connect(setting_scale_auto, SIGNAL(toggled(bool)), setting_scale_max, SLOT(setDisabled(bool))); + connect(setting_scale_max, SIGNAL(valueChanged(int)), this, SLOT(resizeScale())); - setting_showTolerance = new QAction(this); - setting_showTolerance->setMenuText(tr("Show tolerance")); - setting_showTolerance->setToggleAction(true); - setting_showTolerance->setOn(true); + setting_showTolerance = new QAction(tr("Show tolerance"), this); + setting_showTolerance->setCheckable(true); + setting_showTolerance->setChecked(true); connect(setting_showTolerance, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_showTolerance->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_showTolerance); - setting_useCents = new QAction(this); - setting_useCents->setMenuText(tr("Use cents")); - setting_useCents->setToggleAction(true); - setting_useCents->setOn(true); + setting_useCents = new QAction(tr("Use cents"), this); + setting_useCents->setCheckable(true); + setting_useCents->setChecked(true); connect(setting_useCents, SIGNAL(toggled(bool)), this, SLOT(update())); - setting_useCents->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_useCents); + + QHBoxLayout* scaleActionLayout = new QHBoxLayout(&m_popup_menu); - m_popup_menu.insertItem(new Title(tr("Scale range"), &m_popup_menu)); - setting_spinScale = new QSpinBox(5, 50, 1, &m_popup_menu); + QLabel* scaleActionTitle = new QLabel(tr("Scale range"), &m_popup_menu); + scaleActionLayout->addWidget(scaleActionTitle); + + setting_spinScale = new QSpinBox(&m_popup_menu); + setting_spinScale->setMinimum(5); + setting_spinScale->setMaximum(50); + setting_spinScale->setSingleStep(1); setting_spinScale->setValue(50); - QToolTip::add(setting_spinScale, tr("Scale range (in cents)")); + setting_spinScale->setToolTip(tr("Scale range (in cents)")); connect(setting_spinScale, SIGNAL(valueChanged(int)), this, SLOT(update())); - m_popup_menu.insertItem(setting_spinScale); + scaleActionLayout->addWidget(setting_spinScale); + + QWidget* scaleActionWidget = new QWidget(&m_popup_menu); + scaleActionWidget->setLayout(scaleActionLayout); + + QWidgetAction* scaleAction = new QWidgetAction(&m_popup_menu); + scaleAction->setDefaultWidget(scaleActionWidget); + m_popup_menu.addAction(scaleAction); } void GLStatistics::save() { - s_settings->writeEntry("setting_keep_hidden", setting_keep_hidden->isOn()); - s_settings->writeEntry("setting_show_std", setting_show_std->isOn()); - s_settings->writeEntry("setting_scale_auto", setting_scale_auto->isOn()); - s_settings->writeEntry("setting_scale_min", setting_scale_min->value()); - s_settings->writeEntry("setting_scale_max", setting_scale_max->value()); + s_settings->setValue("setting_keep_hidden", setting_keep_hidden->isChecked()); + s_settings->setValue("setting_show_std", setting_show_std->isChecked()); + s_settings->setValue("setting_scale_auto", setting_scale_auto->isChecked()); } void GLStatistics::load() { - setting_keep_hidden->setOn(s_settings->readBoolEntry("setting_keep_hidden", setting_keep_hidden->isOn())); - setting_show_std->setOn(s_settings->readBoolEntry("setting_show_std", setting_show_std->isOn())); - setting_scale_auto->setOn(s_settings->readBoolEntry("setting_scale_auto", setting_scale_auto->isOn())); - setting_scale_min->setValue(s_settings->readNumEntry("setting_scale_min", setting_scale_min->value())); - setting_scale_max->setValue(s_settings->readNumEntry("setting_scale_max", setting_scale_max->value())); + setting_keep_hidden->setChecked(s_settings->value("setting_keep_hidden", setting_keep_hidden->isChecked()).toBool()); + setting_show_std->setChecked(s_settings->value("setting_show_std", setting_show_std->isChecked()).toBool()); + setting_scale_auto->setChecked(s_settings->value("setting_scale_auto", setting_scale_auto->isChecked()).toBool()); } void GLStatistics::clearSettings() { - s_settings->removeEntry("setting_keep_hidden"); - s_settings->removeEntry("setting_show_std"); - s_settings->removeEntry("setting_scale_auto"); - s_settings->removeEntry("setting_scale_min"); - s_settings->removeEntry("setting_scale_max"); + s_settings->remove("setting_keep_hidden"); + s_settings->remove("setting_show_std"); + s_settings->remove("setting_scale_auto"); } void GLStatistics::reset() { m_avg_notes.clear(); - setting_scale_min->setValue(0); - setting_scale_max->setValue(0); + if(setting_scale_auto->isChecked()) + { + setting_scale_min->setValue(0); + setting_scale_max->setValue(0); + } + resizeScale(); updateGL(); } @@ -447,8 +553,9 @@ void GLStatistics::drawTextTickCent(int r, int dy) if(i>=0) txt = QString(" ")+txt; if(i==0) txt = QString(" ")+txt; glRasterPos2i(2, int((height()-dy)*i/100.0f*scale) + (height()-dy)/2 + dy - 4); - for(size_t i=0; iisOn()) + if(setting_useCents->isChecked()) scale = 50.0f/setting_spinScale->value(); else scale = int(50/setting_spinScale->value()); // name - QString str = tr("Statistics"); + string str = tr("Statistics").toStdString(); glColor3f(0.75,0.75,0.75); glRasterPos2i(2, height()-20); for(size_t i = 0; i < str.length(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str.latin1()[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, (unsigned char)str[i]); int char_size = 9; int ticks_size = 2+3*char_size; @@ -481,7 +588,7 @@ void GLStatistics::paintGL() int grid_height = height()-legend_height; // draw green rect - if(setting_showTolerance->isOn()) + if(setting_showTolerance->isChecked()) { int green_ytop = int((scale*human_tol+0.5)*grid_height) + legend_height; int green_ybottom = int((-scale*human_tol+0.5)*grid_height) + legend_height; @@ -505,7 +612,7 @@ void GLStatistics::paintGL() } // std - if(setting_show_std->isOn()) + if(setting_show_std->isChecked()) { glBegin(GL_QUADS); glLineWidth(1.0f); @@ -531,7 +638,7 @@ void GLStatistics::paintGL() } // horiz lines - if(setting_useCents->isOn()) + if(setting_useCents->isChecked()) { glBegin(GL_LINES); float gray = 0.87; @@ -581,7 +688,7 @@ void GLStatistics::paintGL() // text marks float gray = 0.5; glColor3f(gray, gray, gray); - if(setting_useCents->isOn()) + if(setting_useCents->isChecked()) { int grad = 10; if(setting_spinScale->value() <= 25) grad=5; @@ -591,25 +698,25 @@ void GLStatistics::paintGL() else { string sfraq, sufraq; - sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*2).latin1(); + sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*2).toStdString(); sfraq = string("+")+sufraq; glRasterPos2i(2, 3*grid_height/4-dy+legend_height); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); sfraq = string("-")+sufraq; glRasterPos2i(2, grid_height/4-dy+legend_height); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); - sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*4).latin1(); + sufraq = string("1/")+QString::number(int(50/setting_spinScale->value())*4).toStdString(); sfraq = string("+")+sufraq; glRasterPos2i(2, 5*grid_height/8-dy+legend_height); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); sfraq = string("-")+sufraq; glRasterPos2i(2, 3*grid_height/8-dy+legend_height); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); } // vertical lines @@ -628,12 +735,12 @@ void GLStatistics::paintGL() glColor3f(0, 0, 1); for(size_t i=0; isetToggleAction(true); + QPixmap img; + setting_show->setCheckable(true); img.loadFromData(g_icon_volume_graph, sizeof(g_icon_volume_graph), "PNG"); - setting_show->setIconSet(QIconSet(QImage(img))); - setting_show->setOn(false); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(false); hide(); m_volume_treshold = -100; - setting_keep = new QAction(this); - setting_keep->setMenuText(tr("Keep previous notes")); - setting_keep->setToggleAction(true); - setting_keep->setOn(false); + setting_keep = new QAction(tr("Keep previous notes"), this); + setting_keep->setCheckable(true); + setting_keep->setChecked(false); connect(setting_keep, SIGNAL(toggled(bool)), this, SLOT(keepPreviousNotes(bool))); -// setting_keep->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_keep); } void GLVolumeHistory::save() { - s_settings->writeEntry("keep", setting_keep->isOn()); + s_settings->setValue("keep", setting_keep->isChecked()); } void GLVolumeHistory::load() { - setting_keep->setOn(s_settings->readBoolEntry("keep", setting_keep->isOn())); + setting_keep->setChecked(s_settings->value("keep", setting_keep->isChecked()).toBool()); } void GLVolumeHistory::clearSettings() { - s_settings->removeEntry("keep"); + s_settings->remove("keep"); } void GLVolumeHistory::addNote(GLVolumeHistory::Note note) { m_notes.push_back(note); - if(!setting_keep->isOn()) + if(!setting_keep->isChecked()) while(m_notes.size()>1) m_notes.pop_front(); } @@ -270,11 +269,11 @@ void GLVolumeHistory::paintGL() glLineWidth(1.0f); // name - QString str = tr("Volume"); + string str = tr("Volume").toStdString(); glColor3f(0.75,0.75,0.75); glRasterPos2i(2, height()-20); for(size_t i = 0; i < str.length(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str.latin1()[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, (unsigned char)str[i]); int s = 2+fontMetrics().width("50%"); @@ -309,19 +308,19 @@ void GLVolumeHistory::paintGL() string sfraq = "-10"; glRasterPos2i(2, height()-10*height()/50-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); sfraq = "-20"; glRasterPos2i(2, height()-20*height()/50-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); sfraq = "-30"; glRasterPos2i(2, height()-30*height()/50-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); sfraq = "-40"; glRasterPos2i(2, height()-40*height()/50-dy); for(size_t i = 0; i < sfraq.size(); i++) - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, sfraq[i]); + glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, (unsigned char)sfraq[i]); glColor3f(1.0,0.5,0.5); glLineWidth(2.0f); @@ -361,7 +360,7 @@ void GLVolumeHistory::paintGL() glColor3f(0.0,0.0,1.0); glRasterPos2f(x+2, 2); for(size_t c=0; c $@ diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in deleted file mode 100644 index 4f7b7d7..0000000 --- a/src/modules/Makefile.in +++ /dev/null @@ -1,472 +0,0 @@ -# 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 = : -subdir = src/modules -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -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)" -libLIBRARIES_INSTALL = $(INSTALL_DATA) -LIBRARIES = $(lib_LIBRARIES) -AR = ar -ARFLAGS = cru -libmodules_a_AR = $(AR) $(ARFLAGS) -libmodules_a_LIBADD = -am_libmodules_a_OBJECTS = View.$(OBJEXT) DialView.$(OBJEXT) \ - GLFreqStruct.$(OBJEXT) GLSample.$(OBJEXT) \ - GLErrorHistory.$(OBJEXT) GLGraph.$(OBJEXT) \ - GLVolumeHistory.$(OBJEXT) MicrotonalView.$(OBJEXT) \ - GLFT.$(OBJEXT) GLStatistics.$(OBJEXT) -nodist_libmodules_a_OBJECTS = DialView_moc.$(OBJEXT) \ - GLFreqStruct_moc.$(OBJEXT) GLFT_moc.$(OBJEXT) \ - GLSample_moc.$(OBJEXT) GLErrorHistory_moc.$(OBJEXT) \ - GLGraph_moc.$(OBJEXT) GLVolumeHistory_moc.$(OBJEXT) \ - MicrotonalView_moc.$(OBJEXT) GLStatistics_moc.$(OBJEXT) -libmodules_a_OBJECTS = $(am_libmodules_a_OBJECTS) \ - $(nodist_libmodules_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -SOURCES = $(libmodules_a_SOURCES) $(nodist_libmodules_a_SOURCES) -DIST_SOURCES = $(libmodules_a_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -lib_LIBRARIES = libmodules.a -libmodules_a_SOURCES = View.cpp DialView.cpp GLFreqStruct.cpp GLSample.cpp GLErrorHistory.cpp GLGraph.cpp GLVolumeHistory.cpp MicrotonalView.cpp GLFT.cpp GLStatistics.cpp -nodist_libmodules_a_SOURCES = DialView_moc.cpp GLFreqStruct_moc.cpp GLFT_moc.cpp GLSample_moc.cpp GLErrorHistory_moc.cpp GLGraph_moc.cpp GLVolumeHistory_moc.cpp MicrotonalView_moc.cpp GLStatistics_moc.cpp -AM_CXXFLAGS = -Wall -I../../libs -EXTRA_DIST = *.h -CLEANFILES = *_moc.cpp *_moc.o -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .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 src/modules/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/modules/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-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - p=$(am__strip_dir) \ - echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ - $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) -libmodules.a: $(libmodules_a_OBJECTS) $(libmodules_a_DEPENDENCIES) - -rm -f libmodules.a - $(libmodules_a_AR) libmodules.a $(libmodules_a_OBJECTS) $(libmodules_a_LIBADD) - $(RANLIB) libmodules.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DialView.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DialView_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLErrorHistory.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLErrorHistory_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLFT.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLFT_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLFreqStruct.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLFreqStruct_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLGraph.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLGraph_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLSample.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLSample_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLStatistics.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLStatistics_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLVolumeHistory.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GLVolumeHistory_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MicrotonalView.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MicrotonalView_moc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/View.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -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 $(LIBRARIES) -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: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -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-libLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-libLIBRARIES - -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 - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLIBRARIES ctags distclean distclean-compile \ - distclean-generic 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-libLIBRARIES install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLIBRARIES - - -%_moc.cpp: %.h - $(QT_MOC) $< > $@ -# 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 --git a/src/modules/MicrotonalView.cpp b/src/modules/MicrotonalView.cpp index 7f4935e..753f670 100644 --- a/src/modules/MicrotonalView.cpp +++ b/src/modules/MicrotonalView.cpp @@ -156,10 +156,16 @@ static const unsigned char g_icon_ji[] = { using namespace std; #include #include +#ifdef QT3_SUPPORT +#include +#else #include +#endif #include #include #include +#include +#include #include using namespace Music; @@ -167,7 +173,7 @@ using namespace Music; void MScale::load_scala(const QString& file_name) { - ifstream file(file_name.latin1()); + ifstream file(file_name.toAscii().constData()); if(!file.is_open()) throw MicrotonalView::tr("Unkown filename: '")+file_name+"'"; @@ -186,7 +192,7 @@ void MScale::load_scala(const QString& file_name) m_name = QString(buff); m_name = m_name.remove("\r"); m_name = m_name.remove("\n"); - m_name = m_name.simplifyWhiteSpace(); + m_name = m_name.simplified(); lines_red++; } else if(lines_red==1) @@ -249,7 +255,7 @@ bool MScale::operator != (const MScale& scale) // ---------------------- QRoot button ------------------------- QRoot::QRoot(MicrotonalView* view, int ht) -: QPushButton(view, "QRoot:"+QString::number(ht)) +: QPushButton(view) , m_ht(ht) { // cerr << "QRoot::QRoot " << m_ht << endl; @@ -259,11 +265,11 @@ QRoot::QRoot(MicrotonalView* view, int ht) connect(this, SIGNAL(clicked()), this, SLOT(clicked2())); connect(this, SIGNAL(rootClicked(int)), view, SLOT(selectRoot(int))); setFlat(true); - setText(h2n(ht, GetNotesName(), GetTonality(), false)); - setToggleButton(true); + setText(QString::fromStdString(h2n(ht, GetNotesName(), GetTonality(), false))); + setCheckable(true); setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); setFixedWidth(35); // TODO - setFocusPolicy(QPushButton::NoFocus); + setFocusPolicy(Qt::NoFocus); } void QRoot::clicked2() { @@ -273,46 +279,63 @@ void QRoot::clicked2() // --------------------------- MicrotonalView ---------------------------- MicrotonalView::MicrotonalView(QWidget* parent) -: QFrame(parent, "MicrotonalView") -, View("Microtonal", this) -, ui_scale_menu(this) +: QFrame(parent) +, View(tr("Microtonal"), this) +, ui_scale_menu(tr("Used scale"), this) { setting_selectedRoot = -1000; m_AFreq = 440.0f; m_selected_jivalue = NULL; m_tuningFreq = 0.0; + setting_selectedScale = NULL; // settings - QImage img; + QPixmap img; img.loadFromData(g_icon_ji, sizeof(g_icon_ji), "PNG"); - setting_show->setIconSet(QIconSet(QImage(img))); - setting_show->setOn(false); + setting_show->setIcon(QIcon(img)); + setting_show->setChecked(false); hide(); - m_popup_menu.insertItem(new Title(tr("Root's octave"), &m_popup_menu)); - setting_octave = new QSpinBox(-3, 8, 1, &m_popup_menu); - QToolTip::add(setting_octave, tr("Root's octave")); + QHBoxLayout* octaveActionLayout = new QHBoxLayout(&m_popup_menu); + + QLabel* octaveActionTitle = new QLabel(tr("Root's octave"), &m_popup_menu); + octaveActionLayout->addWidget(octaveActionTitle); + + setting_octave = new QSpinBox(&m_popup_menu); + setting_octave->setMinimum(-3); + setting_octave->setMaximum(8); + setting_octave->setSingleStep(1); + setting_octave->setToolTip(tr("Root's octave")); setting_octave->setValue(3); // m_old_octave = setting_octave->value(); // connect(setting_octave, SIGNAL(valueChanged(int)), this, SLOT(octaveChanged(int))); connect(setting_octave, SIGNAL(valueChanged(int)), this, SLOT(emitTuningFreqChanged())); - m_popup_menu.insertItem(setting_octave); + octaveActionLayout->addWidget(setting_octave); + + QWidget* octaveActionWidget = new QWidget(&m_popup_menu); + octaveActionWidget->setLayout(octaveActionLayout); + + QWidgetAction* octaveAction = new QWidgetAction(&m_popup_menu); + octaveAction->setDefaultWidget(octaveActionWidget); + m_popup_menu.addAction(octaveAction); - setting_keepRootToLeft = new QAction(this); - setting_keepRootToLeft->setMenuText(tr("Keep root to left side")); - setting_keepRootToLeft->setToggleAction(true); + setting_keepRootToLeft = new QAction(tr("Keep root to left side"), this); + setting_keepRootToLeft->setCheckable(true); connect(setting_keepRootToLeft, SIGNAL(toggled(bool)), this, SLOT(keepRootToLeft(bool))); - setting_keepRootToLeft->addTo(&m_popup_menu); + m_popup_menu.addAction(setting_keepRootToLeft); - setting_loadScale = new QAction(this); - setting_loadScale->setMenuText(tr("Load Scala file ...")); - setting_loadScale->addTo(&m_popup_menu); + setting_loadScale = new QAction(tr("Load Scala file ..."), this); + m_popup_menu.addAction(setting_loadScale); connect(setting_loadScale, SIGNAL(activated()), this, SLOT(loadScale())); - ui_scale_menu.setCheckable(true); - m_popup_menu.insertItem(tr("used scale"), &ui_scale_menu); - QVBoxLayout* layout = new QVBoxLayout(this, 0, 0, "MicrotonalView:layout"); - QHBoxLayout* roots_layout = new QHBoxLayout(layout, 0, "MicrotonalView:roots_layout"); + m_popup_menu.addMenu(&ui_scale_menu); + + QVBoxLayout* layout = new QVBoxLayout(this); + layout->setMargin(0); + layout->setSpacing(0); + QHBoxLayout* roots_layout = new QHBoxLayout(); + roots_layout->setSpacing(0); + layout->addLayout(roots_layout); for(int i=0; i<13; i++) { m_roots.push_back(new QRoot(this, i+3)); @@ -337,22 +360,22 @@ MicrotonalView::MicrotonalView(QWidget* parent) } void MicrotonalView::save() { - s_settings->writeEntry("octave", setting_octave->value()); - s_settings->writeEntry("keepRootToLeft", setting_keepRootToLeft->isOn()); + s_settings->setValue("octave", setting_octave->value()); + s_settings->setValue("keepRootToLeft", setting_keepRootToLeft->isChecked()); QStringList scale_list; for(size_t i=0; igetPath().isEmpty()) scale_list.push_back(setting_scales[i]->getPath()); - s_settings->writeEntry("scales", scale_list); - s_settings->writeEntry("selectedScale", setting_selectedScale->getName()); - s_settings->writeEntry("lastScalesDirectory", setting_lastScalesDirectory); - s_settings->writeEntry("selectedRoot", setting_selectedRoot); + s_settings->setValue("scales", scale_list); + s_settings->setValue("selectedScale", setting_selectedScale->getName()); + s_settings->setValue("lastScalesDirectory", setting_lastScalesDirectory); + s_settings->setValue("selectedRoot", setting_selectedRoot); } void MicrotonalView::load() { - setting_octave->setValue(s_settings->readNumEntry("octave", setting_octave->value())); - setting_keepRootToLeft->setOn(s_settings->readBoolEntry("keepRootToLeft", setting_keepRootToLeft->isOn())); - QStringList scale_list = s_settings->readListEntry("scales"); + setting_octave->setValue(s_settings->value("octave", setting_octave->value()).toInt()); + setting_keepRootToLeft->setChecked(s_settings->value("keepRootToLeft", setting_keepRootToLeft->isChecked()).toBool()); + QStringList scale_list = s_settings->value("scales").toStringList(); for(QStringList::iterator it=scale_list.begin(); it!=scale_list.end(); ++it) { try @@ -360,22 +383,22 @@ void MicrotonalView::load() MScale* scale = new MScale(*it, MScale::SCALA); setting_scales.push_back(scale); } - catch(QString error){cerr << "MicrotonalView::load " << error << endl;} + catch(QString error){cerr << "MicrotonalView::load " << error.toStdString() << endl;} } refreshScaleList(); - selectScale(s_settings->readEntry("selectedScale", "default")); - setting_lastScalesDirectory = s_settings->readEntry("lastScalesDirectory", "."); - selectRoot(s_settings->readNumEntry("selectedRoot", m_roots[0]->m_ht)); + selectScale(s_settings->value("selectedScale", "default").toString()); + setting_lastScalesDirectory = s_settings->value("lastScalesDirectory", ".").toString(); + selectRoot(s_settings->value("selectedRoot", m_roots[0]->m_ht).toInt()); } void MicrotonalView::clearSettings() { - s_settings->removeEntry("octave"); - s_settings->removeEntry("keepRootToLeft"); - s_settings->removeEntry("scales"); - s_settings->removeEntry("selectedScale"); - s_settings->removeEntry("lastScalesDirectory"); - s_settings->removeEntry("selectedRoot"); + s_settings->remove("octave"); + s_settings->remove("keepRootToLeft"); + s_settings->remove("scales"); + s_settings->remove("selectedScale"); + s_settings->remove("lastScalesDirectory"); + s_settings->remove("selectedRoot"); } /*void MicrotonalView::octaveChanged(int value) @@ -407,23 +430,35 @@ QString MicrotonalView::getTuningNoteName() if(hasTuningFreqSelected()) { if(m_selected_jivalue->is_ratio) - return QString(h2n(setting_selectedRoot+getOctaveShift()))+":"+QString::number(m_selected_jivalue->num)+"/"+QString::number(m_selected_jivalue->den); + return QString::fromStdString(h2n(setting_selectedRoot+getOctaveShift()))+":"+QString::number(m_selected_jivalue->num)+"/"+QString::number(m_selected_jivalue->den); else - return QString(h2n(setting_selectedRoot+getOctaveShift()))+":"+QString::number(m_selected_jivalue->cents); + return QString::fromStdString(h2n(setting_selectedRoot+getOctaveShift()))+":"+QString::number(m_selected_jivalue->cents); } return "no tuning note selected"; } +void MicrotonalView::scaleActionToggled(bool checked) +{ + if (checked) + selectScale(((QAction*)sender())->data().toInt()); +} + void MicrotonalView::selectScale(int index) { assert(index>=0 && index scaleActions = ui_scale_menu.actions(); + + for (int i = 0; i < scaleActions.size(); i++) + { + if (i == index) + scaleActions[i]->setChecked(true); + else + scaleActions[i]->setChecked(false); + } ui_ratios->repaint(); } @@ -441,13 +476,19 @@ void MicrotonalView::selectScale(const QString& name) if(index==-1) { - cerr << "MicrotonalView::selectScale unknown scale '" << name << "'" << endl; + cerr << "MicrotonalView::selectScale unknown scale '" << name.toStdString() << "'" << endl; return; } - for(size_t i=0; i scaleActions = ui_scale_menu.actions(); + + for (int i = 0; i < scaleActions.size(); i++) + { + if (i == index) + scaleActions[i]->setChecked(true); + else + scaleActions[i]->setChecked(false); + } ui_ratios->repaint(); } @@ -463,7 +504,7 @@ int MicrotonalView::getIndex(MScale* scale) void MicrotonalView::notesNameChanged() { for(int i=0; i<13; i++) - m_roots[i]->setText(h2n(m_roots[i]->m_ht, GetNotesName(), GetTonality(), false)); + m_roots[i]->setText(QString::fromStdString(h2n(m_roots[i]->m_ht, GetNotesName(), GetTonality(), false))); } void MicrotonalView::keepRootToLeft(bool keep) @@ -504,11 +545,11 @@ void MicrotonalView::selectRoot(int ht) if(ht==setting_selectedRoot) { for(int i=0; i<13; i++) - m_roots[i]->setOn(m_roots[i]->m_ht==ht); + m_roots[i]->setChecked(m_roots[i]->m_ht==ht); } else { - if(setting_keepRootToLeft->isOn()) + if(setting_keepRootToLeft->isChecked()) { for(int i=0; i<13; i++) m_roots[i]->m_ht = (ht+i)%12; @@ -516,7 +557,7 @@ void MicrotonalView::selectRoot(int ht) } for(int i=0; i<13; i++) - m_roots[i]->setOn(m_roots[i]->m_ht==ht); + m_roots[i]->setChecked(m_roots[i]->m_ht==ht); setting_selectedRoot = ht; @@ -539,14 +580,18 @@ void MicrotonalView::emitTuningFreqChanged() } MicrotonalView::QScaleLabel::QScaleLabel(MicrotonalView* view) -: QLabel(view, "QScaleLabel") +: QLabel(view) , ui_view(view) { setMaximumHeight(15); m_htf = -1000.0f; } -void MicrotonalView::QScaleLabel::drawContents(QPainter* p) +void MicrotonalView::QScaleLabel::paintEvent(QPaintEvent* event) { + QLabel::paintEvent(event); + + QPainter* p = new QPainter(this); + int left = ui_view->m_roots[0]->x() + ui_view->m_roots[0]->width()/2; int right = ui_view->m_roots[12]->x() + ui_view->m_roots[12]->width()/2; int w = right - left; @@ -565,29 +610,30 @@ void MicrotonalView::QScaleLabel::drawContents(QPainter* p) int x = int(left+htw); p->setPen(QColor(0,0,255)); p->setBrush(QColor(191,191,255)); - QPointArray arr; - arr.resize(3); - arr.setPoint(0, x-5, 0); - arr.setPoint(1, x+5, 0); - arr.setPoint(2, x, 2*height()/3); - p->drawConvexPolygon(arr); + QPolygon polygon(3); + polygon.setPoint(0, x-5, 0); + polygon.setPoint(1, x+5, 0); + polygon.setPoint(2, x, 2*height()/3); + p->drawConvexPolygon(polygon); p->drawLine(x, 2*height()/3, x, height()); if(htw<(w/12.0f)/4.0f || -(htw-w)<(w/12.0f)/4.0f) { if(htw<(w/12.0f)/4.0f) x += w; else x -= w; - arr.setPoint(0, x-5, 0); - arr.setPoint(1, x+5, 0); - arr.setPoint(2, x, 2*height()/3); - p->drawConvexPolygon(arr); + polygon.setPoint(0, x-5, 0); + polygon.setPoint(1, x+5, 0); + polygon.setPoint(2, x, 2*height()/3); + p->drawConvexPolygon(polygon); p->drawLine(x, 2*height()/3, x, height()); } } + + delete p; } MicrotonalView::QRatiosLabel::QRatiosLabel(MicrotonalView* view) -: QLabel(view, "QRatiosLabel") +: QLabel(view) , ui_view(view) { setMaximumHeight(12+3*(2*fontMetrics().height()+10)); @@ -604,9 +650,12 @@ void MicrotonalView::QRatiosLabel::drawTicks(QPainter* p, float r, int h) p->drawLine(x, 0, x, h); } } -void MicrotonalView::QRatiosLabel::drawContents(QPainter* p) +void MicrotonalView::QRatiosLabel::paintEvent(QPaintEvent* event) { - QLabel::drawContents(p); + QLabel::paintEvent(event); + + QPainter* p = new QPainter(this); + // p->eraseRect(rect()); int left = ui_view->m_roots[0]->x() + ui_view->m_roots[0]->width()/2; @@ -623,7 +672,7 @@ void MicrotonalView::QRatiosLabel::drawContents(QPainter* p) int dec_h2 = (height()-tick_height-p->fontMetrics().height()+2)/3; dec_h = min(dec_h, dec_h2); int ht = ui_view->setting_selectedRoot - ui_view->m_roots[0]->m_ht; - if(ui_view->setting_keepRootToLeft->isOn()) ht = 0; + if(ui_view->setting_keepRootToLeft->isChecked()) ht = 0; for(list::iterator it=ui_view->setting_selectedScale->values.begin(); it!=ui_view->setting_selectedScale->values.end(); ++it) { float htw = 0.0f; @@ -642,23 +691,23 @@ void MicrotonalView::QRatiosLabel::drawContents(QPainter* p) if((*it).is_ratio) { QRect num_rect = fontMetrics().boundingRect(QString::number((*it).num)); - num_rect.moveBy(x+1, y+p->fontMetrics().height()); + num_rect.translate(x+1, y+p->fontMetrics().height()); QRect den_rect = fontMetrics().boundingRect(QString::number((*it).den)); - den_rect.moveBy(x+1, y+2*p->fontMetrics().height()); + den_rect.translate(x+1, y+2*p->fontMetrics().height()); (*it).bounding_rect = num_rect; (*it).bounding_rect |= den_rect; } else { QRect cents_rect = fontMetrics().boundingRect(QString::number((*it).cents)); - cents_rect.moveBy(x+1, y+2*p->fontMetrics().height()); + cents_rect.translate(x+1, y+2*p->fontMetrics().height()); (*it).bounding_rect = cents_rect; } - (*it).bounding_rect.rLeft() = x; - (*it).bounding_rect.rRight() += 2; - (*it).bounding_rect.rTop() -= 2; - (*it).bounding_rect.rBottom() = y+dec_h; + (*it).bounding_rect.setLeft(x); + (*it).bounding_rect.setRight((*it).bounding_rect.right() + 2); + (*it).bounding_rect.setTop((*it).bounding_rect.top() - 2); + (*it).bounding_rect.setBottom(y+dec_h); if(ui_view->m_selected_jivalue==&(*it)) { @@ -692,11 +741,13 @@ void MicrotonalView::QRatiosLabel::drawContents(QPainter* p) drawTicks(p, 0.5f, tick_height/2); drawTicks(p, 0.25f, tick_height/3); drawTicks(p, 0.125f, tick_height/4); + + delete p; } void MicrotonalView::mouseReleaseEvent(QMouseEvent* e) { - if(e->button()==LeftButton) + if(e->button()==Qt::LeftButton) { MScale::MValue* selected_jivalue_old = m_selected_jivalue; m_selected_jivalue = NULL; @@ -719,34 +770,55 @@ void MicrotonalView::mouseReleaseEvent(QMouseEvent* e) void MicrotonalView::refreshScaleList() { ui_scale_menu.clear(); + + QActionGroup* scaleGroup = new QActionGroup(this); + for(size_t i=0; igetName(), i); - ui_scale_menu.connectItem(i, this, SLOT(selectScale(int))); + QAction* scaleAction = ui_scale_menu.addAction(setting_scales[i]->getName()); + scaleAction->setCheckable(true); + scaleAction->setData((int)i); + scaleGroup->addAction(scaleAction); + if(setting_selectedScale==setting_scales[i]) - ui_scale_menu.setItemChecked(i, true); + scaleAction->setChecked(true); + + connect(scaleAction, SIGNAL(toggled(bool)), this, SLOT(scaleActionToggled(bool))); } } void MicrotonalView::loadScale() { - QFileDialog dlg_file(setting_lastScalesDirectory, "Scala files (*.scl *.SCL)", this, "open file dialog", true); +#ifdef QT3_SUPPORT + Q3FileDialog dlg_file(setting_lastScalesDirectory, "Scala files (*.scl *.SCL)", this, "open file dialog", true); dlg_file.setCaption(tr("Open scale file")); - dlg_file.setMode(QFileDialog::ExistingFile); + dlg_file.setMode(Q3FileDialog::ExistingFile); dlg_file.setInfoPreviewEnabled(true); ScalePreview p(&dlg_file); dlg_file.setInfoPreview(&p,&p); - dlg_file.setPreviewMode(QFileDialog::Info); + dlg_file.setPreviewMode(Q3FileDialog::Info); +#else + QFileDialog dlg_file(this, tr("Open scale file"), setting_lastScalesDirectory, "Scala files (*.scl *.SCL)"); + dlg_file.setFileMode(QFileDialog::ExistingFile); +#endif dlg_file.exec(); if(dlg_file.result()==QDialog::Accepted) { +#ifdef QT3_SUPPORT setting_lastScalesDirectory = dlg_file.dirPath(); - s_settings->writeEntry("MicrotonalView_lastScalesDirectory", setting_lastScalesDirectory); +#else + setting_lastScalesDirectory = dlg_file.directory().path(); +#endif + s_settings->setValue("MicrotonalView_lastScalesDirectory", setting_lastScalesDirectory); // cerr << "setting_lastScalesDirectory=" << setting_lastScalesDirectory << endl; try { +#ifdef QT3_SUPPORT MScale* scale = new MScale(dlg_file.selectedFile(), MScale::SCALA); +#else + MScale* scale = new MScale(dlg_file.selectedFiles()[0], MScale::SCALA); +#endif bool new_one = true; for(size_t i=0; new_one && i #include #include +#ifdef QT3_SUPPORT +#include +#else #include +#endif #include #include "View.h" @@ -89,7 +93,7 @@ class MicrotonalView : public QFrame, public View { Q_OBJECT - QPopupMenu ui_scale_menu; + QMenu ui_scale_menu; float m_AFreq; float m_tuningFreq; @@ -102,7 +106,7 @@ class MicrotonalView : public QFrame, public View MicrotonalView* ui_view; float m_htf; QScaleLabel(MicrotonalView* view); - virtual void drawContents(QPainter* p); + virtual void paintEvent(QPaintEvent* event); virtual ~QScaleLabel(){} }* ui_scale; @@ -111,17 +115,19 @@ class MicrotonalView : public QFrame, public View MicrotonalView* ui_view; void drawTicks(QPainter* p, float r, int h); QRatiosLabel(MicrotonalView* view); - virtual void drawContents(QPainter* p); + virtual void paintEvent(QPaintEvent* event); virtual ~QRatiosLabel(){} }* ui_ratios; virtual void mouseReleaseEvent(QMouseEvent* e); - struct ScalePreview : QLabel, QFilePreview +#ifdef QT3_SUPPORT + struct ScalePreview : QLabel, Q3FilePreview { ScalePreview(QWidget* parent); - virtual void previewUrl(const QUrl& url); + virtual void previewUrl(const Q3Url& url); }; +#endif int m_old_octave; int getOctaveShift(); @@ -129,6 +135,7 @@ class MicrotonalView : public QFrame, public View protected slots: void refreshScaleList(); void loadScale(); + void scaleActionToggled(bool checked); void selectScale(int index); // void octaveChanged(int value); void emitTuningFreqChanged(); diff --git a/src/modules/View.cpp b/src/modules/View.cpp index 9d944e9..6c1252e 100644 --- a/src/modules/View.cpp +++ b/src/modules/View.cpp @@ -23,9 +23,11 @@ #include using namespace std; #include +#include +#include list View::s_views; -QSettings* View::s_settings = NULL; +AutoQSettings* View::s_settings = NULL; void View::saveAll() { @@ -34,7 +36,7 @@ void View::saveAll() for(list::iterator it=s_views.begin(); it!=s_views.end(); ++it) { s_settings->beginGroup((*it)->getName()); - s_settings->writeEntry("show", (*it)->setting_show->isOn()); + s_settings->setValue("show", (*it)->setting_show->isChecked()); (*it)->save(); s_settings->endGroup(); } @@ -46,7 +48,7 @@ void View::loadAll() for(list::iterator it=s_views.begin(); it!=s_views.end(); ++it) { s_settings->beginGroup((*it)->getName()); - (*it)->setting_show->setOn(s_settings->readBoolEntry("show", (*it)->setting_show->isOn())); + (*it)->setting_show->setChecked(s_settings->value("show", (*it)->setting_show->isChecked()).toBool()); (*it)->load(); s_settings->endGroup(); } @@ -58,7 +60,7 @@ void View::clearAllSettings() for(list::iterator it=s_views.begin(); it!=s_views.end(); ++it) { s_settings->beginGroup((*it)->getName()); - s_settings->removeEntry("show"); + s_settings->remove("show"); (*it)->clearSettings(); s_settings->endGroup(); } @@ -72,14 +74,16 @@ View::View(const QString& name, QWidget* parent) , m_popup_menu(parent) { // settings - m_popup_menu.insertItem(new Title(""+QWidget::tr(m_name)+"", &m_popup_menu)); - m_popup_menu.insertSeparator(); + QWidgetAction* caption = new QWidgetAction(&m_popup_menu); + caption->setDefaultWidget(new Title(QString("%1").arg(QObject::tr(m_name.toAscii().constData())), &m_popup_menu)); + m_popup_menu.addAction(caption); - setting_show = new QAction(parent); - setting_show->setMenuText(QWidget::tr("Show ")+getName()+QWidget::tr(" view")); - setting_show->setToggleAction(true); + m_popup_menu.addSeparator(); + + setting_show = new QAction(m_name, parent); + setting_show->setCheckable(true); parent->connect(setting_show, SIGNAL(toggled(bool)), parent, SLOT(setShown(bool))); - setting_show->setToolTip(QWidget::tr(m_name)); + setting_show->setToolTip(QObject::tr("Show \"%1\" view").arg(m_name)); parent->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); diff --git a/src/modules/View.h b/src/modules/View.h index 94862a3..8db559a 100644 --- a/src/modules/View.h +++ b/src/modules/View.h @@ -23,25 +23,25 @@ #include using namespace std; #include -#include -#include +#include #include #include +#include "../AutoQSettings.h" class View { static list s_views; - protected: +protected: struct Title : QLabel { Title(const QString& text, QWidget* parent) : QLabel(text, parent) - {setAlignment(QLabel::AlignCenter);} + {setAlignment(Qt::AlignCenter);} }; const QString m_name; QWidget* m_parent; - QPopupMenu m_popup_menu; + QMenu m_popup_menu; View(const QString& name, QWidget* parent); virtual void mouseReleaseEvent(QMouseEvent* e); @@ -49,7 +49,7 @@ class View virtual ~View() {} public: - static QSettings* s_settings; + static AutoQSettings* s_settings; const QString& getName() {return m_name;} int getNbView() const {return s_views.size();} diff --git a/tr/Makefile.am b/tr/Makefile.am deleted file mode 100644 index 7544a45..0000000 --- a/tr/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -default_DATA = fmit_fr.qm -defaultdir = $(prefix)/share/fmit/tr -EXTRA_DIST = *.ts -CLEANFILES = *.qm - -%.qm: %.ts - $(QT_DIR)/bin/lupdate -verbose ../src/*.cpp ../src/*.h ../ui/*.ui -ts $< - $(QT_DIR)/bin/lrelease $< - diff --git a/tr/Makefile.in b/tr/Makefile.in deleted file mode 100644 index 1daa81c..0000000 --- a/tr/Makefile.in +++ /dev/null @@ -1,342 +0,0 @@ -# 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 = : -subdir = tr -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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)$(defaultdir)" -defaultDATA_INSTALL = $(INSTALL_DATA) -DATA = $(default_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -default_DATA = fmit_fr.qm -defaultdir = $(prefix)/share/fmit/tr -EXTRA_DIST = *.ts -CLEANFILES = *.qm -all: all-am - -.SUFFIXES: -$(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 tr/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tr/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 -uninstall-info-am: -install-defaultDATA: $(default_DATA) - @$(NORMAL_INSTALL) - test -z "$(defaultdir)" || $(mkdir_p) "$(DESTDIR)$(defaultdir)" - @list='$(default_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(defaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultdir)/$$f'"; \ - $(defaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultdir)/$$f"; \ - done - -uninstall-defaultDATA: - @$(NORMAL_UNINSTALL) - @list='$(default_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(defaultdir)/$$f'"; \ - rm -f "$(DESTDIR)$(defaultdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 $(DATA) -installdirs: - for dir in "$(DESTDIR)$(defaultdir)"; 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: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -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 mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-defaultDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-defaultDATA uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-defaultDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-defaultDATA \ - uninstall-info-am - - -%.qm: %.ts - $(QT_DIR)/bin/lupdate -verbose ../src/*.cpp ../src/*.h ../ui/*.ui -ts $< - $(QT_DIR)/bin/lrelease $< -# 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 --git a/tr/fmit_de.ts b/tr/fmit_de.ts index 0f483d4..414f590 100644 --- a/tr/fmit_de.ts +++ b/tr/fmit_de.ts @@ -1,576 +1,1433 @@ - + + + ConfigForm + Configuration - + Konfiguration - Error variation tolerance - + + General + Allgemein - Sound Capture - + Raise the window to the whole screen when the program is started (f) + Bei Programmstart auf Vollbildmodus schalten (f) - Auto detect at startup - + + Start in full-screen + In Vollbildmodus starten - Auto detect - + Auto-save configuration and views layout on exit + Konfiguration und Ansichten beim Beenden speichern - ALSA - + The tuning used + Die verwendete Stimmung - PCM name - + The tuning used to determine note values. Useful for tuning historic intruments. + Die zur Bestimmung der Noten verwendete Stimmung. Hilfreich beim Stimmen historischer Instrumente. - hw:0 - + + Tuning scale + Stimmung - Sampling rate - + + Chromatic + Chromatisch - set to max - + + Werckmeister III + + + + + Kirnberger III + + + + + Diatonic + Diatonisch + + + + Meantone (1/4) + Mitteltönig (1/4) + + + The tonality of the note names + Die Tonalität der Tonnamen + + + The tonality of the note names. +Useful for converting note names to a corresponding instrument tonality. +(Examples: Eb for saxophone, Bb for trumpet, etc.) + Die Tonalität der Tonnamen. +Hilfreich um Tonnamen auf ein bestimmtes Instrument umzusetzen. +(Z.B.: Eb für Saxophon, Bb für Trompete) + + Tonality + Tonalität + + + + C (Do) + + + + + Bb (Sib) + + + + + Eb (Mib) + + + + + + + + Use anglo-saxon or latin note names: +anglo-saxon: C D E F G A B +latin: Do Re Mi Fa Sol La Si + Anglo-amerikanische, oder romanische Tonnamen verwenden: +Anglo-amerikanisch: C D E F G A B +Romanisch: Do Re Mi Fa Sol La Si + + + + Note names + Tonnamen + + + + Anglo-Saxon + Anglo-amerikanisch + + + + Latin + Romanisch + + + Show A4 offset spin box + Kontrollelement für A4 Versatz anzeigen + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">To get more options:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Right-click every view to show up their properties!</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Weitere Optionen:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Über einen Rechtsklick auf einer Ansicht werden ihre Eigenschaften angezeigt!</p></body></html> + + + + Capture System + Aufnahmesystem + + + The selected capture system: The sound server, sound library, like: +JACK, ALSA, OSS, PortAudio + Das zu verwendende Aufnahmesystem: Der Sond-Server, die Sound-Bibliothek wie z.B.: +JACK, ALSA, OSS, PortAudio + + + Selected capture system + Zu verwendendes Aufnahmesystem + + + Auto-detect a working one at startup + Funktionierendes Aufnahmesystem beim Start ermitteln + + + Auto-detect an available capture system at startup. +Even if the capture system is available, it may not work if it's badly configured. + Funktionierendes Aufnahmesystem beim Start ermitteln. +Selbst wenn das Aufnahmesystem verfügbar ist, kann es sein, daß es bei falscher Konfiguration nicht richtig funktioniert. + + + + Auto-detect an available capture system at startup + Funktionierendes Aufnahmesystem beim Start ermitteln + + + Auto-detect an available capture system now. +Even if the capture system is available, it may not work if it's badly configured. + Funktionierendes Aufnahmesystem jetzt ermitteln. +Selbst wenn das Aufnahmesystem verfügbar ist, kann es sein, daß es bei falscher Konfiguration nicht richtig funktioniert. + + + + Auto detect now + Jetzt ermitteln + + + JACK - + - automaticaly connect at startup to - + The name of FMIT under the JACK connection system + Der Client-Name von FMIT im JACK Verbindungssystem - ms - + + Client name + Client-Name - Sound Analysis - + + fmit + - Range - + Automatically connect FMIT to the following source at startup (eg. alsa_pcm:capture_1) + Beim Start automatisch mit folgendem Eingang verbinden (z.B. alsa_pcm:capture_1) - - °/.. - + + t startup automaticaly connect to... + Beim Start automatisch verbinden mit... - Length factor - + Automatically connect FMIT to this source at startup + Beim Start automatisch mit diesem Eingang verbinden - % - + + + + + Sampling rate of the JACK server + Abtastrate des JACK Servers - Tolerance of the error variance - + + + + Sampling rate + Abtastrate - Tonality - + + ALSA + - C (Do) - + The name of the ALSA device to connect to + Der Name des ALSA Geräts mit dem eine Verbindung hergestellt werden soll - Bb (Sib) - + + + + Device name + Gerätename - Eb (Mib) - + The sampling rate, sampling frequency, number of samples by second ... + Die Abtastrate, Abtastfrequenz, Anzahl Samples pro Sekunde, ... - Notes name - + The sampling rate, sampling frequency, number of samples by second ... +Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. + Die Abtastrate, Abtastfrequenz, Anzahl Samples pro Sekunde, ... +Verwenden Sie keine zu hohe Abtastrate. 22050Hz sollten in den meisten Fällen ausreichen. - Latin - + Set the sampling rate to maximum + Abtastrate auf ihr Maximum setzen - Latency - + Set to max + Auf Maximum setzen - Restore factory settings - + + + + Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. + Verwenden Sie keine zu hohe Abtastrate. 22050Hz sollten in den meisten Fällen ausreichen. - &OK - + Mix channels if there are multiple (FMIT will use the first channel if not checked) + Kanäle mischen falls mehrere vorhanden sind (FMIT verwendet den ersten Kanal falls nicht angekreuzt) - Use theses settings and exist configure panel (but don't save them !) - + + OSS + - &Cancel - + + + + + The name of the OSS device to connect to + Der Name des OSS Geräts mit dem eine Verbindung hergestellt werden soll - General - + + /dev/dsp + - Start in full-screen + + PortAudio + + + + + + + + The name of the PortAudio device to connect to + Der Name des PortAudio Geräts mit dem eine Verbindung hergestellt werden soll + + + + + default + + + + + + Raise the window to the whole screen when the program is started +(You can also use the shortcut 'f'). - Auto-save configuration and views layout on exit + + Auto-save configuration and layout on exit - Anglo-Saxon + + + + + The used tuning scale to determine note frequency values. Useful for tuning historic intruments. - <b>To get more options:</b> right-click every view to show up their properties ! + + + + + The used tonality. +Useful to convert note names to a corresponding instrument tonality (e.g. Eb for saxophone, Bb for trumpet). - Volume threshold + + Show the spin box for the A4 offset - Refresh time + + + The capture system (e.g. JACK, ALSA, OSS, PortAudio) - Time between each sound analysis. Increase to get less CPU usage but less time resolution. + + The capture system - Frequency analysis range. + + + Selected the capture system (e.g. JACK, ALSA, OSS, PortAudio) - Minimal half-tone from A3 + + + + + Auto detect a working capture system at FMIT startup. - Maximal half-tone form A3 + + + + + The name of this FMIT instance in the JACK connections. - Wave-length average size + + + + + Automatically connect FMIT to the following source at startup (e.g. alsa_pcm:capture_1) - Size of the average to compute the frequency in one analysis. + + automaticaly connect to... - Algorithms + + JACK sampling rate - Default algorithm + + + + + The name of the ALSA device to use. - for microtonal view + + + + + + + + + + + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. - Multi-Correlation + + + + + + + Set the sampling rate to the maximum possible value. - Increase recognition quality at cost of processor usage. + + + + set to max - Shifting test complexity + + + + Mix channels if there are multiple (if unchecked, the first channel will be used) - Error noise threshold + + Sound Analysis + Analyse + + + + + + + Time between each sound analysis. +Can be increased to get less CPU usage (but less temporal precision). - Consider as valuable all errors below this. + + + Range of possible notes from the lowest to the highest around the A4 reference note. +Smaller the range, smaller the CPU usage. - Auto-Correlation (usualy used for Microtonal view) + + Notes range - Consider as valuable all errors below this (in per thousands !) + + + + + Lowest semitone from the A4 reference note. +It can useful to put it higher than -35 to avoid disturbance from the sector alimentation (~50hz). - Bubble + + + + + Highest semitone from the A4 reference note. - Convolution threshold + + + Filter the sound below the lowest semitone and above the highest semitone to avoid artefacts and noises in all the following steps of the sound analysis. - Restore all settings as you just installed the program (need a program restart). + + Notes range filtering - Raise the window to the whole screen when the program start (f) + + + + + + + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) - Use anglo-saxon or latin notes name. -englo-saxon: C D E F G A B -latin: Do Re Mi Fa Sol La + + + + + + + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. - Consider as unstable all sound with frequency variance above this (in half-tones). + + + + + + + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. - The tonality of the showed notes name. -Usefull for converting notes name to a corresponding instrument tonality. -(examples: Eb for saxophone, Bb for trumpet, etc.) + + + + + Quantize the analysis results: ignore frequency jumps, fill gaps, ignore short notes. +The smaller the value, the faster the tuner. However, by decreasing the value, the computed frequency will be more unstable. - Ignore all sounds with volume below this threshold (in perthousands !) -(shown has a red line in the graph view). + + + Restore settings as if you just installed FMIT (requires to restart FMIT). - Response of the program and tolerance of holes, scratches, artefacts, etc. -Smaller is the value faster the tuner respond, but more unstable the computed frequency is. + + + Use these settings and quit the configuration panel (it is required to click on the "Save settings" button to permanently keep these settings for each FMIT start) - - - CustomInstrumentTunerForm - About Free Music Instrument Tuner + + + Discard any changes and quit the configuration panel - <h3>Version + Time between each sound analysis. +Increase to get less CPU usage but less time precision. + Zeit zwischen den einzelnen Analysen. +Erhöhen Sie diesen Wert um bei verringerter Präzision, weniger CPU Belastung zu erhalten. + + + + Refresh time + Aktualisierungsintervall + + + + + ms + + + + Frequency analysis range: from the lowest note to the highest from the A4 reference note. + Bereich der Frequenzanalyse: Vom tiefsten bis zum höchsten Ton, relativ zum A4 Referenzton. + + + Range + Bereich + + + Lowest semi-tone from the A4 reference note. +Sometimes, it is useful to put it higher than -35 to avoid noise from the sector alimentation. + Tiefster Halbton relativ zum A4 Referenzton. +In manchen Fällen empfiehlt es sich einen Wert größer -35 zu verwenden, um Rauschen zu verhindern. + + + Highest semi-tone from the A4 reference note. + Höchster Halbton relativ zum A4 Referenzton. + + + Filter frequencies below the lowest semi-tone and above the highest semi-tone to avoid artefacts, noises, in all the following steps of the sound analysis. + Frequenzen unterhalb des tiefsten und oberhalb des höchsten Halbtons filtern, um Artefakte und Rauschen in allen nachfolgenden Schritten der Analyse zu verhindern. + + + Range filtering + Bereichsfilter + + + + Rectangular filter: bad precision, but very fast + Rechteckfilter: Ungenau, jedoch aüßerst schnell + + + + FIR filter: good precision, but more costly in CPU usage + FIR Filter: Gute Genauigkeit, dafür rechenintensiv + + + + + Algorithm settings + Algorithmuseinstellungen + + + + Algorithm + Algorithmus + + + Ignore all sounds with volume below this threshold. +Given in dB in the frequency domain. +(Shown as a red line in different views) + Alles unterhalb dieser Lautstärke ignorieren. +Angabe in dB im Frequenzbereich. +(In verschiedenen Ansichten als rote Linie gekennzeichnet) + + + + + dB + + + + Ignore weak sub-harmonics. +The threshold is defined between two neighborhood frequency components. +Prevents too-low errors. + Schwache Subharmonische ignorieren. +Die Begrenzung ist zwischen zwei benachbarten Frequenzen definiert. +Verhindert die Ausgabe zu geringer Abweichungen. + + + + Use sub-harmonic audibility threshold + Subharmonische begrenzen + + + Factor defining the window size from the lowest period defined by the range. +The bigger this factor is, the more stable the analysis will be. The program will need more CPU and will react to sound changes more slowly. + Definiert die Größe des Fensters von der niedrigsten Periodendauer des Bereichs aus. +Je größer dieses Fenster ist, desto stablier wird die Analyse, jedoch wird mehr Rechenleistung benötigt und die Reaktion träger. + + + + Window size factor + Fenstergröße + + + + Volume threshold + Lautstärke begrenzen + + + + + Frequency refinement settings + Verfeinerungseinstellungen + + + + Frequency refinement + Verfeinerung + + + + + + + Use a refinement method in frequency domain: compute the mean of the quasi-harmonic related spectral peaks (the option allows to chose the number of harmonics to use). - </h3><p><h3>Website:</h3><p>homepage: <a href="http://home.gna.org/fmit">http://home.gna.org/fmit</a><p>development site: <a href="http://gna.org/projects/fmit">http://gna.org/projects/fmit</a><p><h3>Authors:</h3><p>Gilles Degottex: gilles.degottex@net2000.ch + + + + + + + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + + + Frequency domain fundamental refinement: +mean of the fundamental relative frequencies of the harmonics. +Choose the number of harmonics to use. + Verfeinerung im Frequenzbereich: +Arithmetisches Mittel der Grundfreqenzen der Harmonischen. +Legen Sie die Anzahl der zu verwendenden Harmonischen fest. + + + + Maximum number of harmonics + Max. Harmonische + + + Time domain fundamental refinement: +mean of period lengths. +Choose the number of periods to use. + Verfeinerung im Zeitbereich: +Arithmetisches Mittel der Periodendauern. +Legen Sie die Anzahl der zu verwendenden Perioden fest. + + + + Maximum number of periods + Max. Perioden + + + + + Quantizer settings + Quantisierer + + + + Quantizer + Quantisierereinstellungen + + + Quantize the analysis results: ignore frequency jumps, fill holes, ignore too short notes. +The smaller the following value is, the faster the tuner will respond, but the computed frequency will be more unstable. + Ergebnisse der Analyse quantisieren. Frequenzsprünge ignorieren, Leerräume auffüllen, zu kurze Töne ignorieren. +Je geringer der folgende Wert ist, desto schneller wird das Stimmgerät reagieren, jedoch wird dadurch die berechnete Frequenz weniger stabil. + + + + Latency + Latenz + + + Restore all settings as if you just installed the program (Requires FMIT to be restarted) + Alle Eiinstellungen zurücksetzen, als ob das das Programm gerade frisch installiert worden wäre (Erfordert einen Neustart von FMIT) + + + + Restore &factory settings + Auf &Werkseinstellungen zurücksetzen + + + Use these settings and exit the configuration panel (Does not save the settings!) + Einstellungen übernehmen und Konfigurationsdialog schließen (Die Einstellungen werden nicht gespeichert!) + + + + &OK + + + + Discard any changes to the settings and exit the configuration panel + Alle Änderungen an den Einstellungen verwerfen und Konfigurationsdialog schließen + + + + &Cancel + &Abbrechen + + + + CustomInstrumentTunerForm + + Graph + Graph + + + + Restore Factory Settings - + Auf Werkseinstellungen zurücksetzen + This operation is NOT reversible. Are you sure you want to lose all your current settings ? - + Dieser Vorgang kann nicht rückgängig gemacht werden. +Sollen Ihre aktuellen Einstellungen verworfen werden? + You can now restart FMIT to get back factory settings - + Sie können FMIT nun neu starten um zu den Werkseinstellungen zurückzukehren + + + + <h3>Version + + + + + </h3><p><h3>Website:</h3><p>homepage: <a href="http://home.gna.org/fmit">http://home.gna.org/fmit</a> + </h3><p><h3>Website:</h3><p>Homepage: <a href="http://home.gna.org/fmit">http://home.gna.org/fmit</a> + + + + <p>development site: <a href="http://gna.org/projects/fmit">http://gna.org/projects/fmit</a> + <p>Entwicklungssite: <a href="http://gna.org/projects/fmit">http://gna.org/projects/fmit</a> + + + + <p>donation link: <a href="http://home.gna.org/fmit/donation.html">http://home.gna.org/fmit/donation.html</a> + <p>Spenden: <a href="http://home.gna.org/fmit/donation.html">http://home.gna.org/fmit/donation.html</a> + + + + <p><h3>Author:</h3><p>Gilles Degottex <a href="mailto:gilles.degottex@gmail.com">gilles.degottex@gmail.com</a> + <p><h3>Autor:</h3><p>Gilles Degottex <a href="mailto:gilles.degottex@gmail.com">gilles.degottex@gmail.com</a> + + + + <p><h3>Packager:</h3><p> + <p><h3>Package:</h3><p> + + + + about_box + + + + + About Free Music Instrument Tuner + Über Free Music Instrument Tuner + + + + &OK + DialView + + Dial + Stimmung + + + + Show tolerance + Toleranz anzeigen + + + Show trace - + Spur anzeigen - Use percentages - + + Use cents + Cents verwenden - Resolution - + + Scale range + Anzeigebereich + + + + Scale range (in cents) + Anzeigebereich (In Cents) GLErrorHistory - Error - + + Error history + Fehler + Keep previous notes - + Vorige Töne beibehalten - Use percentages - + + Use cents + Cents verwenden - Anglo-saxon - + + Scale range + Anzeigebereich - Latin - + + Scale range (in cents) + Anzeigebereich (In Cents) - Resolution - + + Error + Fehler - GLFormants + GLFT - Formants - + + dB scale + dB Skala - Number of formants - + + Size + Größe + + + + window length + Fenstergröße + + + + - Press left mouse button to move the view + - Halten Sie die linke Maustaste gedrückt um die Ansicht zu verschieben + + + + - Press SHIFT key and left mouse button to zoom in and out + - Halten Sie die Shift-Taste und die linke Maustaste gedrückt um hinein-/herauszuzoomen + + + + - Double-click to reset the view + - Doppelklicken Sie um die Ansicht zurückzusetzen + + + + Frequency %1 [Hz] + Frequenz %1 [Hz] + + + + + Fourier Transform + Fourieranalyse + + + + GLFreqStruct + + + + Number of harmonics + Anzahl Harmonische + + + + + Harmonics + Harmonische GLGraph - Captured Sound - + + Show Wave Form + Signalverlauf anzeigen + Auto scale - + Automatisch skalieren + + + + + Scale factor + Skalierungsfaktor + + Duration - + Dauer + + Max height - + Max. Höhe + + + + + Captured Sound + Aufnahme GLSample - Wave form sample - - - + Show fading - + Fading anzeigen + + Number of fading - + Fadinganzahl + + + + + Wave form + Signalverlauf + + + + GLStatistics + + + Reset statistics + Statistik zurücksetzen + + + + Keep notes when hidden + Töne behalten wenn versteckt + + + + Keep n values + n Werte behalten + + + + Keep this number of values in the computation of the statistics + Diese Anzahl von Werten zur Berechnung der Statistik behalten + + + + Show standard deviation + Standardabweichung anzeigen + + + + Scale auto + Automatisch skalieren + + + + Scale min + Min. Skalierung + + + + Scale min value (in semi-tones) + Min. Skalierung (In Halbtönen) + + + + Scale max + Max. Skalierung + + + + Scale max value (in semi-tones) + Max. Skalierung (In Halbtönen) + + + + Show tolerance + Toleranz anzeigen + + + + Use cents + Cents verwenden + + + + Scale range + Skalierbereich + + + + Scale range (in cents) + Skalierbereich (In Cents) + + + + + Statistics + Statistik GLVolumeHistory + + Volume history + Lautstärke + + + Keep previous notes - + Vorige Töne beibehalten + Volume - + Lautstärke InstrumentTunerForm - Music Instrument Tuner - + + Free Music Instrument Tuner + + + + Keep errors (k) + Fehler behalten (k) + + + Keep data in error and volume graphs (k) + Daten in Fehler- und Lautstärkeanzeige beibehalten (k) + Do not clear graphs between notes (for error and volume graphs only) + Anzeigen zwischen Tönen nicht zurücksetzen (Nur Fehler- und Lautstärkeanzeige) + + + K e e p - + + K - + - Keep errors (k) - + Volume with dB scale + Lautstärke mit dB Skala - Volume - + Volume with dB scale. +Computed in the frequency domain, from the max bin. +The maximum is reached when the signal energy is maximal NOT when the sound is saturated in the time domain. + Lautstärke mit dB Skala. +Berechnung im Frequenzbereich. +Der maximale Wert wird erreicht wenn die Signalstärke maximal ist, nicht wenn das Signal im Zeitbereich gesättigt ist. + + + - Red if capture system is not working +- Grey if capture system is OK, but there is not enough sound +- Orange if analysis conditions are bad (like saturation) +- Green if a note is beeing catured and conditions are OK + - Rot, wenn das Aufnahmesystem nicht funktioniert +- Grau, wenn das Aufnahmesystem funktioniert, aber das Signal zu schwach ist +- Orange, wenn schlechte Bedingungen für die Analyse herrschen (Z.B. Sättgung) +- Grün, wenn ein Ton aufgenommen wird und die Bedingungen gut sind + Note Stability - + Tonstabilität - Stability of the playing note - + The tuning frequency (A4 frequency) + Der Stimmton (A4 Frequenz) + Tuning Frequency - + Stimmton + Hz - + - Tools - + Offset in cents from the tuning frequency + Versatz in Cents vom Stimmton - About - + + Offset + Versatz - &About - + + cents + - Pause + The actual frequency of the currently played note in Hertz + Die tatsächliche Frequenz des gerade gespielten Tons in Hertz + + + + + The recognized note + Der erkannte Ton + + + The target frequency of the currently played note in Hertz + Die Soll-Frequenz des gerade gespielten Tons in Hertz + + + + + Keep the data in the error and volume views (shortcut "k"). - Space + + + Volume in dB. +Computed in the frequency domain, from the maximum bin. +The maximum is reached when the signal energy is maximal NOT when the sound is saturated in the time domain. - Configure + + + According to the following colors: +red : the capture system is not working. +grey : the capture system is OK, but there is not enough sound. +orange : the analysis conditions are bad (like saturation) +green : a note is beeing analyzed and analysis conditions are OK. - Save settings + + + + + The base tunning frequency (the A4 frequency) - Ctrl+S + + + + + Offset in cents from the base tuning frequency - Reset + + + The frequency of the current note in Hertz. - Reset capture system + + + The target frequency of the current note in Hertz. + Views - + Ansichten - Do not clear histories between notes. - + + Settings + Einstellungen - Green if the note is stable enough, red if not and grey if there is no sound. - + + Pause + Pause - the A3 frequency + + + Pause: the capture, the sound analysis and all views. - The played note frequency + + + Save configuration panel settings, views settings and the window size. - The frequency of the current played note. + + + Invoke the about box. - The recognized note - + Put in pause state to reduce CPU usage + Auf Pause stellen, um die benötigte Rechenleistung zu verringern - The frequency of the note as it should be. - + Put in pause state: stop the capture, the sound analysis and all views + Auf Pause stellen: Die Aufnahme, Analyse sowie alle Ansichten stoppen - Capture stability - + + Space + - Put in pause state to use less processor has possible. - + + Configure + Konfiguration - Save configure panel settings, views settings and window size. - + + Save settings + Einstellungen speichern - Stop, reload settings and restart the capture sound system. - + Save configured panel settings, views settings and window size + Speichert die Konfiguration und Anordnung der Ansichten und die Größe des Hauptfensters - Green if the program is capturing sound, red if something goes wrong (sound server unavailable, drivers not loaded, etc.) - + + Ctrl+S + + + + + About + Über + + + Invoke the about box + Zeigt den Informationsdialog an MicrotonalView + Unkown filename: ' - + Datei nicht gefunden: ' - Keep root to left side - + + Microtonal + Mikrotonal - Load Scala file ... - + + Used scale + Verwendetes Tonsystem - used scale - + + + Root's octave + Oktave des Grundtons + + + + Keep root to left side + Grundton links ausrichten + + + + Load Scala file ... + Scala-Datei öffnen... + + + + Open scale file - + Tonsystem öfnen + Scale name already exist - + Das Tonsystem ist bereits vorhanden + Invalid file content ! - + Ungültiger Dateiinhalt! - - - MicrotonalView::ScalePreview + <b>name:</b> - + <b>Name:</b> + <b>number of ratio:</b> - + <b>Anzahl der Tonverhältnisse:</b> + Invalid Scala file: - + Ungültige Scala-Datei: - QWidget + QObject - Show - + view + Ansicht anzeigen - view - + + Show "%1" view + Ansicht "%1" anzeigen diff --git a/tr/fmit_fr.ts b/tr/fmit_fr.ts index 62946f1..423bd30 100644 --- a/tr/fmit_fr.ts +++ b/tr/fmit_fr.ts @@ -1,13 +1,11 @@ - + + + ConfigForm - Configuration - - - Error variation tolerance - Tolérance sur la variance de l'erreur + Tolérance sur la variance de l'erreur Sound Capture @@ -22,28 +20,16 @@ Détection automatique - ALSA - - - - hw:0 - - - Sampling rate Taux d'échantillonnage set to max - maximiser - - - JACK - + Maximiser automaticaly connect at startup to - se connecte automatiquement au démarrage + se connecte automatiquement au démarrage Real-time parameters @@ -58,10 +44,6 @@ Augmente pour alléger le processeur mais perdre de la résolution en temps - ms - - - Sound Analysis Analyse du son @@ -71,7 +53,7 @@ Range - Tessiture + Tessiture from half-tones below A3 and above @@ -97,7 +79,7 @@ ignore sounds below this treshold Ignore le son en dessous de ce seuil - + °/.. °/.. @@ -162,18 +144,6 @@ Tonalité - C (Do) - - - - Bb (Sib) - - - - Eb (Mib) - - - the tonality of the showed notes name la tonalité des noms des notes @@ -184,11 +154,7 @@ Usefull for converting notes name to a corresponding instrument tonality (exampl Notes name - Nom des notes - - - Latin - + Nom des notes use englo-saxon or latin notes name @@ -264,7 +230,7 @@ latine: Do Re Mi Fa Sol La Si Restore factory settings - Restaurer la configuration de départ + Restaurer la configuration de départ &OK @@ -276,7 +242,7 @@ latine: Do Re Mi Fa Sol La Si &Cancel - A&nnuller + A&nnuler Show volume history @@ -288,15 +254,11 @@ latine: Do Re Mi Fa Sol La Si Start in full-screen - Démarre en plein-écran + Démarrer en plein-écran Auto-save configuration and views layout on exit - Sauvegarder automatiquement la configuration et la disposition des vues en quittant - - - Anglo-Saxon - + Sauvegarder automatiquement la configuration et la disposition des vues en quittant use anglo-saxon or latin notes name @@ -393,11 +355,11 @@ Latine: Do Re Mi Fa Sol La Si Restore all settings as you just installed the program (need a program restart). - Revenir à la configuration comme si le program venait d'être installé (requière un redémarrage du programme). + Revenir à la configuration comme si le program venait d'être installé (requière un redémarrage du programme). Raise the window to the whole screen when the program start (f) - Agrandit la fenêtre sur tout l'écran lorsque le programme démarre (f) + Agrandit la fenêtre sur tout l'écran lorsque le programme démarre (f) Use anglo-saxon or latin notes name. @@ -439,7 +401,7 @@ Plus petites est la valeur plus vite le program répond, mais plus la fréquence Client name - Nom de client ("client name") + Nom du client fmit @@ -455,7 +417,7 @@ Plus petites est la valeur plus vite le program répond, mais plus la fréquence mix channels if they are multiple (will use the first channel if not checked) - mélanger les canaux s'il y en a plusieurs (utilise le premier sinon) + mélanger les canaux s'il y en a plusieurs (utilise le premier sinon) PortAudio @@ -480,7 +442,7 @@ Plus petites est la valeur plus vite le program répond, mais plus la fréquence <b>To get more options:</b><br> right-click every view to show up their properties ! - <b>Pour plus d'options:</b><br> + <b>Pour plus d'options:</b><br> click-droit sur les vues pour afficher leurs propriétés ! @@ -489,15 +451,15 @@ click-droit sur les vues pour afficher leurs propriétés ! Selected capture system - Système de capture sélectionné + Système de capture sélectionné Auto-detect a working one at startup - En détecter un automatiquement au lancement + En détecter un automatiquement au lancement dB - dB + dB Algorithm @@ -513,7 +475,7 @@ click-droit sur les vues pour afficher leurs propriétés ! Use sub-harmonic audibility treshold - Utiliser un seuil d'audibilité de sous-harmonique + Utiliser un seuil d'audibilité de sous-harmonique Maximum number of harmonics @@ -525,187 +487,319 @@ click-droit sur les vues pour afficher leurs propriétés ! Range filtering - Filtrage de la portée + Filtrage de la portée Maximum number of periods - + Nombre maximum de péiodes + + + Show A4 offset spin box + Montrer la boite de décalage du La4 + + + Configuration + Configuration + + + Tuning scale + Echelle d'accordage + + + Chromatic + + + + Werckmeister III + + + + Kirnberger III + + + + Diatonic + + + + Meantone (1/4) + + + + C (Do) + + + + Bb (Sib) + + + + Eb (Mib) + + + + Use anglo-saxon or latin note names: +anglo-saxon: C D E F G A B +latin: Do Re Mi Fa Sol La Si + Utiliser la notation anglo-saxone ou latine. +Anglo-saxon: C D E F G A B +Latine: Do Re Mi Fa Sol La Si + + + Note names + Nom des notes + + + Anglo-Saxon + + + + Latin + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">To get more options:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Right-click every view to show up their properties!</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Pour obtenir plus d'options:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Faites un clique-droit sur chaque vue pour voir ses propriétés !</p></body></html> + + + Capture System + Système de capture du son + + + Auto-detect an available capture system at startup + Détecter automatiquement un système de capture au démarrage + + + JACK + + + + Sampling rate of the JACK server + Taux d'échantillonnage du server JACK + + + ALSA + Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. - + Ne pas utiliser une fréquence d'échantillonage trop élevée. 22050Hz devrait être largement suffisant dans la pluspart des cas. + + + The name of the OSS device to connect to + Le nom du device OSS + + + The name of the PortAudio device to connect to + Le nom du device PortAudio + + + ms + ms Rectangular filter: bad precision, but very fast - + Filtre réctangulaire: mauvaise précision, mais utilise peu de CPU FIR filter: good precision, but more costly in CPU usage - + Filtre FIR: bonne précision, mais utilise plus de CPU. + + + Algorithm settings + Réglages de l'algorithme + + + dB + dB + + + Use sub-harmonic audibility threshold + Utiliser un seuil d'audibilité des sous-harmoniques. Window size factor - + Facteur de taille de fenêtre - The tonality of the notes name. - + Frequency refinement settings + Réglage du rafinnage fréquenciel - The tonality of the notes name. -Usefull for converting notes name to a corresponding instrument tonality. -(examples: Eb for saxophone, Bb for trumpet, etc.) - + Frequency domain fundamental refinement: +mean of the fundamental relative frequencies of the harmonics. +Choose the number of harmonics to use. + - Use anglo-saxon or latin notes name: -anglo-saxon: C D E F G A B -latin: Do Re Mi Fa Sol La - + Quantizer settings + Réglage du quantizer - Use anglo-saxon or latin notes name: -anglo-saxon: C D E F G A B -latin: Do Re Mi Fa Sol La - + Restore &factory settings + Restaurer la configuration de départ - Show A4 offset spin box - Montrer la boite de décalage du La4 + Raise the window to the whole screen when the program is started +(You can also use the shortcut 'f'). + Agrandit la fenêtre sur tout l'écran lorsque le programme démarre (utilisez le raccourci 'f') - right-click every view to show up their properties ! - + Auto-save configuration and layout on exit + Sauvegarder automatiquement la configuration et la disposition des vues en quittant - Capture System - + The used tuning scale to determine note frequency values. Useful for tuning historic intruments. + L'échelle d'accordage utilisée pour déterminer la fréquence des notes. Pratique pour utiliser des échelles historiques. - The selected capture system: the sound server, sound library, like: -JACK, ALSA, OSS, PortAudio - + The used tonality. +Useful to convert note names to a corresponding instrument tonality (e.g. Eb for saxophone, Bb for trumpet). + La tonalité utilisée. +Utile pour convertir le nom des notes dans la tonalité d'un instrument. +(ex. Mib pour le saxophone, Sib pour la trompette) - Auto-detect an available capture system at startup - + Show the spin box for the A4 offset + Montrer la boite de décalage du La4 - Auto-detect an available capture system at startup. -Even if the capture system is available, it may not works if it's bad configured. - + Selected the capture system (e.g. JACK, ALSA, OSS, PortAudio) + Le système de capture sélectionné (ex. JACK, ALSA? OSS, PortAudio) - Auto-detect an available capture system now. -Even if the capture system is available, it may not works if it's bad configured. - + Auto detect a working capture system at FMIT startup. + Détecter automatiquement un système de capture au démarrage - The name of FMIT under the JACK connection system - + The name of this FMIT instance in the JACK connections. + Le nom de cette instance de FMIT dans JACK - Connect automaticaly FMIT to the following source at startup - + Automatically connect FMIT to the following source at startup (e.g. alsa_pcm:capture_1) + Au démarrage, connecter automatiquement FMIT à la source suivante (ex. alsa_pcm:capture_1) - Connect automaticaly FMIT to the this source at startup - + automaticaly connect to... + se connecte automatiquement à ... - Sampling rate of the JACK server - + JACK sampling rate + Taux d'échantillonnage du server JACK - The device name, where the ALSA library have to be connected to - + The name of the ALSA device to use. + Le nom du device ALSA - The sampling rate, sampling frequency, number of samples by second ... - + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + Le taux d'échantillonnage choisi. Ne pas utiliser une fréquence d'échantillonage trop élevée. 22050Hz devrait être largement suffisant dans la pluspart des cas. - The sampling rate, sampling frequency, number of samples by second ... -Do not rise it too much. Around 22050Hz should be largely enough in most cases. - + Set the sampling rate to the maximum possible value. + Maximiser le taux d'échantillonnage. + + + Mix channels if there are multiple (if unchecked, the first channel will be used) + Mélanger les canaux s'il y en a plusieurs (sinon, utiliser le premier sinon) Time between each sound analysis. -Increase to get less CPU usage but less time precision. - +Can be increased to get less CPU usage (but less temporal precision). + Temps entre chaque analyse du son. Augmenter pour réduire l'utilisation du processeur mais baisse la résolution temporelle. - Frequency analysis range: from the lowest note to the highest from the A4 reference note. - + Range of possible notes from the lowest to the highest around the A4 reference note. +Smaller the range, smaller the CPU usage. + Fourchette des notes possibles à partir de la plus basse jusqu'à la plus haute à partir du La de référence. +Plus petite est cette fourchette, moins de CPU est nécessaire. - Lowest semi-tone from the A4 reference note. -Sometimes, this is usefull to put it higher than -35 to avoid a noise from the sector alimentation. - + Notes range + Fourchette de notes - Lowest semi-tone from the A4 reference note in frequency. -Sometimes, this is usefull to put it higher than 50hz to avoid a noise from the sector alimentation. - + Lowest semitone from the A4 reference note. +It can useful to put it higher than -35 to avoid disturbance from the sector alimentation (~50hz). + Le plus bas demi-ton à partir du La de référence. +Il paut être utile de mettre cette valeur en dessus de -35 pour éviter des perturbations possibles de l'alimentation (~50Hz). - Highest semi-tone from the A4 reference note. - + Highest semitone from the A4 reference note. + Le plus haut demi-ton à partir du La de référence. - Highest semi-tone from the A4 reference note in frequency - + Filter the sound below the lowest semitone and above the highest semitone to avoid artefacts and noises in all the following steps of the sound analysis. + Filtre le son en dessous et en dessus du plus bas et du plus haut demi-ton pour éviter des artefacts et du bruit dans les étapes d'annalyses suivantes. - Filter frequencies belove the lowest semi-tone and above the highest semi-tone to avoid artefacts, noises, in all the following steps of the sound analysis. - + Notes range filtering + Filtrage de la fourchette de notes - Filter frequencies belove the lowest semi-tone and above the highest semi-tone -to avoid artefacts, noises, in all the following steps of the sound analysis. - + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) + Ignorer tout les sons dont le volume est en dessous de ce seuil [dB]. +(Ce seuil est visible sous la forme d'une ligne rouge dans les différentes vues). - Algorithm settings - + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. + Ignorer les sous-harmoniques faibles. +Ce seuil est définit entre deux composantes fréquencielles voisines. +Prévient d'éventuelles sous estimations. - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. + Temps de réponse du program et tolérance des trous, grésillements, etc. +Plus petites est la valeur, plus vite le program répond, mais la fréquence calculée devient alors plus instable. - Ignore weak sub-harmonics. -The treshold is defined between two neighborhood frequency components. -Prevent too-low errors. - + Use a refinement method in frequency domain: compute the mean of the quasi-harmonic related spectral peaks (the option allows to chose the number of harmonics to use). + Utiliser un rafinage en domaine fréquentiel: calcul la moyenne des peaks spectrales quasi-harmoniques (l'option permet de choisir le nombre de peaks à utiliser). - Factor defining the window size from the lowest period define by the range. -Bigger is this factor, more stable is the analysis but more CPU the program will need and slower the program will react to sound changes. - + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + Utiliser un rafinage en domaine temporel: calcul la moyenne des différentes périodes estimées (l'option permet de choisir le nombre de périodes à utiliser). - Frequency domain fundamental refinement: -Mean of the fundamental relative frequencies of the harmonics. -Choose the number of harmonics to use. - + Quantize the analysis results: ignore frequency jumps, fill gaps, ignore short notes. +The smaller the value, the faster the tuner. However, by decreasing the value, the computed frequency will be more unstable. + Temps de réponse du program et tolérance des trous, grésillements, etc. +Plus petites est la valeur, plus vite le program répond, mais la fréquence calculée devient alors plus instable. - Time domain fundamental refinement: -Mean of period lengths. -Choose the number of period to use. - + Restore settings as if you just installed FMIT (requires to restart FMIT). + Revenir à la configuration comme si le program venait d'être installé (requière un redémarrage du programme). - Quantize the analysis results: ignore frequency jumps, fill holes, ignore too short notes. -Smaller is the following value, faster the tuner respond, but more unstable the computed frequency is. - + Use these settings and quit the configuration panel (it is required to click on the "Save settings" button to permanently keep these settings for each FMIT start) + Utiliser ces réglages et quitte le paneau de configuration (Il est nécessaire de cliquer sur le bouton "Sauver les réglages" pour concerver les réglages de façon permanente pour chaque redémarrage de FMIT). - Use theses settings and exist configure panel (but don't save the settings !) - + Discard any changes and quit the configuration panel + Abandonner les modifications de réglages et quitter le panneau de configuration. + + + The capture system (e.g. JACK, ALSA, OSS, PortAudio) + Le système de capture (ex. JACK, ALSA OSS, PortAudio) + + + The capture system + Le système de capture du son @@ -738,38 +832,38 @@ Are you sure you want to lose all your current settings ? </h3><p><h3>Website:</h3><p>homepage: <a href="http://home.gna.org/fmit">http://home.gna.org/fmit</a> - + </h3><p><h3>Site web:</h3><p>Page principale: <a href="http://home.gna.org/fmit">http://home.gna.org/fmit</a> <p>development site: <a href="http://gna.org/projects/fmit">http://gna.org/projects/fmit</a> - + <p>Page de développement: <a href="http://gna.org/projects/fmit">http://gna.org/projects/fmit</a> <p>donation link: <a href="http://home.gna.org/fmit/donation.html">http://home.gna.org/fmit/donation.html</a> - - - - <p><h3>Author:</h3><p>Gilles Degottex [gilles.degottex@net2000.ch] - + <p>Lien pour faire un don: <a href="http://home.gna.org/fmit/donation.html">http://home.gna.org/fmit/donation.html</a> <p><h3>Packager:</h3><p> - + about_box - + A propos de - OK - + <p><h3>Author:</h3><p>Gilles Degottex <a href="mailto:gilles.degottex@gmail.com">gilles.degottex@gmail.com</a> + <p><h3>Auteur:</h3><p>Gilles Degottex <a href="mailto:gilles.degottex@gmail.com">gilles.degottex@gmail.com</a> + + + &OK + &Accepter DialView Show trace - Afficher une trace + Afficher une trace Use percentages @@ -777,30 +871,34 @@ Are you sure you want to lose all your current settings ? Show tolerance - Montrer la tolérance + Montrer la tolérance Use cents - Utilise la mesure en cents + Utilise la mesure en cents Scale range - Échelle d'étirement + Échelle d'étirement Scale range (in cents) - Échelle d'étirement (en cents) + Échelle d'étirement (en cents) + + + Dial + GLErrorHistory Error - Erreur + Erreur Keep previous notes - Conserver les anciennes notes + Conserver les notes précédantes Use percentages @@ -808,15 +906,19 @@ Are you sure you want to lose all your current settings ? Use cents - Utilise la mesure en cents + Utiliser la mesure en cents Scale range - Échelle d'étirement + Échelle d'étirement Scale range (in cents) - Échelle d'étirement (en cents) + Échelle d'étirement (en cents) + + + Error history + Progression de l'erreur @@ -825,6 +927,38 @@ Are you sure you want to lose all your current settings ? Auto scale Adapte la taille automatiquement + + Fourier Transform + Transformée de Fourier + + + dB scale + Echelle en dB + + + Size + taille + + + window length + taille de fenêtre + + + - Press left mouse button to move the view + - Presser le bouton gauche pour déplacer la vue + + + - Press SHIFT key and left mouse button to zoom in and out + - Presser la touche SHIFT et le bouton gauche de la souris pour zoomer et dézoomer + + + - Double-click to reset the view + - Double-cliquer pour réinitialiser la vue + + + Frequency %1 [Hz] + Fréquence %1 [Hz] + GLFormants @@ -849,38 +983,38 @@ Are you sure you want to lose all your current settings ? Number of harmonics - Nombre d'harmoniques + Nombre d'harmoniques Harmonics - Harmoniques + Harmoniques GLGraph Captured Sound - Son + Son Auto scale - Adapte la taille automatiquement + Adapter la taille Duration - Durée + Durée Max height - Hauteur maximale + Hauteur maximale Show Wave Form - Montrer la forme d'onde + Montrer la forme d'onde Scale factor - Facteur d'étirement + Facteur d'étirement @@ -891,18 +1025,93 @@ Are you sure you want to lose all your current settings ? Show fading - Afficher un estompage + Afficher un estompage Number of fading - Nombre d'estompages + Nombre d'estompages + + + Wave form + Forme d'onde + + + + GLStatistics + + Statistics + Statistiques + + + Reset statistics + Mettre les statistiques à zéro + + + Keep notes when hidden + Concerver les notes lorsque cette vues est cachée + + + Keep n values + Conserver n valeurs + + + Keep this number of values in the computation of the statistics + Conserver ce numbre de valeurs dans les statistiques + + + Show standard deviation + Montrer l'écart-type + + + Scale auto + Adapter la taille + + + Scale min + Note la plus basse + + + Scale min value (in semi-tones) + Demi-ton le plus bas + + + Scale max + Note la plus haute + + + Scale max value (in semi-tones) + Demi-ton le plus haut + + + Show tolerance + Montrer la tolérance + + + Use cents + Utilise la mesure en cents + + + Scale range + Échelle d'étirement + + + Scale range (in cents) + Échelle d'étirement (en cents) GLVolumeHistory Keep previous notes - Conserver les anciennes notes + Conserver les notes précédantes + + + Volume history + Progression du volume + + + Volume + Volume @@ -929,7 +1138,7 @@ r Keep errors (k) - Garder les erreurs (g) + Garder les erreurs (g) Keep errors @@ -948,10 +1157,6 @@ r Fréquence d'accordage - Hz - - - A3 frequency Fréquence du La3 @@ -987,7 +1192,7 @@ At 9, the instrument is a quarter tone lower. &About - &A propos de + &A propos de Show sample @@ -998,10 +1203,6 @@ At 9, the instrument is a quarter tone lower. Montrer les composantes - Pause - - - Space Espace @@ -1022,10 +1223,6 @@ At 9, the instrument is a quarter tone lower. Sauvegarder la configuration - Ctrl+S - - - Reset Redémarre @@ -1092,11 +1289,11 @@ Are you sure you want to lose all your current settings ? Put in pause state to use less processor has possible. - Met le program en état de pause pour utiliser un minimum de processeur. + Met le program en état de pause pour utiliser un minimum de processeur. Save configure panel settings, views settings and window size. - Sauvegarde les réglages du panneau de configuration, les réglages des vues et la taille de la fenêtre. + Sauvegarde les réglages du panneau de configuration, les réglages des vues et la taille de la fenêtre. Stop, reload settings and restart the capture sound system. @@ -1108,7 +1305,7 @@ Are you sure you want to lose all your current settings ? Settings - Configurations + Réglages Offset @@ -1116,64 +1313,78 @@ Are you sure you want to lose all your current settings ? Offset in cents on the tuning frequency - Décalage en cents depuis la fréquence d'accordage + Décalage en cents depuis la fréquence d'accordage cents cents - Red if capture system is not working<br/> -Grey if capture system is ok, but there is no sound enough<br/> -Orange if analysis conditions are bad (like saturation)<br/> -Green if a note is beeing catured and conditions are ok - + Free Music Instrument Tuner + - Free Music Instrument Tuner - + Hz + + + + Pause + + + + Ctrl+S + - Do not clear graphs between notes (for error and volume graphs only) - + Keep the data in the error and volume views (shortcut "k"). + Conserver les données dans les vues d'erreurs et volumes (raccourci 'k') - Volume with dB scale - + Volume in dB. +Computed in the frequency domain, from the maximum bin. +The maximum is reached when the signal energy is maximal NOT when the sound is saturated in the time domain. + Volume en dB. Calculé en domain fréquenciel, à partir du bin maximum. +Le maximum de volume est atteintlorsque l'energie du signal est maximal, pas lorsque la forme d'onde sature dans le domaine temporel. - Volume with dB scale. -Computed from in the frequency domaine, from the max bin. -The maximum is reached when the signal energy is maximal NOT when the sound saturate in time domaine. - + According to the following colors: +red : the capture system is not working. +grey : the capture system is OK, but there is not enough sound. +orange : the analysis conditions are bad (like saturation) +green : a note is beeing analyzed and analysis conditions are OK. + Selon les couleurs suivantes: +rouge : le système de capture ne fonctionne pas. +gris : le système de capture est OK, mais le son n'est pas assez fort. +orange : les conditions d'analyses ne sont pas suffisantes (ex. il y a saturation). +vert : une note est en cours d'analyse et les conditions d'analyses sont OK. - the tuning frequency: A4 frequency - + The base tunning frequency (the A4 frequency) + La fréquence d'accordage de base (la fréquence du La de référence) - Offset in cents from the tuning frequency - + Offset in cents from the base tuning frequency + Décalage en cents à partir de la fréquence d'accordage de base - The frequency of the current played note - + The frequency of the current note in Hertz. + La fréquence de la note actuelle en Hertz - The frequency of the note as it should be - + The target frequency of the current note in Hertz. + La fréquence cible de la note actuelle en Hertz. - About FMIT - + Pause: the capture, the sound analysis and all views. + Met en pause la capture du son, l'analyse et toutes les vues. - Invoke the about box - + Save configuration panel settings, views settings and the window size. + Sauvegarde les réglages du panneau de configuration, les réglages des vues et la taille de la fenêtre. - Put in pause state, stop the capture, the sound analysis and all views - + Invoke the about box. + Alazquiz abaut boxis ! @@ -1226,15 +1437,15 @@ The maximum is reached when the signal energy is maximal NOT when the sound satu MicrotonalView Unkown filename: ' - Nom de fichier inconnu: ' + Nom de fichier inconnu: ' Keep root to left side - Conserver la tonique à l'extrémité gauche + Conserver la tonique à l'extrémité gauche Load Scala file ... - Charger un fichier Scala ... + Charger un fichier Scala ... used scale @@ -1242,19 +1453,39 @@ The maximum is reached when the signal energy is maximal NOT when the sound satu Open scale file - Ouvrir un fichier d'échelle + Ouvrir un fichier d'échelle scala Scale name already exist - Nom d'échelle déjà existant + Nom d'échelle déjà existant Invalid file content ! - Contenu de fichier invalid ! + Contenu de fichier invalide ! Root's octave - Octave de base + Octave de base + + + Microtonal + Microtonal + + + Used scale + Échelle utilisée + + + <b>name:</b> + <b>nom:</b> + + + <b>number of ratio:</b> + <b>nombre de valeures:</b> + + + Invalid Scala file: + Fichier Scala invalide: @@ -1273,6 +1504,13 @@ The maximum is reached when the signal energy is maximal NOT when the sound satu + QObject + + Show "%1" view + Montrer la vue "%1" + + + QWidget Show diff --git a/ui/ConfigForm.ui b/ui/ConfigForm.ui index 9cd3db8..013d87e 100644 --- a/ui/ConfigForm.ui +++ b/ui/ConfigForm.ui @@ -1,2295 +1,1818 @@ - -ConfigForm - - - ConfigForm - - - - 0 - 0 - 537 - 702 - - - - Configuration - - - image0 - - - true - - - Error variation tolerance - - - - unnamed - - - 11 - - - 6 - - - - tabWidget + + + ConfigForm + + + + 0 + 0 + 672 + 822 + + + + Configuration + + + + :/fmit/images/configForm.png:/fmit/images/configForm.png + + + true + + + + 6 + + + 11 + + + + + 1 + + + + General + + + + + + Raise the window to the whole screen when the program is started +(You can also use the shortcut 'f'). + + + Raise the window to the whole screen when the program is started +(You can also use the shortcut 'f'). + + + Start in full-screen + + + + + + + Auto-save configuration and layout on exit + + + + + + + + + The used tuning scale to determine note frequency values. Useful for tuning historic intruments. + + + The used tuning scale to determine note frequency values. Useful for tuning historic intruments. + + + Tuning scale + + + + + + + The used tuning scale to determine note frequency values. Useful for tuning historic intruments. + + + The used tuning scale to determine note frequency values. Useful for tuning historic intruments. + + + + Chromatic - - - TabPage - - - General - - - - unnamed - - - - ui_chkFullScreen - - - Start in full-screen - - - Raise the window to the whole screen when the program start (f) - - - Raise the window to the whole screen when the program start (f) - - - - - ui_chkAutoSaveOnExit - - - Auto-save configuration and views layout on exit - - - false - - - Auto-save configuration and views layout on exit - - - Auto-save configuration and views layout on exit - - - - - layout34_1 - - - - unnamed - - - - textLabel1_7_1 - - - Tuning scale - - - The tuning used. - - - The tuning used to determine note values. Useful for tuning historic intruments. - - - - - - Chromatic - - - - - Werckmeister III - - - - - Kirnberger III - - - - - Diatonic - - - - - Meantone (1/4) - - - - ui_cbTuning - - - The tuning used. - - - The tuning used to determine note values. Useful for tuning historic intruments. - - - - - - - layout34_2 - - - - unnamed - - - - textLabel1_7 - - - Tonality - - - The tonality of the notes name. - - - The tonality of the notes name. -Usefull for converting notes name to a corresponding instrument tonality. -(examples: Eb for saxophone, Bb for trumpet, etc.) - - - - - - C (Do) - - - - - Bb (Sib) - - - - - Eb (Mib) - - - - ui_cbTonality - - - The tonality of the notes name. - - - The tonality of the notes name. -Usefull for converting notes name to a corresponding instrument tonality. -(examples: Eb for saxophone, Bb for trumpet, etc.) - - - - - - - layout35_4 - - - - unnamed - - - - textLabel3_3 - - - Notes name - - - Use anglo-saxon or latin notes name: + + + + Werckmeister III + + + + + Kirnberger III + + + + + Diatonic + + + + + Meantone (1/4) + + + + + + + + + + + + The used tonality. +Useful to convert note names to a corresponding instrument tonality (e.g. Eb for saxophone, Bb for trumpet). + + + The used tonality. +Useful to convert note names to a corresponding instrument tonality (e.g. Eb for saxophone, Bb for trumpet). + + + Tonality + + + + + + + The used tonality. +Useful to convert note names to a corresponding instrument tonality (e.g. Eb for saxophone, Bb for trumpet). + + + The used tonality. +Useful to convert note names to a corresponding instrument tonality (e.g. Eb for saxophone, Bb for trumpet). + + + + C (Do) + + + + + Bb (Sib) + + + + + Eb (Mib) + + + + + + + + + + + + Use anglo-saxon or latin note names: anglo-saxon: C D E F G A B -latin: Do Re Mi Fa Sol La - - - Use anglo-saxon or latin notes name: +latin: Do Re Mi Fa Sol La Si + + + Use anglo-saxon or latin note names: anglo-saxon: C D E F G A B -latin: Do Re Mi Fa Sol La - - - - - - Anglo-Saxon - - - - - Latin - - - - ui_cbNotesName - - - Use anglo-saxon or latin notes name: +latin: Do Re Mi Fa Sol La Si + + + Note names + + + + + + + Use anglo-saxon or latin note names: anglo-saxon: C D E F G A B -latin: Do Re Mi Fa Sol La - - - Use anglo-saxon or latin notes name: +latin: Do Re Mi Fa Sol La Si + + + Use anglo-saxon or latin note names: anglo-saxon: C D E F G A B -latin: Do Re Mi Fa Sol La - - - - - - - ui_chkShowA4Offset - - - Show A4 offset spin box - - - false - - - Show A4 offset spin box - - - Show A4 offset spin box - - - - - spacer5 - - - Vertical - - - Expanding - - - - 20 - 110 - - - - - - textLabel1_5 - - - - 10 - - - - <b>To get more options:</b><br> -right-click every view to show up their properties ! - - - WordBreak|AlignVCenter - - - right-click every view to show up their properties ! - - - <b>To get more options:</b><br> -right-click every view to show up their properties ! - - - - - spacer5_2 - - - Vertical - - - Expanding - - - - 20 - 100 - - - - - - - - Widget2 +latin: Do Re Mi Fa Sol La Si + + + + Anglo-Saxon + + + + + Latin + + + + + + + + + + Show the spin box for the A4 offset + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 110 + + + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">To get more options:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Right-click every view to show up their properties!</p></body></html> + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 100 + + + + + + + + + Capture System + + + + + + + + The capture system (e.g. JACK, ALSA, OSS, PortAudio) + + + The capture system (e.g. JACK, ALSA, OSS, PortAudio) + + + The capture system + + + + + + + Selected the capture system (e.g. JACK, ALSA, OSS, PortAudio) + + + Selected the capture system (e.g. JACK, ALSA, OSS, PortAudio) + + + + + + + + + + + Auto detect a working capture system at FMIT startup. + + + Auto detect a working capture system at FMIT startup. + + + Auto-detect an available capture system at startup + + + true + + + + + + + Auto detect a working capture system at FMIT startup. + + + Auto detect a working capture system at FMIT startup. + + + Auto detect now + + + + + + + + + JACK + + + + + + + + The name of this FMIT instance in the JACK connections. + + + The name of this FMIT instance in the JACK connections. + + + Client name + + + + + + + false + + + + 0 + 0 + + + + The name of this FMIT instance in the JACK connections. + + + The name of this FMIT instance in the JACK connections. + + + fmit + + + + + + + + + + + Automatically connect FMIT to the following source at startup (e.g. alsa_pcm:capture_1) + + + Automatically connect FMIT to the following source at startup (e.g. alsa_pcm:capture_1) + + + automaticaly connect to... + + + + + + + false + + + + 0 + 0 + + + + Automatically connect FMIT to the following source at startup (e.g. alsa_pcm:capture_1) + + + Automatically connect FMIT to the following source at startup (e.g. alsa_pcm:capture_1) + + + + + + + + + + + Sampling rate of the JACK server + + + Sampling rate of the JACK server + + + JACK sampling rate + + + + + + + Sampling rate of the JACK server + + + Sampling rate of the JACK server + + + + + + + + + + + + ALSA + + + + + + + + The name of the ALSA device to use. + + + The name of the ALSA device to use. + + + Device name + + + + + + + + 0 + 0 + + + + The name of the ALSA device to use. + + + The name of the ALSA device to use. + + + default + + + + + + + + + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + Sampling rate + + + + + + + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. - - Capture System - - - - unnamed - - - - layout51 - - - - unnamed - - - - ui_lblSelectedCaptureSystem - - - Selected capture system - - - The selected capture system: the sound server, sound library, like: -JACK, ALSA, OSS, PortAudio - - - The selected capture system: the sound server, sound library, like: -JACK, ALSA, OSS, PortAudio - - - - - ui_cbTransports - - - The selected capture system: the sound server, sound library, like: -JACK, ALSA, OSS, PortAudio - - - The selected capture system: the sound server, sound library, like: -JACK, ALSA, OSS, PortAudio - - - - - - - layout56 - - - - unnamed - - - - ui_chkAutoDetect - - - Auto-detect an available capture system at startup - - - true - - - Auto-detect a working one at startup - - - Auto-detect an available capture system at startup. -Even if the capture system is available, it may not works if it's bad configured. - - - - - ui_btnAutoDetect - - - Auto detect now - - - Auto-detect an available capture system now. -Even if the capture system is available, it may not works if it's bad configured. - - - Auto-detect an available capture system now. -Even if the capture system is available, it may not works if it's bad configured. - - - - - - - ui_grpJACK - - - JACK - - - - unnamed - - - - layout56 - - - - unnamed - - - - textLabel1 - - - Client name - - - The name of FMIT under the JACK connection system - - - The name of FMIT under the JACK connection system - - - - - lineEdit7 - - - false - - - - 5 - 0 - 0 - 0 - - - - fmit - - - The name of FMIT under the JACK connection system - - - The name of FMIT under the JACK connection system - - - - - - - layout24 - - - - unnamed - - - - ui_chkJACKAutoConnect - - - automaticaly connect at startup to - - - Connect automaticaly FMIT to the following source at startup (eg. alsa_pcm:capture_1) - - - Connect automaticaly FMIT to the following source at startup (eg. alsa_pcm:capture_1) - - - - - ui_txtJACKSourcePort - - - false - - - - 5 - 0 - 0 - 0 - - - - Connect automaticaly FMIT to the this source at startup (eg. alsa_pcm:capture_1) - - - Connect automaticaly FMIT to the this source at startup (eg. alsa_pcm:capture_1) - - - - - - - layout25 - - - - unnamed - - - - textLabel3 - - - Sampling rate - - - Sampling rate of the JACK server - - - Sampling rate of the JACK server - - - - - ui_lblJACKSamplingRate - - - Sampling rate of the JACK server - - - Sampling rate of the JACK server - - - - - - - - - ui_grpALSA - - - ALSA - - - - unnamed - - - - layout22 - - - - unnamed - - - - textLabel1_2 - - - Device name - - - The device name, where the ALSA library have to be connected to - - - The device name, where the ALSA library have to be connected to - - - - - ui_txtALSAPCMName - - - - 5 - 0 - 0 - 0 - - - - hw:0 - - - The device name, where the ALSA library have to be connected to - - - The device name, where the ALSA library have to be connected to - - - - - - - layout33 - - - - unnamed - - - - textLabel4 - - - Sampling rate - - - The sampling rate, sampling frequency, number of samples by second ... - - - The sampling rate, sampling frequency, number of samples by second ... -Do not rise it too much. Around 22050Hz should be largely enough in most cases. - - - - - ui_spinALSASamplingRate - - - PlusMinus - - - 96000 - - - 8000 - - - 22050 - - - The sampling rate, sampling frequency, number of samples by second ... - - - The sampling rate, sampling frequency, number of samples by second ... -Do not rise it too much. Around 22050Hz should be largely enough in most cases. - - - - - ui_chkALSASamplingRateMax - - - set to max - - - - - - - textLabel1_5_2_2 - - - Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. - - - WordBreak|AlignVCenter - - - - - ui_chkALSAMixMultipleChannels - - - mix channels if they are multiple (will use the first channel if not checked) - - - false - - - - - - - ui_grpOSS - - - OSS - - - - unnamed - - - - layout22_2 - - - - unnamed - - - - textLabel1_2_2 - - - Device name - - - The device name, where the ALSA library have to be connected to - - - The device name, where the ALSA library have to be connected to - - - - - ui_txtOSSPCMName - - - - 5 - 0 - 0 - 0 - - - - /dev/dsp - - - The device name, where the ALSA library have to be connected to - - - The device name, where the ALSA library have to be connected to - - - - - - - layout33_3 - - - - unnamed - - - - textLabel4_3 - - - Sampling rate - - - The sampling rate, sampling frequency, number of samples by second ... - - - The sampling rate, sampling frequency, number of samples by second ... -Do not rise it too much. Around 22050Hz should be largely enough in most cases. - - - - - ui_spinOSSSamplingRate - - - PlusMinus - - - 96000 - - - 8000 - - - 22050 - - - The sampling rate, sampling frequency, number of samples by second ... - - - The sampling rate, sampling frequency, number of samples by second ... -Do not rise it too much. Around 22050Hz should be largely enough in most cases. - - - - - ui_chkOSSSamplingRateMax - - - set to max - - - - - - - textLabel1_5_2 - - - Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. - - - WordBreak|AlignVCenter - - - - - ui_chkOSSMixMultipleChannels - - - mix channels if they are multiple (will use the first channel if not checked) - - - false - - - - - - - ui_grpPortAudio - - - PortAudio - - - - unnamed - - - - layout30 - - - - unnamed - - - - textLabel1_8 - - - Device name - - - The device name, where the ALSA library have to be connected to - - - The device name, where the ALSA library have to be connected to - - - - - - default - - - - ui_cbPortAudioDeviceName - - - The device name, where the ALSA library have to be connected to - - - The device name, where the ALSA library have to be connected to - - - - - - - layout33_2 - - - - unnamed - - - - textLabel4_2 - - - Sampling rate - - - The sampling rate, sampling frequency, number of samples by second ... - - - The sampling rate, sampling frequency, number of samples by second ... -Do not rise it too much. Around 22050Hz should be largely enough in most cases. - - - - - ui_spinPortAudioSamplingRate - - - PlusMinus - - - 96000 - - - 8000 - - - 22050 - - - The sampling rate, sampling frequency, number of samples by second ... - - - The sampling rate, sampling frequency, number of samples by second ... -Do not rise it too much. Around 22050Hz should be largely enough in most cases. - - - - - ui_chkPortAudioSamplingRateMax - - - set to max - - - - - - - textLabel1_5_2_2_2 - - - Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. - - - WordBreak|AlignVCenter - - - - - ui_chkPortAudioMixMultipleChannels - - - mix channels if they are multiple (will use the first channel if not checked) - - - false - - - - - - - spacer6 - - - Vertical - - - Expanding - - - - 20 - 16 - - - - - - - - Widget3 + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. - - Sound Analysis - - - - unnamed - - - - layout147 - - - - unnamed - - - - textLabel1_4 - - - Refresh time - - - Time between each sound analysis. -Increase to get less CPU usage but less time precision. - - - Time between each sound analysis. -Increase to get less CPU usage but less time precision. - - - - - ui_spinRefreshTime - - - ms - - - PlusMinus - - - 2000 - - - 1 - - - 20 - - - Time between each sound analysis. -Increase to get less CPU usage but less time precision. - - - Time between each sound analysis. -Increase to get less CPU usage but less time precision. - - - - - - - layout34 - - - - unnamed - - - - textLabel7 - - - Range - - - Frequency analysis range: from the lowest note to the highest from the A4 reference note. - - - Frequency analysis range: from the lowest note to the highest from the A4 reference note. - - - - - layout26 - - - - unnamed - - - - ui_spinMinHT - - - PlusMinus - - - 96 - - - -96 - - - -36 - - - Lowest semi-tone from the A4 reference note. -Sometimes, this is usefull to put it higher than -35 to avoid a noise from the sector alimentation. - - - Lowest semi-tone from the A4 reference note. -Sometimes, this is usefull to put it higher than -35 to avoid a noise from the sector alimentation. - - - - - ui_txtMinHT - - - Lowest semi-tone from the A4 reference note in frequency. -Sometimes, this is usefull to put it higher than 50hz to avoid a noise from the sector alimentation. - - - Lowest semi-tone from the A4 reference note in frequency. -Sometimes, this is usefull to put it higher than 50hz to avoid a noise from the sector alimentation. - - - - - - - layout27 - - - - unnamed - - - - ui_spinMaxHT - - - PlusMinus - - - 96 - - - -96 - - - 48 - - - Highest semi-tone from the A4 reference note. - - - Highest semi-tone from the A4 reference note. - - - - - ui_txtMaxHT - - - Highest semi-tone from the A4 reference note in frequency - - - Highest semi-tone from the A4 reference note in frequency - - - - - - - - - ui_grpRangeFiltering - - - Range filtering - - - true - - - Filter frequencies belove the lowest semi-tone and above the highest semi-tone to avoid artefacts, noises, in all the following steps of the sound analysis. - - - Filter frequencies belove the lowest semi-tone and above the highest semi-tone to avoid artefacts, noises, in all the following steps of the sound analysis. - - - - unnamed - - - - ui_rdRangeFilteringRectangular - - - Rectangular filter: bad precision, but very fast - - - true - - - Filter frequencies belove the lowest semi-tone and above the highest semi-tone -to avoid artefacts, noises, in all the following steps of the sound analysis. - - - Filter frequencies belove the lowest semi-tone and above the highest semi-tone -to avoid artefacts, noises, in all the following steps of the sound analysis. - - - - - ui_rdRangeFilteringFIR - - - false - - - FIR filter: good precision, but more costly in CPU usage - - - Filter frequencies belove the lowest semi-tone and above the highest semi-tone -to avoid artefacts, noises, in all the following steps of the sound analysis. - - - Filter frequencies belove the lowest semi-tone and above the highest semi-tone -to avoid artefacts, noises, in all the following steps of the sound analysis. - - - - - - - groupBox7_2_3 - - - Algorithm - - - Algorithm settings - - - Algorithm settings - - - - unnamed - - - - layout54 - - - - unnamed - - - - textLabel3_2 - - - Volume threshold - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - - - line2 - - - - 100 - 0 - - - - - - - 0 - 0 - 0 - - - 255 - 0 - 0 - - - 255 - 127 - 127 - - - 255 - 63 - 63 - - - 127 - 0 - 0 - - - 170 - 0 - 0 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 230 - 231 - 230 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - - - 128 - 128 - 128 - - - 255 - 0 - 0 - - - 255 - 127 - 127 - - - 255 - 38 - 38 - - - 127 - 0 - 0 - - - 170 - 0 - 0 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 128 - 128 - 128 - - - 255 - 255 - 255 - - - 230 - 231 - 230 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 192 - - - 128 - 0 - 128 - - - - - 0 - 0 - 0 - - - 255 - 0 - 0 - - - 255 - 127 - 127 - - - 255 - 38 - 38 - - - 127 - 0 - 0 - - - 170 - 0 - 0 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 0 - 0 - 0 - - - 255 - 255 - 255 - - - 230 - 231 - 230 - - - 0 - 0 - 0 - - - 0 - 0 - 128 - - - 255 - 255 - 255 - - - 0 - 0 - 192 - - - 128 - 0 - 128 - - - - - - HLine - - - Sunken - - - Horizontal - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - - - - - layout59 - - - - unnamed - - - - ui_sldVolumeTreshold - - - -100 - - - 0 - - - -28 - - - Horizontal - - - Below - - - 6 - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - - - ui_spinVolumeTreshold - - - dB - - - PlusMinus - - - 0 - - - -100 - - - -28 - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - Ignore all sounds with volume below this threshold. -in dB in frequency domain. -(shown has a red line in different views) - - - - - - - layout60 - - - - unnamed - - - - ui_sldCombedFFTAudibilityRatio - - - false - - - 100 - - - 15 - - - Horizontal - - - Below - - - 6 - - - Ignore weak sub-harmonics. -The treshold is defined between two neighborhood frequency components. -Prevent too-low errors. - - - Ignore weak sub-harmonics. -The treshold is defined between two neighborhood frequency components. -Prevent too-low errors. - - - - - ui_spinCombedFFTAudibilityRatio - - - false - - - dB - - - PlusMinus - - - 100 - - - 15 - - - Ignore weak sub-harmonics. -The treshold is defined between two neighborhood frequency components. -Prevent too-low errors. - - - Ignore weak sub-harmonics. -The treshold is defined between two neighborhood frequency components. -Prevent too-low errors. - - - - - - - ui_chkAlgoUseSubHarmTresh - - - Use sub-harmonic audibility treshold - - - Ignore weak sub-harmonics. -The treshold is defined between two neighborhood frequency components. -Prevent too-low errors. - - - Ignore weak sub-harmonics. -The treshold is defined between two neighborhood frequency components. -Prevent too-low errors. - - - - - layout59_2_3 - - - - unnamed - - - - ui_sldWindowSizeFactor - - - 1 - - - 8 - - - 10 - - - 4 - - - Horizontal - - - Below - - - 1 - - - Factor defining the window size from the lowest period define by the range. -Bigger is this factor, more stable is the analysis but more CPU the program will need and slower the program will react to sound changes. - - - Factor defining the window size from the lowest period define by the range. -Bigger is this factor, more stable is the analysis but more CPU the program will need and slower the program will react to sound changes. - - - - - ui_spinWindowSizeFactor - - - PlusMinus - - - 8 - - - 1 - - - 4 - - - Factor defining the window size from the lowest period define by the range. -Bigger is this factor, more stable is the analysis but more CPU the program will need and slower the program will react to sound changes. - - - Factor defining the window size from the lowest period define by the range. -Bigger is this factor, more stable is the analysis but more CPU the program will need and slower the program will react to sound changes. - - - - - - - textLabel1_6 - - - Window size factor - - - Factor defining the window size from the lowest period define by the range. -Bigger is this factor, more stable is the analysis but more CPU the program will need and slower the program will react to sound changes. - - - Factor defining the window size from the lowest period define by the range. -Bigger is this factor, more stable is the analysis but more CPU the program will need and slower the program will react to sound changes. - - - - - - - up_grpFreqRefinement - - - Frequency refinement - - - true - - - - unnamed - - - - ui_rdUseFreqRefinement - - - Maximum number of harmonics - - - Frequency domain fundamental refinement: -Mean of the fundamental relative frequencies of the harmonics. -Choose the number of harmonics to use. - - - Frequency domain fundamental refinement: -Mean of the fundamental relative frequencies of the harmonics. -Choose the number of harmonics to use. - - - - - ui_rdUseTimeRefinement - - - Maximum number of periods - - - true - - - Time domain fundamental refinement: -Mean of period lengths. -Choose the number of period to use. - - - Time domain fundamental refinement: -Mean of period lengths. -Choose the number of period to use. - - - - - layout59_2_2 - - - - unnamed - - - - ui_sldTimeRefinMaxPeriod - - - 1 - - - 64 - - - 10 - - - 16 - - - Horizontal - - - Below - - - 8 - - - Time domain fundamental refinement: -Mean of period lengths. -Choose the number of period to use. - - - Time domain fundamental refinement: -Mean of period lengths. -Choose the number of period to use. - - - - - ui_spinTimeRefinMaxPeriod - - - PlusMinus - - - 64 - - - 1 - - - 4 - - - Time domain fundamental refinement: -Mean of period lengths. -Choose the number of period to use. - - - Time domain fundamental refinement: -Mean of period lengths. -Choose the number of period to use. - - - - - - - layout59_2 - - - - unnamed - - - - ui_sldFreqRefinMaxHarm - - - 1 - - - 64 - - - 10 - - - 8 - - - Horizontal - - - Below - - - 8 - - - Frequency domain fundamental refinement: -Mean of the fundamental relative frequencies of the harmonics. -Choose the number of harmonics to use. - - - Frequency domain fundamental refinement: -Mean of the fundamental relative frequencies of the harmonics. -Choose the number of harmonics to use. - - - - - ui_spinFreqRefinMaxHarm - - - PlusMinus - - - 64 - - - 1 - - - 8 - - - Frequency domain fundamental refinement: -Mean of the fundamental relative frequencies of the harmonics. -Choose the number of harmonics to use. - - - Frequency domain fundamental refinement: -Mean of the fundamental relative frequencies of the harmonics. -Choose the number of harmonics to use. - - - - - - - - - ui_grpQuantizer - - - Quantizer - - - true - - - - unnamed - - - - layout35_2 - - - - unnamed - - - - textLabel1_3 - - - Latency - - - Quantize the analysis results: ignore frequency jumps, fill holes, ignore too short notes. -Smaller is the following value, faster the tuner respond, but more unstable the computed frequency is. - - - Quantize the analysis results: ignore frequency jumps, fill holes, ignore too short notes. -Smaller is the following value, faster the tuner respond, but more unstable the computed frequency is. - - - - - ui_spinErrorLatency - - - ms - - - PlusMinus - - - 4000 - - - 1 - - - 125 - - - Quantize the analysis results: ignore frequency jumps, fill holes, ignore too short notes. -Smaller is the following value, faster the tuner respond, but more unstable the computed frequency is. - - - Quantize the analysis results: ignore frequency jumps, fill holes, ignore too short notes. -Smaller is the following value, faster the tuner respond, but more unstable the computed frequency is. - - - - - - - - - spacer8 - - - Vertical - - - Expanding - - - - 20 - 40 - - - - - + + 8000 + + + 96000 + + + 22050 + + + + + + + Set the sampling rate to the maximum possible value. + + + Set the sampling rate to the maximum possible value. + + + set to max + + + + + + + + + + + Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. + + + + + + + Mix channels if there are multiple (if unchecked, the first channel will be used) + + + + - - - layout54 + + + + + OSS + + + + + + + + The name of the OSS device to connect to + + + The name of the OSS device to connect to + + + Device name + + + + + + + + 0 + 0 + + + + The name of the OSS device to connect to + + + The name of the OSS device to connect to + + + /dev/dsp + + + + + + + + + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + Sampling rate + + + + + + + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + 8000 + + + 96000 + + + 22050 + + + + + + + Set the sampling rate to the maximum possible value. + + + Set the sampling rate to the maximum possible value. + + + set to max + + + + + + + + + + + Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. - - - unnamed + + + + + + Mix channels if there are multiple (if unchecked, the first channel will be used) + + + + + + + + + + PortAudio + + + + + + + + The name of the PortAudio device to connect to + + + The name of the PortAudio device to connect to + + + Device name + + + + + + + The name of the PortAudio device to connect to + + + The name of the PortAudio device to connect to + + + + default + + + + + + + + + + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + Sampling rate + + + + + + + + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. - - - ui_btnRestoreFactorySettings - - - Restore factory settings - - - Restore all settings as you just installed the program (need a program restart). - - - Restore all settings as you just installed the program (need a program restart). - - - - - spacer3 - - - Horizontal - - - Expanding - - - - 40 - 20 - - - - - - buttonOk - - - &OK - - - - - - true - - - true - - - Use theses settings and exist configure panel (but don't save the settings !) - - - Use theses settings and exist configure panel (but don't save the settings !) - - - - - buttonCancel - - - &Cancel - - - - - - true - - - + + The chosen sampling rate. +Do not use a too big sampling rate. 22050Hz should be enough in most cases. + + + 8000 + + + 96000 + + + 22050 + + + + + + + Set the sampling rate to the maximum possible value. + + + Set the sampling rate to the maximum possible value. + + + set to max + + + + + + + + + + + Do not use a too big sampling rate. 22050Hz should be largely enough in most cases. + + + + + + + Mix channels if there are multiple (if unchecked, the first channel will be used) + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 16 + + + + + + + + + Sound Analysis + + + + + + + + Time between each sound analysis. +Can be increased to get less CPU usage (but less temporal precision). + + + Time between each sound analysis. +Can be increased to get less CPU usage (but less temporal precision). + + + Refresh time + + + + + + + Time between each sound analysis. +Can be increased to get less CPU usage (but less temporal precision). + + + Time between each sound analysis. +Can be increased to get less CPU usage (but less temporal precision). + + + ms + + + 1 + + + 2000 + + + 20 + + + + + + + + + + + Range of possible notes from the lowest to the highest around the A4 reference note. +Smaller the range, smaller the CPU usage. + + + Range of possible notes from the lowest to the highest around the A4 reference note. +Smaller the range, smaller the CPU usage. + + + Notes range + + + + + + + + + Lowest semitone from the A4 reference note. +It can useful to put it higher than -35 to avoid disturbance from the sector alimentation (~50hz). + + + Lowest semitone from the A4 reference note. +It can useful to put it higher than -35 to avoid disturbance from the sector alimentation (~50hz). + + + -96 + + + 96 + + + -36 + + + + + + + Lowest semitone from the A4 reference note. +It can useful to put it higher than -35 to avoid disturbance from the sector alimentation (~50hz). + + + Lowest semitone from the A4 reference note. +It can useful to put it higher than -35 to avoid disturbance from the sector alimentation (~50hz). + + + + + + + + + + + Highest semitone from the A4 reference note. + + + Highest semitone from the A4 reference note. + + + -96 + + + 96 + + + 48 + + + + + + + Highest semitone from the A4 reference note. + + + Highest semitone from the A4 reference note. + + + + + + + + + + + Filter the sound below the lowest semitone and above the highest semitone to avoid artefacts and noises in all the following steps of the sound analysis. + + + Filter the sound below the lowest semitone and above the highest semitone to avoid artefacts and noises in all the following steps of the sound analysis. + + + Notes range filtering + + + true + + + + + + Rectangular filter: bad precision, but very fast + + + true + + + + + + + false + + + FIR filter: good precision, but more costly in CPU usage + + + + + + + + + + Algorithm settings + + + Algorithm settings + + + Algorithm + + + + + + + + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) + + + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) + + + -100 + + + 0 + + + -28 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 6 + + + + + + + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) + + + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) + + + dB + + + -100 + + + 0 + + + -28 + + + + + + + + + + + false + + + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. + + + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. + + + 100 + + + 15 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 6 + + + + + + + false + + + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. + + + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. + + + dB + + + 100 + + + 15 + + + + + + + + + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. + + + Ignore weak sub-harmonics. +This threshold is defined between two neighbors frequency components. +Prevents underestimation errors. + + + Use sub-harmonic audibility threshold + + + + + + + + + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. + + + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. + + + 1 + + + 8 + + + 10 + + + 4 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 1 + + + + + + + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. + + + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. + + + 1 + + + 8 + + + 4 + + + + + + + + + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. + + + Factor defining the window size (from the lowest possible period defined by the notes range). +The bigger this factor, the more stable the analysis. However, by increasing this factor, FMIT will need more CPU and will react slower to sound changes. + + + Window size factor + + + + + + + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) + + + Ignore all sounds with volume below this threshold [dB] +(Shown as a red line in various views) + + + Volume threshold + + + + - - - - - 89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af400000995494441545885ad97596c5cd519c77f779fb9b379c64eec388ee36c640f2610b134850402626d4b6969a144290f541404550b0814aaee955a15fa50412b01a29b0ab4f481250d2941ec04502981e090385e13db33f678167be6de3b73f73e8c1d2089d33ef493cecbe8fb9fffef7cf79c39df11f8bf85005d9f5f2f6fbae946ad65f15a521d097bfce3a2d7f7ea5b7cf0b7bf624e66e750cd117254a4fdac8548728642df18d55c616e6f19f99a07ee3bf3fa3b7fd8de2444ec3ad80e982ee4a67d72bd6f1c0b76edbc93a36f3f7ba2543ae5842b2e5fb3f8b63f3fb6fc2b3b7fdd7cc1f6db84b36edc61e9adcbc9f70e52af9c04227df1d7f7debef33bbfd8b94d90a3b186b922434c81942c12e8eda9e9f96baf6668df47988523a7075876e98a1d0f3fbfe7c73b169d2b6ba2a22992d8d2948cd3b9f99ca9d4ca4bc3432fbc8c579f3c9edfb565ed967b1efac36fb6895a93047d0e4c5980089208b2089140c40834d50a59c591977601d559b978a27fe735b7dffded2d6a57b302b206f11864e2b0ba0916afdd7206ebbff43d409dcd57baafbb6ed54229d9ebc3be1a580ee83ae8118869108f422621b0281621da71d646324b2efeb4df6701d4a4debaf282adaf8ec08b63200890883600dad2b03cad12ef3cfb42a06b569298b7e8ac6209fe7100f60f43a5069a0651ada14dc720adc3fc98422a9684746737a0cceae5130aa03a76a81f3a0a4d4988e9d0ac8312858a00665420a6289a811083b0b182d08d964d90f3904a423c0eaa0ac9284474a85b2039505240174310a4f84c05dd932be054a74b477b3eb46ca8996019e0d441f04109c077ead8d903a31056662576a5305c77c0b11bc3ae3586ef8018822a801282e0d904b532181313ccd29fbc07c230fbc2af1e193e6685d31530ca305580fc380c1f7338b87f9f3f75e0f91780e327c1e8d9b5bb3c6553af43cd6a80db33f046056a0618559fe97291e9dc91290a03ef03f6acfea4531016fa7b27c7fa2b466ce566cb89a8b90983fe23831cd8f71c43bb7e9e0bf2477e031c3e2e28f40fd633cb37c5dabb97cb3e841e042e040e3835a84c058c8e8cd33bd44beef5479ea638f814509e130020183ff86ef9bdbfefcd1e7e23dde41d5d13cdbe863ab89bf2508fe8fac193c0f0a7d3eda1b7df998eccdbea44da5a034fc0adf958864ba95865786494de818f197ded91bd41ef8b0f00bd803f2b3e71131e2f0456e15f41efde7b979e216dddb0a1bb79585f456e74346ee5726b80573e935d9d1848bef9d3bd2b3a83f5fb8f26b1c5042221ae59c6c91d2c9b079e7d9adc478f020701e7d3d2b9006663f050dff08b9bcebff0864c8b4d737333b95c6ef5a912972c6cedb865a3ceb37bfe496ecae2c8e0310a6343c8b6f12853530f01634070a2eebf0130d0dff744213f71831e8bd3924923c65b2e0c575d792fb1160803290c832a134385d68ee43a49d3492762441589a10339d211319fafd82f022373cd7f7a8096335adc6597ae399433fc2dddf3a54ca6093d9658df76d53dbf88af58073ef82114c7b2b4571fa3661a78418855b7a99a353445fec0b6ed23a7b3383540bc3d215f7cef1d4bb77df38ec59dc9b6da0bbfc4770c5adb1612f1df2639dd4367621d6100a108a9628905b28e59ab138621939393388e83d4b9a9d52f058ba98ccc5981934fc1daaf6eecbaf3e967b6df7cd9372e5ea3c55b533055f51046de67e1c2760e7df42156a499e4da2d08b284a442fdd801ce6b36b1eb75b2d91c873e3e88ebf9442ebaabcd3aff8eebbcc057c8f5bc47e8bba7af40f78ecbb67dffd127efba5cc9482af41c856c19269bcec42e3d41bdfc0178362a2287fbf2f8924add87c8e18f69ea4a712c57c1344d26c6b33475aea3b57319cd2d67a606e73ff0937cfb9917b2e707dfc22a0d9d1a60d5b5e75efda3479f78f81a25531161ef10bcd90fb92244e41423c9cdbcb3ef49321bae27b27233e9549d585c40d32304932eb22451abd529954a985583255dab696a6b454a802e2739f2b91ddb46a3a96778e6bb5fc32c1cfe2c40a233b5eed6077ffbe0154a3322bc3e0abbdfb3181eae90897878ba4aebd66b597ac965c4b490443a4532a9a328603b3e95430aa2ac50abd598181f271444325dab496652086ae34e581544f1d75fbe2167e41f67d77d5fc677c78f0328dbeebeedd62f2cd91853614f0e7a4740137c962d5249679a89c714a21a8852024902510049005104df36d13c0b4952a8542ae472595a167490ec5a4932a9e1d3b8ccc2406299ad535d7bd5f9c6c0ebf7d0f3ecdd4028a2cf8b2edd7cfdf69638bc9c8783c3306540269da07d41865854411621084008411620aa80a6802f40253f41c78c51b158a43a3dc5fce5ebf0921d38a2422034aee7a80a695d65412286b0fa8a1b91d40d8d0ab4ae5aac45524bf6ee073700db070410a54643228b8dd56a32a80a984ec8d06440d980ba2f61f45b8cbdb487d75c8ba363e364d229c2f967f3ca4187707814bb36cda6ae142b1675509304d28a889e6a6b3353ed67531afe5026f4e5baed087dd9088ad230d11488680d0899c69d5e3643c6a7a1660bc4448926190409cc8e95ec6fba9cfc9bbfa7599358bbf5eb14339d2c9b07d1580d3c91b6a48614804c808a4b8400535232802c933f3c522d8d8d6612c965028d120702845263d82ef4e5434cc32321b8244517a3e63215f8a89a88ae8b6cbdf916f4edd7a1ba06482a7ab28578b20942f05cb04c30aa10ba359c5a15cf2c3818852c10ca58a5e9d23b7f7caa79c14fef9703015790910077a6ec23458bbe8151daf4907a54434a4659d41923938ca0472422aa0021f8611cdf87c0833000cb02d705cf06bb0ea661512a1598284e62f4befc2eb5720f8d6d0468c979a99b1edfbdb8fbca7312324454958826115541967cc2d025129189eb3211b5b13760e65533db5c85108410ce40781eb80e38751fd3a832519c64283bc6f8fee7fa9db77eb713afbe1b301b7fc5be6dd9fdafbf69c6dace93335ded5218200401a12f00328a2c238622810b8ed398d89b19ae3df35bfd937eb066069886c3d47495f1c93c83d931fa063e0a26dff9d3abfebffff2333cfb15a0727c11c743892e9436de707ffadced3b5ada97eba9884e4c95892832aa2c218b029224228a202020101286214110e27b1eb6eb50b3eb58759b8a65502ae628e7fa2bb58137f68703af3ec774762f300058b396a77a1bcac4e69d27acdc7693befca24b12edab96eaf1b418d1a28d4a8822221012e2fb1e9e6363d70d6ab52a75a3ecd64ad949bb746cc22f0d1f23dfdb4371e05dbcfa21601c303ff5d1e604f80444103b49b475d3bca49b68ba1549d591150d4114f15c1fdfb171eb2656a98c55ca6316c6708c09c2a008e4018346ffefcd65723a801343a1f1a090f9a49df76786738249c8ff18ff019be35d187a77ecac0000000049454e44ae426082 - - - - - buttonOk - clicked() - ConfigForm - accept() - - - buttonCancel - clicked() - ConfigForm - reject() - - - ui_chkALSASamplingRateMax - toggled(bool) - ui_spinALSASamplingRate - setDisabled(bool) - - - ui_chkJACKAutoConnect - toggled(bool) - ui_txtJACKSourcePort - setEnabled(bool) - - - ui_chkPortAudioSamplingRateMax - toggled(bool) - ui_spinPortAudioSamplingRate - setDisabled(bool) - - - ui_chkOSSSamplingRateMax - toggled(bool) - ui_spinOSSSamplingRate - setDisabled(bool) - - - ui_sldCombedFFTAudibilityRatio - valueChanged(int) - ui_spinCombedFFTAudibilityRatio - setValue(int) - - - ui_spinCombedFFTAudibilityRatio - valueChanged(int) - ui_sldCombedFFTAudibilityRatio - setValue(int) - - - ui_sldVolumeTreshold - valueChanged(int) - ui_spinVolumeTreshold - setValue(int) - - - ui_spinVolumeTreshold - valueChanged(int) - ui_sldVolumeTreshold - setValue(int) - - - ui_chkAlgoUseSubHarmTresh - toggled(bool) - ui_spinCombedFFTAudibilityRatio - setEnabled(bool) - - - ui_chkAlgoUseSubHarmTresh - toggled(bool) - ui_sldCombedFFTAudibilityRatio - setEnabled(bool) - - - ui_sldFreqRefinMaxHarm - valueChanged(int) - ui_spinFreqRefinMaxHarm - setValue(int) - - - ui_spinFreqRefinMaxHarm - valueChanged(int) - ui_sldFreqRefinMaxHarm - setValue(int) - - - ui_sldWindowSizeFactor - valueChanged(int) - ui_spinWindowSizeFactor - setValue(int) - - - ui_spinWindowSizeFactor - valueChanged(int) - ui_sldWindowSizeFactor - setValue(int) - - - ui_sldTimeRefinMaxPeriod - valueChanged(int) - ui_spinTimeRefinMaxPeriod - setValue(int) - - - ui_spinTimeRefinMaxPeriod - valueChanged(int) - ui_sldTimeRefinMaxPeriod - setValue(int) - - - - + + + + + Frequency refinement settings + + + Frequency refinement settings + + + Frequency refinement + + + true + + + + + + Use a refinement method in frequency domain: compute the mean of the quasi-harmonic related spectral peaks (the option allows to chose the number of harmonics to use). + + + Use a refinement method in frequency domain: compute the mean of the quasi-harmonic related spectral peaks (the option allows to chose the number of harmonics to use). + + + Maximum number of harmonics + + + + + + + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + + + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + + + Maximum number of periods + + + true + + + + + + + + + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + + + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + + + 1 + + + 64 + + + 10 + + + 16 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 8 + + + + + + + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + + + Use a refinement method in time domain: compute the mean of various period lengths (the option allows to chose the number of periods to use). + + + 1 + + + 64 + + + 4 + + + + + + + + + + + Use a refinement method in frequency domain: compute the mean of the quasi-harmonic related spectral peaks (the option allows to chose the number of harmonics to use). + + + Use a refinement method in frequency domain: compute the mean of the quasi-harmonic related spectral peaks (the option allows to chose the number of harmonics to use). + + + 1 + + + 64 + + + 10 + + + 8 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 8 + + + + + + + Frequency domain fundamental refinement: +mean of the fundamental relative frequencies of the harmonics. +Choose the number of harmonics to use. + + + Frequency domain fundamental refinement: +mean of the fundamental relative frequencies of the harmonics. +Choose the number of harmonics to use. + + + 1 + + + 64 + + + 8 + + + + + + + + + + + + Quantizer settings + + + Quantizer settings + + + Quantizer + + + true + + + + + + + + Quantize the analysis results: ignore frequency jumps, fill gaps, ignore short notes. +The smaller the value, the faster the tuner. However, by decreasing the value, the computed frequency will be more unstable. + + + Quantize the analysis results: ignore frequency jumps, fill gaps, ignore short notes. +The smaller the value, the faster the tuner. However, by decreasing the value, the computed frequency will be more unstable. + + + Latency + + + + + + + Quantize the analysis results: ignore frequency jumps, fill gaps, ignore short notes. +The smaller the value, the faster the tuner. However, by decreasing the value, the computed frequency will be more unstable. + + + Quantize the analysis results: ignore frequency jumps, fill gaps, ignore short notes. +The smaller the value, the faster the tuner. However, by decreasing the value, the computed frequency will be more unstable. + + + ms + + + 1 + + + 4000 + + + 125 + + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + + + + + + + + + Restore settings as if you just installed FMIT (requires to restart FMIT). + + + Restore settings as if you just installed FMIT (requires to restart FMIT). + + + Restore &factory settings + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Use these settings and quit the configuration panel (it is required to click on the "Save settings" button to permanently keep these settings for each FMIT start) + + + Use these settings and quit the configuration panel (it is required to click on the "Save settings" button to permanently keep these settings for each FMIT start) + + + &OK + + + true + + + true + + + + + + + Discard any changes and quit the configuration panel + + + Discard any changes and quit the configuration panel + + + &Cancel + + + true + + + + + + + + + + + + + + buttonOk + clicked() + ConfigForm + accept() + + + 20 + 20 + + + 20 + 20 + + + + + buttonCancel + clicked() + ConfigForm + reject() + + + 20 + 20 + + + 20 + 20 + + + + + ui_chkALSASamplingRateMax + toggled(bool) + ui_spinALSASamplingRate + setDisabled(bool) + + + 20 + 20 + + + 20 + 20 + + + + + ui_chkJACKAutoConnect + toggled(bool) + ui_txtJACKSourcePort + setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + + + + ui_chkPortAudioSamplingRateMax + toggled(bool) + ui_spinPortAudioSamplingRate + setDisabled(bool) + + + 20 + 20 + + + 20 + 20 + + + + + ui_chkOSSSamplingRateMax + toggled(bool) + ui_spinOSSSamplingRate + setDisabled(bool) + + + 20 + 20 + + + 20 + 20 + + + + + ui_sldCombedFFTAudibilityRatio + valueChanged(int) + ui_spinCombedFFTAudibilityRatio + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_spinCombedFFTAudibilityRatio + valueChanged(int) + ui_sldCombedFFTAudibilityRatio + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_sldVolumeTreshold + valueChanged(int) + ui_spinVolumeTreshold + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_spinVolumeTreshold + valueChanged(int) + ui_sldVolumeTreshold + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_chkAlgoUseSubHarmTresh + toggled(bool) + ui_spinCombedFFTAudibilityRatio + setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + + + + ui_chkAlgoUseSubHarmTresh + toggled(bool) + ui_sldCombedFFTAudibilityRatio + setEnabled(bool) + + + 20 + 20 + + + 20 + 20 + + + + + ui_sldFreqRefinMaxHarm + valueChanged(int) + ui_spinFreqRefinMaxHarm + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_spinFreqRefinMaxHarm + valueChanged(int) + ui_sldFreqRefinMaxHarm + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_sldWindowSizeFactor + valueChanged(int) + ui_spinWindowSizeFactor + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_spinWindowSizeFactor + valueChanged(int) + ui_sldWindowSizeFactor + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_sldTimeRefinMaxPeriod + valueChanged(int) + ui_spinTimeRefinMaxPeriod + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + ui_spinTimeRefinMaxPeriod + valueChanged(int) + ui_sldTimeRefinMaxPeriod + setValue(int) + + + 20 + 20 + + + 20 + 20 + + + + + diff --git a/ui/InstrumentTunerForm.ui b/ui/InstrumentTunerForm.ui index 66ffad0..1d280de 100644 --- a/ui/InstrumentTunerForm.ui +++ b/ui/InstrumentTunerForm.ui @@ -1,715 +1,616 @@ - -InstrumentTunerForm - - - InstrumentTunerForm - - - - 0 - 0 - 532 - 448 - - - - Free Music Instrument Tuner - - - image0 - - - - unnamed - - - - layout42 + + + InstrumentTunerForm + + + + 0 + 0 + 532 + 448 + + + + Free Music Instrument Tuner + + + + :/fmit/ui/images/fmit.png:/fmit/ui/images/fmit.png + + + + + + + + + + + + + + + + + 0 + 0 + - - - unnamed - - - - layout18 - - - - unnamed - - - - ui_graphLayout - - - - unnamed - - - - - - layout17 - - - - unnamed - - - - ui_btnKeepErrorHistory - - - - 1 - 5 - 0 - 0 - - - - - 20 - 32767 - - - - NoFocus - - - K + + + 20 + 16777215 + + + + Qt::NoFocus + + + Keep the data in the error and volume views (shortcut "k"). + + + Keep the data in the error and volume views (shortcut "k"). + + + K e e p - - - K - - - true - - - false - - - Keep errors (k) - - - Do not clear graphs between notes (for error and volume graphs only) - - - - - layout16 - - - - unnamed - - - - ui_errorLayout - - - - unnamed - - - - - - ui_volumeLayout - - - - unnamed - - - - - - - - - - ui_sampleLayout - - - - unnamed - - - - - - ui_formantsLayout - - - - unnamed - - - - - - ui_FT - - - - unnamed - - - - - - - - ui_rightLayout - - - - unnamed - - - - ui_pgbVolume - - - - 1 - 0 - 0 - 0 - - - - - 32767 - 14 - - - - false - - - Volume with dB scale - - - Volume with dB scale. -Computed from in the frequency domaine, from the max bin. -The maximum is reached when the signal energy is maximal NOT when the sound saturate in time domaine. - - - - - ui_lblSoundStability - - - - 1 - 5 - 0 - 0 - - - - - 300 - 0 - - - - - 165 - 165 - 165 - - - - - 11 - - - - Note Stability - - - WordBreak|AlignCenter - - - Red if capture system is not working<br/> -Grey if capture system is ok, but there is no sound enough<br/> -Orange if analysis conditions are bad (like saturation)<br/> -Green if a note is beeing catured and conditions are ok - - - Red if capture system is not working<br/> -Grey if capture system is ok, but there is no sound enough<br/> -Orange if analysis conditions are bad (like saturation)<br/> -Green if a note is beeing catured and conditions are ok - - - - - layout16 - - - - unnamed - - - - layout27 - - - - unnamed - - - - textLabel8 - - - - 10 - 1 - - - - Tuning Frequency - - - AlignVCenter|AlignRight - - - - - ui_spinAFreq - - - - 100 - 32767 - - - - - 14 - 1 - - - - NoFocus - - - Hz - - - PlusMinus - - - 880 - - - 220 - - - 1 - - - 440 - - - the tuning frequency: A4 frequency - - - the tuning frequency: A4 frequency - - - - - - - layout27_2 - - - - unnamed - - - - ui_lblA3Offset - - - Offset - - - AlignVCenter|AlignRight - - - Offset in cents on the tuning frequency - - - - - ui_spinA3Offset - - - - 100 - 32767 - - - - NoFocus - - - cents - - - PlusMinus - - - 50 - - - -50 - - - 1 - - - 0 - - - Offset in cents on the tuning frequency - - - Offset in cents from the tuning frequency - - - - - - - - - ui_dialTuneLayout - - - - unnamed - - - - - - ui_txtFreq - - - - 1 - 1 - 0 - 0 - - - - - 0 - 25 - - - - NoFrame - - - Plain - - - Flat - - - The frequency in Hertz of the current played note - - - The frequency in Hertz of the current played note - - - - - layout40 - - - - unnamed - - - - ui_txtNote - - - - 28 - - - - AlignCenter - - - The recognized note - - - The recognized note - - - - - ui_txtNoteFreq - - - - 1 - 1 - 0 - 0 - - - - - 32767 - 25 - - - - NoFrame - - - Plain - - - Flat - - - The frequency in Hertz of the note as it should be - - - The frequency in Hertz of the note as it should be - - - - - - - - - - - ui_microtonalLayout - - NoFocus + + K - - - unnamed - - - - - - - - MenuBarEditor - - - - - - ui_tbViews - - - Views - - - - textLabel7 + + true - - Views + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 14 + + + + Volume in dB. +Computed in the frequency domain, from the maximum bin. +The maximum is reached when the signal energy is maximal NOT when the sound is saturated in the time domain. + + + Volume in dB. +Computed in the frequency domain, from the maximum bin. +The maximum is reached when the signal energy is maximal NOT when the sound is saturated in the time domain. + + + + + + false + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + 11 + + + + According to the following colors: +red : the capture system is not working. +grey : the capture system is OK, but there is not enough sound. +orange : the analysis conditions are bad (like saturation) +green : a note is beeing analyzed and analysis conditions are OK. + + + According to the following colors: +red : the capture system is not working. +grey : the capture system is OK, but there is not enough sound. +orange : the analysis conditions are bad (like saturation) +green : a note is beeing analyzed and analysis conditions are OK. + + + true + + + Note Stability + + + Qt::AlignCenter + + + true + + + + + + + + + + + + 10 + 75 + true + + + + The base tunning frequency (the A4 frequency) + + + The base tunning frequency (the A4 frequency) + + + Tuning Frequency + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + 100 + 32767 + + + + + 14 + 75 + true + + + + Qt::NoFocus + + + The base tunning frequency (the A4 frequency) + + + The base tunning frequency (the A4 frequency) + + + Hz + + + 220 + + + 880 + + + 1 + + + 440 + + + + + + + + + + + Offset in cents from the base tuning frequency + + + Offset in cents from the base tuning frequency + + + Offset + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + 100 + 32767 + + + + Qt::NoFocus + + + Offset in cents from the base tuning frequency + + + Offset in cents from the base tuning frequency + + + cents + + + -50 + + + 50 + + + 1 + + + 0 + + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + The frequency of the current note in Hertz. + + + The frequency of the current note in Hertz. + + + QFrame::NoFrame + + + QFrame::Plain + + + QLCDNumber::Flat + + + + + + + + + + 28 + + + + The recognized note + + + The recognized note + + + Qt::AlignCenter + + + false + + + + + + + + 0 + 0 + + + + + 32767 + 25 + + + + The target frequency of the current note in Hertz. + + + The target frequency of the current note in Hertz. + + + QFrame::NoFrame + + + QFrame::Plain + + + QLCDNumber::Flat - - - - - ui_tbButtons - - - Settings - - - - - - - - - - - helpAboutAction - - - image1 - - - About - - - &About - - - About FMIT - - - Invoke the about box - - - - - - - - pauseAction - - - true - - - image2 - - - Pause - - - Put in pause state to use less processor has possible. - - - Put in pause state, stop the capture, the sound analysis and all views - - - Space - - - - - configAction - - - image3 - - - Configure - - - - - saveSettingsAction - - - image4 - - - Save settings - - - Save configure panel settings, views settings and window size. - - - Save configure panel settings, views settings and window size. - - - Ctrl+S - - - - - - 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003a849444154388d8d954b4c5c6514c77f77e672a7cccb99f0b2a4093666061b4402098f020b024436920848a37521246a8ca6abc69ad865830b13a376d918178d6da262ac93b40b174dc0486b902812093e182c42a08333cc1d66eedcd7dccf45d154321739c9b7f94efebffccf39dfc3cbd1e224300a3c0b540019403fa2b66c34023f4b92743f1289e8d5d5d54296e51c701f78ed30a174486e08b8168bc5aa3a3a3aa8acac440881aeebacacacb0b8b8b867dbf697c04be5c45e176818f8baa5a5a5aebdbd9d70384c3018445114244922140a1189447cebebeb27800560ed20c0e302be188d461f6d6c6ca4a2a2029fcf472814c2eff7a3280ab22c138d46696868a8022e9703b881fb6b6b6bbd8ee3f0cf324d13dbb6711c07210442086a6a6a00aaca552ebb806bfc7e3f9665619a269aa6fd0bd5751dd334b12c0b4551e0c19c4e00f78e0236f2f93cbaaee3f57a711c075996711c07cbb228168b188641369b0510c0c6511dcf673299587d7dbd2484c0344dbc5e2f42086cdbc6300c0cc3209d4e03fc05948e0a9e4aa7d3438140b13a972b619a261e8f072104a55209dbb6515595542a95065e2d07701bde73f1f823e1975fa9a2a5354ca150209fcf532814d0348d6c36cbeaea6ad6719c6bc05c3940b90b720c48be79a1ebb8659de2cc591feb6b5916e677b879738dcdcd744e55d5027001f8c4c55859c7afd7d55546b482cde6460ecbb2f1780a24d7922c2f27b755551d011e03be05de57142501f41f841cec7105707e64e464e5ae6ad371da43c92cb2bd95e3ee9d94037c01dc06a6babbbbcf353737878410eceeee3e3d3d3d7d4308f1bc5b05670201397fe3ab2191dc784b2c2cbe213efd7c58bc70f671c18387a71668eceaeaca8d8d8d99c06fc07bfdfdfdf9dedede3de0b45b2b8ecbb2a7e2d453714c5323bbbbcbf696ca777777c4bed394cfe7fbaca7a727944824fe049e00cecfccccdc6a6d6d0d0297dcc0095535b3b712cbe4559d9d548eefe7b748267319e06de099c1c1c1d8ececec9e655993ec9fdf52a974a5582c5ab22cc7dcc0f700b1f4539ed48eced4a53bcef5ebbfa781abc01fc160f0723c1eaf9c9f9fff05987d48f76b2a9532eaebeb0340c0adcfef4e4e4e0a45514ac03b40dbfefed5898909b3a9a94905da0f68a4b6b6b64c6767e77ffa7c309e1c1e1e2ef4f5f569c037c045e087f1f171636060a0085c29279224e9b6a228ab40145c7e1059963f1a1d1d7d311a8d1ed3340dbfdfcfd2d292363737f73170cecd11e007b443f200744a92f4612814fa11f80018f83fc1c3f1373a379a4ec5018c7f0000000049454e44ae426082 - - - 89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000003da494441545885c5d64b6cd4451c07f0cff6012d94d2424593261c50ab520ebe2e2884c407d10389a25e0807133918138909c4c478f080241ed498e8cd8b891c247a2162627cc041c10858340a288f02a51468e9634bed6eb7dd8e87f963d7cd1676db127fc964e63ff3fbcff73bbff93d86ff5952e52ab6d1329fe726792ab0040b3196e7c7c097273988c93925d0ce9214cf4eb239c5da14d54db8132d388c814437cfe941b65ee65b4c544aa414f82bed8cae22ac267c4ce823848296271c216c21b4c79659ce3b689e2df887ab080f11de270c150117b70c6127e17ec22a422b3bb0a21cacea52938dacac65fd7bd884ba9b6c52838731843f51cbca341d792e215b31011c6fe0e51eea36faafa35c4e8016a0aa60be162318c425162ca46e804e5c40a8884096b1069a0759d38645a2c3edc577f819fbf144d17fc3095a3aee71f70487b3f1b3bf2202e2e90e2d64d33e9af6c65319c5197488a67e41b4c475398b53a2c52e919ae4d470345817f2a5706aa62330c0700d2f35b27d9cc7fa9897c2049dd5ac785c0cc542e949fa86a4afe58e78168de8ab8800f4b2bf97ce061e58c6c6514e34b17931de28d21dc2b1645c9004c6927e8169e48604c4cc76768473231cbc9b1d35dcbb13b71729ee452e195f49fa1cdd05fbcc88c07509edbc9662cb36ac2b5afc15c793f184781581813e8e26d323332690a4e34fb0612b5e2c5a1fc4d705dfbf8bce3accae5cbc828c18093322904a717429cbb76143d1620f764530705eb4799e731762c4c209b3b88210a87f134f162d9cc667e2698919e73802997e3e8a4383a682634604047acf735be1dc3738807131b87fc3454c92eee5adab315d04538131ad54dd4c21d0d35934d79180ff8d1f12f03c5d17793d01cfe388189d3794722cd05d4c609178effdb886113ebdc017f978d7391c2a07bc5c025d6745773e2adaf462b27bf394ce58027e597485d1527bcd94c099513c83bbc4d34393185b35a88fa9e10365dc79b14c5b8cae4b3f27ea68ccd0d645fd8468f63ff0177291e057e95808cfcd39014ca6c9a4d9574fb8465b2f5559422ae689c568ce91ce455e99b92600dd79c6330c35f3f483d46d27b51629aafa6869e091714e66a36166ff282d25f7f1f9ab25de84ef12d610ee899978b50a9efb37cd0345caeb9f2f31ff28da514b7b1dcb4df9eadc11488a52636b89b5c5625404520df111d234e7048e3110b8baa7c4da11ff067e7e384643ae84daec0888bbeed92d96dfac58e4bf17bdee34c6399094e0b2b22015380b2ca171193fd5b2b21d4b1322e7d1136bc6f62cbfe0e42d21008b58dac2dbf359574d6b9e2b393abad99d8bc04955be450412a942abe87ff3c4e4d8eb062f9fe9e41fd23a6b537c367d7e0000000049454e44ae426082 - - - 89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af400000355494441545885ed95bf8b245510c73ff576ef9673513ce51031528343c54441840531f1078808c21988469a897f849709626668666e20181d265e721ca8c86a7681b0bab7bbb733b3b7e3ce74f77bef6bd06f7a7aa65fbbb326265b490fddafea7daaea5b35706ee7f63f9be55e3eb475e965113f02ae60ba62d80311a2611143483bc7378b7797fd1edcdaf812e3a5e4f728720e8b11998028b83ebe597cd5f659cf01083d87f1f1635b8ff0fe9b1fb27dfc0bbfeefe44b51b18dc3801e3723e1d7bc55de2c5b73f7d83d7aebec517bf5f677a3065786342f197c76063d9c5f554c6033c75f5493e7bf5739e79e259dc86e1366d46e8f36ed19b83779ebfc67b4f7f40c013bd9a5b8cae5f16c0881ea0f0050007c51e12680930634111ca58b03fbddbc583b012404c1714650298eed762517f26e94b50803296ec4ff7ea579afbe52a976f81ab0f966509c0bde93e6a0512d6c9249947a90293dde6fe39b8adda825481aa2028302c0f5968406a51c62f10b454817609ba15c84e81615ed42d382a8744d543d83a910588102c42194a867190001203606e450dcc48abaaa48a558aa3cef72e786a5d28880af3b70d60b772598090328c3e320d933acca298f21ab0fa7de94b94d296046a20cea60145982480b698e47aa640ad0a1067b13a715700b00420a6e16416bc21e81b434bd3515445ad1b2d1d50777af2220cbe947310e0c7bd1f9af45ae96401a45860c69fe31d76aa3f1aee4684993d90ff2f70ee084001beb9f3f58cfe540dc8d9c804db073f1337038acde2a801566d81e28551fd14637fdcdcfa6f0ba50e664380a22c17a66656b8b0ea221a1f8d47004947096a5e80d8db028dd2b3615eb0b555f7c06f94c044a11dc15abff29b9054012d5fa3997857ac40b2915a156894545b1ec0e2b07ecc2b60d616a13f1b40a7608d08f37f46924bdab185e30ddfaa22ac4f6b11a015cd7a169108a905e9705cfcee33d3d30f201ba955f6f63cf789f022eb35406c79b556b8e90c1a1036523a2e2f08a76bc0aa499a1e212fc2c9f21e3803804323a2f023cf74a7aa83c45926f94534b8c53110e4a138a8087f07dc866bc6d2adba09d325df9677e3e383ef275b6ed31e0ef775a13a0cf741db12b77bdc24f1c9e0bbf1ebeeb27b616ddd36cb7b11857807d9b65d2c0efbee3bddaeb1f6df9dcfaddffe01aa4c03e348a660d30000000049454e44ae426082 - - - 89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000007ac494441545885bd977b5094e715c67fdf5ed80bcbc58244ebba062163c612f1026219a5418c1a9b042d166b1d1d2b4e641231a6a9edd84b18afe9d4a4b15334d58a33d556ace365466aa396d838801720d1142122acc00a0bba1a606fc0eef2bdfde3db8d94803599a6cfccceb73bdf7bdef39cf39ef39c77d58c8cc98000bc8f58f3b5e13bc003c001acf88a7be8810dc0d42f6b980938cd66b3c8cccc142859781f98f098f661c02b409b4aa512400510fbb8ce9f059c168b459497978bfafa7a515858284c269300dcc046403582ad167819b045444488fcfc7c51525222341a8d00b600eaffe67c0ed0131f1f2f6a6a6ac47d874358ad56515d5d2d4e9e3c29a64f9f1ecac6552071909d065803341b8d46919797274a4b4b45494989282d2d150b172e14402790349cd35034b1c00c20222f2f0f8bc582c7ebc5ed76d3dbdb4b9856cbf66ddb58bf7e3d9224cd04160ddaa342afd717af5ab5eac9a3478f3277ee5c7c3e1f9191917477775359590960051200c34804a4e0a27feedfbf9fa6a6265c2e171eb71b8fdb8dcbeda6adbd9decec6c8c46238071d01ee6356bd6b064c912dc6e37b1b1b1188d465c2e171b366cc0e5729d027e8dd24d1a861c61e88703b80bfcc966b3f5151717d3d3d383dbe3c1ed76e3f57a319bcde8743a0c06034322510b21906599d1a34703e0f57a29282890bbbabaf6020781de60062e01df1f8e00401d4aebfdf5f0e1c3d86c367a7b7bf1783c8c19330693c904805eaf1f9a018d2ccb082100080402343737e3703802c0a74036f097888888f792939393809f024f0d47c003dc064efb7cbeceddbb7763341a191d17474444c4e78b121212005603538247a715427c4e40abd53263c60cd2d3d3c380df272626aeddbc7973dca953a7d8ba752b2a956a3a9015f23db435ba8171c067ededed19e1e1e178bd5e6eddba45434303494949ac58b182caca4aa3dd6eff01b04492a484458b163169d2249c4e277abd9ebebe3ed2d2d2c8caca62f5ead5444747e3f7fbd16ab534343460b7dbc3800f01a7c417311e45bdb601c9835f646464b06fdf3e743a1dcb972fa7aaaa8a4d9b3691939303404b4b0b515151a8d56afafafaf07abd180c06743a1db22c73eedc398a8a8a0804023750c4aa7c3871700271400df077e02c500674b4b6b64eb55aadd2fcf9f3c9cdcda5aaaa8a3367ce909a9a4a4c4c0c269389b6b636244942afd763341a916519954ac5ce9d3b3976ec18b22c9f01de0966ffce48ea64031a518aa80e45482c40aad5da14d6d6d6cebc79f3c8c9c9e1f2e5cb141717d3d9d9495959197ebf9f2953a6a0d16800b0dbed141414505f5fdf07bc0b9c005cc0151e73d08503ef01e28db51962dbcff38446ad122b57ae1456ab5558ad56919191212c1ab598a0550b404447478bc58b178b65cb9685a4b8155807bc8022789ac7710c300b684c9f3e413cb8fe96b8db7c5594162d15af2ff8a600447e7ebeb0de6a1055392f09db9444e1dcbf476c7deac99064cbc1e707400ef05d207ea883918e400b6c55a93878e8eda5b1efee2ac418398ef01b3bd0593b304a6aee7bfc1c3b5bc1e4ba7f21ae5523f9fb89d458497bc982c56ce0ecf57b921054a29cb71ba8023a1e87c064e0fdd929f1b91f9ddea89af5dc2b486d27e0d211680f10add7d2e397d97bc981d3eb676d5f0f2061c98cc59c1b83e1996f90ba740be3f59f70fa62a705e803f6a0e8cc1730988004bcae5673ecd0ae9cf1bf7deb2784478d839a2d50db0a1ea563bb8d7a9edb5d4beb5d773fa099aad3f2845e435a6e3c5217a0f182d4c4b4f9bf22d257cdf92bf7a6a148f73f1e452012383b3b257edd47a75fd3cc5ab001a9fd245c3d0e6d03204b08351cb7ab49d97441ee76f55f04ce0193ca7a7dfad5b3e3484c8c5242e802d44e906c7cfbc53709dcafa0fcda8374947ab83812813529cf985fad38f402175a665259dd44b4348a516db500788c3ab28a1a79e744ed1d603b703e687701482bb1f61856658d215aad51487403ea2ed0743237a71047f305aaebba3351daeff26002a159f0a3577f988c3ad0856f40457c7c3cda7b9f225470be3b0c535e995c51db7e1c780db809dc00fe18fcfecb0119e7d33faba663c0f770e7db32b4d441e7718afef067563c6f06a5205f1e4c2024c557f37253661ef8b18140f7047c2d6e541a174b0f3471e64aab0dd88d224c4ee013a067d0d1a5034f033b220c6ae3eddfa4128b36f85a40a20a12e620c73c4ff6e21cfe567e5706560247fea306aed5d917684c8944c5a869b43b99fcc607030d777a8e03bb50ee0b8dc03594aa0ea11f65841b807a5f40cc3958d1a159376f2c7a544a7c5d02b8831497ccf79e1dc5c54b7592ed6e7f36500bdc0c65400dbc1d4cb104b404a3b606a3be1e7c8e8418200d9806bc39365a1b766b472a26f96193b9c7091e74f8686eee63c99e7aba7b033e60d2d069380345adfa5194ac31f8118f701e421c900acc047e31f1099dbaae3005fd800a01486a604059b8f1c46d7ef7613bc0f8e1c6b11145097d2857a92f83b1c12066039bbe353e5cf5f1e669088340e77e78f749dd758d1a9b5b0674c329a11f2503812fe91c14c9f506c93b1c4e7fdad99b5dd2344b3866a30eff8060fbb93b1ca971803265f77c051f8f8509c08bc05e4084a9259134365c4c8cd58706553f432e3b5f072606491c003ee3e184bc0e2c0e2d1aae06fe974840c98601d0a108f5c73cd491ff1b2446f84ff96f135d0792420819e00000000049454e44ae426082 - - - 89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000007b3494441545885c5977b70547715c73f77efeede7d27d96c364931c926c01228ef37a17690f22c030575acb5b68c4ec7ca63044a5b2c9621b54251463b7580b636ce88f58180222a96b1e55532c32b2049790784244d52369b6477b3cffbd8eb1f812424883c3a7afefbfdeef97dcff79cdf39e7772efc9f457850007f8167143001b876a921b8f77f46c05fe0b101af03cb00f1c6f6924b0dc12df78263b84fe3338033c00bfd8b33c48d1bbe88d76b05d8e02ff07ce15eb08cf768381bf819f06cffc1c3e9d74fe2276b4b10c5ce40bef4fdc34e2d9dde0acc04d4bbc114ffbb4a97f1a780bf0165cf2c5fc3936b363178ec74ae9ed886afc885afc8c5a54b6dd437448b25b32877c4e5cacf8580bfc0e3c9ceb06d03563b5c99f6f5bfdf87afec717404048b83ab97357cd9ff429244460ccf61d75fae802e8c5114ed2359d59a1e8880bfc03305f810183b79d67c5eaed88321c37b8b4eff017e7eb7790b93277a70384c98cc068e1fbf6e914c6249289adc0324ee9980bfc0236667d8ca815f02ae556fbdcf23cfac4013ba53c62080df0543b28cc84a0675570e5358e8e2e121d91caa6c241c924b0c06a12d9e544e00da5d13f01778f2e9bceb677dfe21c2ba1d95b84a86d1b3629d2618ed861c4be77a807f105bb7ee67c4d034168b4869a99bdd7fbd82d9681c164dc847b5b45e775704fc059ec1c00160f8538b57f1f46bef9236dbbabe0b80cf0ec33241ea457dc4e8896c7eab82b2491ebc3956dadb939cbfd0eeb048a6cc702c5905b4df8e40571ff017782603958240d1f21fbfc3e4852fa2f5681316114667c3405767f87b8aaeebecdcf65b6cf6eeca5bb268049e6c2b92497c22cb699d0b64fd4702fe02cf02e0a31c8fc5fdab8a195c3cfc0b4c5aaa4b29cf0a933ce036f705686b0db26cd13729ceaf64f1778676eddbed26562e1f85200806b7cbfa3d83208c034cbdcf8bfe02cf18e0c30c97d9f4fada498c1c99c3f8d12e36adff35a3a77e99d24c91fecebe5e03541d3bc24fd73fcf8aa55e06f9dd7dbe97946470f66c2b8d8db12c8bd9a447e2a93ae096d23400f34037bcbd792a27ab03e87a27fb65cfb97877e91c9c5ab40fb0aeebbcb3e94d0efcfd07ac2b1f4a8ea73b4f76fef132affde858d77ad54b63902411ab64fcbad3268d068a6f8980db651d2008c2bccc0c89af7d7520ffd8574fe920372e974451a1c0c68dbb9839673ea22876857cf5cae79938aa8e27e61663b8111a5d879f6faee65a6020f50d29321c098a7d2e9c4e33a268e044d575d12a998adb3b12a78100900210db23895086c3f2d899b3addee98f15928c6b385d66ec76135eaf8ddc9c2415151f3375fa6c4e1e3fca9b1bbecbf2255e060ec8ecf24296355e2dafc2682f233fbf1f46b3c4ce1d47983da31f56ab91a10f6773f0e0a784c3b25747af4ea4548006202d02f9aaa635db24f3f49a4f82c657968e65fbae8b8c1cd9d9f172736d386d41de78633bd1b63dac5c3604bbbd3b97c291142fbc5c85cf3f03c96ae5d4a99304020174c14cf5e96bcc9c5e88c120909929b1ef40035a5a3f1f4dc80d800d681681a8ac689916b329198baa633d6e8905d3fa5179aa055f910b80bc5c3b651324268ecf4310bab3b1b129ca8bafd4307cdce3a4810be7cf110a8591651955d368688c91e316686f4ff1c375c74824553d9a947727524a007002919b6839c0849287dcebcc2661f807ef4fe3d2b50843c715e270f4a91c00ce9e6f6375790d658fce46d37582810075f575a88a8aaa6aa89a8aa66aa462adc88938e9344413a92d4dc18e0f7ac07c76b39fc50114556bb65ba49935e743c665dfc863c7de46860df3f6317ee87023e5eb2fe0f566138f050847649a9a9a482692c88a82acc828b242221a21158fa1ebba1e4f2aef35053bf6f482eae8d950db6455335bccc6747b4819979f6f63d6783367ea74f2f3ec5d4a75f51156ae3e8dcd99c9e26f7b99352d9bed7f3a473ca1222b0a8aaca0a46492b13069390ee8a9482cb5b1b9ad635f2fe371e074efc7a8a5232ec7331c96e11f1f0be62d9c9b45536388dcc25c44b1b32d67664804ae47a8bd9ae2ccd9169efc4a09037c16f6ee6f44553452a9244a3c0c6995745a0f06c3b135ad91784d2f3b61e02890ec4d4003da65550b39add28c9ada9469c57c99dd8752940ee9be8a09e3f33874f832f5cd02572e5de75b0b079356121c3dd18c2ec710d0d1b4746d736bc7ab1d09b9f750520f9c0214b8fd3c9054542d24998c96b6507a4271919d2f9506a969caecba0a8341e0d1471e62f79f2f72ee6a8a8e509443871a08b7c7110059d10e3404c2eb53ca2d6d54014e035700fde6e69dc6f29125f9591526a361ccd1b7753eb9eee1e0852ce6cd1b44b1afb33c6b6bdb79fab9fd68b28a41d0d1755d8925e5f77a653a401bf04f6e331ddd69246b51b474d06195e6545f359b97cc8e30c5574f24d8ca1f763753f79946b6dbc291234dc46232e9b41e688dc4cb5b42b1633d3074a016a8be11813e722702baac6af566a3680a868431bb2a0de684e0a2c8ab3279e2605a2256162ddf4f34aaa0a85a55634b646d342137f7381f014ed0ebf5eb2d77f367942799c429de2cc7028bd9384f10040b80280aa86a5a4fa4d4df7cda12de41f7bddef4bab6c7de031100f003032593e874bb6c932c66e33841109c9158725b301cafeea117a633dc91bbc4bda77f432be0030ae93bd9a4e9f4f83277e1f5fd12b82922e0057201079dc9750ee8b80f2cfe0d8fa11dfe311eba210000000049454e44ae426082 - - - - - helpAboutAction - activated() - InstrumentTunerForm - helpAbout() - - - configAction - activated() - InstrumentTunerForm - configure() - - - pauseAction - toggled(bool) - InstrumentTunerForm - pause(bool) - - - ui_spinAFreq - valueChanged(int) - InstrumentTunerForm - ui_spinAFreq_valueChanged(int) - - - saveSettingsAction - activated() - InstrumentTunerForm - saveSettings() - - - ui_spinA3Offset - valueChanged(int) - InstrumentTunerForm - ui_spinAOffset_valueChanged(int) - - - - helpAbout() - refresh() - refresh_views() - ui_spinLatency_destroyed( QObject * ) - ui_spinAFreq_valueChanged( int ) - configure() - pause(bool on) - configure_ok() - saveSettings() - errorRaised(const QString&) - samplingRateChanged(int) - restoreFactorySettings() - noteRangeChanged() - transportChanged(const QString& name) - autoDetectTransport() - update_views() - tuningFreqChanged(float) - ui_spinAOffset_valueChanged( int ) - selectTransport(const QString & string) - noteStarted(double,double) - noteFinished(double,double) - - - + + + + + + + + + + + + + + + + Qt::PreventContextMenu + + + Views + + + TopToolBarArea + + + false + + + + + Qt::PreventContextMenu + + + Settings + + + TopToolBarArea + + + false + + + + + + + + + true + + + + :/fmit/ui/images/pause.png:/fmit/ui/images/pause.png + + + Pause + + + Pause: the capture, the sound analysis and all views. + + + Pause: the capture, the sound analysis and all views. + + + Space + + + pauseAction + + + + + + :/fmit/ui/images/config.png:/fmit/ui/images/config.png + + + Configure + + + configAction + + + + + + :/fmit/ui/images/saveSettings.png:/fmit/ui/images/saveSettings.png + + + Save settings + + + Save configuration panel settings, views settings and the window size. + + + Save configuration panel settings, views settings and the window size. + + + Ctrl+S + + + saveSettingsAction + + + + + + :/fmit/ui/images/helpAbout.png:/fmit/ui/images/helpAbout.png + + + About + + + Invoke the about box. + + + Invoke the about box. + + + helpAboutAction + + + + + + + + + + helpAboutAction + activated() + InstrumentTunerForm + helpAbout() + + + -1 + -1 + + + 20 + 20 + + + + + configAction + activated() + InstrumentTunerForm + configure() + + + -1 + -1 + + + 20 + 20 + + + + + pauseAction + toggled(bool) + InstrumentTunerForm + pause(bool) + + + -1 + -1 + + + 20 + 20 + + + + + ui_spinAFreq + valueChanged(int) + InstrumentTunerForm + ui_spinAFreq_valueChanged(int) + + + 20 + 20 + + + 20 + 20 + + + + + saveSettingsAction + activated() + InstrumentTunerForm + saveSettings() + + + -1 + -1 + + + 20 + 20 + + + + + ui_spinA3Offset + valueChanged(int) + InstrumentTunerForm + ui_spinAOffset_valueChanged(int) + + + 20 + 20 + + + 20 + 20 + + + + + diff --git a/ui/Makefile.am b/ui/Makefile.am deleted file mode 100644 index 29b757a..0000000 --- a/ui/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -BUILT_SOURCES = ConfigForm.h ConfigForm.cpp ConfigForm_moc.cpp InstrumentTunerForm.h InstrumentTunerForm.cpp InstrumentTunerForm_moc.cpp -EXTRA_DIST = *.ui -CLEANFILES = *.h *.cpp - -%.h: %.ui - $(QT_UIC) $< > $@ - -%.cpp: %.h %.ui - $(QT_UIC) -impl $^ > $@ - -%_moc.cpp: %.h - $(QT_MOC) $< > $@ diff --git a/ui/Makefile.in b/ui/Makefile.in deleted file mode 100644 index 6e6881b..0000000 --- a/ui/Makefile.in +++ /dev/null @@ -1,319 +0,0 @@ -# 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 = : -subdir = ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_exceptions.m4 \ - $(top_srcdir)/m4/ac_cxx_have_complex.m4 \ - $(top_srcdir)/m4/ac_cxx_have_numeric_limits.m4 \ - $(top_srcdir)/m4/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/m4/ac_cxx_have_stl.m4 \ - $(top_srcdir)/m4/ac_cxx_namespaces.m4 \ - $(top_srcdir)/m4/ac_cxx_templates.m4 \ - $(top_srcdir)/m4/bnv_have_qt.m4 \ - $(top_srcdir)/m4/mdl_have_opengl.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -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@ -QT_CXXFLAGS = @QT_CXXFLAGS@ -QT_DIR = @QT_DIR@ -QT_LIBS = @QT_LIBS@ -QT_MOC = @QT_MOC@ -QT_UIC = @QT_UIC@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_prefix = @ac_prefix@ -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@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -BUILT_SOURCES = ConfigForm.h ConfigForm.cpp ConfigForm_moc.cpp InstrumentTunerForm.h InstrumentTunerForm.cpp InstrumentTunerForm_moc.cpp -EXTRA_DIST = *.ui -CLEANFILES = *.h *.cpp -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -$(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 ui/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu ui/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 -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile -installdirs: -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) 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: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -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." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic 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-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - - -%.h: %.ui - $(QT_UIC) $< > $@ - -%.cpp: %.h %.ui - $(QT_UIC) -impl $^ > $@ - -%_moc.cpp: %.h - $(QT_MOC) $< > $@ -# 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 --git a/ui/images/config.png b/ui/images/config.png new file mode 100755 index 0000000000000000000000000000000000000000..fbd8362bfa1d7f620ae5bc64cd9a6d81c23e0574 GIT binary patch literal 2021 zcmV`5;3N!?bu5guj$mJ zu~RhFiZj(#tm9=yYNM9eIDi)*(G(#ftiTEjx*A|_!0z(B{o~t>lz=svrq9gIw>#f^ z-t(OEp7We{)r^eEfB?LYSo5{vJHP|L0j&6nd+31;z|=2mmOG`ybNr@;eEfotFE)+l~kTjgrP&Bc?3?L#eFAs~wg2(H{?RL}K z+e?^M%l2*CSigQfk|fOp77f~?La)~suUfV0$)iV)GI#D=d_EtMk&$$FcT-te319^h z0K-TGq~M}|?%%(krluxbE*BoR8;{$K%k8GEy`AjrY>Y-DfN{_s<~3{9uw=;++-^6q zv9TD9MqDlz8#Zjf<#L?@evQ&i8ipKU=!XNi3;fAuv-K4h7t_;3ic;ltQ$ zHhOz|@pwFp88Zfx$pnC2uOFHLjV#LuApi&j0yH-_<8U|vz^6bq@Rx{)i1(6{laqj- z0#6M`zysU{PWybm&fU9rV>B8W9T!JLM8xNd5)u*sRs&OlN2e7+d`>{C)iPto4ARrn z!+_r>CMK@kym@onsZ*!ex^*imm1;VW74ki_HM)Uuz-R64?HS?W;ds4XZr!>?Lqh{e zNlC0&v4YCVN~7Iw{{gT>lB9%1ixx3y(j=TtCwje}zP>)v($dJv%3}5E)kH@}pG+?*e!+;L~r^FXA9!0&j0m*}3WMpKpZ{I$2IvvZGFQ=-iicOm~k&}}HKub#t zQBhH-)oS|s`tW+a7z_qqCno3Me3?`F_wzf7TNkXsJV>B9(Wf_%9#m=2OId<$A zvMiqg-U(*^&PeKH0~%3^s18L)EI_K&+7#B-*3P_n^T^4`;qv9n6c-oM+1W{1Ss8x6 zpD9zOpwVamu-okv6ckWjU*8A33!DI4z!e^I(1io<0pg9d8DiVd^MppN5-V4(6jrNM zSglr(k&z)R8nu|9RSQ5wM@Ngrix-P!%a(WZ?bTDe<`N(_Mqs@7ciKB1iY?RbL`NrobkVX>nDUq zjf0vkP}>R~rDMB|dY;=|OY2>CKcJba)AEE~Lt1V;QWv1{g4D#c`M)C4SIzk=_oksp z_dgy*AQCt`J0*VIN2g!Y%v!Jksr@8eJq~RHAWH}}9Ji}U*>pkfcJ*Hb&HTDe zwE%dGIVIs^98Ewx-(JQ z@A6;*p;_>wSAUp{I?#o0Kt+6fJlcDoB2;j`I}B4^nOsrZejIoWxCz_<{uuoJ%K;hZ z(?6@GW5D-t=i4&0)IsNQivI9tRy=P8r66A(Odur1SMzdHW*+#lfk5{Jd@XKN8W&3s zG;!uis}0zVB1}%;6QF0%(WL`V13MxNYUAzSq!NoZ_*y`s3KHfZ$2?E=;vD`~epd!o z0!RL%2CmiF7idh0M8&9Sv^$yn#s>opcY2NkyHM^6jleaOst%zaWrQ1mdS5`yIatx5 zSvPMidQ?h$T>`j+6qn5Ro*l)-OLda%ZhtmV3)~E4Kn=VdOtA#C1f#YFqrM(|j)WK> z4VVVJIW}4wc56o}Ci!8LxyK0}bogj)?qkWGdb)c9K48+&X*dH#t@=@vtTFfzk8mDB z9FPjk1b#8`37xvGFa`a93IRxJU_e>8@x*O@_hCE0_~FK}5k(1oC|9X3gR#LNW&@kP zH9lPR@#bj=gFxqgc=t)&b&VRETLyH)DWM-F1A#B;92Cj*2FW`dPJi0jn_bd0OE_ku z4*!5)`?)(Dsd0cZW%qmqACH9zz>C0MK!m9!ku)}3OpMis230>pE<0ZbCI(3y06yd4 zguD(c4lNq42L6{wK*@#y(4h$R$2`=L{~IJm_)qz76I}J{q literal 0 HcmV?d00001 diff --git a/ui/images/configForm.png b/ui/images/configForm.png new file mode 100755 index 0000000000000000000000000000000000000000..2544baf9a74b44c1fc2fc19a7127d4af0dc73b82 GIT binary patch literal 2510 zcmV;<2{HDGP)Z zS!`U@8OMKjpSiPn#!l=wj^k`(4<-XL3bgcrB@HP->;zCLf#8rhUK86h_IMV1=H5GV_dbjrAc@mH^pnoZ==-1l?|k>1 zIo}cZzl8u@pIRWv9x4&XeX6I1N5pq1Zf_a+ng{MX^ZGk~*xn>W>^j&Em@ed|eR92T91C{sypyAEKYOB7I^~2bE?=|w zwm(0%{3|o@B7O1K_ujtqJHObuO^~CphPfg`Oo5av z66o!z>G^A~W@z6>n1v&!2UvFLiX9I>zvst07M&|=qM|91*wU1Y)4BPasnp6#!$U8; zj8~sLp5L`)?Us8U`onLwiCU8ceGW`nfC!QZvIvnt#0WIi3R%UGmv#ZwS-E(kf9Ex~ z-~H_^YFD!YvIg-OWa6;82^O#2at79~wan?pMOD_Jj-)8~Tq~5ynf~~KPz>8xb2#|<20NT>9JgpM%Jo`eRYgUq& zx9F^53I1^a_76j)2AT#@t)WfFAg#mvm_jO+gmh;&pv>y!6AGX@cBmgZ3Qb9f>Cmi$ z5`~HYW>g@iD4Kx~gRrrJ(2bT&kn@mALOc$t3dtx$bf{Y(IZ#qS7ef%F_)G=elPlm< zr%OkBKD2D8nP3^<)Isn;3BY&i*x3W45LRX-cBL>}cfhe5!>%=k?|>MBDu5D#;MoMV zG8hvR%+jB{2f{G>!ml0~K4yi}6)?&$Re=0B3?FkixPPBNb>R6Ifa52@=-IWqJY`d_ zL(OV{+cWS+1!@KuRiEi{k?Gu#DGCGc1NN-`q*D+U`gKlpC>y}$3x9)2U;{Sq`;R8E#RMWDu35&(9W0v%o_(6!M~?yr z0q4`wxd3Kk@KE3Ii<{2B@P=WIxm<4bsS=kgZ0)#Zqt3H?{z-1i;>h4J3S&da zw(%%aQx5@SKyae&zX34N-}gizKXHQ|i_?-xBgR`U3|C!wFR>N~11SuHDicG6){f*l zNz+LuVnh{*p#wS65iy^y*e?PjbIpHxfR-~_++~-pIg~T}E#32_Or{AvmRR3*)jhw6 zuUH2@_#qU>vb0wpqh=a-L5NkishTx3MgG9H?IWkNI5j}LJt1Fw?;T6Gee;gRoyoS^ z3%|s73|iY367k1VdzeAzcHUZcfZQ!rKa5Jui-;lg$fee@w#q?zQ}EeNuNq(c4J0nTeS zvFmlR*&K&HK8Wl2L@v6k%{u>%>%72M$o0HO=)0${K=+QzwtfH6C-1sk$w(^n9EEHd zCY#R0EkaV%HCG)*SPvov+CqqTDx%`Io92IoKU zlYIM`7qaIE-@+;lof=@(wdY>_qeq{3_!=cs5n=BTyx9-AB1GgABgxIYv+qeV8?Gm^ zax>{vomgBz(<20vF0v$1tJNu$N|;rHC0(m&YHLMGfG#IF^0^(`Mx&``c;>rb!z>*B zEI^_&weHpjfBWDSN;4w7J_@_vvlt$(kcoJBx=QQTYgu~9WyG|QL^?$>siP=hJ3f^| z3Zkq~tJRnoA14$N@h<4#x=MDf>Oz9DDiA7|HnU&eRGj{_*%?!N8TFD%&@ zQ(;dIdPhJLe3mUzNoSgg#}uL(h*APc0#N`-08s?rHqkr_Nm8g(D&%rmS{8JW>{>}O zso~SO%)&ronXOY@d)4{I!0Y$W^X%O~D5B4cF5P_n_LexjoQH$MFl9g{ouGX|hFDZV z79j{g2tgJgs(_||FF++fLC1_yu~?)!J;nUx>+q5tIHE!zG_L2U3Ta(sK_Z5*`idKo z)D4Xaw60pLMN&)l?guvj+Xn;?rA9*{i;dN4GN=lePRP(?K-qx0FJbgsjJ>pn*IbLE zW8-AfDZ=?@^U6VoaCj8EHqEB46e|{WP?H4Giin~Ff9{F}e0S(8}1_3IQfoh+LN(O3;U zk+!6U6o5>Cic5q5Q&KX3ER#PxQZ0>*W)jI|0*w*}0)$dy*e>+tLrlXXA-E((7o+Af z75J!{h^~ulz4;dO?bo5Y21qJ;vW0lE2}1B(uuL$j5V|#-S{2VMI2eU25XxAk>C!uY ze5!fDPw$rl0auWb0C%SBBSnk8fl=D@ka|=@N=8}K86%U7phqMkssJJQVI1Fwz=JRV z%L3O0&jz~=reRSk6__YaV)VZJF12zGjco*I$$6=p9^bvV`^s|?GDK9Bh$azLL6&^N z&?OR)iR&^EwXru~=2bJ>T!j#X5Y9k&9=HxTbsy8HGEtmlC_BdZ{^$Cgw|=)1uf7{F z8-K;VZQ1>=ziGzW&XY4;?NS&Z1OcHh05Xa!BZeY@3y#y6*qa%yJ@Z@rlYX#f2AGD! z)O3~c$vlJEG5Q8R3MSwA)2sf!|MD|D`xT&ad=bY(i7u2j-f(~V-0eGB+L!C8h)ztE zi6}CvEFp^mk|ZLEARr(R5{4l`5aN3tw(C%{>sWQ0ie*qL<|ya-E46_)_J;$nKF4%+ zFE9XDvzDiN8_LAyohPi^c9XvRqDvC(tCs5Vv>4H%jY^0jA`lYd`yQTSW7iF8wJLR^ z?AA)zNxO7x!Y>UUBj4LYao}CN`XOK(FhBLt<^=czL=Zbkv~|5E6-m{R6%9cY z@mwF@v2p7rR;i3t%3~JBaEuAUpa|pvgGT@F&1G^rfD=QZ@t~0Tq@DL?hI4{R$p0As Y0h{Ap7PpYW6;RT!Mecig|U{F77QlycYkq_jWm=! zzR%6gO^6XaKhH|&i`m-TEGa9qO?&|slF^RleNKEkMTxtSR>zkP2oh6xGdiBvk(U>u zlcFv1n3d!Yo28tri-L=SuY$HVHT}g!p!(SUsjxmmNzcS2)$d_E+Wu}j8Ri!TUjzsQ z?(;>-sd>gtxh2f$`Sl3P@5&S5NIP*|F|3m05bES}b0=ME+BlU@K%s%Nv-8^OVChZs z*0Z5tnsyK4wGf}KG!+?|HocLMmJsQsp>_f9$?9G^iMqXr=;+TtRB2V!VcQZB+6-;( z{?U)yciHuTF-)mHaay20&>H|Ek~#XFz9=D==GW>RYU68HIK!hmdwS&gHcARDuENKi z7tG+s!N&2ZZg&)To|FoZy*td9LVC%Rp-?)K`;4bnO=?PHgJzY+husYWLu0)HwAz+~ zF4N9Dh=E9juPrjD>@v0uExD-4`+!}t>^xV`w9VnMssp=XO~{7K=8C|LVswEeh$Pgy zd}{xL%-jbn_`zPi4=MxIDszEKOPhghkXh0{yJ9%UMIV>t_f=F@(sLzB-ELOS|L)2VS4uxsb@@b-ZR z1ZHMt>@@5FkFK}irMv6Xrs!Hmm{7Tn<}@g);Uup4aSFMy&TR=fM`1QvfbU?ZO#jT1n-#lHPQNr+)-}Vc=VyGGGxP2j+hW3 zryTfTJbeE(B&k@N$DHQBdG^n1mN8vRWkt0oBpM;J8V!H?JqOg~g&r>-k;T<)P%&K} z}8mVeYq13~_25|`Tt$zy-}h)LR|Z|PZo+s|)4diCUl;m#uW z(OQXD5k0iQyxT6QWF&p|j9p8?MMvJkG*>E-bQ=Z+RF9QqCL+vd$S9{P3?Yr+ZaEwqB~-=D%_-*)Ef@eD%Z zp#PS_?cI)Yk?^*GyGdvg;CIIcJx(pes%8+8=FH%dRL8lS!gqv`*ssL8)Bq6*xg-?y z2WJ7H+pltBHH)&uJgv8?7AET*_A`53^_u{2?4ns&Xr+iK2h%;iY=^q+`;pTkMW<;OE!%@x6q#zJwc~U|`L4Lkuz(4H* z-N>%xKDWe#1pPt&I{`A(&2J9HBmsak^^kcWU!c&bZ<;8JrBcX7Lqo&Y_h$o;uge>$ z&~EwcTr=CC)YaMf=;UOs&UNPU?1+en2o8rM5`S8Ek>7+}BVg_UeSq5$0JvEV3AQYp z!;roYuk$j%#;H}Mr30g*qYyx?V5GbIvs%HHru60)*&OW)+`hZJ`_0V4wSke5z+vbPeVvRw$T)aP=>k)8`BaZS(6j|%@ABcFGZJA<>>V6#IN>x z?#SoD>q1N4rywV$k3eBP(Y*6N9#kA1&7DSI~yCx zJBhY08uGI{7p89}l+9=AA#ZPQPR_!Q9CyM88q;e9tXcRH3Vh3wt1WQC$4|~Z;vCW)K%-=n&o`&E zN@U*FP9qFOy8~E94{)FRzHF6jMkc1Gke}J^-%Lqm1(NQP5d%SKX=#}IuCA`*V1l~3 zx_Cs8d&?PVOpl?VA&8W;-?o~=VE8P4-PqJP#DbWcKT&*O9RSK$kjRX(ee>qh1$lRv z|BQcaz1B#4%A{)vQ+=ZI4<4NuGUZNHP`(ji;vr*)RKHnPF&4 zYAG2W;&Y^>+ka{hb4{u~cu!EqvaqNy>)$ysd00Ohjiwmkjvql$OoLrVyEFf_k$x%7+Ys_!IH0BCEw z3eI&^T-QvWskLDk;l=GQ+#L3RV`8+PJ32W#$H&K$ggioN@YBy=vBn}K><=JjW;C$m zp>@5I&ujP{r}`!qHa7GqT}PH+thX#MK}pxc9A7(L$>5kQ{L4I5hzV~I7)zM?SDcnh z>SB$@{A{)ny~n)^9HDq&fe@O#|MS(bhf}W)F8cJkc4cyYYyJ!BUW0f;MeFs;zs`1c zcJJRGZ;hA2&Nm+cZB;fs_UP0PYlA6~1mG&8oyEnVoE+5`g+*q zzvr}>c(M{!SzB4*q9ZqhKr}O6t}ZPduBEvX0s>}@-@bm$%^IAUF=eAxDbNLjv;OA( z{n`1`+rBB{5h2ea?FJ!0eez{zmQo@jzCv$s{docC^`XeWPkOgLqe$U(c{7wgR5L@* znWyP|`a{8BHohnC9@?6!=oyT*Jtc}Py2~3?#MnOE<5_G&7TQ6U7KZdgR>7h_9DDAx zj>=36o9IAtZh9X+e253jZAwaw*RSEuR^a67njz|*DOX)tS=rdwxU=KJ9iI{x7d#t@w(sfcdXRscifY|M zj1jSRgeL3f9t3IoL;QV^E6Ap?!} zzn6^oC%)^Ku3<8mn3yi+d=|`5AIB#q=wo`A_&*_$NEIbfQBi@U(wfH_QGh()RLdCZ z_f9An9|!nKnl+q%yx6VB?alfBUFl0tXXc3e_wVq};Nal5Z**5XF9Bg;VLv~=%*;%N zr{*s1Z>b7NaH7YhE01lFHF-0}PLR=#O;jz4ltFx5%+~M)&?Yr9H$BYAyYR{WNpe_s z_8+Zo|1N*=vzOygV>mQuzSRfj>WYL`@9nwy`}>1HAfPRn2=x8?cRa4_Eb})w&RznI zj%&TWWY%NJ!XyvWjo!b^==oFo<41l`5mWx{Teo=m_`Ezk*r>@~CkfcqV3P#Qz84oK z`^K!StOz?#&@nJ%Ne7y&bBw*2SSecRv4~*6NmBrLb)lJ$P%9kCsPdgXOCDOf%Y$b< zddDtE6*3LE`Kqkffa#`zrt19wE&-$yT3%VM!u2&dIXNf@V7^lyaP|&pE72>G{?XKZSu%C0JY)BEesVRUqKPYn2GC0;9)_*#m${51A~r#*N=ZF z=6_oDE1`b=BfQHR5uyB&^d+$dp{-n<%JudY#VEx(G9`RUrCRPmiW)1JsouNV{6j!O zN?6o^lA3qo&P; z3krq4dsnT_U1Ldn;4A5adlW8KX~ZAi;pZv$XK~RIkkx-X-rt!(p40B0m!*j1l#c#+ zeSLzLHtOBT7U#hI02m06jd|uw_0@C$b=9@IEk2o-o12OJYy0BC^HCZp-ve0&{>s|g zdt}7!tygsl9M7+!3zzsyYHW-2=I7_rouXrToBdDA72P>$c5eMD`8D42od6Ky&@9j< zpnK*(Rehy&kzwQ04nHR^#B*^6N^>O?A)^VQckVwG5z(CRy(>l8W zdZdB>Iwm7FmU^z@^z>9(S{j8y6)vEj6I)VyXKG@nrYip$1$zhAd(Wkge3~>>m)*&- zVG-t7`ueF&@q^W_Rc>n{`o4hyxLSddqGFX1za*>s@ApECyGa(%=P39AUC`|8>_W#( zjYZ($_i;YPSzM$%f0BRD9Mk< z8+cEpEFX3Jv9@M^*E6E1j16gUaWZM4RW~Yuo^G_mM;F`SZ^24ncqWU`i2z$gH0VcA zd$ws&c1BcuzA@IPbkSg@ek0vmJVw56NFO6bN4kjzE&qGYWaWOGNol>-HS6zZ#_4DAWs2Y;(pBO)X;H@GU$ zE!iX%T!b5AFc{%gVO!RQE$xI~cbdx6h=Af>Z*E_!b`~DOn3`^e(dD+SofD$Uf`8)e zxM(92dQ3KcR@yp5sujMdCfr7a<%~OGd#1LUoHT{kA3}+j6Yx2;Hp^#8f=^p(|30yQ ztS2z$Mf0N-1quSRW4;fZCJrla+9}!mQKfPKS=`EOJnL{8D!NI|Thcxyg_#`1jfFV-he5RNh7~^v#k^6s1 ew%HZmfZ9Kq`O0a$X~G9zfU2UVLisDpkpBZ>77{W5 literal 0 HcmV?d00001 diff --git a/ui/images/fmit.svg b/ui/images/fmit.svg new file mode 100644 index 0000000..01cf1e8 --- /dev/null +++ b/ui/images/fmit.svg @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/images/helpAbout.png b/ui/images/helpAbout.png new file mode 100755 index 0000000000000000000000000000000000000000..cc7c0493ba83013eacff0e3490e5bbcda627dcc9 GIT binary patch literal 1043 zcmV+u1nm2XP)DJHPoo zhW}YotR{R+=p%%JmM0t`Y$3GAmRZg_Xr3+jhpPw=5#A>Z6#*Bw z3}GkXe!?n3D?6~F9IWb6lZ~vbW&L~Dgu0t-QiF#vgg;Ts$}}B$E+Jbn0UU4O|K^##0%^8FYxIenGUvbvcVuqQx$en&i}QG*}n%rEqGd zBQU^l4KFpaeVoVon3uu?oz<*(TnxoR=}G#Aq_5?UcovQ5tB3&fvcH$k1|C?(#!*f* zv3W7xDAFCmv1DA31jdqnfobH11jNjCc7$^y9K4$yHQc)sw-+hyMJ^d%N%|b!1^dj1 zz;y}jyq03iHmoaJ{1wNO@q~C4fq_1bCetG`CXl4#Pq1MtUMyN4#McGizl+W~%&uI# zf{YjmGa`^madaumw_!ukVh?sjFmPV9d7g6@V#LA;v$%o~sDBer7A>5{XX0sz8Rs|x znSMTsLxZM*V@3o7de3uP;oLVkfN?Rnf5SyglJ4cLt1(>!Q-Lw9RNYJ=(9>Bo*O7q# zjUN*5JY5%gJps?-h!~wWlyWT4T})t+c<=qVh7mr!z!&*=*Et+22fSPYU1vpiJ}TPu zVzPVll+IWJepz&d(NcTOl)#x$JcGN$(?gROTQ#VUso?`<+FS9SP0L}IRQ+j$)wp=Pq;=~FI8DWD&~pBXwH$&MP8Y?CIH=e#xo2x z^Ynw%Z6~!BDXRKtY2cA@PG+NFX8$NHCHL|9t0mrq?-JG!?unUrwF;j5H_Zb@%Ilvm zG5;vqQA>Lr%T4*}+!08MQe$h0wZ&po1X2z05z;j01dcHfxVopr+7bT-ettMcL#~9{ z>g{VzZbpkG{!lQl;E*v4*`15PNmaf@1QMx2tLT68#N^oP1}~rK17c=0ixHWCD7ZepS$x&@SEW=eS_DozQq^6UuSwSWq4yk z@t4P7W7);^RK^25b@fR;d-ZdkdE!~zhT%4CM(Fcy(VK&Jp1;O>Pk%tb6TO;SjILi6 zz=$58@C5(|#U2u92{2|Kx$FOFA%g; zfp!VH706D3VP4cNI4Xxk)kD}ikp+klEJ7JdhH;Pp5(8jvMGeeItE!}mRf?m|_bzy9 zT_}hO^S2FPw{ls4kTQ%uG7XbD%%Yg`8nF6(=}VN-mIP`b&ZYrHm?VI0|+cY+X9W!vteGawN>}PZ#dKQrgsRik9T>S1c)6)+i8>v6*3>+Z69VQt+u%X<-pcn8_GT`Ug! k?mOMCvG(7c&#mA70jf*`<4C4p(*OVf07*qoM6N<$f}KRCJ^%m! literal 0 HcmV?d00001 diff --git a/ui/images/saveSettings.png b/ui/images/saveSettings.png new file mode 100755 index 0000000000000000000000000000000000000000..61fbcaa14c491c329b33f2bc183141fb0bf38bdc GIT binary patch literal 2028 zcmV-P)r3G%K-7l_L55t!7cZKW4KS_Gk`O| z3;l~T#El!ih}UZc*x)bleBoZOjQ40b8~7RUZ2!T->DN!U(#m+#!^!>w5EuG#9 z%mmcC!4&_yN|*7cfWHA{&n#cVlWR6Hc~VAi1dD^KmoPMhwqk*I%xHE{stW?IT&$ znjVONzrZsE_z)O7dDeVhuGoVi!+VQP{{en}w|NVbCwg!=Oqk3Djvv2nkxXJqD4N^@ zB<`7jzrZ7AXV}VtUjnXGZ@teW&#XWbx>Lp=fZqi}vW&<|26a~sQ&{NY;UU=^s%#`2 zl1mH*p)H+Ib2TWt33%3HE%1fFawl1Y3b%W0hpWc^11{sPYe;G-Om z#r>;_8C*R43rt$7ODWF^lRV%y_XTKc4YF*}H!04qWbt=~cJ15kCRQ#Vg&+t9x6ArH zgCL9pOuf&G{sPY!;KK};+4TC_NsJts!}!rIHm(0Pqo;nE(oB*5&c0p)R2@6QPuD-s ziltr#`Q3fKmy~31_G~MSjj=3?*`!C}sXE}6(lh|`KsUU-c`7HX1L%4u`(@9$cz5X> zoLaOGu&(R8v*}F^{QU>4D<4XZr#nw}{_!%e{peWNdeuu~kR%bSWc<3*CXEJ)Z;620 zWgQ?0!o183iLZTiAph7`Pw5~xE|)}6p}@wCyO=p=KB6dgg?#nO=b1RFjwj|8W4I9- zU5B45mnXjB7YuX6$woUayVZoFo+$A2W6OY)&3O%9|U$%km{&1`f#V@u{8dJ*-?d1iQUEm%@=0FT7lZ&p!jnYUR|alLP_*biqvZ z>1)iKUWmaUkeMm5??3}uT0b96$PIuEXcmE}tZ11Qvnd&is$)HFi3QX8QF*EbUy%!d zyj(kF6C@^%&qENpv$3%$%8RemFnrwOq=5_P&k+iRk!2ZG(`aank>eI&zx$_y_M#U8q+>|IKA^$}LCK8?+p$>MK& znKdn&?SDE)JfR{h3W}_tq-2t@Fljjs=&497wXwOaV_z@hao}|C$Ec+vF2^$*mf;^C z3+64Hn?+M&h}^;)RWwqmBuYFCX_a(Z z4+g`rHLa0&O)ooP;3$ynO+W+MWmO9~t@ zS1w)WTMGx1RuUXN(Tpy~5YW-IbZv8M$EzI)x%W^~51axNxcxkkR8%b_nT(dUPOFLLf`ijGi}Lx&m&x5p6xS- z_j+YIKpXH+ZZjR-X(Ve=v~9ihbjl|1aLa}2#Fm#|6sJ;<_K5{1lx~yvTW}|2dhJ-P@Dh=j@;G)Q@GI`=)S|U~! zE#FTxs-UP^RbxwJZ8RY__c$K`PSET1>n(TlXOt(I#3|k^#{!GlI8P7+3xFsJsA^hI zq}1Ph+7jMD_r2cqy0*vO0}%l50|OyJ) zy{CUeE8qhP={wn^>Gb$Acj5K@61XWM;01C42c5}v4(PZKEdC9Tp&kA)9=ag_0000< KMNUMnLSTXwTh;ae literal 0 HcmV?d00001 -- 1.7.10.4