Commit Graph

223 Commits

Author SHA1 Message Date
Diane Bruce
7ce8878e3a - I forgot -lsamplerate
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@75 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 05:00:34 +00:00
Diane Bruce
1a7eba8421 - clean up start_threads.c using bob's start_threads.c as template
- always define -pthread
- make sure right libs are passed along



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@74 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 04:30:03 +00:00
Diane Bruce
f504e95c03 - ok, this should enable Bobs portaudio fixes and ALSA depending on
--enable options. 

This will have to be cleaned up a lot more to minimise #ifdef's
a2d_() is needed for portaudio which is needed by both windows and *nix
but only a small piece of start_threads.c is needed for portaudio
the ALSA part is #ifdef'd out when USE_PORTAUDIO is enabled.
audio_init.f90 and a2d.f90 now have #ifdef's on USE_PORTAUDIO
instead of Win32.

Lots to do still.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@73 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 02:43:23 +00:00
Diane Bruce
f95e01d28f - forgot to add -lportaudio
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@71 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 21:35:25 +00:00
Diane Bruce
8a708402af - check correct HAS_ASOUNDLIB_H flag in start_threads.c
- look for alsa/asoundlib.h and set HAS_ASOUNDLIB_H if present
- also rework Makefile to pass proper flags

This should be it for alsa and portaudio.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@70 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 21:30:35 +00:00
Diane Bruce
1f1abc09d3 - cleaned up a few more stupids on configure system
- cleaned up Makefile to use LDFLAGS and CPPFLAGS
- look for asoundlib.h properly



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@69 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 19:18:03 +00:00
Joe Taylor
2cfd513bd7 Implemented Freeze/Tolerance/MouseDF features for JT6M.
Removed superfluous "#ifdef Win32" in jtaudio.c.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@67 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 15:42:44 +00:00
Joe Taylor
e61b287980 Added dfinc.mak (include file for Makefile.win).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@66 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 15:08:01 +00:00
Joe Taylor
e1ace45403 Changed WIN32 to Win32 in wrapkarn.c and igray.c.
Corresponding change in go.bat.
Added Makefiile.win.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@65 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 15:06:21 +00:00
Diane Bruce
a160f9aca3 - A little more work on configure.ac, to at least get portaudio right
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@64 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 18:19:01 +00:00
Robert W Mc Gwier, Jr
ce7b1a958f adding install-sh
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@63 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 04:35:48 +00:00
Diane Bruce
b3403ec2f9 - Cleaned up further using Joe's Windows makefile as a basis
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@62 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 03:54:50 +00:00
Diane Bruce
cc0bd39e85 - A few more cleanups to configure
Note for *now* you will have to expressly state ./configure --enable-alsa
  or --enable-oss etc. I'll fix it later to pick a default.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@61 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 01:40:30 +00:00
Diane Bruce
de3e8a9c5b - oops sorry about that.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@60 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 22:40:26 +00:00
Diane Bruce
0d0bcdaf58 - more cleanups to configure
- ptt_linux.c is no longer needed (replaced with generic ptt_unix.c)
- Makefile should be created from configure (and Makefile.in)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@59 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 21:24:49 +00:00
Diane Bruce
2c36b84bb5 - Add first rough cut of configure
Note that Makefile should go since it should be rebuilt from Makefile.in
  by configure.
- start_threads now has HAVE_ALSA_ALSASOUND_H
- ptt_unix now uses configure HAVE_SYS_PARAM_H

Initial *non production* commit
I am a little rusty with it, sorry. --db



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@58 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 20:14:23 +00:00
Diane Bruce
c6e3d2ec9a - first cut at a general Makefile for WSJT, it is *not* production quality
Still a lot of re-factoring to do with the .o etc. 

  (Reviewed and tested by Joe)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@57 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 16:51:20 +00:00
