mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-29 04:42:28 -04:00
Separate out the final call to timer(), using new "all_done()" function.
This commit is contained in:
parent
ff39abab58
commit
ae1cf334e2
@ -33,12 +33,6 @@ subroutine q65c(itimer)
|
|||||||
nparams=nparams0 !Copy parameters into common/npar/
|
nparams=nparams0 !Copy parameters into common/npar/
|
||||||
datetime(12:)='00 '
|
datetime(12:)='00 '
|
||||||
|
|
||||||
if(itimer.ne.0) then
|
|
||||||
call timer('decode0 ',101)
|
|
||||||
call fini_timer
|
|
||||||
return
|
|
||||||
endif
|
|
||||||
|
|
||||||
npatience=1
|
npatience=1
|
||||||
newdat=1 !Always on ??
|
newdat=1 !Always on ??
|
||||||
|
|
||||||
@ -78,3 +72,15 @@ subroutine q65c(itimer)
|
|||||||
|
|
||||||
return
|
return
|
||||||
end subroutine q65c
|
end subroutine q65c
|
||||||
|
|
||||||
|
subroutine all_done
|
||||||
|
|
||||||
|
use timer_module, only: timer
|
||||||
|
use timer_impl, only: fini_timer
|
||||||
|
|
||||||
|
call timer('decode0 ',101)
|
||||||
|
call fini_timer
|
||||||
|
print*,'All Done'
|
||||||
|
|
||||||
|
return
|
||||||
|
end subroutine all_done
|
||||||
|
@ -186,8 +186,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
{
|
{
|
||||||
writeSettings();
|
writeSettings();
|
||||||
int one=1;
|
all_done_();
|
||||||
q65c_(&one);
|
|
||||||
|
|
||||||
if (soundInThread.isRunning()) {
|
if (soundInThread.isRunning()) {
|
||||||
soundInThread.quit();
|
soundInThread.quit();
|
||||||
|
@ -200,6 +200,10 @@ extern "C" {
|
|||||||
const char* mygrid, int* ndop00, int len1);
|
const char* mygrid, int* ndop00, int len1);
|
||||||
|
|
||||||
void q65c_(int* itimer);
|
void q65c_(int* itimer);
|
||||||
|
// void q65c_(const char* fname, const char* revision, int* itimer,
|
||||||
|
// int len1, int len2);
|
||||||
|
|
||||||
|
void all_done_();
|
||||||
|
|
||||||
void zaptx_(float d4[], int* k0, int* k);
|
void zaptx_(float d4[], int* k0, int* k);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user