Wykres commitów

155 Commity (master)

Autor SHA1 Wiadomość Data
James Coxon 892162ac86 Merge branch 'master' of https://github.com/hexameron/dl-fldigi 2016-08-02 21:21:02 +01:00
Richard Meadows 98ac732e22 [mingw] Revert "Network soundcard.". Not easily portable to windows
This reverts commit ae53109a87.

Conflicts:
	src/dialogs/confdialog.h
	src/include/confdialog.h
	src/soundcard/sound.cxx
2016-08-02 12:14:15 +01:00
hexameron 9cbaf774c9 Merge 3.23.12 2016-07-02 22:40:08 +00:00
David Freese 01245fe7b5 Native Select Save-As dialogs
Bug fix to correct differences in returned character pointer
  and character pointer value from native file select and
  file save-as dialogs.
2016-05-29 15:06:10 -05:00
Edouard Lafargue W6ELA 505c8b384b Portaudio Mono
* Observed on OS X, fldigi cannot work on audio cards with mono output
    - it requests 2 channels from PortAudio no matter what and portaudio
      will complain if the audio output is only mono.
    - modified SoundPort::init_stream to make sure that if max_channels < 2
      sd[1].params.channelCount is updated to max_channels
2016-04-19 14:28:31 -05:00
David Freese 0caa5ea1e1 PA debug 2015-09-20 13:34:21 -05:00
James Coxon 2f0c606d28 fix for weird merge problem, looks like large section was moved and so wasn't detected by git, variable declared twice. 2015-08-23 17:53:11 +01:00
James Coxon 3ee3a4bd47 Merge remote-tracking branch 'hex/master'
Conflicts:
	src/dialogs/confdialog.h
	src/xmlrpcpp/XmlRpcThread.cpp
	src/xmlrpcpp/XmlRpcThread.h
	src/xmlrpcpp/XmlRpcThreadedServer.cpp
	src/xmlrpcpp/XmlRpcThreadedServer.h
