Compare commits

...

101 Commits

Author SHA1 Message Date
Michele Calgaro 1adc3202d2
Remove obsolete setting of CMAKE_MODULE_PATH in cmake files. 3 weeks ago
TDE Gitea 4b588b17be Reset submodule main/dependencies/arts/admin to latest HEAD 4 months ago
Slávek Banko 0a17c3871a
Raise the minimum required version of CMake to 3.1. 5 months ago
Slávek Banko 9827d671c1
Remove cmake submodule since it has now been replaced by cmake-trinity dependency. 1 year ago
TDE Gitea d5b8e71452 Reset submodule main/dependencies/arts/cmake to latest HEAD 1 year ago
TDE Gitea 6539be6022 Reset submodule main/dependencies/arts/cmake to latest HEAD 1 year ago
TDE Gitea 2ab5fc53d8 Reset submodule main/dependencies/arts/admin to latest HEAD 1 year ago
TDE Gitea edbd05eca8 Reset submodule main/dependencies/arts/cmake to latest HEAD 1 year ago
TDE Gitea 373b4ab3e5 Reset submodule main/dependencies/arts/cmake to latest HEAD 1 year ago
TDE Gitea c3f34b58aa Reset submodule main/dependencies/arts/admin to latest HEAD 1 year ago
Slávek Banko df10418062
Raise the minimum required version of CMake to 2.8.12. 1 year ago
TDE Gitea b3bb68a06d Reset submodule main/dependencies/arts/cmake to latest HEAD 1 year ago
TDE Gitea b0603e0f1c Reset submodule main/dependencies/arts/libltdl to latest HEAD 1 year ago
TDE Gitea 46f32cc89b Reset submodule main/dependencies/arts/cmake to latest HEAD 1 year ago
TDE Gitea a5a4a3168b Reset submodule main/dependencies/arts/admin to latest HEAD 1 year ago
Michele Calgaro 247750abcb
Renaming of files in preparation for code style tools. 1 year ago
TDE Gitea 595ad58e25 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea b60e52c022 Reset submodule main/dependencies/arts/admin to latest HEAD 2 years ago
TDE Gitea e83c390dd4 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 08683dfd1e Reset submodule main/dependencies/arts/admin to latest HEAD 2 years ago
TDE Gitea 91efb29600 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea edf650d85d Reset submodule main/dependencies/arts/admin to latest HEAD 2 years ago
Michele Calgaro ed5dd22ab7
Removed code formating modelines. 2 years ago
TDE Gitea 10f8caf33b Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 092c8d432b Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 6013eace94 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea b86fc1cfe8 Reset submodule main/dependencies/arts/admin to latest HEAD 2 years ago
TDE Gitea 3a86276a62 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 8088cafb8b Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 831b51f61d Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 54782cb211 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 690684d57a Reset submodule main/dependencies/arts/admin to latest HEAD 2 years ago
TDE Gitea 898fd0ee7a Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 1d187803fb Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 181b3e78a7 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 0ba88fc4de Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea cf0e2bb82b Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea 6de5dc184f Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea ca7ffff85c Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea e166d4b640 Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
TDE Gitea f0eb92c6ec Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
Michele Calgaro ef3cfbd6d1
Remove remaining 'register' instructions. 2 years ago
OBATA Akio 405df7bf90
Drop `unsigned long int` case for the first argment type of ioctl(2) 2 years ago
OBATA Akio 35cbe8d714
Port ioctl prototype check to CMake 2 years ago
Michele Calgaro 1d42e0d842
Removed explicit usage of the 'register' keyword. 2 years ago
TDE Gitea ef4a1c768f Reset submodule main/dependencies/arts/cmake to latest HEAD 2 years ago
Slávek Banko a95f91bd53
Switch all submodules to https. 2 years ago
Michele Calgaro 2faaab124c
Removed .lsm files. lsm database is outdated and unmaintained. 3 years ago
TDE Gitea 9e01acbc0e Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
TDE Gitea 9035d57d6e Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
TDE Gitea 2ce20f1066 Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
Michele Calgaro c3c624e563
Updated date and version to R14.0.6 in .lsm files. 3 years ago
TDE Gitea e19dcc47f2 Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
TDE Gitea 558308e7f4 Reset submodule main/dependencies/arts/admin to latest HEAD 3 years ago
TDE Gitea 486ca933f3 Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
Slávek Banko 672fc71b41
Use common CMake tests. 3 years ago
TDE Gitea ed86e389a2 Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
TDE Gitea 374a580462 Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
TDE Gitea b84a7d97ac Reset submodule main/dependencies/arts/cmake to latest HEAD 3 years ago
Fabio Rossi ad65b874d0
Avoid overriding user linker flags (LDFLAGS) for modules and shared libs 3 years ago
TDE Gitea 0ecfff93dc Reset submodule main/dependencies/arts/cmake to latest HEAD 4 years ago
TDE Gitea 947679ff69 Reset submodule main/dependencies/arts/cmake to latest HEAD 4 years ago
TDE Gitea a98e80d159 Reset submodule main/dependencies/arts/admin to latest HEAD 4 years ago
TDE Gitea c60ba83c6e Reset submodule main/dependencies/arts/cmake to latest HEAD 4 years ago
TDE Gitea 0bdf621360 Reset submodule main/dependencies/arts/cmake to latest HEAD 4 years ago
TDE Gitea 6dcf7b17ab Reset submodule main/dependencies/arts/admin to latest HEAD 4 years ago
Slávek Banko d10ad97ae9
Fix FTBFS with stricter C++11 4 years ago
Slávek Banko f93e65b4fe Update version numbers and date for R14.0.5 final release 4 years ago
Michele Calgaro 1ee7912f7e cmake: Use set_property( SOURCE ... COMPILE_DEFINITIONS ) 4 years ago
Michele Calgaro 1b0b9f6271 Fixed for bug 2845. This is a bit of a quick-n-dirty patch. 4 years ago
Slávek Banko 212899926b Reset submodule main/dependencies/arts/admin to latest HEAD 4 years ago
Slávek Banko 77f9cb10cd Reset submodule main/dependencies/arts/admin to latest HEAD 4 years ago
Slávek Banko 9493a7c2f9 Reset submodule main/dependencies/arts/admin to latest HEAD 4 years ago
Michele Calgaro 8999284fae Fixed FTBFS with g++7 caused by #include directive placed inside namespace. 4 years ago
Slávek Banko 8f88b82b29 Reset submodule main/dependencies/arts/cmake to latest HEAD 5 years ago
Slávek Banko 35e97a709a Reset submodule main/dependencies/arts/cmake to latest HEAD 5 years ago
Slávek Banko 435eb14d99 Fix detection whether the system is big endian 5 years ago
Slávek Banko a9cdb4590f Reset submodule main/dependencies/arts/cmake to latest HEAD 5 years ago
Slávek Banko ff91582164 Reset submodule main/dependencies/arts/cmake to latest HEAD 5 years ago
Slávek Banko 81b143626c Reset submodule main/dependencies/arts/admin to latest HEAD 5 years ago
Slávek Banko 13a0d86cd3 cmake: add tde_add_check_executable macro 5 years ago
Slávek Banko 6721994f95 Update version number for new target R14.0.5 6 years ago
Slávek Banko 889d12d843 Update date in lsm files 6 years ago
Slávek Banko ea63949bb8 Add artsc pkg-config file 6 years ago
Slávek Banko 6c9faab508 Fix FTBFS with GCC 6 (C++11 dialect) 6 years ago
Slávek Banko 024700a58f Reset submodule main/dependencies/arts/admin to latest HEAD 6 years ago
Slávek Banko 07ef9395d2 Reset submodule main/dependencies/arts/cmake to latest HEAD 6 years ago
Slávek Banko 6be1edd325 Reset submodule main/dependencies/arts/cmake to latest HEAD 6 years ago
Slávek Banko 94966ca012 Update version number for new target R14.0.4 6 years ago
Slávek Banko 5c0687251a Update date in lsm files 6 years ago
Slávek Banko 49e5417d8b Fix security issue CVE-2015-7543 7 years ago
Slávek Banko 0bb256e199 Update version number for new target R14.0.3 7 years ago
Slávek Banko f09df7386c Update date in lsm files 7 years ago
Slávek Banko a273b9bcc7 Update version number for new target R14.0.2 7 years ago
Slávek Banko 63d5642dfa Update date in lsm files 7 years ago
Slávek Banko 326d4d0c10 Update version in lsm files 7 years ago
Slávek Banko 58dd759fd7 Add include directory for internal libltdl 7 years ago
Slávek Banko ad5cf07804 Reset submodule main/dependencies/arts/cmake to latest HEAD 7 years ago
Nikolaus Klepp c23ca441d8 Fix FTBFS on freebsd 7 years ago
Slávek Banko aed034d05d Reset submodule main/dependencies/arts/cmake to latest HEAD 7 years ago
Slávek Banko fab40b39c1 Reset submodule main/dependencies/arts/admin to latest HEAD 7 years ago
  1. 7
      .gitmodules
  2. 34
      CMakeLists.txt
  3. 2
      admin
  4. 14
      arts.lsm
  5. 11
      artsc/CMakeLists.txt
  6. 16
      artsc/artsc-config.in
  7. 11
      artsc/artsc.pc.in
  8. 0
      artsc/artscbackend.cpp
  9. 5
      artsc/artsdsp.c
  10. 1
      cmake
  11. 7
      config.h.cmake
  12. 4
      doc/TODO
  13. 0
      examples/catfile.cpp
  14. 0
      examples/dcasttest.cpp
  15. 0
      examples/flow.cpp
  16. 0
      examples/hello_impl.cpp
  17. 0
      examples/helloclient.cpp
  18. 0
      examples/hellodynamic.cpp
  19. 0
      examples/hellodynamic2.cpp
  20. 0
      examples/hellomain.cpp
  21. 0
      examples/helloserver.cpp
  22. 0
      examples/irdemo.cpp
  23. 0
      examples/playtofile_impl.cpp
  24. 2
      examples/playtofile_main.cpp
  25. 0
      examples/referenceinfo.cpp
  26. 0
      examples/streamsound.cpp
  27. 0
      examples/testaggregation.cpp
  28. 0
      examples/testasubsys.cpp
  29. 0
      examples/testdhandle.cpp
  30. 0
      examples/testthreads.cpp
  31. 0
      examples/x11commtest.cpp
  32. 30
      flow/CMakeLists.txt
  33. 0
      flow/asyncschedule.cpp
  34. 0
      flow/audioio.cpp
  35. 0
      flow/audioioaix.cpp
  36. 0
      flow/audioioalsa.cpp
  37. 2
      flow/audioioalsa9.cpp
  38. 0
      flow/audioiocsl.cpp
  39. 0
      flow/audioioesd.cpp
  40. 1
      flow/audioiojack.cpp
  41. 0
      flow/audioiolibaudioio.cpp
  42. 0
      flow/audioiomas.cpp
  43. 0
      flow/audioionas.cpp
  44. 0
      flow/audioionull.cpp
  45. 0
      flow/audioiooss.cpp
  46. 0
      flow/audioioossthreaded.cpp
  47. 0
      flow/audioiosgi.cpp
  48. 0
      flow/audioiosndio.cpp
  49. 0
      flow/audioiosun.cpp
  50. 2
      flow/audiomanager_impl.cpp
  51. 0
      flow/audiosubsys.cpp
  52. 0
      flow/audiotobytestream_impl.cpp
  53. 0
      flow/bus.cpp
  54. 0
      flow/bytestreamtoaudio_impl.cpp
  55. 0
      flow/cache.cpp
  56. 0
      flow/convert.cpp
  57. 0
      flow/cpuinfo.cpp
  58. 0
      flow/datahandle_impl.cpp
  59. 2
      flow/gsl/CMakeLists.txt
  60. 0
      flow/gsl/dummy.cpp
  61. 24
      flow/gsl/gsl-fftgen.pl
  62. 2
      flow/gsl/gslartsthreads.cpp
  63. 3
      flow/gsl/gslartsthreads.h
  64. 4
      flow/gsl/gsldatacache.c
  65. 2
      flow/gsl/gsldatahandle-mad.c
  66. 2
      flow/gsl/gsldatautils.c
  67. 2
      flow/gsl/gsldatautils.h
  68. 2
      flow/gsl/gsldefs.h
  69. 2
      flow/gsl/gslengine.c
  70. 220
      flow/gsl/gslfft.c
  71. 2
      flow/gsl/gslfft.h
  72. 12
      flow/gsl/gslffttest.c
  73. 10
      flow/gsl/gslfilter.c
  74. 2
      flow/gsl/gslfilter.h
  75. 8
      flow/gsl/gslglib.c
  76. 5
      flow/gsl/gslglib.h
  77. 2
      flow/gsl/gslglibhash.cpp
  78. 0
      flow/gsl/gslglibhashtest.cpp
  79. 14
      flow/gsl/gslieee754.h
  80. 2
      flow/gsl/gslmath.h
  81. 1
      flow/gsl/gslopmaster.c
  82. 5
      flow/gsl/gsloputil.c
  83. 2
      flow/gsl/gslosctable.c
  84. 28
      flow/gsl/gslsignal.h
  85. 4
      flow/gsl/gsltests.c
  86. 2
      flow/gsl/gslwaveosc-aux.c
  87. 1
      flow/gsl/gslwaveosc.c
  88. 0
      flow/gslschedule.cpp
  89. 0
      flow/pipebuffer.cpp
  90. 0
      flow/resample.cpp
  91. 0
      flow/stdsynthmodule.cpp
  92. 0
      flow/stereoeffectstack_impl.cpp
  93. 0
      flow/stereofftscope_impl.cpp
  94. 2
      flow/stereovolumecontrol_impl.cpp
  95. 0
      flow/synth_add_impl.cpp
  96. 0
      flow/synth_frequency_impl.cpp
  97. 0
      flow/synth_mul_impl.cpp
  98. 0
      flow/synth_multi_add_impl.cpp
  99. 1
      flow/synth_play_impl.cpp
  100. 0
      flow/synth_play_wav_impl.cpp
  101. 2
      flow/synth_record_impl.cpp
  102. 0
      flow/synth_wave_sin_impl.cpp
  103. 0
      flow/virtualports.cpp
  104. 2
      gmcop/CMakeLists.txt
  105. 0
      gmcop/giomanager.cpp
  106. 2
      libltdl
  107. 21
      mcop/CMakeLists.txt
  108. 0
      mcop/anyref.cpp
  109. 0
      mcop/asyncstream.cpp
  110. 2
      mcop/buffer.cpp
  111. 0
      mcop/connect.cpp
  112. 0
      mcop/connection.cpp
  113. 0
      mcop/core.cpp
  114. 0
      mcop/datapacket.cpp
  115. 3
      mcop/debug.cpp
  116. 0
      mcop/delayedreturn.cpp
  117. 2
      mcop/dispatcher.cpp
  118. 0
      mcop/dynamicrequest.cpp
  119. 0
      mcop/dynamicskeleton.cpp
  120. 0
      mcop/extensionloader.cpp
  121. 0
      mcop/factory.cpp
  122. 0
      mcop/flowsystem.cpp
  123. 0
      mcop/idlfilereg.cpp
  124. 0
      mcop/ifacerepo_impl.cpp
  125. 4
      mcop/iomanager.cpp
  126. 0
      mcop/loopback.cpp
  127. 0
      mcop/mcopconfig.cpp
  128. 9
      mcop/mcoputils.cpp
  129. 0
      mcop/md5auth.cpp
  130. 2
      mcop/namedstore.h
  131. 0
      mcop/notification.cpp
  132. 0
      mcop/object.cpp
  133. 0
      mcop/objectmanager.cpp
  134. 0
      mcop/reference.cpp
  135. 0
      mcop/referenceclean.cpp
  136. 0
      mcop/socketconnection.cpp
  137. 0
      mcop/startupmanager.cpp
  138. 1
      mcop/tcpconnection.cpp
  139. 4
      mcop/tcpserver.cpp
  140. 0
      mcop/thread.cpp
  141. 0
      mcop/tmpglobalcomm.cpp
  142. 0
      mcop/trader_impl.cpp
  143. 0
      mcop/type.cpp
  144. 1
      mcop/unixconnection.cpp
  145. 3
      mcop/unixserver.cpp
  146. 2
      mcop_mt/CMakeLists.txt
  147. 5
      mcop_mt/threads_posix.cpp
  148. 2
      mcopidl/CMakeLists.txt
  149. 4
      mcopidl/mcopidl.cpp
  150. 0
      mcopidl/namespace.cpp
  151. 50
      mcopidl/scanner.cpp
  152. 2
      mcopidl/scanner.ll
  153. 20
      mcopidl/yacc.cpp
  154. 6
      mcopidl/yacc.cpp.h
  155. 2
      qtmcop/CMakeLists.txt
  156. 0
      qtmcop/qiomanager.cpp
  157. 30
      soundserver/CMakeLists.txt
  158. 0
      soundserver/artscat.cpp
  159. 2
      soundserver/artsd.cpp
  160. 0
      soundserver/artsplay.cpp
  161. 0
      soundserver/artsrec.cpp
  162. 2
      soundserver/artsshell.cpp
  163. 0
      soundserver/cpuusage.cpp
  164. 0
      soundserver/crashhandler.cpp
  165. 0
      soundserver/fileinputstream_impl.cpp
  166. 2
      soundserver/gslplayobject_impl.cpp
  167. 0
      soundserver/samplestorage_impl.cpp
  168. 0
      soundserver/simplesoundserver_impl.cpp
  169. 2
      soundserver/soundserver_impl.cpp
  170. 2
      soundserver/soundserverstartup_impl.cpp
  171. 2
      soundserver/soundserverv2_impl.cpp
  172. 0
      soundserver/stdoutwriter_impl.cpp
  173. 0
      soundserver/tradercheck.cpp
  174. 2
      soundserver/wavplayobject_impl.cpp
  175. 4
      tests/README.test
  176. 0
      tests/testanyref.cpp
  177. 0
      tests/testbuffer.cpp
  178. 0
      tests/testchangenotify.cpp
  179. 0
      tests/testdispatcher.cpp
  180. 0
      tests/testflowsystem.cpp
  181. 0
      tests/testifacerepo.cpp
  182. 0
      tests/testnotification.cpp
  183. 0
      tests/testremote.cpp
  184. 0
      tests/testwrapper.cpp
  185. 0
      tests/value_impl.cpp
  186. 0
      x11/x11globalcomm_impl.cpp

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