Diane Bruce
8a3e4eb784 - initial cut at a portable ptt module for all unix and unix like systems
It will be refined later on for OSX/Solaris etc.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@56 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 16:48:20 +00:00
Joe Taylor
d07751007a Clear PTT in ftn_init.
F10 to show SpecJT screen.
Alt-F to toggle Freeze.
Erase when changing modes.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@55 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 22:03:35 +00:00
Joe Taylor
e99746d70c Fixed readout of average messages: needed flush(12) in wsjt65.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@54 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 21:04:14 +00:00
Joe Taylor
84ed1eb1f6 Removed redundancy in fsubs.f.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@53 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 21:02:19 +00:00
Joe Taylor
d5ac2ce57c Added wsjtrc.win, configuration file for Windows.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@52 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 16:53:57 +00:00
Joe Taylor
5d7a297dca Will I ever be happy with the fonts?
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@51 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 16:45:05 +00:00
Joe Taylor
948327b4aa More tweaking of fonts; fix NMAX in indexx.f; increase latency in jtaudio.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@50 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-06 16:06:57 +00:00
Joe Taylor
c909fc794e Corrected logic in ptt_linux.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@49 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 20:38:27 +00:00
Joe Taylor
aae9ccb6d5 Fleshed out ptt_linux.c to control DTR/RTS lines on serial port.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@48 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 19:39:21 +00:00
Joe Taylor
e9817a2c16 Fixed several problems in playback_callback (start_threads.c).
Reverted to display of full Tx message in status bar (wsjt.py).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@47 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 15:33:56 +00:00
J C Dutton
445a0f7985 Summary: Implements audio playback (TX) for ALSA.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@46 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-05 00:08:26 +00:00
Joe Taylor
821f4c3b14 Passed ndsec to capture callback, as required.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@45 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-04 21:02:30 +00:00
Joe Taylor
3f2e2fd65f Fixed definition of stime and Tsec in start_threads.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@44 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-04 20:10:08 +00:00
Joe Taylor
34caaa937e Workaround code for James's problem with the Python rfind method; better
error message in ssort.f.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@43 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-03 16:33:16 +00:00
J C Dutton
ae261d38b7 Summary: Fix wrap around capture buffer.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@42 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-02 02:06:19 +00:00
J C Dutton
77cf42de42 Summary: Add in timing code. The captured audio is now decoded.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@41 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-02 01:34:45 +00:00
J C Dutton
88c5bb9a6d Summary: Add first attempt at sound capture.
Currently display the trace in specjt, but does not seem to decode it.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@40 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-02 00:41:10 +00:00
Joe Taylor
682145f8e8 Fixed sort of zero-length array in wsjt1.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@39 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-30 01:40:23 +00:00
Joe Taylor
f42500ecd5 Tweaked spacings on Astrodata window.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@38 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 21:29:42 +00:00
Joe Taylor
fd0b90ecb9 Fixed igray.c to compile on Windows; changed go.bat accordingly.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@37 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 21:07:24 +00:00
Joe Taylor
363d225f78 Added sort.f, ssort.f
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@36 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 20:32:28 +00:00
Joe Taylor
7f05b65775 Added indexx.f
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@35 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 20:31:33 +00:00
Joe Taylor
a8450874bc Removed ran1 and gasdev; replaced igray, sort, and indexx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@34 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 20:12:45 +00:00
Joe Taylor
9bdd9d7691 Delete JT65code; remove extra 160 ms ping from mtdecode; fix "go" script
for Linux.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@33 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 15:02:29 +00:00
Joe Taylor
743e07bd10 Fixed spacing of labels above text box, FSK441 and JT6M modes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@32 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 14:42:02 +00:00
Joe Taylor
15f3250202 Removed the undesired WSJT directory from .../wsjt/WSJT/trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@31 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-29 13:55:28 +00:00
Joe Taylor
ab9ac14bd6 Corrected typo in g1.bat.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@30 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-28 22:02:59 +00:00
Joe Taylor
39abf7a037 Trivial change to wsjt.py, testing commit on berlios.de.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@29 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-28 21:25:15 +00:00
Joe Taylor
840b58a17d Test of a commit to berlios repository.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@28 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-28 21:12:35 +00:00
Joe Taylor
22e1299073 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@27 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 2005-12-28 18:59:19 +00:00
Joe Taylor
b6035c9f96 Updated WSJT_Source_Cose.txt
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@26 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-28 18:20:01 +00:00
Joe Taylor
12f5fd600d Completed brief documentation of all variables in gcom?.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@25 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-28 17:02:57 +00:00
Joe Taylor
adf00024bf Trivial change to wsjt.py, to make Rev# change?
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@24 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2005-12-27 20:58:44 +00:00