2015-08-23 16:42:05 +01:00
John Greb c855e7075b Dummy transmit needs a delay. 2015-07-13 18:19:39 +01:00
hexameron ae53109a87 Network soundcard. 2015-05-25 15:11:09 +00:00
John Greb 2fe29550ab Merge git://git.code.sf.net/p/fldigi/fldigi
Conflicts:
	configure.ac
	doc/Makefile.am
	doc/dl-fldigi-shell.1.txt
	m4/build.m4
	po/LINGUAS
	po/de.po
	po/es.po
	po/fldigi.pot
	po/fr.po
	po/it.po
	po/pl.po
	src/Makefile.am
	src/blank/blank.cxx
	src/combo/combo.cxx
	src/contestia/contestia.cxx
	src/cw_rtty/cw.cxx
	src/cw_rtty/rtty.cxx
	src/cw_rtty/view_rtty.cxx
	src/dialogs/Viewer.cxx
	src/dialogs/confdialog.cxx
	src/dialogs/confdialog.fl
	src/dialogs/fl_digi.cxx
	src/dialogs/guide.cxx
	src/dialogs/htmlstrings.cxx
	src/dialogs/notifydialog.fl
	src/dominoex/dominoex.cxx
	src/fileselector/FL/Native_File_Chooser.H
	src/fileselector/FL/Native_File_Chooser_FLTK.H
	src/fileselector/FL/Native_File_Chooser_MAC.H
	src/fileselector/FL/Native_File_Chooser_WIN32.H
	src/fileselector/Native_File_Chooser.cxx
	src/fileselector/Native_File_Chooser_FLTK.cxx
	src/fileselector/Native_File_Chooser_MAC.cxx
	src/fileselector/Native_File_Chooser_WIN32.cxx
	src/fileselector/fileselect.cxx
	src/filters/fftfilt.cxx
	src/filters/filters.cxx
	src/flarq-src/flarq.cxx
	src/globals/globals.cxx
	src/include/Fl_Text_Buffer_mod.H
	src/include/Fl_Text_Display_mod.H
	src/include/Fl_Text_Editor_mod.H
	src/include/analysis.h
	src/include/charsetdistiller.h
	src/include/charsetlist.h
	src/include/combo.h
	src/include/compat.h
	src/include/confdialog.h
	src/include/configuration.h
	src/include/cw.h
	src/include/digiscope.h
	src/include/dtmf.h
	src/include/fftfilt.h
	src/include/field_def.h
	src/include/fileselect.h
	src/include/filters.h
	src/include/fl_digi.h
	src/include/fldigi-config.h
	src/include/flslider2.h
	src/include/globals.h
	src/include/interleave.h
	src/include/macros.h
	src/include/main.h
	src/include/mfsk.h
	src/include/mixer.h
	src/include/modem.h
	src/include/navtex.h
	src/include/outputencoder.h
	src/include/psk.h
	src/include/qso_db.h
	src/include/record_loader_gui.h
	src/include/rigio.h
	src/include/rsid.h
	src/include/rtty.h
	src/include/socket.h
	src/include/soundconf.h
	src/include/status.h
	src/include/strutil.h
	src/include/threads.h
	src/include/trx.h
	src/include/view_rtty.h
	src/libtiniconv/tiniconv.c
	src/libtiniconv/tiniconv.h
	src/libtiniconv/tiniconv_desc.c
	src/libtiniconv/tiniconv_int.h
	src/logbook/adif_io.cxx
	src/logbook/lgbook.cxx
	src/logbook/lgbook.fl
	src/logbook/logsupport.cxx
	src/logbook/lookupcall.cxx
	src/logbook/qso_db.cxx
	src/logbook/xmlrpc_log.cxx
	src/logger/rx_extract.cxx
	src/main.cxx
	src/mfsk/mfsk-pic.cxx
	src/mfsk/mfsk.cxx
	src/misc/arq_io.cxx
	src/misc/ascii.cxx
	src/misc/charsetlist.cxx
	src/misc/configuration.cxx
	src/misc/coordinate.cxx
	src/misc/debug.cxx
	src/misc/dxcc.cxx
	src/misc/macroedit.cxx
	src/misc/macros.cxx
	src/misc/misc.cxx
	src/misc/newinstall.cxx
	src/misc/nls.cxx
	src/misc/pixmaps.cxx
	src/misc/pixmaps_tango.cxx
	src/misc/record_loader.cxx
	src/misc/socket.cxx
	src/misc/status.cxx
	src/misc/util.cxx
	src/misc/weather.cxx
	src/misc/xmlrpc.cxx
	src/mt63/mt63.cxx
	src/navtex/navtex.cxx
	src/olivia/olivia.cxx
	src/psk/psk.cxx
	src/qrunner/qrunner.cxx
	src/rigcontrol/FreqControl.cxx
	src/rigcontrol/rigio.cxx
	src/rigcontrol/rigsupport.cxx
	src/rigcontrol/rigxml.cxx
	src/rsid/rsid.cxx
	src/rsid/rsid_defs.cxx
	src/soundcard/mixer.cxx
	src/soundcard/sound.cxx
	src/spot/notify.cxx
	src/spot/pskrep.cxx
	src/thor/thor.cxx
	src/throb/throb.cxx
	src/trx/modem.cxx
	src/trx/nullmodem.cxx
	src/trx/trx.cxx
	src/waterfall/digiscope.cxx
	src/waterfall/waterfall.cxx
	src/wefax/wefax-pic.cxx
	src/widgets/FTextRXTX.cxx
	src/widgets/Fl_Text_Buffer_mod.cxx
	src/widgets/Fl_Text_Display_mod.cxx
	src/widgets/Fl_Text_Editor_mod.cxx
	src/widgets/Fl_Tile_Check.cxx
	src/widgets/Panel.cxx
	src/widgets/progress.cxx
	src/widgets/psk_browser.cxx
	src/wwv/analysis.cxx
	src/wwv/wwv.cxx
	src/xmlrpcpp/XmlRpc.h
	src/xmlrpcpp/XmlRpcDispatch.cpp
2015-05-13 23:26:35 +01:00
David Freese ae560e7b3a Vista SignaLink driver
* Vista driver disallows 2 channel input.  Causes sound
    card open failure on read.
2015-03-31 20:07:41 -05:00
David Freese 2424904eea R-L channel input
* read from either left (default) or right channel
2015-03-20 19:50:32 -05:00
David Freese f2198122e5 Sound File Generate
* Added samplerate conversion to Generate initialization
  * Added limiter to maximum sample file amplitude
2015-03-20 19:50:32 -05:00
David Freese 35ef2ed3fe devices_text mutex
* added mutex for devices_text
2015-02-18 08:44:47 -06:00
Robert Stiles aedc628d92 Bug fixes/Comments
* Script Generate should save PA device index vice menu index.
  * PSK: Possible segment fault. Tighter control on string lengths
  * Util.cxx add comment block to each functions and remove
    trim_white_spaces() function.
