Compare commits

...

123 Commits

Author SHA1 Message Date
TDE Gitea 183afa41e2 Reset submodule main/dependencies/arts/admin to latest HEAD
2 weeks ago
Michele Calgaro 5ce55f2734
Use centralized cmake version
2 months ago
Michele Calgaro be1c8167bd
cmake files: change keywords to lower case
2 months ago
TDE Gitea 4b72579c25 Reset submodule main/dependencies/arts/admin to latest HEAD
3 months ago
TDE Gitea 2652c30933 Reset submodule main/dependencies/arts/admin to latest HEAD
3 months ago
Michele Calgaro 67fab506ee
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
4 months ago
TDE Gitea b7ed7de214 Reset submodule main/dependencies/arts/admin to latest HEAD
4 months ago
TDE Gitea 93badd477b Reset submodule main/dependencies/arts/admin to latest HEAD
6 months ago
TDE Gitea 6eab3adb1d Reset submodule main/dependencies/arts/admin to latest HEAD
6 months ago
Slávek Banko 63bb4a70fa
Raise the minimum required version of CMake to 3.5.
6 months ago
TDE Gitea ec21ee882d Reset submodule main/dependencies/arts/admin to latest HEAD
6 months ago
TDE Gitea 745df680ea Reset submodule main/dependencies/arts/admin to latest HEAD
7 months ago
TDE Gitea e9c2c61f41 Reset submodule main/dependencies/arts/admin to latest HEAD
8 months ago
Michele Calgaro 0d8b0ecdf5
Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version
8 months ago
TDE Gitea 0f8861a034 Reset submodule main/dependencies/arts/admin to latest HEAD
9 months ago
Michele Calgaro 8412f6e6d1
Replace Q_OBJECT with TQ_OBJECT
10 months ago
TDE Gitea 18ee00d80f Reset submodule main/dependencies/arts/admin to latest HEAD
10 months ago
Bobby Bingham 596d2accf4 Rename file
11 months ago
Bobby Bingham c9092132fd Update ALSA support to use 1.x API
11 months ago
Bobby Bingham adebb5ae26 Delete unused source file
11 months ago
Bobby Bingham 200e35e604 Use poll.h instead of sys/poll.h
11 months ago
Bobby Bingham 2182932392 Fix possibly incorrect type for format string
11 months ago
TDE Gitea 914164d8db Reset submodule main/dependencies/arts/libltdl to latest HEAD
11 months ago
TDE Gitea fc4ef1f440 Reset submodule main/dependencies/arts/libltdl to latest HEAD
1 year ago
Denis Kozadaev bee9a082a3
include string.h for illumos based systems
1 year ago
TDE Gitea c4af0692ce Reset submodule main/dependencies/arts/admin to latest HEAD
1 year ago
TDE Gitea e315e7557c Reset submodule main/dependencies/arts/admin to latest HEAD
1 year ago
Michele Calgaro 10a0510943
Add man pages from tde-packaging repo.
2 years ago
Michele Calgaro fbe27fc928
Use 'tde_setup_paths' macro to setup required paths.
2 years ago
Slávek Banko 0a2f5a7929
Add a check for a pkg-config package named libmad next to mad,
2 years ago
Michele Calgaro b0a1e683ac
Use TDE cmake macro to set version
2 years ago
Michele Calgaro 551db270af
Remove obsolete setting of CMAKE_MODULE_PATH in cmake files.
2 years ago
TDE Gitea ea1de39de8 Reset submodule main/dependencies/arts/admin to latest HEAD
2 years ago
Slávek Banko cbedd9e183
Raise the minimum required version of CMake to 3.1.
2 years ago
Slávek Banko ec80625a62
Remove cmake submodule since it has now been replaced by cmake-trinity dependency.
3 years ago
TDE Gitea 525e2a1b4e Reset submodule main/dependencies/arts/cmake to latest HEAD
3 years ago
TDE Gitea c28fac7e83 Reset submodule main/dependencies/arts/cmake to latest HEAD
3 years ago
TDE Gitea 7ce14eef14 Reset submodule main/dependencies/arts/admin to latest HEAD
3 years ago
TDE Gitea 8b08b0b756 Reset submodule main/dependencies/arts/cmake to latest HEAD
3 years ago
TDE Gitea cae8e28d50 Reset submodule main/dependencies/arts/cmake to latest HEAD
3 years ago
TDE Gitea 96bbae6609 Reset submodule main/dependencies/arts/admin to latest HEAD
3 years ago
Slávek Banko f7d6c3a863
Raise the minimum required version of CMake to 2.8.12.
3 years ago
TDE Gitea 6b28843f40 Reset submodule main/dependencies/arts/cmake to latest HEAD
3 years ago
TDE Gitea d7793b6359 Reset submodule main/dependencies/arts/libltdl to latest HEAD
3 years ago
TDE Gitea f581771ccb Reset submodule main/dependencies/arts/cmake to latest HEAD
3 years ago
TDE Gitea 7951ae0a3e Reset submodule main/dependencies/arts/admin to latest HEAD
3 years ago
Michele Calgaro 00d4f92b71
Renaming of files in preparation for code style tools.
3 years ago
TDE Gitea 2f53bfe61c Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 6880f04131 Reset submodule main/dependencies/arts/admin to latest HEAD
4 years ago
TDE Gitea 20eb51fc09 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 54e4978f1a Reset submodule main/dependencies/arts/admin to latest HEAD
4 years ago
TDE Gitea 2747295dcb Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 961268c395 Reset submodule main/dependencies/arts/admin to latest HEAD
4 years ago
Michele Calgaro b6c36b6b6b
Removed code formating modelines.
4 years ago
TDE Gitea 6b23f6c7c9 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea d6b34670a6 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 94804aba54 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 9bb5942b2e Reset submodule main/dependencies/arts/admin to latest HEAD
4 years ago
TDE Gitea 26f242ae88 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea b69812ec85 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 2ef12166d5 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea cbc3b888de Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 2f0246b9e2 Reset submodule main/dependencies/arts/admin to latest HEAD
4 years ago
TDE Gitea 879b0cc7e0 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea b9baf9d1a8 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 5d5d13b2e4 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 8da7963839 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 3c43b89084 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea d38f176b26 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 1114529b45 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea 61f315e720 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
TDE Gitea ece4949f8c Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
Michele Calgaro afad82ed85
Remove remaining 'register' instructions.
4 years ago
OBATA Akio 08329d9014 Drop `unsigned long int` case for the first argment type of ioctl(2)
4 years ago
OBATA Akio 482eea48c7 Port ioctl prototype check to CMake
4 years ago
Michele Calgaro 9d57e3ae1b
Removed explicit usage of the 'register' keyword.
4 years ago
TDE Gitea 8a30d26ad4 Reset submodule main/dependencies/arts/cmake to latest HEAD
4 years ago
Slávek Banko f9d72ae305
Switch all submodules to https.
4 years ago
Michele Calgaro cf74f54769
Removed .lsm files. lsm database is outdated and unmaintained.
5 years ago
TDE Gitea 21853b6be0 Reset submodule main/dependencies/arts/cmake to latest HEAD
5 years ago
TDE Gitea abd2beeb93 Reset submodule main/dependencies/arts/cmake to latest HEAD
5 years ago
TDE Gitea b64349f8a2 Reset submodule main/dependencies/arts/cmake to latest HEAD
5 years ago
TDE Gitea 60927dd7fa Reset submodule main/dependencies/arts/admin to latest HEAD
5 years ago
TDE Gitea 87b99fe7f6 Reset submodule main/dependencies/arts/cmake to latest HEAD
5 years ago
Slávek Banko 0466265722
Use common CMake tests.
5 years ago
TDE Gitea 7406ac3cfd Reset submodule main/dependencies/arts/cmake to latest HEAD
5 years ago
TDE Gitea ad1383fafa Reset submodule main/dependencies/arts/cmake to latest HEAD
5 years ago
TDE Gitea a5ed2d28f6 Reset submodule main/dependencies/arts/cmake to latest HEAD
5 years ago
Fabio Rossi ad1a487481 Avoid overriding user linker flags (LDFLAGS) for modules and shared libs
5 years ago
TDE Gitea 5ec8629d48 Reset submodule main/dependencies/arts/cmake to latest HEAD
6 years ago
TDE Gitea 337ddc216b Reset submodule main/dependencies/arts/cmake to latest HEAD
6 years ago
TDE Gitea 04c135eb3d Reset submodule main/dependencies/arts/admin to latest HEAD
6 years ago
TDE Gitea b1c89eb407 Reset submodule main/dependencies/arts/cmake to latest HEAD
6 years ago
TDE Gitea ab92337762 Reset submodule main/dependencies/arts/cmake to latest HEAD
6 years ago
TDE Gitea ac186a755b Reset submodule main/dependencies/arts/admin to latest HEAD
6 years ago
TDE Gitea 6019b3b2c0 Reset submodule main/dependencies/arts/admin to latest HEAD
6 years ago
TDE Gitea 9f6a785b6c Reset submodule main/dependencies/arts/cmake to latest HEAD
6 years ago
TDE Gitea 1f56e891df Reset submodule main/dependencies/arts/admin to latest HEAD
6 years ago
TDE Gitea 4cd63353c9 Reset submodule main/dependencies/arts/libltdl to latest HEAD
6 years ago
Slávek Banko 0184742fd6
Fix FTBFS with stricter C++11
6 years ago
Michele Calgaro c1b7409de9 cmake: Use set_property( SOURCE ... COMPILE_DEFINITIONS )
6 years ago
Michele Calgaro 5d9981995e Fixed for bug 2845. This is a bit of a quick-n-dirty patch.
6 years ago
Timothy Pearson e87a9e9157 Reset submodule main/dependencies/arts/admin to latest HEAD
6 years ago
Timothy Pearson e1c70d2fa2 Reset submodule main/dependencies/arts/admin to latest HEAD
6 years ago
Timothy Pearson 8a5f9a5197 Reset submodule main/dependencies/arts/admin to latest HEAD
6 years ago
Michele Calgaro 1a41c9e42a Fixed FTBFS with g++7 caused by #include directive placed inside namespace.
6 years ago
Slávek Banko 4bcfb33a3a Reset submodule main/dependencies/arts/cmake to latest HEAD
7 years ago
Timothy Pearson 2268ba5fea Reset submodule main/dependencies/arts/cmake to latest HEAD
7 years ago
Slávek Banko 117ec1e9d4 Fix detection whether the system is big endian
7 years ago
Slávek Banko 357b459406 Reset submodule main/dependencies/arts/cmake to latest HEAD
7 years ago
Slávek Banko cd82d409d6 cmake: add tde_add_check_executable macro
7 years ago
Slávek Banko de977c9845 Add artsc pkg-config file
8 years ago
Slávek Banko 2d91d9ada0 Fix FTBFS with GCC 6 (C++11 dialect)
8 years ago
Timothy Pearson 4ae14c6b10 Reset submodule main/dependencies/arts/admin to latest HEAD
8 years ago
Timothy Pearson 9600c588ee Reset submodule main/dependencies/arts/cmake to latest HEAD
8 years ago
Timothy Pearson 744752ac15 Reset submodule main/dependencies/arts/cmake to latest HEAD
8 years ago
Slávek Banko bbb70b9ed2 Fix security issue CVE-2015-7543
9 years ago
Michele Calgaro a0e89884e9 Update version number to R14.1.0
9 years ago
Slávek Banko 591eae8387 Add include directory for internal libltdl
9 years ago
Slávek Banko b36dfa8455 Reset submodule main/dependencies/arts/cmake to latest HEAD
9 years ago
Nikolaus Klepp 31a6127eec Fix FTBFS on freebsd
9 years ago
Slávek Banko 0b75ac2639 Reset submodule main/dependencies/arts/cmake to latest HEAD
9 years ago
Slávek Banko d40e4a57d7 Reset submodule main/dependencies/arts/admin to latest HEAD
9 years ago

7
.gitmodules vendored

@ -1,9 +1,6 @@
[submodule "admin"]
path = admin
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "libltdl"]
path = libltdl
url = http://system@scm.trinitydesktop.org/scm/git/libltdl
url = https://system@scm.trinitydesktop.org/scm/git/libltdl

