Fixed format of WAV files written by savedata.F90 in *nix.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@201 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2006-07-24 17:20:27 +00:00
parent c8afc2da11
commit b18438a6eb
4 changed files with 16 additions and 15 deletions

View File

@ -14,9 +14,6 @@ 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

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 night.db.net: # on host phy-joe.Princeton.EDU:
# #
# ./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@%i386-unknown-freebsd7.0%g s%@host@%i686-pc-linux-gnu%g
s%@host_alias@%i386-unknown-freebsd7.0%g s%@host_alias@%i686-pc-linux-gnu%g
s%@host_cpu@%i386%g s%@host_cpu@%i686%g
s%@host_vendor@%unknown%g s%@host_vendor@%pc%g
s%@host_os@%freebsd7.0%g s%@host_os@%linux-gnu%g
s%@PKG_CONFIG@%/usr/local/bin/pkg-config%g s%@PKG_CONFIG@%/usr/local/bin/pkg-config%g
s%@JACK_CFLAGS@%-I/usr/local/include %g s%@JACK_CFLAGS@%%g
s%@JACK_LIBS@%-pthread -L/usr/local/lib -ljack %g s%@JACK_LIBS@%%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

View File

@ -107,12 +107,16 @@ subroutine savedata
#ifdef Win32 #ifdef Win32
open(17,file=longname,status='unknown',form='binary',err=20) open(17,file=longname,status='unknown',form='binary',err=20)
#else
open(17,file=longname,status='unknown',form='unformatted',err=20)
#endif
write(17) ariff,nchunk,awave,afmt,lenfmt,nfmt2,nchan2,nsamrate, & write(17) ariff,nchunk,awave,afmt,lenfmt,nfmt2,nchan2,nsamrate, &
nbytesec,nbytesam2,nbitsam2,adata,ndata,(d2a(j),j=1,jza) nbytesec,nbytesam2,nbitsam2,adata,ndata,(d2a(j),j=1,jza)
close(17) close(17)
#else
open(17,file=longname,status='unknown',form='unformatted', &
access='direct',recl=nbytes,err=20)
write(17,rec=1) ariff,nchunk,awave,afmt,lenfmt,nfmt2,nchan2,nsamrate, &
nbytesec,nbytesam2,nbitsam2,adata,ndata,(d2a(j),j=1,jza)
close(17)
#endif
filetokillb=filetokilla filetokillb=filetokilla
filetokilla=longname filetokilla=longname
go to 30 go to 30

View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------- WSJT #------------------------------------------------------------------ WSJT
from Tkinter import * from Tkinter import *
from tkFileDialog import * from tkFileDialog import *
import Pmw import Pmw