w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 17:11:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

- libsamplerate is not being used at all in *nix, I assume it is supposed

Browse Source 
to be used for portaudio. The following files enable libsamplerate
  when either Win32 is defined or portaudio is used.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@239 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Diane Bruce 2006-08-05 16:53:41 +00:00
parent 8acdc5e266
commit 3bb5e2c9c4
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wsjt 5.9.2. # Generated by GNU Autoconf 2.59 for wsjt 5.9.2.
# #
# $Id: configure.ac 226 2006-08-02 03:47:38Z va3db $ # $Id: configure.ac 227 2006-08-02 10:12:59Z va3db $
# #
# Copyright (C) 2003 Free Software Foundation, Inc. # Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
@ -976,7 +976,7 @@ Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. gives unlimited permission to copy, distribute and modify it.
$Id: configure.ac 226 2006-08-02 03:47:38Z va3db $ $Id: configure.ac 227 2006-08-02 10:12:59Z va3db $
_ACEOF _ACEOF
exit 0 exit 0
fi fi
@ -6737,7 +6737,7 @@ cat >>confdefs.h <<\_ACEOF
#define USE_PORTAUDIO 1 #define USE_PORTAUDIO 1
_ACEOF _ACEOF
AUDIO="a2d.f90 jtaudio.c start_portaudio.c" AUDIO="a2d.f90 jtaudio.c resample.c start_portaudio.c"
NEEDPORTAUDIO="portaudio-v19/lib/libportaudio.a" NEEDPORTAUDIO="portaudio-v19/lib/libportaudio.a"

2
configure.ac
View File

@ -305,7 +305,7 @@ fi
if test "$portaudio" = yes; then if test "$portaudio" = yes; then
AC_DEFINE(USE_PORTAUDIO, 1, [Define if you want PORTAUDIO used.]) AC_DEFINE(USE_PORTAUDIO, 1, [Define if you want PORTAUDIO used.])
AC_SUBST(AUDIO, "a2d.f90 jtaudio.c start_portaudio.c") AC_SUBST(AUDIO, "a2d.f90 jtaudio.c resample.c start_portaudio.c")
AC_SUBST(NEEDPORTAUDIO, "portaudio-v19/lib/libportaudio.a") AC_SUBST(NEEDPORTAUDIO, "portaudio-v19/lib/libportaudio.a")
LDFLAGS="portaudio-v19/lib/libportaudio.a ${LDFLAGS} -lsamplerate" LDFLAGS="portaudio-v19/lib/libportaudio.a ${LDFLAGS} -lsamplerate"
else else

3
portaudio-v19/config.log
View File

@ -14,6 +14,9 @@ configure:991: checking whether byte ordering is bigendian
configure:1083: checking for snd_pcm_open in -lasound configure:1083: checking for snd_pcm_open in -lasound
configure:1131: checking host system type configure:1131: checking host system type
configure:1159: checking for pkg-config configure:1159: checking for pkg-config
configure:1203: checking for jack
configure:1210: checking JACK_CFLAGS
configure:1215: checking JACK_LIBS
configure:1244: checking size of short configure:1244: checking size of short
configure:1283: checking size of int configure:1283: checking size of int
configure:1322: checking size of long configure:1322: checking size of long

16
portaudio-v19/config.status
View File

@ -2,7 +2,7 @@
# Generated automatically by configure. # Generated automatically by configure.
# Run this file to recreate the current configuration. # Run this file to recreate the current configuration.
# This directory was configured as follows, # This directory was configured as follows,
# on host phy-joe.Princeton.EDU: # on host night.db.net:
# #
# ./configure --with-jack=no # ./configure --with-jack=no
# #
@ -64,14 +64,14 @@ s%@INSTALL_PROGRAM@%${INSTALL}%g
s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g
s%@INSTALL_DATA@%${INSTALL} -m 644%g s%@INSTALL_DATA@%${INSTALL} -m 644%g
s%@AR@%/usr/bin/ar%g s%@AR@%/usr/bin/ar%g
s%@host@%i686-pc-linux-gnu%g s%@host@%i386-unknown-freebsd7.0%g
s%@host_alias@%i686-pc-linux-gnu%g s%@host_alias@%i386-unknown-freebsd7.0%g
s%@host_cpu@%i686%g s%@host_cpu@%i386%g
s%@host_vendor@%pc%g s%@host_vendor@%unknown%g
s%@host_os@%linux-gnu%g s%@host_os@%freebsd7.0%g
s%@PKG_CONFIG@%/usr/local/bin/pkg-config%g s%@PKG_CONFIG@%/usr/local/bin/pkg-config%g
s%@JACK_CFLAGS@%%g s%@JACK_CFLAGS@%-I/usr/local/include %g
s%@JACK_LIBS@%%g s%@JACK_LIBS@%-pthread -L/usr/local/lib -ljack %g
s%@OTHER_OBJS@% pa_unix_oss/pa_unix_oss.o pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o%g s%@OTHER_OBJS@% pa_unix_oss/pa_unix_oss.o pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o%g
s%@PADLL@%libportaudio.so%g s%@PADLL@%libportaudio.so%g
s%@SHARED_FLAGS@%-shared -fPIC%g s%@SHARED_FLAGS@%-shared -fPIC%g

2
wsjt1.F
View File

@ -105,7 +105,7 @@
dat2(j)=dat(j)-ave dat2(j)=dat(j)-ave
enddo enddo
#ifdef Win32 #if (USE_PORTAUDIO==1) || defined(Win32)
ierr=resample(dat2,dat,samratio,jz) ierr=resample(dat2,dat,samratio,jz)
if(ierr.ne.0) print*,'Resample error.',samratio if(ierr.ne.0) print*,'Resample error.',samratio
#endif #endif