@ -9,34 +9,47 @@
#
#################################################
cmake_minimum_required( VERSION 2.8 )
##### set project version ########################
include( TDEVersion )
cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
tde_set_project_version( )
##### project settings ##########################
project( arts )
set( ARTS_MAJOR_VERSION 1 )
set( ARTS_MINOR_VERSION 5 )
set( ARTS_MICRO_VERSION 10 )
set( ARTS_VERSION "${ARTS_MAJOR_VERSION}.${ARTS_MINOR_VERSION}.${ARTS_MICRO_VERSION}" )
##### include essential cmake modules ###########
include( CheckCXXSourceCompiles )
include( CheckFunctionExists )
include( CheckSymbolExists )
include( CheckPrototypeDefinition )
include( CheckIncludeFile )
include( CheckLibraryExists )
include( FindPkgConfig )
##### include our cmake modules #################
set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
##### project settings ##########################
##### setup install paths #######################
project( arts )
set( ARTS_MAJOR_VERSION 1 )
set( ARTS_MINOR_VERSION 5 )
set( ARTS_MICRO_VERSION 10 )
set( ARTS_VERSION "${ARTS_MAJOR_VERSION}.${ARTS_MINOR_VERSION}.${ARTS_MICRO_VERSION}" )
include( TDESetupPaths )
tde_setup_paths( )
##### user requested options ####################
##### user requested modules ####################
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_ALSA "Enable ALSA support" ON )
@ -48,191 +61,39 @@ option( WITH_JACK "Enable JACK support" ${WITH_ALL_OPTIONS} )
option( WITH_SNDIO "Enable SNDIO support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
option( BUILD_ALL "Build all" ON )
option( BUILD_DOC "Build doc" ${BUILD_ALL} )
##### paths setup ###############################
tde_setup_install_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" )
tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}" )
tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" )
##### setup architecture flags ##################
tde_setup_architecture_flags( )
##### check for include files ###################
check_include_file( "sys/time.h" HAVE_SYS_TIME_H )
check_include_file( "time.h" TIME_WITH_SYS_TIME )
check_include_file( "stdio.h" HAVE_STDIO_H )
check_include_file( "stdlib.h" HAVE_STDLIB_H )
check_include_file( "string.h" HAVE_STRING_H )
check_include_file( "strings.h" HAVE_STRINGS_H )
check_include_file( "ctype.h" HAVE_CTYPE_H )
check_include_file( "malloc.h" HAVE_MALLOC_H )
check_include_file( "memory.h" HAVE_MEMORY_H )
check_include_file( "dlfcn.h" HAVE_DLFCN_H )
check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
check_include_file( "pthread.h" HAVE_LIBPTHREAD )
##### check for system libraries ################
set( DL_LIBRARIES dl )
check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
if( NOT HAVE_LIBDL )
unset( DL_LIBRARIES )
check_function_exists( dlopen HAVE_DLOPEN )
if( HAVE_DLOPEN )
set( HAVE_LIBDL 1 )
endif( HAVE_DLOPEN )
endif( NOT HAVE_LIBDL )
find_package( Threads )
##### check for functions #######################
set( bak_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} )
set( CMAKE_REQUIRED_LIBRARIES ${DL_LIBRARIES} )
check_function_exists( dlerror HAVE_DLERROR )
check_function_exists( strcmp HAVE_STRCMP )
check_function_exists( strchr HAVE_STRCHR )
check_function_exists( index HAVE_INDEX )
check_function_exists( strrchr HAVE_STRRCHR )
check_function_exists( rindex HAVE_RINDEX )
check_function_exists( memcpy HAVE_MEMCPY )
check_function_exists( bcopy HAVE_BCOPY )
set( CMAKE_REQUIRED_LIBRARIES ${bak_CMAKE_REQUIRED_LIBRARIES} )
unset( bak_CMAKE_REQUIRED_LIBRARIES )
##### check for audiofile #######################
set( HAVE_LIBAUDIOFILE 0 )
if( WITH_AUDIOFILE )
pkg_search_module( AUDIOFILE audiofile )
if( AUDIOFILE_FOUND )
set( HAVE_LIBAUDIOFILE 1 )
else( AUDIOFILE_FOUND )
message(FATAL_ERROR "\naudiofile (wav) support are requested, but `libaudiofile` not found" )
endif( AUDIOFILE_FOUND )
endif( WITH_AUDIOFILE )
##### check for alsa ############################
set( HAVE_LIBASOUND2 0 )
if( WITH_ALSA )
pkg_search_module( ALSA alsa )
if( ALSA_FOUND )
# there is support only for ALSA 1.x
set( HAVE_LIBASOUND2 1 )
set( ALSA_PCM_OLD_SW_PARAMS_API 1 )
set( ALSA_PCM_OLD_HW_PARAMS_API 1 )
check_include_file( "alsa/asoundlib.h" HAVE_ALSA_ASOUNDLIB_H )
if( NOT HAVE_ALSA_ASOUNDLIB_H )
check_include_file( "sys/asoundlib.h" HAVE_SYS_ASOUNDLIB_H )
endif( NOT HAVE_ALSA_ASOUNDLIB_H )
##### configure checks
set( bak_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} )
set( CMAKE_REQUIRED_LIBRARIES ${ALSA_LIBRARIES} )
check_function_exists( snd_pcm_resume HAVE_SND_PCM_RESUME )
set( CMAKE_REQUIRED_LIBRARIES ${bak_CMAKE_REQUIRED_LIBRARIES} )
unset( bak_CMAKE_REQUIRED_LIBRARIES )
set( PC_LIB_REQUIRE "" CACHE INTERNAL "List of required packages" FORCE )
include( ConfigureChecks.cmake )
else( ALSA_FOUND )
message(FATAL_ERROR "\nALSA support are requested, but not found on your system" )
endif( ALSA_FOUND )
endif( WITH_ALSA )
##### check for esound #######################
set( HAVE_LIBESD 0 )
if( WITH_ESOUND )
pkg_search_module( ESOUND esound )
if( ESOUND_FOUND )
set( HAVE_LIBESD 1 )
else( ESOUND_FOUND )
message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" )
endif( ESOUND_FOUND )
endif( WITH_ESOUND )
##### check for JACK ############################
set( HAVE_LIBJACK 0 )
if( WITH_JACK )
pkg_search_module( LIBJACK jack )
if( LIBJACK_FOUND )
set( HAVE_LIBJACK 1 )
else( LIBJACK_FOUND )
message(FATAL_ERROR "\nJACK support is requested, but `jack.pc` was not found" )
endif( LIBJACK_FOUND )
endif( WITH_JACK )
##### check for SNDIO ###########################
set( HAVE_LIBSNDIO 0 )
if( WITH_SNDIO )
check_include_file( "sndio.h" HAVE_SNDIO_H )
if( HAVE_SNDIO_H )
set( HAVE_LIBSNDIO 1 )
set( LIBSNDIO_LIBRARIES "sndio" )
else( HAVE_SNDIO_H )
tde_message_fatal( "SNDIO support is requested, but `sndio.h` was not found" )
endif( HAVE_SNDIO_H )
endif( WITH_SNDIO )
##### check for glib/gthread modules ############
##### global compiler settings ##################
pkg_search_module( GLIB2 glib-2.0 )
add_definitions( -DHAVE_CONFIG_H )
if( GLIB2_FOUND )
pkg_search_module( GTHREAD2 gthread-2.0 )
if( NOT GTHREAD2_FOUND )
message(FATAL_ERROR "\ngthread-2.0 are required, but not found on your system" )
endif( NOT GTHREAD2_FOUND )
else( GLIB2_FOUND )
message(FATAL_ERROR "\nglib-2.0 are required, but not found on your system" )
endif( GLIB2_FOUND )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
##### check for gcc visibility support #########
# FIXME
# This should check for [T]Qt3 visibility support
##### project subdirectories ####################
if( WITH_GCC_VISIBILITY )
if( NOT UNIX )
message(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
endif( NOT UNIX )
set( __KDE_HAVE_GCC_VISIBILITY 1 )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
endif( )
add_subdirectory( libltdl )
add_subdirectory( mcop )
add_subdirectory( mcopidl )
add_subdirectory( flow )
add_subdirectory( mcop_mt )
add_subdirectory( soundserver )
add_subdirectory( artsc )
add_subdirectory( gmcop )
add_subdirectory( qtmcop )
##### check for TQt #############################
##### other data ################################
find_package( TQt )
tde_conditional_add_project_docs( BUILD_DOC )
##### write config.h file #######################
@ -242,58 +103,17 @@ configure_file( config.h.cmake config.h @ONLY )
##### write pkgconfig file ######################
set( PC_LIB_REQUIRE "" )
if( WITH_ALSA )
list( APPEND PC_LIB_REQUIRE "alsa" )
endif( WITH_ALSA )
if( WITH_AUDIOFILE )
list( APPEND PC_LIB_REQUIRE "audiofile" )
endif( WITH_AUDIOFILE )
if( WITH_VORBIS )
list( APPEND PC_LIB_REQUIRE "vorbis" )
list( APPEND PC_LIB_REQUIRE "vorbisfile" )
endif( WITH_VORBIS )
if( WITH_MAD )
list( APPEND PC_LIB_REQUIRE "mad" )
endif( WITH_MAD )
if( WITH_ESOUND )
list( APPEND PC_LIB_REQUIRE "esound" )
endif( WITH_ESOUND )
if( WITH_JACK )
list( APPEND PC_LIB_REQUIRE "jack" )
endif( WITH_JACK )
list( LENGTH PC_LIB_REQUIRE PC_LIB_REQUIRES_FOUND )
if( PC_LIB_REQUIRES_FOUND GREATER 0 )
list( SORT PC_LIB_REQUIRE )
list( REMOVE_DUPLICATES PC_LIB_REQUIRE )
string( REPLACE ";" " " PC_LIB_REQUIRES "Requires: ${PC_LIB_REQUIRE}" )
else( )
set( PC_LIB_REQUIRES "" )
endif( )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} )
configure_file( arts.pc.cmake arts.pc @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/arts.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
##### global compiler settings ##################
add_definitions(
-DHAVE_CONFIG_H
)
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
##### project subdirectories ####################
add_subdirectory( libltdl )
add_subdirectory( mcop )
add_subdirectory( mcopidl )
add_subdirectory( flow )
add_subdirectory( mcop_mt )
add_subdirectory( soundserver )
add_subdirectory( artsc )
add_subdirectory( gmcop )
add_subdirectory( qtmcop )

@ -0,0 +1,190 @@
#################################################
#
# (C) 2010 Serghei Amelian
# serghei (DOT) amelian (AT) gmail.com
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 2
#
#################################################
# required stuff
tde_setup_architecture_flags( )
include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
tde_setup_largefiles( )
##### check for TQt #############################
find_package( TQt )
##### check for gcc visibility support #########
if( WITH_GCC_VISIBILITY )
tde_setup_gcc_visibility( )
endif( )
##### check for include files ###################
check_include_file( "sys/time.h" HAVE_SYS_TIME_H )
check_include_file( "time.h" TIME_WITH_SYS_TIME )
check_include_file( "stdio.h" HAVE_STDIO_H )
check_include_file( "stdlib.h" HAVE_STDLIB_H )
check_include_file( "string.h" HAVE_STRING_H )
check_include_file( "strings.h" HAVE_STRINGS_H )
check_include_file( "ctype.h" HAVE_CTYPE_H )
check_include_file( "malloc.h" HAVE_MALLOC_H )
check_include_file( "memory.h" HAVE_MEMORY_H )
check_include_file( "dlfcn.h" HAVE_DLFCN_H )
check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
check_include_file( "pthread.h" HAVE_LIBPTHREAD )
##### check for system libraries ################
set( DL_LIBRARIES dl )
check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
if( NOT HAVE_LIBDL )
unset( DL_LIBRARIES )
check_function_exists( dlopen HAVE_DLOPEN )
if( HAVE_DLOPEN )
set( HAVE_LIBDL 1 )
endif( HAVE_DLOPEN )
endif( NOT HAVE_LIBDL )
find_package( Threads )
##### check for functions #######################
tde_save_and_set( CMAKE_REQUIRED_LIBRARIES ${DL_LIBRARIES} )
check_function_exists( dlerror HAVE_DLERROR )
check_function_exists( strcmp HAVE_STRCMP )
check_function_exists( strchr HAVE_STRCHR )
check_function_exists( index HAVE_INDEX )
check_function_exists( strrchr HAVE_STRRCHR )
check_function_exists( rindex HAVE_RINDEX )
check_function_exists( memcpy HAVE_MEMCPY )
check_function_exists( bcopy HAVE_BCOPY )
tde_restore( CMAKE_REQUIRED_LIBRARIES )
check_prototype_definition( ioctl "int ioctl(int d, int request, ...)" "-1" "unistd.h;sys/ioctl.h" HAVE_IOCTL_INT_INT_DOTS )
check_prototype_definition( ioctl "int ioctl(int d, unsigned long request, ...)" "-1" "unistd.h;sys/ioctl.h" HAVE_IOCTL_INT_ULONG_DOTS )
##### check for audiofile #######################
set( HAVE_LIBAUDIOFILE 0 )
if( WITH_AUDIOFILE )
pkg_search_module( AUDIOFILE audiofile )
if( AUDIOFILE_FOUND )
set( HAVE_LIBAUDIOFILE 1 )
list( APPEND PC_LIB_REQUIRE "audiofile" )
else( AUDIOFILE_FOUND )
tde_message_fatal( "audiofile (wav) support is requested, but `libaudiofile` not found" )
endif( AUDIOFILE_FOUND )
endif( WITH_AUDIOFILE )
##### check for alsa ############################
set( HAVE_LIBASOUND2 0 )
if( WITH_ALSA )
pkg_search_module( ALSA alsa )
if( ALSA_FOUND )
set( HAVE_LIBASOUND2 1 )
check_include_file( "alsa/asoundlib.h" HAVE_ALSA_ASOUNDLIB_H )
if( NOT HAVE_ALSA_ASOUNDLIB_H )
check_include_file( "sys/asoundlib.h" HAVE_SYS_ASOUNDLIB_H )
endif( NOT HAVE_ALSA_ASOUNDLIB_H )
tde_save_and_set( CMAKE_REQUIRED_LIBRARIES ${ALSA_LIBRARIES} )
check_function_exists( snd_pcm_resume HAVE_SND_PCM_RESUME )
tde_restore( CMAKE_REQUIRED_LIBRARIES )
list( APPEND PC_LIB_REQUIRE "alsa" )
else( ALSA_FOUND )
tde_message_fatal( "ALSA support is requested, but not found on your system" )
endif( ALSA_FOUND )
endif( WITH_ALSA )
##### check for esound #######################
set( HAVE_LIBESD 0 )
if( WITH_ESOUND )
pkg_search_module( ESOUND esound )
if( ESOUND_FOUND )
set( HAVE_LIBESD 1 )
list( APPEND PC_LIB_REQUIRE "esound" )
else( ESOUND_FOUND )
tde_message_fatal( "ESOUND support is requested, but `libesd` not found" )
endif( ESOUND_FOUND )
endif( WITH_ESOUND )
##### check for JACK ############################
set( HAVE_LIBJACK 0 )
if( WITH_JACK )
pkg_search_module( LIBJACK jack )
if( LIBJACK_FOUND )
set( HAVE_LIBJACK 1 )
list( APPEND PC_LIB_REQUIRE "jack" )
else( LIBJACK_FOUND )
tde_message_fatal( "JACK support is requested, but `jack.pc` was not found" )
endif( LIBJACK_FOUND )
endif( WITH_JACK )
##### check for SNDIO ###########################
set( HAVE_LIBSNDIO 0 )
if( WITH_SNDIO )
check_include_file( "sndio.h" HAVE_SNDIO_H )
if( HAVE_SNDIO_H )
set( HAVE_LIBSNDIO 1 )
set( LIBSNDIO_LIBRARIES "sndio" )
else( HAVE_SNDIO_H )
tde_message_fatal( "SNDIO support is requested, but `sndio.h` was not found" )
endif( HAVE_SNDIO_H )
endif( WITH_SNDIO )
##### check for glib/gthread modules ############
pkg_search_module( GLIB2 glib-2.0 )
if( GLIB2_FOUND )
pkg_search_module( GTHREAD2 gthread-2.0 )
if( NOT GTHREAD2_FOUND )
tde_message_message( "gthread-2.0 is required, but not found on your system" )
endif( NOT GTHREAD2_FOUND )
else( GLIB2_FOUND )
tde_message_fatal( "glib-2.0 is required, but not found on your system" )
endif( GLIB2_FOUND )
##### save cached value of required packages ####
set( PC_LIB_REQUIRE "${PC_LIB_REQUIRE}" CACHE INTERNAL "List of required packages" FORCE )

@ -0,0 +1,25 @@
aRts sound system
aRts is a short form for "analog realtime synthesizer". aRts is highly
modular, creating and processing sound using small modules performing
specific tasks. These may create a waveform (oscillators), play samples,
filter data, add signals, perform effects like delay/flanger/chorus, or
output the data to the soundcard.
All of the aRts documentation is now in "The aRts Handbook" which is
in TDE DocBook format, part of tdemultimedia. It should be found on a
KDE system in $TDEDIR/share/doc/tde/HTML/default/artsbuilder/index.html.
.
Contributing
--------------
If you wish to contribute to aRts, you might do so:
- TDE Gitea Workspace (TGW) collaboration tool.
https://mirror.git.trinitydesktop.org/gitea
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
https://mirror.git.trinitydesktop.org/weblate

@ -151,7 +151,7 @@
## Misc
- put streamwise blocking into MCOP, see artscat.cc to read really ugly
- put streamwise blocking into MCOP, see artscat.cpp to read really ugly
source which lives without that feature
- implement plugins that transfer non-standard datatypes such as midi events,
video frames, fft packets, oscilloscope views, ... (which was impossible
@ -185,7 +185,7 @@ Flowsystem transactions:
Example: problematic assertion
assert(done[i] <= samples); /* synthschedule.cc:998 */
assert(done[i] <= samples); /* synthschedule.cpp:998 */
the problem with the assertion here is this - suppose some object reacts
in a way on some signal that will lead to the creation of new objects,
@ -206,7 +206,7 @@ Example: problematic assertion
approximately what the C API can do
* don't export implementation details in the API - for instance
KAudio(Play|Record)Stream should probably only inherit from QObject, and
KAudio(Play|Record)Stream should probably only inherit from TQObject, and
only "use" some aRts objects to do the actual work - that way, they can
be changed/modified more easily afterwards

@ -1 +1 @@
Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
Subproject commit 7fc9aedfb802dbb23da9f54134dd1c381124bc58

@ -1,14 +0,0 @@
Begin4
Title: arts
Version: R14.0.0
Entered-date: 2010-05-10
Description: Sound server for the Trinity Desktop Environment
Keywords: TDE X11 desktop Qt
Author: http://www.kde.org/
Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
Primary-site: http://git.trinitydesktop.org/cgit/
Alternate-site:
Original-site: http://www.kde.org/
Platforms: Linux and other Unices running TDE
Copying-policy: LGPL
End

@ -31,10 +31,14 @@ foreach( INC ${GTHREAD2_INCLUDE_DIRS} )
set( GLIB_CFLAGS "${GLIB_CFLAGS} -I${INC}" )
endforeach(INC)
configure_file( artsc.pc.in artsc.pc @ONLY )
configure_file( artsc-config.in artsc-config @ONLY )
configure_file( artsdsp.in artsdsp @ONLY )
configure_file( artsc_export.h.in artsc_export.h @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/artsc.pc
DESTINATION ${PKGCONFIG_INSTALL_DIR} )
install( PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/artsdsp
${CMAKE_CURRENT_BINARY_DIR}/artsc-config
@ -46,6 +50,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/artsc
${CMAKE_SOURCE_DIR}/libltdl
${CMAKE_BINARY_DIR}/mcop
${CMAKE_SOURCE_DIR}/mcop
${CMAKE_BINARY_DIR}/flow
@ -81,7 +86,7 @@ tde_add_library( artsdsp_st SHARED
DESTINATION ${LIB_INSTALL_DIR}
)
set_target_properties( artsdsp_st-shared PROPERTIES COMPILE_FLAGS -DARTSC_BACKEND=\\"${LIB_INSTALL_DIR}/libartscbackend.la\\" )
set_property( TARGET artsdsp_st-shared APPEND PROPERTY COMPILE_DEFINITIONS ARTSC_BACKEND="${LIB_INSTALL_DIR}/libartscbackend.la" )
##### artsc (shared lib) ########################
@ -93,13 +98,13 @@ tde_add_library( artsc SHARED
DESTINATION ${LIB_INSTALL_DIR}
)
set_target_properties( artsc-shared PROPERTIES COMPILE_FLAGS -DARTSC_BACKEND=\\"${LIB_INSTALL_DIR}/libartscbackend.la\\" )
set_property( TARGET artsc-shared APPEND PROPERTY COMPILE_DEFINITIONS ARTSC_BACKEND="${LIB_INSTALL_DIR}/libartscbackend.la" )
##### artscbackend (shared lib) #################
tde_add_library( artscbackend SHARED
SOURCES artscbackend.cc
SOURCES artscbackend.cpp
VERSION 0.0.0
LINK soundserver_idl-shared artsflow-shared
DESTINATION ${LIB_INSTALL_DIR}

@ -15,31 +15,25 @@ EOH
exit 1;
}
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
libdl=@LIBDL@
flags=""
while test $# -gt 0
do
case $1 in
--libs)
flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@ @GLIB_LDFLAGS@ @GLIB_LIBADD@"
flags="$flags `pkg-config artsc --libs`"
;;
--cflags)
flags="$flags -I$includedir @GLIB_CFLAGS@"
flags="$flags `pkg-config artsc --cflags`"
;;
--version)
echo 0.9.5
pkg-config artsc --modversion
;;
--arts-version)
echo @ARTS_VERSION@
pkg-config artsc --variable=arts_version
;;
--arts-prefix)
echo $prefix
pkg-config artsc --variable=prefix
;;
*)
echo "$0: unknown option $1"

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
arts_version=@ARTS_VERSION@
Name: aRtsC
Description: aRts sound system C support library (TDE)
Version: 0.9.5
Libs: -L${libdir} -lartsc @LIBDL@ @USE_THREADS@ @LIBPTHREAD@ @GLIB_LDFLAGS@ @GLIB_LIBADD@
Cflags: -I${includedir} @GLIB_CFLAGS@