34
CMakeLists.txt

@ -9,20 +9,22 @@
#
#################################################
cmake_minimum_required( VERSION 2.8 )
cmake_minimum_required( VERSION 3.1 )
##### 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 )
@ -62,6 +64,11 @@ tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" )
tde_setup_architecture_flags( )
include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
tde_setup_largefiles( )
##### check for include files ###################
@ -108,6 +115,8 @@ 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_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 #######################
@ -216,23 +225,16 @@ else( GLIB2_FOUND )
endif( GLIB2_FOUND )
##### check for gcc visibility support #########
# FIXME
# This should check for [T]Qt3 visibility support
##### check for TQt #############################
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( )
find_package( TQt )
##### check for TQt #############################
##### check for gcc visibility support #########
find_package( TQt )
if( WITH_GCC_VISIBILITY )
tde_setup_gcc_visibility( )
endif( )
##### write config.h file #######################
@ -283,7 +285,7 @@ add_definitions(
-DHAVE_CONFIG_H
)
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
##### project subdirectories ####################

2
admin

@ -1 +1 @@
Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

14
arts.lsm

@ -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

11
artsc/CMakeLists.txt

@ -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}

16
artsc/artsc-config.in

@ -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"

11
artsc/artsc.pc.in

@ -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@

0
artsc/artscbackend.cc → artsc/artscbackend.cpp