2015-02-18 08:43:56 -06:00
Robert Stiles cbc9975bd5 Check IO and delay prior to autoexec prgs 2015-02-18 08:43:56 -06:00
Robert Stiles 003707f81a Rename local variables 2015-02-18 08:43:56 -06:00
David Freese edee64aa42 pa names
* correct search method for matching sound card device
    name with device number
  * add LOG_INFO data stream for selected device
2015-02-17 15:41:50 -06:00
David Freese 3eb8e41d8f Code merge/PortAudio Script return error
* Correct return value on port audio script command
2015-02-10 18:48:34 -06:00
Robert Stiles 814bed31f8 Configure Script Engine
* Add menu item "Scripts" and callback function.
    * Add scripting engine.
    * Update script engine for localization strings/messages.
    * Add hierarchy syntax
    * New file run_script.h
    * Hierarchy integration completed
    * Add command set
    * Add 'int find_index(char *)' to combo.cxx
    * Add menu item 'Generate Script' and code for generating a default
      config script file.
    * Add void loadRigXmlFile(void) to rigxml.cxx to support scripting calls.
      - Trim leading/trailing white spaces from portaudio device names.
    * Remove duplicate calling functions/method members.
    * Move command parameter specific verification to run_script.cxx
      basic testing remains in script_parsing.cxx
    * First Document Draft - Script commands
      - Add Misc NBEMS config commands
      - Add Notice - Program restart required.
      - Update Documentation with new commands
    * Removed Unused Variables (multiple locations)
    * Change behavior of floating point output for script generate.
    * Remove function qsy() use restriction on rig control availability.
    * Add strnlen, strncmp and strncpy checks to configure.ac
    * Add trim_white_spaces, strnlen, strncmp and strncpy routines to util.cxx
    * Add pa_set_dev() to soundconf.cxx for updating pa device names.
    * Add code to save macro(s) with content only.
    * Add config_script files to POTFILES.in for localization processing.
    * Flag command types.
    * Limit generate script output based on configure content.
    * Change script error dialog box to warning.
    * Change default rig.xml to rig-unassigned.xml. For testing purposes.
      (script generation)
    * Update Documents with Notes about script generation and executing.
    * Correct \ref and \section name duplicates in doxygen doc source
    * Add script commands for ID->RSID/Video/CW panel.
    * Move Script/Execute/Generate Menu Items to File Menu.
      - Move repetitive code into general functions.
    * Rename "Scripts" menu item to "Config Scripts"
    * Fix error introduced in last mods. Port Audio Gen Config
2015-02-10 18:48:34 -06:00
David Freese 54917d2f9a WIN32 error reports
* looking for COM/SC gremlin
2014-11-18 13:52:25 -06:00
David Freese a798037fc9 Remove Mixer controls 2014-10-14 20:19:37 -05:00
David Freese 13e1cd5663 Audio selectors for PORTAUDIO
* correct ListBox offset in configuration panel
2014-08-29 04:03:53 -05:00
David Freese df3c010aa8 Change Fl_ListBox
* Change to Fl_ComboBox for various controls
    which may require user entry.
2014-08-29 03:24:04 -05:00
David Freese eaafc9173c Restore Fl_Choice
* Sound card device selection
2014-08-29 03:23:35 -05:00
David Freese 6762423be6 Choice-->ListBox
* Changed all instances of Fl_Choice and Fl_Input_Choice
    to Fl_ListBox.
    - old Fl_Choice objects renamed to listbox_xxx
    - old Fl_Input_Choice objects renamed to i_listbox_xxx
    - Note that i_listbox_xxx objects need indexing offset
      to maintain compatability with progdefaults definitions.
    - New objects should use listbox_xxx naming convention.
    - This removes a rather ugly Fltk widget.  Fltk does not
      have a native ComboBox or ListBox widget.
2014-08-29 03:04:45 -05:00
David Freese bd42895f94 Sound.cxx cleanup
* Corrected tab indents to 4 vice 8
2014-08-29 02:50:11 -05:00
David Freese 2add98886d Portaudio ring buffer
* Increased size of portaudio ring buffer.
    Problem reported by Simon Gander, "I recently found
    out that the THROB1 and THROBX1 modes don't work
    correctly under certain circumstances. The pulses are 
    too short and get cut off at the end, which in turn also 
    causes the baudrate to be too high. I found out that I 
    could fix the problem by increasing the size of the ring
    buffer in the SoundPort class.