@ -79,8 +79,6 @@ static int frags;
typedef int ioctl_request_t;
#elif defined(HAVE_IOCTL_INT_ULONG_DOTS)
typedef unsigned long ioctl_request_t;
#elif defined(HAVE_IOCTL_INT_ULONGINT_DOTS)
typedef unsigned long int ioctl_request_t;
#else
#error "unknown ioctl type (check config.h, adapt configure test)..."
#endif
@ -486,7 +484,7 @@ int ioctl (int fd, ioctl_request_t request, ...)
#endif
default:
artsdspdebug("aRts: unhandled /dev/dsp ioctl (%lx - %p)\n",request, argp);
artsdspdebug("aRts: unhandled /dev/dsp ioctl (%lx - %p)\n", (unsigned long)request, argp);
break;
}
@ -672,6 +670,3 @@ FILE* fopen(const char *path, const char *mode)
#endif
#endif
/*
* vim:ts=4
*/

@ -1 +0,0 @@
Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

@ -1,6 +1,10 @@
/* Defined if you have fvisibility and fvisibility-inlines-hidden support. */
#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
#cmakedefine HAVE_SYS_TIME_H 1
#cmakedefine TIME_WITH_SYS_TIME 1
#cmakedefine HAVE_STDIO_H 1
@ -31,12 +35,11 @@
#cmakedefine HAVE_LIBASOUND2 1
#cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
#cmakedefine HAVE_SND_PCM_RESUME 1
#cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
#cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
#cmakedefine HAVE_SYS_SOUNDCARD_H 1
#cmakedefine HAVE_LIBPTHREAD 1
#define HAVE_IOCTL_INT_ULONGINT_DOTS 3
#cmakedefine HAVE_IOCTL_INT_INT_DOTS 1
#cmakedefine HAVE_IOCTL_INT_ULONG_DOTS 2
#cmakedefine HAVE_LIBJACK 1
#cmakedefine HAVE_LIBSNDIO 1

@ -1,5 +0,0 @@
All of the aRts documentation is now in "The aRts Handbook" which is
in KDE DocBook format, part of tdemultimedia. It should be found on a
KDE system in $TDEDIR/share/doc/tde/HTML/default/artsbuilder/index.html.
An on-line version can be found at http://www.arts-project.org/doc/handbook