5
artsc/artsdsp.c

@ -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
@ -672,6 +670,3 @@ FILE* fopen(const char *path, const char *mode)
#endif
#endif
/*
* vim:ts=4
*/

1
cmake

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

7
config.h.cmake

@ -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
@ -36,7 +40,8 @@
#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

4
doc/TODO

@ -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,

0
examples/catfile.cc → examples/catfile.cpp

0
examples/dcasttest.cc → examples/dcasttest.cpp

0
examples/flow.cc → examples/flow.cpp

0
examples/hello_impl.cc → examples/hello_impl.cpp

0
examples/helloclient.cc → examples/helloclient.cpp

0
examples/hellodynamic.cc → examples/hellodynamic.cpp

0
examples/hellodynamic2.cc → examples/hellodynamic2.cpp

0
examples/hellomain.cc → examples/hellomain.cpp

0
examples/helloserver.cc → examples/helloserver.cpp

0
examples/irdemo.cc → examples/irdemo.cpp

0
examples/playtofile_impl.cc → examples/playtofile_impl.cpp

2
examples/playtofile_main.cc → examples/playtofile_main.cpp

@ -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 = "";

0
examples/referenceinfo.cc → examples/referenceinfo.cpp

0
examples/streamsound.cc → examples/streamsound.cpp