2014-08-29 02:50:04 -05:00
David Freese c9f6df04ac Portaudio error reporting
* added code to provide addition details for
    portaudio failures
2014-08-29 02:49:44 -05:00
David Freese 819a3ee530 Change Fl_ListBox
* Change to Fl_ComboBox for various controls
    which may require user entry.
2014-03-17 11:14:48 -05:00
David Freese 6baa7d10b5 Restore Fl_Choice
* Sound card device selection
2014-03-17 11:14:48 -05:00
David Freese ea4042ec80 Choice-->ListBox
* Changed all instances of Fl_Choice and Fl_Input_Choice
    to Fl_ListBox.
    - old Fl_Choice objects renamed to listbox_xxx
    - old Fl_Input_Choice objects renamed to i_listbox_xxx
    - Note that i_listbox_xxx objects need indexing offset
      to maintain compatability with progdefaults definitions.
    - New objects should use listbox_xxx naming convention.
    - This removes a rather ugly Fltk widget.  Fltk does not
      have a native ComboBox or ListBox widget.
2014-02-19 19:46:35 -06:00
David Freese 89bb26d9d1 Sound.cxx cleanup
* Corrected tab indents to 4 vice 8
2014-02-11 06:52:17 -06:00
David Freese 4d30c67fd6 Portaudio ring buffer
* Increased size of portaudio ring buffer.
    Problem reported by Simon Gander, "I recently found
    out that the THROB1 and THROBX1 modes don't work
    correctly under certain circumstances. The pulses are 
    too short and get cut off at the end, which in turn also 
    causes the baudrate to be too high. I found out that I 
    could fix the problem by increasing the size of the ring
    buffer in the SoundPort class.
2014-02-11 06:26:26 -06:00
David Freese 4e553454cb Portaudio error reporting
* added code to provide addition details for
    portaudio failures
2014-02-10 16:17:42 -06:00
David Freese 678f66b460 modem timing test
* read timing factors for string transmission by external
    program using new xmlrpc query
    - main.get_tx_timing
      respone - #samples: samplerate: transmit_time (secs)
  * read char rate table using external xmlrpc query
    - main.get_char_rates
      table structure
      char, ascii-rep', #samples, samplerate, transmit_time (secs)
  * added hidden macro <CPS_TEST> which simulates transmission
    of test string and measures the character per second rate
    for the modem in use.
    - <CPS_TEST> uses internal "Jabberwocky" string
    - <CPS_FILE:[full pathname to file]> uses external text file
    - <CPS_STRING:ascii text string...>
    - produces report similar to:
      CPS test
      text:         /home/dave/dev.git/all.git/pskr-tests/paris.txt
      mode:         PSK-500R
      # chars:      2400
      xmt time:     56.580000
      data time:    52.480000
      data samples: 419840
      sample rate:  8000
      chars/sec:    45.731707
      ~WPM:         457.317073
  * Allow writing wav file during timing test
  * High Speed WAV
    - Add macros to enable writing WAV file in at maximum
      character throughput.
    - disables codec output
    - use this for creating wav test files
  * Suppress waterfall display for CPS and WAV tests
  * Remove PSK printf debug statements
  * Fix MFSK xmt 0x05 --> 0x04 during CPS testing
2014-01-31 12:55:33 -06:00
David Freese 3b9ace3d25 modem timing test
* read timing factors for string transmission by external
    program using new xmlrpc query
    - main.get_tx_timing
      respone - #samples: samplerate: transmit_time (secs)
  * read char rate table using external xmlrpc query
    - main.get_char_rates
      table structure
      char, ascii-rep', #samples, samplerate, transmit_time (secs)
  * added hidden macro <CPS_TEST> which simulates transmission
    of test string and measures the character per second rate
    for the modem in use.
    - <CPS_TEST> uses internal "Jabberwocky" string
    - <CPS_FILE:[full pathname to file]> uses external text file
    - <CPS_STRING:ascii text string...>
    - produces report similar to:
      CPS test
      text:         /home/dave/dev.git/all.git/pskr-tests/paris.txt
      mode:         PSK-500R
      # chars:      2400
      xmt time:     56.580000
      data time:    52.480000
      data samples: 419840
      sample rate:  8000
      chars/sec:    45.731707
      ~WPM:         457.317073
  * Allow writing wav file during timing test
  * High Speed WAV
    - Add macros to enable writing WAV file in at maximum
      character throughput.
    - disables codec output
    - use this for creating wav test files
  * Suppress waterfall display for CPS and WAV tests
  * Remove PSK printf debug statements
  * Fix MFSK xmt 0x05 --> 0x04 during CPS testing