@ -0,0 +1,41 @@
.TH "ARTSC-CONFIG" "1"
.SH "NAME"
artsc-config \(em Get information about a libartsc installation
.SH "SYNOPSIS"
.PP
\fBartsc-config\fR [\fB\-\-arts-prefix\fI\fR\fP] [\fB\-\-arts-version\fI\fR\fP] [\fB\-\-cflags\fI\fR\fP] [\fB\-\-libs\fI\fR\fP] [\fB\-\-version\fI\fR\fP]
.SH "DESCRIPTION"
.PP
This manual page documents briefly the
\fBartsc-config\fR command.
.PP
\fBartsc-config\fR displays information about a previous libartsc installation.
.SH "OPTIONS"
.PP
This program follows the usual GNU command line syntax,
with long options starting with two dashes (`\-'). A summary of
options is included below.
.IP "\fB\-\-arts-prefix\fP " 10
This is the prefix used when libartsc was installed.
.IP "\fB\-\-arts-version\fP " 10
Outputs version information about the installed arts.
.IP "\fB\-\-cflags\fP " 10
Set of compiler options (CFLAGS) to use when compiling files that use libartsc.
.IP "\fB\-\-libs\fP " 10
Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.
.IP "\fB\-\-version\fP " 10
Outputs version information about the installed libartsc.
.SH "AUTHOR"
.PP
This manual page was written by Chris Cheney
<ccheney@debian.org> for the \fBDebian\fP system (but may be used by
others). Permission is granted to copy, distribute and/or
modify this document under the terms of the GNU General Public
License, Version 2 or any later version published by the Free
Software Foundation.
.PP
On Debian systems, the complete text of the GNU General
Public License can be found in /usr/share/common-licenses/GPL.
.\" created by instant / docbook-to-man

@ -0,0 +1,43 @@
.TH "ARTSCAT" "1"
.SH "NAME"
artscat \(em pipe data to sound device
.SH "SYNOPSIS"
.PP
\fBartscat\fR [\fB\fI options \fR\fP] [\fB\fI filename \fR\fP]
.SH "DESCRIPTION"
.PP
This manual page documents briefly the
\fBartscat\fR command.
.PP
\fBartscat\fR pipes data from a pipe to the sound device through arts.
.SH "OPTIONS"
.PP
This program follows the usual GNU command line syntax,
with long options starting with two dashes (`\-'). A summary of
options is included below.
.IP "\fB-b \fIbits\fR\fP " 10
set number of bits (8 or 16)
.IP "\fB-c \fIchannels\fR\fP " 10
set number of channels (1 or 2)
.IP "\fB-h\fP " 10
display help and exit
.IP "\fB-r \fIsamplingrate\fR\fP " 10
set samplingrate to use
.IP "\fB-t \fItitle\fR\fP " 10
set stream title
.IP "\fB-v\fP " 10
show version
.SH "AUTHOR"
.PP
This manual page was written by Chris Cheney
<ccheney@debian.org> for the \fBDebian\fP system (but may be used by
others). Permission is granted to copy, distribute and/or
modify this document under the terms of the GNU General Public
License, Version 2 or any later version published by the Free
Software Foundation.
.PP
On Debian systems, the complete text of the GNU General
Public License can be found in /usr/share/common-licenses/GPL.
.\" created by instant / docbook-to-man

@ -0,0 +1,31 @@
.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
.SH NAME
artsdsp \- manual page for artsdsp
.SH DESCRIPTION
artsdsp \- attempt to reroute audio device to artsd
.PP
artsdsp [options] binary
.PP
options:
.TP
.B \-h, \-\-help
Show brief help.
.TP
.B \-n, \-\-name\fR=\fINAME\fR
Use name to identify player to artsd.
.TP
.B \-m, \-\-mmap
Emulate memory mapping (i.e. for quake).
.TP
.B \-s, \-\-single\-threaded
Use the single\-threaded version.
.TP
.B \-v, \-\-verbose
Show parameters.
.TP
.B \-V, \-\-version
Show version.
.PP
This manual page was written by Fathi Boudra <fabo@debian.org>,
for the Debian project (but may be used by others).

@ -45,7 +45,7 @@ int main()
connect(sin, play, "invalue_left");
connect(sin, play, "invalue_right");
// start all objects (maybe we should group objects like with QWidget
// start all objects (maybe we should group objects like with TQWidget
// parents and such?)
freq.start();
sin.start();

@ -32,7 +32,7 @@
using namespace Arts;
using namespace std;
/* copypasted from simplesoundserver_impl.cc */
/* copypasted from simplesoundserver_impl.cpp */
PlayObject createPlayObject(const string& filename)
{
string objectType = "";

@ -32,7 +32,7 @@ install( FILES
fft.h artsflow.idl audioio.h resample.h cpuinfo.h
bufferqueue.h gslschedule.h
${CMAKE_CURRENT_BINARY_DIR}/artsflow.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} )
##### other data ################################
@ -48,19 +48,19 @@ install( FILES
set( target artsflow )
set( ${target}_SRCS
synth_play_impl.cc gslschedule.cc audiosubsys.cc
pipebuffer.cc convert.cc synth_wave_sin_impl.cc
synth_frequency_impl.cc synth_multi_add_impl.cc
synth_add_impl.cc synth_mul_impl.cc synth_play_wav_impl.cc
stdsynthmodule.cc cache.cc asyncschedule.cc bytestreamtoaudio_impl.cc
stereovolumecontrol_impl.cc stereoeffectstack_impl.cc
fft.c stereofftscope_impl.cc virtualports.cc bus.cc
audiomanager_impl.cc synth_record_impl.cc resample.cc
audioio.cc audioiooss.cc audioioalsa.cc audioioalsa9.cc
audioionull.cc audioiolibaudioio.cc audioioesd.cc audioiosndio.cc
audioiojack.cc audioiosun.cc audioioaix.cc audioionas.cc
cpuinfo.cc audioioossthreaded.cc audiotobytestream_impl.cc
audioiosgi.cc audioiocsl.cc audioiomas.cc datahandle_impl.cc
synth_play_impl.cpp gslschedule.cpp audiosubsys.cpp
pipebuffer.cpp convert.cpp synth_wave_sin_impl.cpp
synth_frequency_impl.cpp synth_multi_add_impl.cpp
synth_add_impl.cpp synth_mul_impl.cpp synth_play_wav_impl.cpp
stdsynthmodule.cpp cache.cpp asyncschedule.cpp bytestreamtoaudio_impl.cpp
stereovolumecontrol_impl.cpp stereoeffectstack_impl.cpp
fft.c stereofftscope_impl.cpp virtualports.cpp bus.cpp
audiomanager_impl.cpp synth_record_impl.cpp resample.cpp
audioio.cpp audioiooss.cpp audioioalsa.cpp
audioionull.cpp audioiolibaudioio.cpp audioioesd.cpp audioiosndio.cpp
audioiojack.cpp audioiosun.cpp audioioaix.cpp audioionas.cpp
cpuinfo.cpp audioioossthreaded.cpp audiotobytestream_impl.cpp
audioiosgi.cpp audioiocsl.cpp audioiomas.cpp datahandle_impl.cpp
)
tde_add_library( ${target} SHARED
@ -73,13 +73,13 @@ tde_add_library( ${target} SHARED
##### artsflow_idl (shared lib) #################
add_custom_command(
OUTPUT artsflow.cc
OUTPUT artsflow.cpp
COMMAND ../mcopidl/mcopidl
ARGS -t ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl
)
tde_add_library( artsflow_idl SHARED
SOURCES artsflow.cc
SOURCES artsflow.cpp
VERSION 1.0.0
LINK mcop-shared ${ALSA_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}

@ -1,561 +0,0 @@
/*
Copyright (C) 2000,2001 Jozef Kosoru
jozef.kosoru@pobox.sk
(C) 2000,2001 Stefan Westerfeld
stefan@space.twc.de
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library 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 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
/**
* only compile 'alsa' AudioIO class if configure thinks it is a good idea
*/
#ifdef HAVE_LIBASOUND
#ifdef HAVE_ALSA_ASOUNDLIB_H
#include <alsa/asoundlib.h>
#elif defined(HAVE_SYS_ASOUNDLIB_H)
#include <sys/asoundlib.h>
#endif
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/stat.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> // Needed on some systems.
#endif
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iostream>
#include <algorithm>
#include "debug.h"
#include "audioio.h"
namespace Arts {
class AudioIOALSA : public AudioIO {
protected:
int audio_read_fd;
int audio_write_fd;
int requestedFragmentSize;
int requestedFragmentCount;
enum BufferMode{block, stream};
int m_card;
int m_device;
int m_format;
BufferMode m_bufferMode;
snd_pcm_t *m_pcm_handle;
snd_pcm_channel_info_t m_cinfo;
snd_pcm_format_t m_cformat;
snd_pcm_channel_params_t m_params;
snd_pcm_channel_setup_t m_setup;
int setPcmParams(const int channel);
void checkCapabilities();
public:
AudioIOALSA();
void setParam(AudioParam param, int& value);
int getParam(AudioParam param);
bool open();
void close();
int read(void *buffer, int size);
int write(void *buffer, int size);
};
REGISTER_AUDIO_IO(AudioIOALSA,"alsa","Advanced Linux Sound Architecture");
};
using namespace std;
using namespace Arts;
AudioIOALSA::AudioIOALSA()
{
param(samplingRate) = 44100;
paramStr(deviceName) = "/dev/dsp"; //!! alsa doesn't need this
requestedFragmentSize = param(fragmentSize) = 1024;
requestedFragmentCount = param(fragmentCount) = 7;
param(channels) = 2;
param(direction) = directionWrite;
/*
* default parameters
*/
m_card = snd_defaults_pcm_card(); //!! need interface !!
m_device = snd_defaults_pcm_device(); //!!
#ifdef WORDS_BIGENDIAN
m_format = SND_PCM_SFMT_S16_BE;
#else
m_format = SND_PCM_SFMT_S16_LE;
#endif
m_bufferMode = block; //block/stream (stream mode doesn't work yet)
if(m_card >= 0) {
char* cardname = 0;
if(snd_card_get_name(m_card, &cardname) == 0 && cardname != 0)
{
//!! thats not what devicename is intended to do
//!! devicename is an input information into
//!! the "driver", to select which card to use
//!! not an output information
paramStr(deviceName) = cardname;
free(cardname);
}
}
}
bool AudioIOALSA::open()
{
string& _error = paramStr(lastError);
string& _deviceName = paramStr(deviceName);
int& _channels = param(channels);
int& _fragmentSize = param(fragmentSize);
int& _fragmentCount = param(fragmentCount);
int& _samplingRate = param(samplingRate);
int& _direction = param(direction);
int& _format = param(format);
/*
* initialize format - TODO: implement fallback (i.e. if no format given,
* it should try 16bit first, then fall back to 8bit)
*/
switch(_format)
{
default: _format = 16;
case 16: // 16bit, signed little endian
m_format = SND_PCM_SFMT_S16_LE;
break;
case 17: // 16bit, signed big endian
m_format = SND_PCM_SFMT_S16_BE;
break;
case 8: // 8bit, unsigned
m_format = SND_PCM_SFMT_U8;
break;
}
/* open pcm device */
int mode = SND_PCM_OPEN_NONBLOCK;
if(_direction == directionReadWrite)
mode |= SND_PCM_OPEN_DUPLEX;
else if(_direction == directionWrite)
mode |= SND_PCM_OPEN_PLAYBACK;
else
{
_error = "invalid direction";
return false;
}
int err;
if((err = snd_pcm_open(&m_pcm_handle, m_card, m_device, mode)) < 0) {
_error = "device: ";
_error += _deviceName.c_str();
_error += " can't be opened (";
_error += snd_strerror(err);
_error += ")";
return false;
}
else {
artsdebug("ALSA driver: %s", _deviceName.c_str());
}
snd_pcm_nonblock_mode(m_pcm_handle, 0);
/* flush buffers */
(void)snd_pcm_capture_flush(m_pcm_handle);
if(_direction & directionRead)
(void)snd_pcm_channel_flush(m_pcm_handle, SND_PCM_CHANNEL_CAPTURE);
if(_direction & directionWrite)
(void)snd_pcm_channel_flush(m_pcm_handle, SND_PCM_CHANNEL_PLAYBACK);
/* check device capabilities */
checkCapabilities();
/* set the fragment settings to what the user requested */
_fragmentSize = requestedFragmentSize;
_fragmentCount = requestedFragmentCount;
/* set PCM communication parameters */
if((_direction & directionRead) && setPcmParams(SND_PCM_CHANNEL_CAPTURE))
return false;
if((_direction & directionWrite) && setPcmParams(SND_PCM_CHANNEL_PLAYBACK))
return false;
/* prepare channel */
if((_direction & directionRead) &&
snd_pcm_channel_prepare(m_pcm_handle, SND_PCM_CHANNEL_CAPTURE) < 0)
{
_error = "Unable to prepare capture channel!";
return false;
}
if((_direction & directionWrite) &&
snd_pcm_channel_prepare(m_pcm_handle, SND_PCM_CHANNEL_PLAYBACK) < 0)
{
_error = "Unable to prepare playback channel!";
return false;
}
/* obtain current PCM setup (may differ from requested one) */
(void)memset(&m_setup, 0, sizeof(m_setup));
m_setup.channel = SND_PCM_CHANNEL_PLAYBACK;
if(snd_pcm_channel_setup(m_pcm_handle, &m_setup) < 0) {
_error = "Unable to obtain channel setup!";
return false;
}
/* check samplerate */
const int tolerance = _samplingRate/10+1000;
if(abs(m_setup.format.rate-_samplingRate) > tolerance)
{
_error = "Can't set requested sampling rate!";
char details[80];
sprintf(details," (requested rate %d, got rate %d)",
_samplingRate, m_setup.format.rate);
_error += details;
return false;
}
_samplingRate = m_setup.format.rate;
/* check format */
if(m_setup.format.format != m_format) {
_error = "Can't set requested format:";
_error += snd_pcm_get_format_name(m_format);
return false;
}
/* check voices */
if(m_setup.format.voices != _channels) {
_error = "Audio device doesn't support number of requested channels!";
return false;
}
/* update fragment settings with what we got */
switch(m_bufferMode) {
case block:
_fragmentSize = m_setup.buf.block.frag_size;
_fragmentCount = m_setup.buf.block.frags_max-1;
break;
case stream:
_fragmentSize = m_setup.buf.stream.queue_size;
_fragmentCount = 1;
break;
}
artsdebug("buffering: %d fragments with %d bytes "
"(audio latency is %1.1f ms)", _fragmentCount, _fragmentSize,
(float)(_fragmentSize*_fragmentCount) /
(float)(2.0 * _samplingRate * _channels)*1000.0);
/* obtain PCM file descriptor(s) */
audio_read_fd = audio_write_fd = -1;
if(_direction & directionRead)
audio_read_fd = snd_pcm_file_descriptor(m_pcm_handle,
SND_PCM_CHANNEL_CAPTURE);
if(_direction & directionWrite)
audio_write_fd = snd_pcm_file_descriptor(m_pcm_handle,
SND_PCM_CHANNEL_PLAYBACK);
/* start recording */
if((_direction & directionRead) && snd_pcm_capture_go(m_pcm_handle)) {
_error = "Can't start recording!";
return false;
}
return true;
}
void AudioIOALSA::close()
{
int& _direction = param(direction);
if(_direction & directionRead)
(void)snd_pcm_channel_flush(m_pcm_handle, SND_PCM_CHANNEL_CAPTURE);
if(_direction & directionWrite)
(void)snd_pcm_channel_flush(m_pcm_handle, SND_PCM_CHANNEL_PLAYBACK);
(void)snd_pcm_close(m_pcm_handle);
}
void AudioIOALSA::setParam(AudioParam p, int& value)
{
switch(p)
{
case fragmentSize:
param(p) = requestedFragmentSize = value;
break;
case fragmentCount:
param(p) = requestedFragmentCount = value;
break;
default:
param(p) = value;
break;
}
}
int AudioIOALSA::getParam(AudioParam p)
{
snd_pcm_channel_status_t status;
(void)memset(&status, 0, sizeof(status));
switch(p)
{
case canRead:
status.channel = SND_PCM_CHANNEL_CAPTURE;
if(snd_pcm_channel_status(m_pcm_handle, &status) < 0) {
arts_warning("Capture channel status error!");
return -1;
}
return status.free;
break;
case canWrite:
status.channel = SND_PCM_CHANNEL_PLAYBACK;
if(snd_pcm_channel_status(m_pcm_handle, &status) < 0) {
arts_warning("Playback channel status error!");
return -1;
}
return status.free;
break;
case selectReadFD:
return audio_read_fd;
break;
case selectWriteFD:
return audio_write_fd;
break;
case autoDetect:
/*
* that the ALSA driver could be compiled doesn't say anything
* about whether it will work (the user might be using an OSS
* kernel driver) so we'll use a value less than the OSS one
* here, because OSS will most certainly work (ALSA's OSS emu)
*/
return 5;
break;
default:
return param(p);
break;
}
}
int AudioIOALSA::read(void *buffer, int size)
{
int length;
do {
length = snd_pcm_read(m_pcm_handle, buffer, size);
} while (length == -EINTR);
if(length == -EPIPE) {
snd_pcm_channel_status_t status;
(void)memset(&status, 0, sizeof(status));
status.channel = SND_PCM_CHANNEL_CAPTURE;
if(snd_pcm_channel_status(m_pcm_handle, &status) < 0) {
arts_info("Capture channel status error!");
return -1;
}
else if(status.status == SND_PCM_STATUS_RUNNING) {
length = 0;
}
else if(status.status == SND_PCM_STATUS_OVERRUN) {
artsdebug("Overrun at position: %d" ,status.scount);
if(snd_pcm_channel_prepare(m_pcm_handle, SND_PCM_CHANNEL_CAPTURE)<0)
{
arts_info("Overrun: capture prepare error!");
return -1;
}
length = 0;
}
else {
arts_info("Unknown capture error!");
return -1;
}
}
else if(length < 0) {
arts_info("Capture error: %s", snd_strerror(length));
return -1;
}
return length;
}
int AudioIOALSA::write(void *buffer, int size)
{
int length;
while((length = snd_pcm_write(m_pcm_handle, buffer, size)) != size) {
if (length == -EINTR)
continue; // Try again
snd_pcm_channel_status_t status;
(void)memset(&status, 0, sizeof(status));
status.channel = SND_PCM_CHANNEL_PLAYBACK;
if(snd_pcm_channel_status(m_pcm_handle, &status) < 0) {
arts_warning("Playback channel status error!");
return -1;
}
else if(status.status == SND_PCM_STATUS_UNDERRUN) {
artsdebug("Underrun at position: %d", status.scount);
if(snd_pcm_channel_prepare(m_pcm_handle, SND_PCM_CHANNEL_PLAYBACK)
< 0) {
arts_warning("Underrun: playback prepare error!");
return -1;
}
}
else {
arts_warning("Unknown playback error!");
return -1;
}
}
return size;
}
int AudioIOALSA::setPcmParams(const int channel)
{
int &_samplingRate = param(samplingRate);
int &_channels = param(channels);
int &_fragmentSize = param(fragmentSize);
int &_fragmentCount = param(fragmentCount);
(void)memset(&m_cformat, 0, sizeof(m_cformat));
m_cformat.interleave = 1;
m_cformat.format = m_format;
m_cformat.rate = _samplingRate;
m_cformat.voices = _channels;
(void)memset(&m_params, 0, sizeof(m_params));
switch(m_bufferMode){
case stream:
m_params.mode=SND_PCM_MODE_STREAM;
break;
case block:
m_params.mode=SND_PCM_MODE_BLOCK;
break;
}
m_params.channel=channel;
(void)memcpy(&m_params.format, &m_cformat, sizeof(m_cformat));
if(channel==SND_PCM_CHANNEL_CAPTURE){
m_params.start_mode=SND_PCM_START_GO;
m_params.stop_mode=SND_PCM_STOP_ROLLOVER;
}
else{ //SND_PCM_CHANNEL_PLAYBACK
m_params.start_mode= (m_bufferMode==block) ? SND_PCM_START_FULL : SND_PCM_START_DATA;
m_params.stop_mode=SND_PCM_STOP_ROLLOVER; // SND_PCM_STOP_STOP
//use this ^^^ if you want to track underruns
}
switch(m_bufferMode){
case stream:
m_params.buf.stream.queue_size=1024*1024; //_fragmentSize*_fragmentCount;
m_params.buf.stream.fill=SND_PCM_FILL_SILENCE_WHOLE;
m_params.buf.stream.max_fill=1024;
break;
case block:
m_params.buf.block.frag_size=_fragmentSize;
if(channel==SND_PCM_CHANNEL_CAPTURE){
m_params.buf.block.frags_max=1;
m_params.buf.block.frags_min=1;
}
else{ //SND_PCM_CHANNEL_PLAYBACK
m_params.buf.block.frags_max=_fragmentCount+1;
m_params.buf.block.frags_min=1;
}
}
if(snd_pcm_channel_params(m_pcm_handle, &m_params)<0){
paramStr(lastError) = "Unable to set channel params!";
return 1;
}
else {
return 0;
}
}
void AudioIOALSA::checkCapabilities()
{
snd_pcm_info_t info;
(void)memset(&info, 0, sizeof(info));
if(!snd_pcm_info(m_pcm_handle, &info)) {
string flags = "";
if(info.flags & SND_PCM_INFO_PLAYBACK) flags += "playback ";
if(info.flags & SND_PCM_INFO_CAPTURE) flags += "capture ";
if(info.flags & SND_PCM_INFO_DUPLEX) flags += "duplex ";
if(info.flags & SND_PCM_INFO_DUPLEX_RATE) flags += "duplex_rate ";
artsdebug(" type:%d id:%s\n"
" flags:%s\n"
" playback_subdevices:%d capture_subdevices:%d",
info.type, info.id,
flags.c_str(),
info.playback+1, info.capture+1);
}
else {
arts_warning("Can't get device info!"); //not fatal error
}
(void)memset(&m_cinfo, 0, sizeof(m_cinfo));
m_cinfo.channel = SND_PCM_CHANNEL_PLAYBACK;
if(!snd_pcm_channel_info(m_pcm_handle, &m_cinfo)) {
string flags = "";
if(m_cinfo.flags & SND_PCM_CHNINFO_MMAP) flags += "mmap ";
if(m_cinfo.flags & SND_PCM_CHNINFO_STREAM) flags += "stream ";
if(m_cinfo.flags & SND_PCM_CHNINFO_BLOCK) flags += "block ";
if(m_cinfo.flags & SND_PCM_CHNINFO_BATCH) flags += "batch ";
if(m_cinfo.flags & SND_PCM_CHNINFO_INTERLEAVE) flags += "interleave ";
if(m_cinfo.flags & SND_PCM_CHNINFO_NONINTERLEAVE) flags += "noninterleave ";
if(m_cinfo.flags & SND_PCM_CHNINFO_BLOCK_TRANSFER) flags += "block_transfer ";
if(m_cinfo.flags & SND_PCM_CHNINFO_OVERRANGE) flags += "overrange ";
if(m_cinfo.flags & SND_PCM_CHNINFO_MMAP_VALID) flags += "mmap_valid ";
if(m_cinfo.flags & SND_PCM_CHNINFO_PAUSE) flags += "pause ";
artsdebug(" subdevice:%d\n"
" flags:%s\n"
" min_rate:%d max_rate:%d\n"
" buffer_size:%d min_fragment_size:%d max_fragment_size:%d\n"
" fragment_align:%d fifo_size:%d transfer_block_size:%d\n"
" mmap_size:%d",
m_cinfo.subdevice,
flags.c_str(),
m_cinfo.min_rate, m_cinfo.max_rate,
m_cinfo.buffer_size, m_cinfo.min_fragment_size, m_cinfo.max_fragment_size,
m_cinfo.fragment_align, m_cinfo.fifo_size, m_cinfo.transfer_block_size,
m_cinfo.mmap_size);
}
else {
arts_warning("Can't get channel info!"); //not fatal error
}
}
#endif /* HAVE_LIBASOUND */

@ -3,7 +3,7 @@
Copyright (C) 2001 Takashi Iwai <tiwai@suse.de>
Copyright (C) 2004 Allan Sandfeld Jensen <kde@carewolf.com>
based on audioalsa.cc:
based on audioalsa.cpp:
Copyright (C) 2000,2001 Jozef Kosoru
jozef.kosoru@pobox.sk
(C) 2000,2001 Stefan Westerfeld
@ -73,7 +73,8 @@ protected:
snd_pcm_t *m_pcm_playback;
snd_pcm_t *m_pcm_capture;
snd_pcm_format_t m_format;
int m_period_size, m_periods;
snd_pcm_uframes_t m_period_size;
unsigned m_periods;
void startIO();
int setPcmParams(snd_pcm_t *pcm);
@ -540,7 +541,11 @@ int AudioIOALSA::setPcmParams(snd_pcm_t *pcm)
return 1;
}
unsigned int rate = snd_pcm_hw_params_set_rate_near(pcm, hw, _samplingRate, 0);
unsigned rate = _samplingRate;
if (snd_pcm_hw_params_set_rate_near(pcm, hw, &rate, 0) < 0) {
_error = "Unable to set sampling rate!";
return 1;
}
const unsigned int tolerance = _samplingRate/10+1000;
if (abs((int)rate - (int)_samplingRate) > (int)tolerance) {
_error = "Can't set requested sampling rate!";
@ -562,12 +567,12 @@ int AudioIOALSA::setPcmParams(snd_pcm_t *pcm)
m_period_size <<= 1;
if (_channels > 1)
m_period_size /= _channels;
if ((m_period_size = snd_pcm_hw_params_set_period_size_near(pcm, hw, m_period_size, 0)) < 0) {
if (snd_pcm_hw_params_set_period_size_near(pcm, hw, &m_period_size, 0) < 0) {
_error = "Unable to set period size!";
return 1;
}
m_periods = _fragmentCount;
if ((m_periods = snd_pcm_hw_params_set_periods_near(pcm, hw, m_periods, 0)) < 0) {
if (snd_pcm_hw_params_set_periods_near(pcm, hw, &m_periods, 0) < 0) {
_error = "Unable to set periods!";
return 1;
}

@ -343,4 +343,3 @@ void AudioIOJack::notifyTime()
}
#endif
// vim: sw=4 ts=4

@ -321,5 +321,3 @@ REGISTER_IMPLEMENTATION(Synth_AMAN_PLAY_impl);
REGISTER_IMPLEMENTATION(Synth_AMAN_RECORD_impl);
}
// vim: sw=4 ts=4 noet

@ -9,97 +9,9 @@
#
#################################################
include( CheckCSourceCompiles )
##### configure checks
##### check for ogg/vorbis ######################
set( GSL_HAVE_OGGVORBIS 0 )
if( WITH_VORBIS )
pkg_search_module( VORBIS vorbis )
if( VORBIS_FOUND )
pkg_search_module( VORBISFILE vorbisfile )
if( VORBISFILE_FOUND )
set( GSL_HAVE_OGGVORBIS 1 )
set( bak_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} )
set( CMAKE_REQUIRED_LIBRARIES ${VORBISFILE_LIBRARIES} )
check_c_source_compiles(
"#include <vorbis/vorbisfile.h>
int main() { ov_read_float(0,0,0); return 0; } "
GSL_HAVE_OGGVORBIS_RC3 )
if( NOT GSL_HAVE_OGGVORBIS_RC3 )
set( GSL_HAVE_OGGVORBIS_RC3 0 )
endif( NOT GSL_HAVE_OGGVORBIS_RC3 )
set( CMAKE_REQUIRED_LIBRARIES ${bak_CMAKE_REQUIRED_LIBRARIES} )
else( VORBISFILE_FOUND )
message(FATAL_ERROR "\nOgg/Vorbis support are requested, but `libvorbisfile` not found" )
endif( VORBISFILE_FOUND )
else( VORBIS_FOUND )
message(FATAL_ERROR "\nOgg/Vorbis support are requested, but `libvorbis` but found" )
endif( VORBIS_FOUND )
endif( WITH_VORBIS )
##### check for libmad MPEG decoder #############
set( GSL_HAVE_LIBMAD 0 )
if( WITH_MAD )
pkg_search_module( MAD mad )
if( MAD_FOUND )
set( GSL_HAVE_LIBMAD 1 )
else( MAD_FOUND )
find_library( MAD_LIBRARIES NAMES mad )
find_path( MAD_INCLUDE_DIRS mad.h )
if( NOT MAD_LIBRARIES )
message(FATAL_ERROR "\nMAD support is requested, but `libmad` not found" )
endif( NOT MAD_LIBRARIES )
endif( MAD_FOUND )
endif( WITH_MAD )
##### check for some type sizes #################
include( CheckTypeSize )
check_type_size( pthread_mutex_t GSL_SIZEOF_PTH_MUTEX_T )
check_type_size( pthread_cond_t GSL_SIZEOF_PTH_COND_T )
check_type_size( intmax_t GSL_SIZEOF_STD_INTMAX_T )
set( bak_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} )
set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
check_c_source_compiles(
"#define _XOPEN_SOURCE 500
#include <pthread.h>
int main()
{
int (*attr_settype) (pthread_mutexattr_t *__attr, int __kind) = pthread_mutexattr_settype;
int val = PTHREAD_MUTEX_RECURSIVE; attr_settype = 0; val = 0;
return 0;
}"
GSL_HAVE_MUTEXATTR_SETTYPE )
if( NOT GSL_HAVE_MUTEXATTR_SETTYPE )
set( GSL_HAVE_MUTEXATTR_SETTYPE 0 )
endif( NOT GSL_HAVE_MUTEXATTR_SETTYPE )
set( CMAKE_REQUIRED_LIBRARIES ${bak_CMAKE_REQUIRED_LIBRARIES} )
set( GSL_USE_GSL_GLIB 1 )
set( GSL_USE_ARTS_THREADS 1 )
include( ConfigureChecks.cmake )
##### write configuration #######################
@ -129,7 +41,7 @@ install( FILES
gslengine.h gslwaveosc.h gslwavechunk.h
gsldatahandle-mad.h gslosctable.h gsloscillator.h
${CMAKE_CURRENT_BINARY_DIR}/gslconfig.h
DESTINATION ${INCLUDE_INSTALL_DIR}/gsl )
DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME}/gsl )
##### gsl (static lib) ##########################
@ -144,7 +56,7 @@ set( ${target}_SRCS
gslconvert.c gslfft.c gslsignal.c gslloader.c
gslwaveosc.c gslengine.c gsloputil.c gslopmaster.c
gslopschedule.c gsldatahandle-mad.c gslosctable.c
gsloscillator.c gslfilehash.c gslartsthreads.cc
gsloscillator.c gslfilehash.c gslartsthreads.cpp
)
tde_add_library( ${target} STATIC_PIC
@ -152,4 +64,3 @@ tde_add_library( ${target} STATIC_PIC
LINK ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${MAD_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)

@ -0,0 +1,112 @@
#################################################
#
# (C) 2010 Serghei Amelian
# serghei (DOT) amelian (AT) gmail.com
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 2
#
#################################################
include( CheckCSourceCompiles )
include( CheckTypeSize )
##### check for ogg/vorbis ######################
set( GSL_HAVE_OGGVORBIS 0 )
if( WITH_VORBIS )
pkg_search_module( VORBIS vorbis )
if( VORBIS_FOUND )
pkg_search_module( VORBISFILE vorbisfile )
if( VORBISFILE_FOUND )
set( GSL_HAVE_OGGVORBIS 1 )
tde_save_and_set( CMAKE_REQUIRED_LIBRARIES ${VORBISFILE_LIBRARIES} )
check_c_source_compiles(
"#include <vorbis/vorbisfile.h>
int main() { ov_read_float(0,0,0); return 0; } "
GSL_HAVE_OGGVORBIS_RC3 )
if( NOT GSL_HAVE_OGGVORBIS_RC3 )
set( GSL_HAVE_OGGVORBIS_RC3 0 )
endif( NOT GSL_HAVE_OGGVORBIS_RC3 )
tde_restore( CMAKE_REQUIRED_LIBRARIES )
list( APPEND PC_LIB_REQUIRE "vorbis" "vorbisfile" )
else( VORBISFILE_FOUND )
tde_message_fatal( "Ogg/Vorbis support are requested, but `libvorbisfile` not found" )
endif( VORBISFILE_FOUND )
else( VORBIS_FOUND )
tde_message_fafal( "Ogg/Vorbis support are requested, but `libvorbis` but found" )
endif( VORBIS_FOUND )
endif( WITH_VORBIS )
##### check for libmad MPEG decoder #############
set( GSL_HAVE_LIBMAD 0 )
if( WITH_MAD )
pkg_search_module( MAD libmad )
set( MAD_MODULE_NAME "libmad" )
if( NOT MAD_FOUND )
pkg_search_module( MAD mad )
set( MAD_MODULE_NAME "mad" )
endif()
if( MAD_FOUND )
set( GSL_HAVE_LIBMAD 1 )
list( APPEND PC_LIB_REQUIRE ${MAD_MODULE_NAME} )
else( MAD_FOUND )
find_library( MAD_LIBRARIES NAMES mad )
find_path( MAD_INCLUDE_DIRS mad.h )
if( NOT MAD_LIBRARIES )
tde_message_fatal( "MAD support is requested, but `libmad` not found" )
endif( NOT MAD_LIBRARIES )
endif( MAD_FOUND )
endif( WITH_MAD )
##### check for some type sizes #################
check_type_size( pthread_mutex_t GSL_SIZEOF_PTH_MUTEX_T )
check_type_size( pthread_cond_t GSL_SIZEOF_PTH_COND_T )
check_type_size( intmax_t GSL_SIZEOF_STD_INTMAX_T )
tde_save_and_set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
check_c_source_compiles(
"#define _XOPEN_SOURCE 500
#include <pthread.h>
int main()
{
int (*attr_settype) (pthread_mutexattr_t *__attr, int __kind) = pthread_mutexattr_settype;
int val = PTHREAD_MUTEX_RECURSIVE; attr_settype = 0; val = 0;
return 0;
}"
GSL_HAVE_MUTEXATTR_SETTYPE )
if( NOT GSL_HAVE_MUTEXATTR_SETTYPE )
set( GSL_HAVE_MUTEXATTR_SETTYPE 0 )
endif( NOT GSL_HAVE_MUTEXATTR_SETTYPE )
tde_restore( CMAKE_REQUIRED_LIBRARIES )
set( GSL_USE_GSL_GLIB 1 )
set( GSL_USE_ARTS_THREADS 1 )
##### save cached value of required packages ####
set( PC_LIB_REQUIRE "${PC_LIB_REQUIRE}" CACHE INTERNAL "List of required packages" FORCE )

@ -551,7 +551,7 @@ sub fft_loop_macros {
# mul_result = gsl_complex (c1.re * c2.re - c1.im * c2.im, c1.re * c2.im + c1.im * c2.re);
print "
#define WMULTIPLY(Wre,Wim,Dre,Dim) { \\
register $tmp_ieee_type T1re, T1im, T2re, T2im; \\
$tmp_ieee_type T1re, T1im, T2re, T2im; \\
T1re = Wre * Dre; \\
T1im = Wim * Dre; \\
T2re = Wim * Dim; \\
@ -567,7 +567,7 @@ sub butterfly_macros {
# add_result = gsl_complex (c1.re + c2.re, c1.im + c2.im);
print "
#define BUTTERFLY_XY(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,Wim) { \\
register $tmp_ieee_type T1re, T1im, T2re, T2im; \\
$tmp_ieee_type T1re, T1im, T2re, T2im; \\
T1re = X2re * Wre; \\
T1im = X2im * Wre; \\
T2re = X2im * Wim; \\
@ -582,7 +582,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_Yx(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,Wim) { \\
register $tmp_ieee_type T1re, T1im, T2re, T2im; \\
$tmp_ieee_type T1re, T1im, T2re, T2im; \\
T1re = X2re * Wim; \\
T1im = X2im * Wim; \\
T2re = X2im * Wre; \\
@ -597,7 +597,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_yX(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,Wim) { \\
register $tmp_ieee_type T1re, T1im, T2re, T2im; \\
$tmp_ieee_type T1re, T1im, T2re, T2im; \\
T1re = X2re * Wim; \\
T1im = X2im * Wim; \\
T2re = X2im * Wre; \\
@ -612,7 +612,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_10(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \\
register $tmp_ieee_type T2re, T2im; \\
$tmp_ieee_type T2re, T2im; \\
T2re = X1re - X2re; \\
T2im = X1im - X2im; \\
Y1re = X1re + X2re; \\
@ -621,7 +621,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_01(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \\
register $tmp_ieee_type T2re, T2im; \\
$tmp_ieee_type T2re, T2im; \\
T2re = X1re + X2im; \\
T2im = X1im - X2re; \\
Y1re = X1re - X2im; \\
@ -630,7 +630,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_0m(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \\
register $tmp_ieee_type T2re, T2im; \\
$tmp_ieee_type T2re, T2im; \\
T2re = X1re - X2im; \\
T2im = X1im + X2re; \\
Y1re = X1re + X2im; \\
@ -639,7 +639,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_XX(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,_2) { \\
register $tmp_ieee_type T1re, T1im, T2re, T2im; \\
$tmp_ieee_type T1re, T1im, T2re, T2im; \\
T1re = X2re * Wre; \\
T1im = X2im * Wre; \\
T2re = T1im; \\
@ -654,7 +654,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_yY(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,_2) { \\
register $tmp_ieee_type T1re, T1im, T2re, T2im; \\
$tmp_ieee_type T1re, T1im, T2re, T2im; \\
T1re = X2re * Wre; \\
T1im = X2im * Wre; \\
T2re = T1im; \\
@ -669,7 +669,7 @@ sub butterfly_macros {
Y2im = T2im; \\
}
#define BUTTERFLY_10scale(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,S) { \\
register $tmp_ieee_type T2re, T2im; \\
$tmp_ieee_type T2re, T2im; \\
T2re = X1re - X2re; \\
T2im = X1im - X2im; \\
Y1re = X1re + X2re; \\
@ -790,8 +790,8 @@ print " **/\n";
$fft_size, $negate_sign ? "synthesis" : "analysis",
$skip2 ? "_skip2" : "",
$ieee_type, $ieee_type);
printf "%sregister unsigned int butterfly, block, offset;\n", $indent;
printf "%sregister %s Wre, Wim;\n\n", $indent, $tmp_ieee_type, $tmp_ieee_type;
printf "%sunsigned int butterfly, block, offset;\n", $indent;
printf "%s%s Wre, Wim;\n\n", $indent, $tmp_ieee_type, $tmp_ieee_type;
printf "%sbutterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */\n", $indent;
my $seen_rule = 0;

@ -201,5 +201,3 @@ EXTC void
gsl_arts_thread_init (gpointer /*arg*/)
{
}
/* vim:set ts=8 sts=2 sw=2: */

@ -96,7 +96,4 @@ void gsl_arts_thread_init (gpointer arg);
}
#endif /* __cplusplus */
/* vim:set ts=8 sts=2 sw=2: */
#endif // GSLARTSTHREADS_H

@ -22,7 +22,7 @@
#include <string.h>
#include <sched.h>
#include <errno.h>
#include <sys/poll.h>
#include <poll.h>
#include <sys/stat.h>
#include <sys/time.h>

@ -264,8 +264,8 @@ data_cache_lookup_nextmost_node_L (GslDataCache *dcache,
nodes -= 1;
do
{
register gint cmp;
register guint i;
gint cmp;
guint i;
i = (n_nodes + 1) >> 1;
check = nodes + i;

@ -707,5 +707,3 @@ gsl_data_handle_mad_testopen (const gchar *file_name,
}
#endif /* !GSL_HAVE_LIBMAD */
/* vim:set ts=8 sts=2 sw=2: */

@ -458,5 +458,3 @@ gsl_data_find_block (GslDataHandle *handle,
}
return -1;
}
/* vim:set ts=8 sts=2 sw=2: */

@ -905,5 +905,3 @@ gsl_conv_to_double (GslWaveFormatType format,
#endif /* __cplusplus */
#endif /* __GSL_DATA_UTILS_H__ */
/* vim:set ts=8 sts=2 sw=2: */

@ -132,5 +132,3 @@ struct _GslRecMutex
#endif /* __cplusplus */
#endif /* __GSL_DEFS_H__ */
/* vim:set ts=8 sw=2 sts=2: */

@ -749,5 +749,3 @@ gsl_engine_wait_on_trans (void)
/* call all free() functions */
gsl_engine_garbage_collect ();
}
/* vim:set ts=8 sts=2 sw=2: */

@ -2,7 +2,7 @@
#include <math.h>
#define BUTTERFLY_XY(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,Wim) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = X2re * Wre; \
T1im = X2im * Wre; \
T2re = X2im * Wim; \
@ -17,7 +17,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_Yx(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,Wim) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = X2re * Wim; \
T1im = X2im * Wim; \
T2re = X2im * Wre; \
@ -32,7 +32,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_yX(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,Wim) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = X2re * Wim; \
T1im = X2im * Wim; \
T2re = X2im * Wre; \
@ -47,7 +47,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_10(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re - X2re; \
T2im = X1im - X2im; \
Y1re = X1re + X2re; \
@ -56,7 +56,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_01(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re + X2im; \
T2im = X1im - X2re; \
Y1re = X1re - X2im; \
@ -65,7 +65,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_0m(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re - X2im; \
T2im = X1im + X2re; \
Y1re = X1re + X2im; \
@ -74,7 +74,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_XX(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,_2) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = X2re * Wre; \
T1im = X2im * Wre; \
T2re = T1im; \
@ -89,7 +89,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_yY(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,_2) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = X2re * Wre; \
T1im = X2im * Wre; \
T2re = T1im; \
@ -104,7 +104,7 @@
Y2im = T2im; \
}
#define BUTTERFLY_10scale(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,S) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re - X2re; \
T2im = X1im - X2im; \
Y1re = X1re + X2re; \
@ -116,7 +116,7 @@
}
#define WMULTIPLY(Wre,Wim,Dre,Dim) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = Wre * Dre; \
T1im = Wim * Dre; \
T2re = Wim * Dim; \
@ -224,8 +224,8 @@ bitreverse_fft2synthesis (const unsigned int n,
static void
gsl_power2_fft2analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -246,8 +246,8 @@ gsl_power2_fft2analysis (const double *X, double *Y)
static void
gsl_power2_fft4analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -283,8 +283,8 @@ gsl_power2_fft4analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft4analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -313,8 +313,8 @@ gsl_power2_fft4analysis (const double *X, double *Y)
static void
gsl_power2_fft8analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -406,8 +406,8 @@ gsl_power2_fft8analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft8analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -448,8 +448,8 @@ gsl_power2_fft8analysis (const double *X, double *Y)
static void
gsl_power2_fft16analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -687,8 +687,8 @@ gsl_power2_fft16analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft16analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -751,8 +751,8 @@ gsl_power2_fft16analysis (const double *X, double *Y)
static void
gsl_power2_fft32analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -1352,8 +1352,8 @@ gsl_power2_fft32analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft32analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -1458,8 +1458,8 @@ gsl_power2_fft32analysis (const double *X, double *Y)
static void
gsl_power2_fft64analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -2051,8 +2051,8 @@ gsl_power2_fft64analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft64analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -2239,8 +2239,8 @@ gsl_power2_fft64analysis (const double *X, double *Y)
static void
gsl_power2_fft128analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -3412,8 +3412,8 @@ gsl_power2_fft128analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft128analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -3443,8 +3443,8 @@ gsl_power2_fft128analysis (const double *X, double *Y)
static void
gsl_power2_fft256analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -3573,8 +3573,8 @@ gsl_power2_fft256analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft256analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -3606,8 +3606,8 @@ gsl_power2_fft256analysis (const double *X, double *Y)
static void
gsl_power2_fft512analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -3901,8 +3901,8 @@ gsl_power2_fft512analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft512analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -3936,8 +3936,8 @@ gsl_power2_fft512analysis (const double *X, double *Y)
static void
gsl_power2_fft1024analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4011,8 +4011,8 @@ gsl_power2_fft1024analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft1024analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4048,8 +4048,8 @@ gsl_power2_fft1024analysis (const double *X, double *Y)
static void
gsl_power2_fft2048analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4165,8 +4165,8 @@ gsl_power2_fft2048analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft2048analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4204,8 +4204,8 @@ gsl_power2_fft2048analysis (const double *X, double *Y)
static void
gsl_power2_fft4096analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4283,8 +4283,8 @@ gsl_power2_fft4096analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft4096analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4324,8 +4324,8 @@ gsl_power2_fft4096analysis (const double *X, double *Y)
static void
gsl_power2_fft8192analysis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4405,8 +4405,8 @@ gsl_power2_fft8192analysis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft8192analysis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4448,8 +4448,8 @@ gsl_power2_fft8192analysis (const double *X, double *Y)
static void
gsl_power2_fft2synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4470,8 +4470,8 @@ gsl_power2_fft2synthesis (const double *X, double *Y)
static void
gsl_power2_fft4synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4507,8 +4507,8 @@ gsl_power2_fft4synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft4synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4537,8 +4537,8 @@ gsl_power2_fft4synthesis (const double *X, double *Y)
static void
gsl_power2_fft8synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4630,8 +4630,8 @@ gsl_power2_fft8synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft8synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4672,8 +4672,8 @@ gsl_power2_fft8synthesis (const double *X, double *Y)
static void
gsl_power2_fft16synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4911,8 +4911,8 @@ gsl_power2_fft16synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft16synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -4975,8 +4975,8 @@ gsl_power2_fft16synthesis (const double *X, double *Y)
static void
gsl_power2_fft32synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -5576,8 +5576,8 @@ gsl_power2_fft32synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft32synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -5682,8 +5682,8 @@ gsl_power2_fft32synthesis (const double *X, double *Y)
static void
gsl_power2_fft64synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -6275,8 +6275,8 @@ gsl_power2_fft64synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft64synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -6463,8 +6463,8 @@ gsl_power2_fft64synthesis (const double *X, double *Y)
static void
gsl_power2_fft128synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -7636,8 +7636,8 @@ gsl_power2_fft128synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft128synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -7667,8 +7667,8 @@ gsl_power2_fft128synthesis (const double *X, double *Y)
static void
gsl_power2_fft256synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -7797,8 +7797,8 @@ gsl_power2_fft256synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft256synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -7830,8 +7830,8 @@ gsl_power2_fft256synthesis (const double *X, double *Y)
static void
gsl_power2_fft512synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8125,8 +8125,8 @@ gsl_power2_fft512synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft512synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8160,8 +8160,8 @@ gsl_power2_fft512synthesis (const double *X, double *Y)
static void
gsl_power2_fft1024synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8235,8 +8235,8 @@ gsl_power2_fft1024synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft1024synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8272,8 +8272,8 @@ gsl_power2_fft1024synthesis (const double *X, double *Y)
static void
gsl_power2_fft2048synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8389,8 +8389,8 @@ gsl_power2_fft2048synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft2048synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8428,8 +8428,8 @@ gsl_power2_fft2048synthesis (const double *X, double *Y)
static void
gsl_power2_fft4096synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8507,8 +8507,8 @@ gsl_power2_fft4096synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft4096synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8548,8 +8548,8 @@ gsl_power2_fft4096synthesis (const double *X, double *Y)
static void
gsl_power2_fft8192synthesis_skip2 (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */
@ -8629,8 +8629,8 @@ gsl_power2_fft8192synthesis_skip2 (const double *X, double *Y)
static void
gsl_power2_fft8192synthesis (const double *X, double *Y)
{
register unsigned int butterfly, block, offset;
register double Wre, Wim;
unsigned int butterfly, block, offset;
double Wre, Wim;
butterfly = block = offset = 0, Wre = Wim = 0.0; /* silence compiler */

@ -123,4 +123,4 @@ void gsl_power2_fftsr_simple (const unsigned int n_values,
}
#endif /* __cplusplus */
#endif /* __GSL_FFT_H__ */ /* vim:set ts=8 sw=2 sts=2: */
#endif /* __GSL_FFT_H__ */

@ -147,7 +147,7 @@ diff (guint m,
/* --- fft implementation --- */
#define BUTTERFLY_XY(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,Wre,Wim) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = X2re * Wre; \
T1im = X2im * Wre; \
T2re = X2im * Wim; \
@ -162,7 +162,7 @@ diff (guint m,
Y2im = T2im; \
}
#define BUTTERFLY_10(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re - X2re; \
T2im = X1im - X2im; \
Y1re = X1re + X2re; \
@ -171,7 +171,7 @@ diff (guint m,
Y2im = T2im; \
}
#define BUTTERFLY_01(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re + X2im; \
T2im = X1im - X2re; \
Y1re = X1re - X2im; \
@ -180,7 +180,7 @@ diff (guint m,
Y2im = T2im; \
}
#define BUTTERFLY_0m(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,_1,_2) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re - X2im; \
T2im = X1im + X2re; \
Y1re = X1re + X2im; \
@ -189,7 +189,7 @@ diff (guint m,
Y2im = T2im; \
}
#define BUTTERFLY_10scale(X1re,X1im,X2re,X2im,Y1re,Y1im,Y2re,Y2im,S) { \
register double T2re, T2im; \
double T2re, T2im; \
T2re = X1re - X2re; \
T2im = X1im - X2im; \
Y1re = X1re + X2re; \
@ -200,7 +200,7 @@ diff (guint m,
Y1im *= S; \
}
#define WMULTIPLY(Wre,Wim,Dre,Dim) { \
register double T1re, T1im, T2re, T2im; \
double T1re, T1im, T2re, T2im; \
T1re = Wre * Dre; \
T1im = Wim * Dre; \
T2re = Wim * Dim; \

@ -993,7 +993,7 @@ static inline gdouble /* Y */
filter_step_direct_canon_2 (GslIIRFilter *f,
gdouble X)
{
register guint n = f->order;
guint n = f->order;
gdouble *a = f->a, *b = f->b, *w = f->w;
gdouble x, y, v;
@ -1025,7 +1025,7 @@ static inline gdouble /* Y */
filter_step_direct_canon_1 (GslIIRFilter *f,
gdouble X)
{
register guint n = f->order;
guint n = f->order;
gdouble *a = f->a, *b = f->b, *w = f->w;
gdouble y, v;
@ -1371,9 +1371,3 @@ gsl_filter_sine_scan (guint order,
}
return result;
}
/* vim:set ts=8 sts=2 sw=2: */

@ -278,4 +278,4 @@ gsl_trans_freq2z (double w)
}
#endif /* __cplusplus */
#endif /* __GSL_FILTER_H__ */ /* vim:set ts=8 sw=2 sts=2: */
#endif /* __GSL_FILTER_H__ */

@ -68,8 +68,8 @@ g_stpcpy (gchar *dest,
g_return_val_if_fail (src != NULL, NULL);
return stpcpy (dest, src);
#else
register gchar *d = dest;
register const gchar *s = src;
gchar *d = dest;
const gchar *s = src;
g_return_val_if_fail (dest != NULL, NULL);
g_return_val_if_fail (src != NULL, NULL);
@ -2036,7 +2036,7 @@ printf_string_upper_bound (const gchar *format,
while (*format)
{
register gchar c = *format++;
gchar c = *format++;
if (c != '%')
len += 1;
@ -2396,5 +2396,3 @@ g_path_is_absolute (const gchar *file_name)
return FALSE;
}
/* vim:set ts=8 sw=2 sts=2: */

@ -313,7 +313,7 @@ struct _GTrashStack
static inline guint
g_bit_storage (gulong number)
{
register guint n_bits = 0;
guint n_bits = 0;
do
{
@ -854,5 +854,4 @@ void g_scanner_warn (GScanner *scanner,
#undef inline
#endif
#endif /* __GSL_GLIB_H__ */ /* vim: set ts=8 sw=2 sts=2: */
#endif /* __GSL_GLIB_H__ */

@ -147,5 +147,3 @@ void g_hash_table_foreach (GHashTable *hash_table,
func ((void*) i->first, (void*) i->second, user_data);
}
}
/* vim:set ts=8 sw=2 sts=2: */

@ -109,8 +109,8 @@ typedef unsigned short int GslFpuState;
static inline void gsl_fpu_setround (GslFpuState *cw);
static inline int gsl_fpu_okround (void);
static inline void gsl_fpu_restore (GslFpuState cv);
static inline int gsl_ftoi /* nearest */ (register float f) G_GNUC_CONST;
static inline int gsl_dtoi /* nearest */ (register double f) G_GNUC_CONST;
static inline int gsl_ftoi /* nearest */ (float f) G_GNUC_CONST;
static inline int gsl_dtoi /* nearest */ (double f) G_GNUC_CONST;
/* fallbacks for the !386 case are below */
#endif
@ -204,7 +204,7 @@ gsl_fpu_restore (GslFpuState cv)
: "m" (*&cv));
}
static inline int G_GNUC_CONST
gsl_ftoi (register float f)
gsl_ftoi (float f)
{
int r;
@ -214,7 +214,7 @@ gsl_ftoi (register float f)
return r;
}
static inline int G_GNUC_CONST
gsl_dtoi (register double f)
gsl_dtoi (double f)
{
int r;
@ -228,12 +228,12 @@ gsl_dtoi (register double f)
# define gsl_fpu_okround() (1)
# define gsl_fpu_restore(x) /* nop */
static inline int G_GNUC_CONST
gsl_ftoi (register float v)
gsl_ftoi (float v)
{
return v < -0.0 ? v - 0.5 : v + 0.5;
}
static inline int G_GNUC_CONST
gsl_dtoi (register double v)
gsl_dtoi (double v)
{
return v < -0.0 ? v - 0.5 : v + 0.5;
}
@ -243,4 +243,4 @@ gsl_dtoi (register double v)
}
#endif /* __cplusplus */
#endif /* __GSL_IEEE754_H__ */ /* vim: set ts=8 sw=2 sts=2: */
#endif /* __GSL_IEEE754_H__ */

@ -515,4 +515,4 @@ gsl_poly_eval (unsigned int degree,
}
#endif /* __cplusplus */
#endif /* __GSL_MATH_H__ */ /* vim: set ts=8 sw=2 sts=2: */
#endif /* __GSL_MATH_H__ */

@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
#include <string.h>
#include <sys/poll.h>
#include <poll.h>
#include <sys/time.h>
#include <errno.h>
@ -780,4 +780,3 @@ _engine_master_thread (gpointer data)
run = gsl_thread_sleep (0);
}
}
/* vim:set ts=8 sts=2 sw=2: */

@ -273,7 +273,7 @@ const_values_lookup_nextmost (ConstValuesArray *array,
do
{
guint i;
register gfloat cmp;
gfloat cmp;
i = (n_nodes + 1) >> 1;
check = nodes + i;
@ -716,6 +716,3 @@ _gsl_init_engine_utils (void)
gsl_mutex_init (&pqueue_mutex);
gsl_cond_init (&pqueue_done_cond);
}
/* vim:set ts=8 sts=2 sw=2: */

@ -616,7 +616,7 @@ gsl_osc_wave_normalize (guint n_values,
max = min;
for (i = 1; i < n_values; i++)
{
register gfloat v = values[i];
gfloat v = values[i];
max = MAX (max, v);
min = MIN (min, v);

@ -113,7 +113,7 @@ static inline double gsl_approx_exp2 (float ex) G_GNUC_CONST;
* d2 = 1.0091272542790025586079663559158;
* positive_atan1(x) = 1 + (n1 * x + n2) / ((1 + d1 * x) * x + d2);
*/
static inline double gsl_approx_atan1 (register double x) G_GNUC_CONST;
static inline double gsl_approx_atan1 (double x) G_GNUC_CONST;
/**
* gsl_approx_atan1_prescale
@ -134,7 +134,7 @@ double gsl_approx_atan1_prescale (double boost_amount);
* wasn't minimized, but distributed to best fit the curverture of a
* quarter circle. The maximum error is below 0.092.
*/
static inline double gsl_approx_qcircle1 (register double x) G_GNUC_CONST;
static inline double gsl_approx_qcircle1 (double x) G_GNUC_CONST;
/**
* gsl_approx_qcircle2
@ -145,7 +145,7 @@ static inline double gsl_approx_qcircle1 (register double x) G_GNUC_CONST;
* wasn't minimized, but distributed to best fit the curverture of a
* quarter circle. The maximum error is below 0.092.
*/
static inline double gsl_approx_qcircle2 (register double x) G_GNUC_CONST;
static inline double gsl_approx_qcircle2 (double x) G_GNUC_CONST;
/**
* gsl_approx_qcircle3
@ -156,7 +156,7 @@ static inline double gsl_approx_qcircle2 (register double x) G_GNUC_CONST;
* wasn't minimized, but distributed to best fit the curverture of a
* quarter circle. The maximum error is below 0.092.
*/
static inline double gsl_approx_qcircle3 (register double x) G_GNUC_CONST;
static inline double gsl_approx_qcircle3 (double x) G_GNUC_CONST;
/**
* gsl_approx_qcircle4
@ -167,7 +167,7 @@ static inline double gsl_approx_qcircle3 (register double x) G_GNUC_CONST;
* wasn't minimized, but distributed to best fit the curverture of a
* quarter circle. The maximum error is below 0.092.
*/
static inline double gsl_approx_qcircle4 (register double x) G_GNUC_CONST;
static inline double gsl_approx_qcircle4 (double x) G_GNUC_CONST;
/* --- windows --- */
@ -186,11 +186,11 @@ extern const gdouble *gsl_cent_table;
/* --- implementation details --- */
static inline double G_GNUC_CONST
gsl_approx_atan1 (register double x)
gsl_approx_atan1 (double x)
{
if (x < 0) /* make use of -atan(-x)==atan(x) */
{
register double numerator, denominator = -1.0;
double numerator, denominator = -1.0;
denominator += x * 0.81901156857081841441890603235599; /* d1 */
numerator = x * 0.41156875521951602506487246309908; /* -n1 */
@ -202,7 +202,7 @@ gsl_approx_atan1 (register double x)
}
else
{
register double numerator, denominator = 1.0;
double numerator, denominator = 1.0;
denominator += x * 0.81901156857081841441890603235599; /* d1 */
numerator = x * -0.41156875521951602506487246309908; /* n1 */
@ -215,7 +215,7 @@ gsl_approx_atan1 (register double x)
}
static inline double G_GNUC_CONST
gsl_approx_qcircle1 (register double x)
gsl_approx_qcircle1 (double x)
{
double numerator = 1.20460124790369468987715633298929 * x - 1.20460124790369468987715633298929;
double denominator = x - 1.20460124790369468987715633298929;
@ -224,7 +224,7 @@ gsl_approx_qcircle1 (register double x)
}
static inline double G_GNUC_CONST
gsl_approx_qcircle2 (register double x)
gsl_approx_qcircle2 (double x)
{
double numerator = 1.20460124790369468987715633298929*x;
double denominator = x + 0.20460124790369468987715633298929;
@ -233,7 +233,7 @@ gsl_approx_qcircle2 (register double x)
}
static inline double G_GNUC_CONST
gsl_approx_qcircle3 (register double x)
gsl_approx_qcircle3 (double x)
{
double numerator = 0.20460124790369468987715633298929 - 0.20460124790369468987715633298929 * x;
double denominator = x + 0.20460124790369468987715633298929;
@ -242,7 +242,7 @@ gsl_approx_qcircle3 (register double x)
}
static inline double G_GNUC_CONST
gsl_approx_qcircle4 (register double x)
gsl_approx_qcircle4 (double x)
{
double numerator = -0.20460124790369468987715633298929 * x;
double denominator = x - 1.20460124790369468987715633298929;
@ -253,8 +253,8 @@ gsl_approx_qcircle4 (register double x)
static inline double G_GNUC_CONST
gsl_approx_exp2 (float ex)
{
register GslFloatIEEE754 fp = { 0, };
register double numer, denom, x;
GslFloatIEEE754 fp = { 0, };
double numer, denom, x;
gint i;
i = gsl_ftoi (ex);

@ -644,7 +644,3 @@ usage (void)
g_print (" poly | polyr | polyp polynom test (+roots or +poles)\n");
exit (1);
}
/* vim:set ts=8 sts=2 sw=2: */

@ -245,5 +245,3 @@ WOSC_MIX_VARIANT_NAME (GslWaveOscData *wosc,
#undef WOSC_MIX_VARIANT
#undef WOSC_MIX_VARIANT_NAME
/* vim:set ts=8 sw=2 sts=2: */

@ -219,7 +219,6 @@ gsl_wave_osc_process (GslWaveOscData *wosc,
}
}
g_assert (!GSL_DOUBLE_IS_NANINF (wosc->y[0]));
g_assert (!GSL_DOUBLE_IS_SUBNORMAL (wosc->y[0]));
wosc->done = (wosc->block.is_silent && /* FIXME, let filter state run out? */
((wosc->block.play_dir < 0 && wosc->block.offset < 0) ||

@ -193,5 +193,3 @@ public:
REGISTER_IMPLEMENTATION(StereoVolumeControl_impl);
}
// vim: sw=4 ts=4 noet

@ -282,4 +282,3 @@ public:
REGISTER_IMPLEMENTATION(Synth_PLAY_impl);
}
// vim: sw=4 ts=4 noet

@ -180,5 +180,3 @@ public:
REGISTER_IMPLEMENTATION(Synth_RECORD_impl);
}
// vim: sw=4 ts=4

@ -18,15 +18,15 @@ include_directories(
##### headers ###################################
install( FILES
giomanager.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
install(
FILES giomanager.h
DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} )
##### gmcop (shared lib) ########################
tde_add_library( gmcop SHARED
SOURCES giomanager.cc
SOURCES giomanager.cpp
VERSION 1.0.0
LINK mcop-shared ${GLIB2_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}

@ -1 +1 @@
Subproject commit 7aeb4e9d71aeb59db6a2e40c271536fcff6b1e0e
Subproject commit 754b445fd5519ddca551a45b9ae6385d3ee451bb

@ -27,6 +27,7 @@ add_definitions(
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/libltdl
)
@ -43,7 +44,7 @@ install( FILES
weakreference.h dynamicrequest.h anyref.h debug.h
delayedreturn.h dynamicskeleton.h thread.h core.idl
${CMAKE_CURRENT_BINARY_DIR}/arts_export.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} )
##### mcop (shared library) #####################
@ -51,16 +52,16 @@ install( FILES
set( target mcop )
set( ${target}_SRCS
buffer.cc connection.cc core.cc debug.cc dispatcher.cc
iomanager.cc object.cc socketconnection.cc tcpconnection.cc
unixconnection.cc tcpserver.cc unixserver.cc objectmanager.cc
factory.cc idlfilereg.cc ifacerepo_impl.cc mcoputils.cc
startupmanager.cc md5.c md5auth.cc referenceclean.cc
datapacket.cc asyncstream.cc notification.cc
flowsystem.cc extensionloader.cc tmpglobalcomm.cc
mcopconfig.cc connect.cc reference.cc type.cc
trader_impl.cc dynamicrequest.cc anyref.cc
loopback.cc delayedreturn.cc thread.cc dynamicskeleton.cc
buffer.cpp connection.cpp core.cpp debug.cpp dispatcher.cpp
iomanager.cpp object.cpp socketconnection.cpp tcpconnection.cpp
unixconnection.cpp tcpserver.cpp unixserver.cpp objectmanager.cpp
factory.cpp idlfilereg.cpp ifacerepo_impl.cpp mcoputils.cpp
startupmanager.cpp md5.c md5auth.cpp referenceclean.cpp
datapacket.cpp asyncstream.cpp notification.cpp
flowsystem.cpp extensionloader.cpp tmpglobalcomm.cpp
mcopconfig.cpp connect.cpp reference.cpp type.cpp
trader_impl.cpp dynamicrequest.cpp anyref.cpp
loopback.cpp delayedreturn.cpp thread.cpp dynamicskeleton.cpp
)
tde_add_library( ${target} SHARED

@ -86,7 +86,7 @@ void Buffer::writeLongSeq(const vector<long>& seq) {
void Buffer::writeFloat(float f) {
// FIXME: on some machines this may fail badly (there is explicit
// float marshalling and demarshalling code in mico/orb/util.cc)
// float marshalling and demarshalling code in mico/orb/util.cpp)
union { float f; long l; } u = {f};
writeLong(u.l);
}

@ -24,6 +24,7 @@
*/
#include "debug.h"
#include <config.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
@ -497,7 +498,7 @@ printf_string_upper_bound (const gchar *format,
while (*format)
{
register gchar c = *format++;
gchar c = *format++;
if (c != '%')
len += 1;

@ -1086,5 +1086,5 @@ void Dispatcher::wakeUp()
}
/*
void Dispatcher::reloadTraderData() is declared in trader_impl.cc
void Dispatcher::reloadTraderData() is declared in trader_impl.cpp
*/

@ -29,6 +29,9 @@
#include "thread.h"
#include <stdio.h>
#include <fcntl.h>
#if defined(__dilos__)
#include <string.h> /* in illumos memset() is defined here */
#endif /* __dilos__ */
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> // Needed on some systems.
@ -38,7 +41,7 @@
// However, we can not include config.h in a header file.
// The right solution would be not to use "fd_set" in the
// header file but to use it only in a private datastructure
// defined in the .cc file.
// defined in the .cpp file.
using namespace std;
using namespace Arts;
@ -465,7 +468,7 @@ timeval TimeWatcher::advance(const timeval& currentTime)
{
delete this;
struct timeval never = { 0xffffffff, 0 };
struct timeval never = { -1, 0 };
return never;
}
}

@ -307,7 +307,8 @@ int build_link(string tmp_prefix, const char *kde_prefix)
unlink(kde_tmp_dir.c_str());
user_tmp_dir += "XXXXXX";
tmp_buf = strdup(user_tmp_dir.c_str());
mktemp(tmp_buf); /* We want a directory, not a file, so using mkstemp makes no sense and is wrong */
if (mkdtemp(tmp_buf) == NULL)
return 1;
result = create_link(kde_tmp_dir.c_str(), tmp_buf);
free(tmp_buf);
return result;
@ -347,7 +348,8 @@ int build_link(string tmp_prefix, const char *kde_prefix)
unlink(kde_tmp_dir.c_str());
user_tmp_dir += "XXXXXX";
tmp_buf = strdup(user_tmp_dir.c_str());
mktemp(tmp_buf); /* We want a directory, not a file, so using mkstemp makes no sense and is wrong */
if (mkdtemp(tmp_buf) == NULL)
return 1;
result = create_link(kde_tmp_dir.c_str(), tmp_buf);
free(tmp_buf);
return result;
@ -358,7 +360,8 @@ int build_link(string tmp_prefix, const char *kde_prefix)
unlink(kde_tmp_dir.c_str());
user_tmp_dir += "XXXXXX";
tmp_buf = strdup(user_tmp_dir.c_str());
mktemp(tmp_buf); /* We want a directory, not a file, so using mkstemp makes no sense and is wrong */
if (mkdtemp(tmp_buf) == NULL)
return 1;
result = create_link(kde_tmp_dir.c_str(), tmp_buf);
free(tmp_buf);
return result;

@ -32,7 +32,7 @@
* BC - Status (2002-03-08): NamedStore
*
* None of these classes is considered part of the public API. Do NOT use it
* in your apps. These are part of the implementation of object.cc and not
* in your apps. These are part of the implementation of object.cpp and not
* to be used elsewhere.
*/

@ -35,6 +35,7 @@
#include <errno.h>
#include "debug.h"
#include <stdlib.h>
#include <string.h>
using namespace std;
using namespace Arts;

@ -121,7 +121,7 @@ bool TCPServer::initSocket()
socket_addr.sin_family = AF_INET;
socket_addr.sin_port = htons( TCPServerPort ); // 0 = choose port freely
socket_addr.sin_addr.s_addr = htonl( inet_addr("0.0.0.0") );
if ( bind( theSocket, (struct sockaddr *) &socket_addr,
if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
sizeof(struct sockaddr_in) ) < 0 )
{
arts_warning("MCOP TCPServer: can't bind to port/address");
@ -189,5 +189,3 @@ void TCPServer::notifyIO(int fd, int types)
arts_assert((types & IOType::write) == 0);
arts_assert((types & IOType::except) == 0);
}
// vim: sw=4 ts=4

@ -29,6 +29,7 @@
#include <sys/un.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
using namespace std;
using namespace Arts;

@ -40,6 +40,7 @@
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
using namespace std;
using namespace Arts;
@ -97,7 +98,7 @@ bool UnixServer::initSocket(const string& serverID)
xserverpath = socket_addr.sun_path;
if ( bind( theSocket, (struct sockaddr *) &socket_addr,
if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
sizeof(struct sockaddr_un) ) < 0 )
{
arts_warning("MCOP UnixServer: can't bind to file \"%s\"",

@ -22,7 +22,7 @@ include_directories(
##### mcop_mt (shared lib ) #####################
tde_add_library( mcop_mt SHARED
SOURCES threads_posix.cc
SOURCES threads_posix.cpp
VERSION 1.0.0
LINK artsflow-shared pthread
DESTINATION ${LIB_INSTALL_DIR}

@ -28,6 +28,7 @@
#ifdef HAVE_LIBPTHREAD
#include <gsl/gslconfig.h>
#include <gsl/gslcommon.h>
#include <sys/types.h>
#include <stddef.h>
@ -36,7 +37,6 @@
#include <semaphore.h>
#include <debug.h>
#include <string.h>
#include "thread.h"
/*
@ -332,7 +332,6 @@ public:
}
} initOnStartup;
#include <gsl/gslcommon.h>
/* -fast- locking for gsl on platforms with unix98 support */
#if (GSL_HAVE_MUTEXATTR_SETTYPE > 0)
static void pth_mutex_init (GslMutex *mutex)
@ -358,7 +357,7 @@ static void pth_rec_cond_init (GslCond *cond)
static void pth_rec_cond_wait_timed (GslCond *cond, GslMutex *mutex,
gulong abs_secs, gulong abs_usecs)
{
struct timespec abstime;
struct ::timespec abstime;
abstime.tv_sec = abs_secs;
abstime.tv_nsec = abs_usecs * 1000;

@ -20,7 +20,7 @@ include_directories(
set( target mcopidl )
set( ${target}_SRCS
mcopidl.cc yacc.cc scanner.cc namespace.cc
mcopidl.cpp yacc.cpp scanner.cpp namespace.cpp
)
tde_add_executable( ${target}

@ -749,7 +749,7 @@ void endHeader(FILE *header, string prefix)
FILE *startSource(string prefix)
{
string header_name = prefix+".h";
string source_name = prefix+".cc.new";
string source_name = prefix+".cpp.new";
FILE *source = fopen(source_name.c_str(),"w");
fprintf(source,"%s", generated_disclaimer);
@ -2636,7 +2636,7 @@ int main(int argc, char **argv)
doInterfacesSource(source);
doInterfaceRepoSource(source,prefix);
endSource(source);
moveIfChanged(string(prefix)+".cc");
moveIfChanged(string(prefix)+".cpp");
// create type file
if(makeTypeInfo)

@ -1,4 +1,4 @@
#line 2 "scanner.cc"
#line 2 "scanner.cpp"
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
@ -678,7 +678,7 @@ using namespace std;
using namespace Arts;
#ifndef KDE_USE_FINAL
#include "yacc.cc.h"
#include "yacc.cpp.h"
#endif
extern int idl_line_no;
@ -705,7 +705,7 @@ extern void endInclude();
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
#line 710 "scanner.cc"
#line 710 "scanner.cpp"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@ -852,14 +852,14 @@ YY_MALLOC_DECL
YY_DECL
{
register yy_state_type yy_current_state;
register char *yy_cp, *yy_bp;
register int yy_act;
yy_state_type yy_current_state;
char *yy_cp, *yy_bp;
int yy_act;
#line 100 "scanner.ll"
#line 864 "scanner.cc"
#line 864 "scanner.cpp"
if ( yy_init )
{
@ -903,7 +903,7 @@ YY_DECL
yy_match:
do
{
register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
@ -1200,7 +1200,7 @@ YY_RULE_SETUP
#line 177 "scanner.ll"
ECHO;
YY_BREAK
#line 1205 "scanner.cc"
#line 1205 "scanner.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@ -1344,9 +1344,9 @@ ECHO;
static int yy_get_next_buffer()
{
register char *dest = yy_current_buffer->yy_ch_buf;
register char *source = yytext_ptr;
register int number_to_move, i;
char *dest = yy_current_buffer->yy_ch_buf;
char *source = yytext_ptr;
int number_to_move, i;
int ret_val;
if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@ -1476,8 +1476,8 @@ static int yy_get_next_buffer()
static yy_state_type yy_get_previous_state()
{
register yy_state_type yy_current_state;
register char *yy_cp;
yy_state_type yy_current_state;
char *yy_cp;
yy_current_state = yy_start;
yy_state_ptr = yy_state_buf;
@ -1485,7 +1485,7 @@ static yy_state_type yy_get_previous_state()
for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
{
register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
@ -1513,9 +1513,9 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
yy_state_type yy_current_state;
#endif
{
register int yy_is_jam;
int yy_is_jam;
register YY_CHAR yy_c = 1;
YY_CHAR yy_c = 1;
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
@ -1533,14 +1533,14 @@ yy_state_type yy_current_state;
#ifndef YY_NO_UNPUT
#ifdef YY_USE_PROTOS
static void yyunput( int c, register char *yy_bp )
static void yyunput( int c, char *yy_bp )
#else
static void yyunput( c, yy_bp )
int c;
register char *yy_bp;
char *yy_bp;
#endif
{
register char *yy_cp = yy_c_buf_p;
char *yy_cp = yy_c_buf_p;
/* undo effects of setting up yytext */
*yy_cp = yy_hold_char;
@ -1548,10 +1548,10 @@ register char *yy_bp;
if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
register int number_to_move = yy_n_chars + 2;
register char *dest = &yy_current_buffer->yy_ch_buf[
int number_to_move = yy_n_chars + 2;
char *dest = &yy_current_buffer->yy_ch_buf[
yy_current_buffer->yy_buf_size + 2];
register char *source =
char *source =
&yy_current_buffer->yy_ch_buf[number_to_move];
while ( source > yy_current_buffer->yy_ch_buf )
@ -2012,7 +2012,7 @@ yyconst char *s2;
int n;
#endif
{
register int i;
int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@ -2026,7 +2026,7 @@ static int yy_flex_strlen( s )
yyconst char *s;
#endif
{
register int n;
int n;
for ( n = 0; s[n]; ++n )
;

@ -40,7 +40,7 @@ using namespace std;
using namespace Arts;
#ifndef KDE_USE_FINAL
#include "yacc.cc.h"
#include "yacc.cpp.h"
#endif
extern int idl_line_no;

@ -522,9 +522,9 @@ __yy_memcpy (to, from, count)
char *from;
unsigned int count;
{
register char *f = from;
register char *t = to;
register int i = count;
char *f = from;
char *t = to;
int i = count;
while (i-- > 0)
*t++ = *f++;
@ -537,9 +537,9 @@ __yy_memcpy (to, from, count)
static void
__yy_memcpy (char *to, char *from, unsigned int count)
{
register char *t = to;
register char *f = from;
register int i = count;
char *t = to;
char *f = from;
int i = count;
while (i-- > 0)
*t++ = *f++;
@ -582,10 +582,10 @@ int
yyparse(YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
{
register int yystate;
register int yyn;
register short *yyssp;
register YYSTYPE *yyvsp;
int yystate;
int yyn;
short *yyssp;
YYSTYPE *yyvsp;
int yyerrstatus; /* number of tokens to shift before error messages enabled */
int yychar1 = 0; /* lookahead token as an internal (translated) token number */

@ -1,6 +1,6 @@
#ifndef YACC_CC_H
#define YACC_CC_H
#ifndef YACC_CPP_H
#define YACC_CPP_H
typedef union
{
@ -71,5 +71,5 @@ typedef union
extern YYSTYPE yylval;
#endif // YACC_CC_H
#endif // YACC_CPP_H

@ -27,14 +27,14 @@ link_directories(
##### headers ###################################
install( FILES
qiomanager.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
install(
FILES qiomanager.h
DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} )
##### qtmcop ##############################
set( qtmcop_SRCS qiomanager.cc )
set( qtmcop_SRCS qiomanager.cpp )
tde_add_library( qtmcop SHARED AUTOMOC
SOURCES ${qtmcop_SRCS}

@ -70,7 +70,7 @@ QIOWatch::QIOWatch(int fd, int type, IONotify *notify,
: _fd(fd), _type(type), _client(notify), _reentrant(reentrant)
{
qsocketnotify = new TQSocketNotifier(fd,qtype,this);
connect(qsocketnotify,TQT_SIGNAL(activated(int)),this,TQT_SLOT(notify(int)));
connect(qsocketnotify,TQ_SIGNAL(activated(int)),this,TQ_SLOT(notify(int)));
}
void QIOWatch::notify(int socket)
@ -85,7 +85,7 @@ void QIOWatch::notify(int socket)
QTimeWatch::QTimeWatch(int milliseconds, TimeNotify *notify)
{
timer = new TQTimer(this);
connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(notify()) );
connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(notify()) );
timer->start(milliseconds);
_client = notify;
}

@ -39,7 +39,7 @@
namespace Arts {
class QIOWatch : public TQObject {
Q_OBJECT
TQ_OBJECT
protected:
TQSocketNotifier *qsocketnotify;
@ -61,7 +61,7 @@ public slots:
};
class QTimeWatch : public TQObject {
Q_OBJECT
TQ_OBJECT
protected:
TQTimer *timer;

@ -38,7 +38,7 @@ install( FILES
${CMAKE_CURRENT_BINARY_DIR}/artsversion.h
${CMAKE_CURRENT_BINARY_DIR}/soundserver.h
${CMAKE_CURRENT_BINARY_DIR}/kmedia2.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} )
##### other data ################################
@ -59,13 +59,13 @@ install( FILES
##### kmedia2_idl (shared lib) ##################
add_custom_command(
OUTPUT kmedia2.cc
OUTPUT kmedia2.cpp
COMMAND ../mcopidl/mcopidl ARGS -t ${MCOPINC} ${CMAKE_CURRENT_SOURCE_DIR}/kmedia2.idl
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kmedia2.idl
)
tde_add_library( kmedia2_idl SHARED
SOURCES kmedia2.cc
SOURCES kmedia2.cpp
VERSION 1.0.0
LINK artsflow_idl-shared
DESTINATION ${LIB_INSTALL_DIR}
@ -76,13 +76,13 @@ tde_add_library( kmedia2_idl SHARED
##### soundserver_idl (shared lib) ##############
add_custom_command(
OUTPUT soundserver.cc soundserver.h
OUTPUT soundserver.cpp soundserver.h
COMMAND ../mcopidl/mcopidl ARGS -t ${MCOPINC} ${CMAKE_CURRENT_SOURCE_DIR}/soundserver.idl
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/soundserver.idl
)
tde_add_library( soundserver_idl SHARED
SOURCES soundserver.cc
SOURCES soundserver.cpp
VERSION 1.0.0
LINK kmedia2_idl-shared
DESTINATION ${LIB_INSTALL_DIR}
@ -93,7 +93,7 @@ tde_add_library( soundserver_idl SHARED
##### artsgslplayobject (shared lib) ############
tde_add_library( artsgslplayobject SHARED
SOURCES gslplayobject_impl.cc
SOURCES gslplayobject_impl.cpp
VERSION 0.0.0
LINK soundserver_idl-shared artsflow-shared
DESTINATION ${LIB_INSTALL_DIR}
@ -103,7 +103,7 @@ tde_add_library( artsgslplayobject SHARED
##### artswavplayobject (shared lib) ############
tde_add_library( artswavplayobject SHARED
SOURCES wavplayobject_impl.cc
SOURCES wavplayobject_impl.cpp
VERSION 0.0.0
LINK soundserver_idl-shared artsflow-shared
DESTINATION ${LIB_INSTALL_DIR}
@ -113,7 +113,7 @@ tde_add_library( artswavplayobject SHARED
##### kmedia2 (shared lib) ######################
tde_add_library( kmedia2 SHARED
SOURCES fileinputstream_impl.cc stdoutwriter_impl.cc
SOURCES fileinputstream_impl.cpp stdoutwriter_impl.cpp
VERSION 1.0.0
LINK kmedia2_idl-shared artsflow-shared
DESTINATION ${LIB_INSTALL_DIR}
@ -125,9 +125,9 @@ tde_add_library( kmedia2 SHARED
set( target artsd )
set( ${target}_SRCS
soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc
artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc
soundserverstartup_impl.cc
soundserverv2_impl.cpp soundserver_impl.cpp simplesoundserver_impl.cpp
artsd.cpp cpuusage.cpp samplestorage_impl.cpp crashhandler.cpp
soundserverstartup_impl.cpp
)
tde_add_executable( ${target}
@ -140,7 +140,7 @@ tde_add_executable( ${target}
##### artsplay ##################################
tde_add_executable( artsplay
SOURCES artsplay.cc
SOURCES artsplay.cpp
LINK soundserver_idl-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@ -149,7 +149,7 @@ tde_add_executable( artsplay
##### artscat ###################################
tde_add_executable( artscat
SOURCES artscat.cc
SOURCES artscat.cpp
LINK soundserver_idl-shared artsflow-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@ -164,14 +164,14 @@ tde_add_executable( artswrapper
# FIXME "artsdpath" seems inconsistent name
# necessary for artswrapper
SET( artsdpath ${BIN_INSTALL_DIR}/artsd )
set_target_properties( artswrapper PROPERTIES COMPILE_FLAGS -DEXECUTE=\\"${artsdpath}\\" )
set( artsdpath ${BIN_INSTALL_DIR}/artsd )
set_property( TARGET artswrapper APPEND PROPERTY COMPILE_DEFINITIONS EXECUTE="${artsdpath}" )
##### artsshell #################################
tde_add_executable( artsshell
SOURCES artsshell.cc tradercheck.cc
SOURCES artsshell.cpp tradercheck.cpp
LINK soundserver_idl-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@ -180,7 +180,7 @@ tde_add_executable( artsshell
##### artsrec ###################################
tde_add_executable( artsrec
SOURCES artsrec.cc
SOURCES artsrec.cpp
LINK soundserver_idl-shared artsflow-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@ -365,7 +365,7 @@ int main(int argc, char **argv)
}
#ifdef __SUNPRO_CC
/* See bottom of simplesoundserver_impl.cc for the reason this is here. */
/* See bottom of simplesoundserver_impl.cpp for the reason this is here. */
#include "simplesoundserver_impl.h"
REGISTER_IMPLEMENTATION(SimpleSoundServer_impl);
#include "soundserver_impl.h"

@ -667,5 +667,3 @@ int main(int argc, char *argv[])
return 0;
}
// vim: sw=4 ts=4

@ -134,7 +134,7 @@ public:
*/
std::string description()
{
return "no description available (see "__FILE__")";
return "no description available (see " __FILE__ ")";
}
poTime currentTime()

@ -85,6 +85,6 @@ bool SoundServer_impl::terminate() {
}
#ifndef __SUNPRO_CC
/* See bottom of simplesoundserver_impl.cc for the reason this is here. */
/* See bottom of simplesoundserver_impl.cpp for the reason this is here. */
REGISTER_IMPLEMENTATION(SoundServer_impl);
#endif

@ -93,7 +93,7 @@ void SoundServerStartup_impl::unlock()
namespace Arts {
#ifndef __SUNPRO_CC
/* See bottom of simplesoundserver_impl.cc for the reason this is here. */
/* See bottom of simplesoundserver_impl.cpp for the reason this is here. */
REGISTER_IMPLEMENTATION(SoundServerStartup_impl);
#endif
}

@ -381,6 +381,6 @@ float SoundServerV2_impl::cpuUsage()
#ifndef __SUNPRO_CC
/* See bottom of simplesoundserver_impl.cc for the reason this is here. */
/* See bottom of simplesoundserver_impl.cpp for the reason this is here. */
REGISTER_IMPLEMENTATION(SoundServerV2_impl);
#endif

@ -74,7 +74,7 @@ public:
* KMedia2 interface
*/
string description() {
return "no description (see "__FILE__")";
return "no description (see " __FILE__ ")";
}
poTime currentTime() {

@ -23,7 +23,7 @@ likely at least.
How to add a new set of tests:
==============================
1. create a new .cc file, for this example we'll suppose testarithmetic.cc
1. create a new .cpp file, for this example we'll suppose testarithmetic.cpp
2. #include "test.h"
3. create a struct which will hold all your tests
@ -67,6 +67,6 @@ TESTMAIN(TestArithmetic);
7. add the following to the Makefile.am (you may want to add more source files,
as required)
testarithmetic_SOURCES = testarithmetic.cc
testarithmetic_SOURCES = testarithmetic.cpp
8. add it to check_PROGRAMS

Loading…
Cancel
Save