0
examples/testaggregation.cc → examples/testaggregation.cpp

0
examples/testasubsys.cc → examples/testasubsys.cpp

0
examples/testdhandle.cc → examples/testdhandle.cpp

0
examples/testthreads.cc → examples/testthreads.cpp

0
examples/x11commtest.cc → examples/x11commtest.cpp

30
flow/CMakeLists.txt

@ -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 audioioalsa9.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}

0
flow/asyncschedule.cc → flow/asyncschedule.cpp

0
flow/audioio.cc → flow/audioio.cpp

0
flow/audioioaix.cc → flow/audioioaix.cpp

0
flow/audioioalsa.cc → flow/audioioalsa.cpp

2
flow/audioioalsa9.cc → flow/audioioalsa9.cpp

@ -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

0
flow/audioiocsl.cc → flow/audioiocsl.cpp

0
flow/audioioesd.cc → flow/audioioesd.cpp

1
flow/audioiojack.cc → flow/audioiojack.cpp

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

0
flow/audioiolibaudioio.cc → flow/audioiolibaudioio.cpp

0
flow/audioiomas.cc → flow/audioiomas.cpp

0
flow/audioionas.cc → flow/audioionas.cpp

0
flow/audioionull.cc → flow/audioionull.cpp

0
flow/audioiooss.cc → flow/audioiooss.cpp

