mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-09-16 10:16:33 -04:00
b6559fae7c
Audio input can be mono, left of stereo pair or, right of stereo pair. Audio output can be mono, left of stereo pair, right of stereo pair or, both of stereo pair (the same output goes to both channels in both mode). Settings are remembered between sessions. Stream channel suport is implemented mainly in the new AudioDevice class which is now the base class of Modulator and Detector. Audio channels are selected on the configuration screen. Only supported channel configurations per device can be selected. Audio output volume (actually attenuation) is now possible from the GUI. I have added a slider control to the main window; I don't necessarily propose this as a final release location for the widget as I understand that changes to the main screen are sensitive. This location is just a starting suggestion for a trial. The volume (attenuation) setting is remembered between sessions and is not device dependent. This addresses all issues of volume setting on *nix versions since there is no need to use pavucontrol to set audio levels. The volume (attenuation) action is logarithmic. Shaped CW keying has been implemented in Modulator although it is currently disabled as I am not 100% happy wth the implementation. If you want to try it define the C++ preprocessor macro WSJT_SOFT_KEYING in your build. The Modulator instance has been moved to the same thread as the SoundOutput instance as it should have been since the output callback already operates in that thread. Cross thread slots are now correctly called in a thread safe way as a result. A number of files where in the SVN repository with DOS line endings which I have removed. SVN users on Windows need set the config for native line endings so that DOS line endings are automatically stripped on checkin. The DevSetup class now holds it's UI o the heap to reduce imapact on build dependencies. The application settings are now passed to objects from the main.cpp file. Management of settings are moved to the responsible classes (top level windows). This has involved a few settings moving groups so users will see some settings reverting to default values on the first run of an update. Persistance of top level windows geometry and position is now handled in the recommened manner (constructor for load, closeEvent for store in modal windows and, hideEvent for store in modeless dialogs). The MainWindow class now holds its children as members rather than global variables. The LogQSO class now hides its implementation and takes responsibility for its own settings and widows rendering parameters. A new settings file group is implemented to persist the LogQSO class settings. The WideGraph class now hides its implementation and manages its own settings and window rendering parameters. --This line, and those below, will be ignored-- M Modulator.cpp M rigclass.cpp M widegraph.cpp M signalmeter.cpp M soundin.cpp M soundout.cpp M mainwindow.h M main.cpp M meterwidget.h M devsetup.cpp M mainwindow.ui M Detector.cpp M logqso.h M rigclass.h M mainwindow.cpp M meterwidget.cpp M soundin.h M devsetup.ui M wsjtx.pro M devsetup.h M logqso.cpp M Modulator.hpp M psk_reporter.cpp M killbyname.cpp M Detector.hpp M signalmeter.h M widegraph.h M psk_reporter.h M soundout.h M PSKReporter.h M lib/afc65b.f90 M lib/gran.c M lib/usleep.c M lib/afc9.f90 M lib/wrapkarn.c A AudioDevice.hpp git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
90 lines
2.3 KiB
C++
90 lines
2.3 KiB
C++
#ifndef MODULATOR_HPP__
|
|
#define MODULATOR_HPP__
|
|
|
|
#include "AudioDevice.hpp"
|
|
|
|
#ifdef UNIX
|
|
# define NUM_CHANNELS 2
|
|
#else
|
|
# define NUM_CHANNELS 1
|
|
#endif
|
|
|
|
//
|
|
// Input device that generates PCM audio frames that encode a message
|
|
// and an optional CW ID.
|
|
//
|
|
// Output can be muted while underway, preserving waveform timing when
|
|
// transmission is resumed.
|
|
//
|
|
class Modulator : public AudioDevice
|
|
{
|
|
Q_OBJECT;
|
|
|
|
Q_PROPERTY (unsigned frequency READ frequency WRITE setFrequency);
|
|
Q_PROPERTY (bool tuning READ isTuning WRITE tune);
|
|
Q_PROPERTY (bool muted READ isMuted WRITE mute);
|
|
|
|
public:
|
|
enum ModulatorState {Synchronizing, Active, Idle};
|
|
|
|
Modulator (unsigned frameRate, unsigned periodLengthInSeconds, QObject * parent = 0);
|
|
|
|
Q_SLOT void open (unsigned symbolsLength, double framesPerSymbol, unsigned frequency, AudioDevice::Channel, bool synchronize = true, double dBSNR = 99.);
|
|
|
|
bool isTuning () const {return m_tuning;}
|
|
bool isMuted () const {return m_muted;}
|
|
unsigned frequency () const {return m_frequency;}
|
|
bool isActive () const {return m_state != Idle;}
|
|
|
|
protected:
|
|
qint64 readData (char * data, qint64 maxSize);
|
|
qint64 writeData (char const * /* data */, qint64 /* maxSize */)
|
|
{
|
|
return -1; // we don't consume data
|
|
}
|
|
|
|
private:
|
|
/* private because we epect to run in a thread and don't want direct
|
|
C++ calls made, instead they must be invoked via the Qt
|
|
signal/slot mechanism which is thread safe */
|
|
Q_SLOT void close ()
|
|
{
|
|
Q_EMIT stateChanged ((m_state = Idle));
|
|
AudioDevice::close ();
|
|
}
|
|
|
|
Q_SLOT void tune (bool newState = true) {m_tuning = newState;}
|
|
Q_SLOT void mute (bool newState = true) {m_muted = newState;}
|
|
Q_SLOT void setFrequency (unsigned newFrequency) {m_frequency = newFrequency;}
|
|
Q_SIGNAL void stateChanged (ModulatorState);
|
|
|
|
private:
|
|
qint16 postProcessSample (qint16 sample) const;
|
|
|
|
unsigned m_symbolsLength;
|
|
|
|
static double const m_twoPi;
|
|
static unsigned const m_nspd; // CW ID WPM factor
|
|
|
|
int m_frameRate;
|
|
int m_period;
|
|
double m_nsps;
|
|
double volatile m_frequency;
|
|
double m_snr;
|
|
qint64 m_silentFrames;
|
|
qint64 m_framesSent;
|
|
ModulatorState volatile m_state;
|
|
bool volatile m_tuning;
|
|
bool volatile m_muted;
|
|
bool m_addNoise;
|
|
double m_phi;
|
|
double m_dphi;
|
|
double m_amp;
|
|
unsigned m_ic;
|
|
double m_fac;
|
|
unsigned m_isym0;
|
|
qint16 m_ramp;
|
|
};
|
|
|
|
#endif
|