2014-01-13 14:22:25 -06:00
David Freese 108ffd4532 Sound File
* Changed recording to selectable
    - 22050, 24000, 44100, 48000 samples / sec
  * Change to allow playback at any sample rate
  * Record and playback are monophonic
    - left channel active
2013-09-22 06:45:07 -05:00
David Freese 433ec86044 Sound File
* Changed recording to selectable
    - 22050, 24000, 44100, 48000 samples / sec
  * Change to allow playback at any sample rate
  * Record and playback are monophonic
    - left channel active
2013-08-21 09:46:33 -05:00
David Freese 1ff3a7f7a5 Thor update
* Changes to insure that array boundaries are not exceeded
  * Moved large array from stack to static store.
  * Added cmd line parameter --debug-audio to enable audio
    debug events.  default is off.
2013-08-02 18:34:00 -05:00
David Freese 5a9287760c PortAudio
* Added throw exception statement and loop test to PortAudio
    Read and Write while blocks
  * Potentially cause of reported faults and unresponsive behavior
    by both Linux and Windows users.
2013-08-02 18:33:59 -05:00
David Freese e624bc0bec Thor update
* Changes to insure that array boundaries are not exceeded
  * Moved large array from stack to static store.
  * Added cmd line parameter --debug-audio to enable audio
    debug events.  default is off.
2013-07-16 10:54:01 -05:00
David Freese 237cc8f143 PortAudio
* Added throw exception statement and loop test to PortAudio
    Read and Write while blocks
  * Potentially cause of reported faults and unresponsive behavior
    by both Linux and Windows users.
2013-05-24 07:35:04 -05:00
David Freese 75a8e09004 High Speed Playback
* high speed playback of wav file
  * on/off/toggle control is provided with an
    undocumented macro tag
    - <HS:on|off|t(oggle)>
  * Start wav playback at normal speed and allow
    decoding to begin.  Then change to high speed mode.
    Waterfall & scope are disabled during high speed
    playback.  Rx text display remains active.
  * Added ability to playback sound file as single pass
    or continuous loop.  If in single pass then high speed
    if toggled off at end of file.
2013-05-19 17:55:26 -05:00
David Freese c5862194a8 High Speed Playback
* high speed playback of wav file
  * on/off/toggle control is provided with an
    undocumented macro tag
    - <HS:on|off|t(oggle)>
  * Start wav playback at normal speed and allow
    decoding to begin.  Then change to high speed mode.
    Waterfall & scope are disabled during high speed
    playback.  Rx text display remains active.
  * Added ability to playback sound file as single pass
    or continuous loop.  If in single pass then high speed
    if toggled off at end of file.
2013-02-27 15:56:11 -06:00
Kamal Mostafa e203c4e520 Fix crash if no OSS mixer support
Protect MixerOSS:: routines from trying to access uninitialized tables, as
happens when no OSS mixer support is present.  Specifically, if openMixer()
or initMask() error out for whatever reason, then InputSourceNbr() and other
routines will crash becasue num_rec and num_out never get set to zero.

BugLink: https://bugs.launchpad.net/ubuntu/+source/fldigi/+bug/1058298
2012-10-02 16:13:21 -05:00
Kamal Mostafa 199978a4f6 Fix crash if no OSS mixer support
Protect MixerOSS:: routines from trying to access uninitialized tables, as
happens when no OSS mixer support is present.  Specifically, if openMixer()
or initMask() error out for whatever reason, then InputSourceNbr() and other
routines will crash becasue num_rec and num_out never get set to zero.

BugLink: https://bugs.launchpad.net/ubuntu/+source/fldigi/+bug/1058298
2012-10-02 16:01:16 -05:00
David J Vanecek 9025bea6e7 Open BSD fixes
* Changes to allow correct build on Open BSD
2012-08-02 14:45:30 -05:00
David J Vanecek eeaa755bd2 Open BSD fixes
* Changes to allow correct build on Open BSD
2012-08-02 10:37:17 -05:00