0
flow/audioioossthreaded.cc → flow/audioioossthreaded.cpp

0
flow/audioiosgi.cc → flow/audioiosgi.cpp

0
flow/audioiosndio.cc → flow/audioiosndio.cpp

0
flow/audioiosun.cc → flow/audioiosun.cpp

2
flow/audiomanager_impl.cc → flow/audiomanager_impl.cpp

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

0
flow/audiosubsys.cc → flow/audiosubsys.cpp

0
flow/audiotobytestream_impl.cc → flow/audiotobytestream_impl.cpp

0
flow/bus.cc → flow/bus.cpp

0
flow/bytestreamtoaudio_impl.cc → flow/bytestreamtoaudio_impl.cpp

0
flow/cache.cc → flow/cache.cpp

0
flow/convert.cc → flow/convert.cpp

0
flow/cpuinfo.cc → flow/cpuinfo.cpp

0
flow/datahandle_impl.cc → flow/datahandle_impl.cpp

2
flow/gsl/CMakeLists.txt

@ -144,7 +144,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

0
flow/gsl/dummy.cc → flow/gsl/dummy.cpp

24
flow/gsl/gsl-fftgen.pl

@ -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;

2
flow/gsl/gslartsthreads.cc → flow/gsl/gslartsthreads.cpp

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

3
flow/gsl/gslartsthreads.h

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

4
flow/gsl/gsldatacache.c

@ -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;

2
flow/gsl/gsldatahandle-mad.c

@ -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: */

2
flow/gsl/gsldatautils.c

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

2
flow/gsl/gsldatautils.h

@ -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: */

2
flow/gsl/gsldefs.h

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

2
flow/gsl/gslengine.c

@ -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: */

220
flow/gsl/gslfft.c

@ -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; \