mirror of
https://github.com/cookiengineer/audacity
synced 2025-12-02 14:50:17 +01:00
Update nyquist to SVN r331 (r3.16+)
------------------------------------------------------------------------ r331 | rbd | 2020-10-13 12:40:12 -0500 (Tue, 13 Oct 2020) | 2 lines Also forgot to install NyquistWords.txt ------------------------------------------------------------------------ r330 | rbd | 2020-10-13 12:34:06 -0500 (Tue, 13 Oct 2020) | 2 lines Forgot to move nyquistman.pdf from docsrc/s2h to release ------------------------------------------------------------------------ r329 | rbd | 2020-10-13 11:32:33 -0500 (Tue, 13 Oct 2020) | 2 lines Updated some version numbers for 3.16. ------------------------------------------------------------------------ r328 | rbd | 2020-10-13 11:20:52 -0500 (Tue, 13 Oct 2020) | 2 lines Fixed NyquistIDE antialiasing for plot text, fix format of message. ------------------------------------------------------------------------ r327 | rbd | 2020-10-12 21:01:53 -0500 (Mon, 12 Oct 2020) | 2 lines Fixed a couple of format problems in manual. This version of Nyquist has been tested wtih macOS, Linux, 32&64-bit Windows. ------------------------------------------------------------------------ r326 | rbd | 2020-10-12 20:21:38 -0500 (Mon, 12 Oct 2020) | 1 line Modified WIN32 32-bit XLisp to use 64-bit FIXNUMs. This allows XLisp and Nyquist to handle big sounds even on 32-bit machines. Probably at some cost, but inner loops are mostly float and int32, and the Nyquist release is 64-bit anyway. Maybe we'll have to run some benchmarks on Audacity, which is still 32-bit on Windows. ------------------------------------------------------------------------ r325 | rbd | 2020-10-12 13:16:57 -0500 (Mon, 12 Oct 2020) | 1 line Win64 passes bigfiletest.lsp now. This version should work on all 64-bit systems now. These changes untested on Linux and macOS. ------------------------------------------------------------------------ r324 | rbd | 2020-10-11 21:31:53 -0500 (Sun, 11 Oct 2020) | 2 lines I couldn't free enough space on my linux box, so I adjusted the bigfiletest to write 8-bit ulaw. It's still >4GB and >4G samples. Works on Linux. ------------------------------------------------------------------------ r323 | rbd | 2020-10-11 19:41:25 -0500 (Sun, 11 Oct 2020) | 2 lines Missing file from last commit. ------------------------------------------------------------------------ r322 | rbd | 2020-10-11 19:36:08 -0500 (Sun, 11 Oct 2020) | 1 line Found another case where WIN64 needs int64_t instead of long for sample count. ------------------------------------------------------------------------ r321 | rbd | 2020-10-11 19:33:25 -0500 (Sun, 11 Oct 2020) | 3 lines Fixed s-save to handle optional and keyword parameters (which should never have been mixed in the first place). Documentation cleanup - should be final for this version. ------------------------------------------------------------------------ r320 | rbd | 2020-10-11 14:44:37 -0500 (Sun, 11 Oct 2020) | 2 lines Fixes to handle IRCAM sound format and tests for big file io working on macOS. ------------------------------------------------------------------------ r319 | rbd | 2020-10-10 21:31:58 -0500 (Sat, 10 Oct 2020) | 2 lines Changes for linux and to avoid compiler warnings on linux. ------------------------------------------------------------------------ r318 | rbd | 2020-10-10 20:50:23 -0500 (Sat, 10 Oct 2020) | 1 line This is the test used for Win64 version. ------------------------------------------------------------------------ r317 | rbd | 2020-10-10 20:34:34 -0500 (Sat, 10 Oct 2020) | 1 line This version works on Win64. Need to test changes on macOS and linux. ------------------------------------------------------------------------ r316 | rbd | 2020-10-10 19:59:15 -0500 (Sat, 10 Oct 2020) | 2 lines PWL changes to avoid compiler warning. ------------------------------------------------------------------------ r315 | rbd | 2020-10-10 19:34:04 -0500 (Sat, 10 Oct 2020) | 2 lines A few more changes for 64-bit sample counts on Win64 ------------------------------------------------------------------------ r314 | rbd | 2020-10-10 13:19:42 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed int64_t declaration in gate.alg ------------------------------------------------------------------------ r313 | rbd | 2020-10-10 12:07:40 -0500 (Sat, 10 Oct 2020) | 2 lines Fixes to gate for long sounds ------------------------------------------------------------------------ r312 | rbd | 2020-10-10 11:47:29 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed sound_save types for intgen ------------------------------------------------------------------------ r311 | rbd | 2020-10-10 11:09:01 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed a 64-bit sample count problem in siosc.alg ------------------------------------------------------------------------ r310 | rbd | 2020-10-10 11:03:12 -0500 (Sat, 10 Oct 2020) | 2 lines Fixed sndmax to handle 64-bit sample counts. ------------------------------------------------------------------------ r309 | rbd | 2020-10-10 10:57:04 -0500 (Sat, 10 Oct 2020) | 2 lines Forgot to re-translate all tran/*.alg files with fix for int64 cast to int32. This version compiles on macOS and ready for test on Win64. ------------------------------------------------------------------------ r308 | rbd | 2020-10-10 10:16:05 -0500 (Sat, 10 Oct 2020) | 2 lines Everything seems to compile and run on macOS now. Moving changes to Windows for test. ------------------------------------------------------------------------ r307 | rbd | 2020-10-10 09:23:45 -0500 (Sat, 10 Oct 2020) | 1 line Added casts to avoid compiler warnings and to review changes to support 64-bit sample counts on Windows. Still not complete, and waiting to regenerate and compile tran directory code after updates to translation code that will insert more casts. ------------------------------------------------------------------------ r306 | rbd | 2020-10-09 21:55:15 -0500 (Fri, 09 Oct 2020) | 2 lines Rebuilt seqfnint.c from header files. ------------------------------------------------------------------------ r305 | rbd | 2020-10-09 21:53:33 -0500 (Fri, 09 Oct 2020) | 1 line Changed some FIXNUMS to LONG to avoid compiler warnings in seqfnint.c ------------------------------------------------------------------------ r304 | rbd | 2020-10-09 21:44:03 -0500 (Fri, 09 Oct 2020) | 2 lines I discovered forgotten regression-test.lsp and added test that requires 64-bit sample counts to pass. Fixed a few bugs revealed by running the type-checking regression tests. ------------------------------------------------------------------------ r303 | rbd | 2020-10-09 12:28:58 -0500 (Fri, 09 Oct 2020) | 2 lines Changes for 64-bit sample counts broke mult-channel s-save. Fixed in the commit for macOS. ------------------------------------------------------------------------ r302 | rbd | 2020-10-09 10:03:39 -0500 (Fri, 09 Oct 2020) | 2 lines Changed snd-play to return samples computed and used that to make a test for computing long sounds that would overflow 32-bit length counts. ------------------------------------------------------------------------ r301 | rbd | 2020-10-09 09:11:26 -0500 (Fri, 09 Oct 2020) | 2 lines corrected mistake in delaycv.alg and re-translated ------------------------------------------------------------------------ r300 | rbd | 2020-10-09 09:09:06 -0500 (Fri, 09 Oct 2020) | 2 lines Fix to delaycv.alg -- "s" changed to "input" to avoid matching "s" in "sample_type". ------------------------------------------------------------------------ r299 | rbd | 2020-10-09 09:03:33 -0500 (Fri, 09 Oct 2020) | 4 lines To avoid compiler warnings, XLisp interfaces to C int and long are now specified as LONG rather than FIXNUM, and the stubs that call the C functions cast FIXNUMs from XLisp into longs before calling C functions. ------------------------------------------------------------------------ r298 | rbd | 2020-10-08 22:20:26 -0500 (Thu, 08 Oct 2020) | 2 lines This commit has many more fixes to handle long (64-bit) sounds, including a lot of fixes for warnings by Visual Studio assigning int64_t to long (works on macOS, doesn't work on VS). This was compiled and tested on macOS, and even computed a 27.1-hour sound using OSC, LP, SUM and MULT (haven't tested I/O yet). ------------------------------------------------------------------------ r297 | rbd | 2020-10-07 13:04:02 -0500 (Wed, 07 Oct 2020) | 2 lines This is a major cleanup. It started with the goal of changing long to int64_t for sample counts so that on 64-bit windows, where long is only 32-bits, the sample counts would nevertheless be 64-bit allowing long sounds, which was a limitation for long recordings in Audacity. Since I was using compiler warnings to track possible loss-of-precision conversions from 64-bit sample counts, and there were *many* warnings, I started cleaning up *all* the warnings and ended up with a very large set of changes, including "modernizing" C declarations that date back to XLisp and CMU MIDI Toolkit code and were never changed. This version runs all the examples.sal code on macOS, but will surely have problems on Windows and Linux given the number of changes. ------------------------------------------------------------------------ r296 | rbd | 2020-10-06 13:34:20 -0500 (Tue, 06 Oct 2020) | 2 lines More changes from long to int64_t for sample counts. ------------------------------------------------------------------------ r295 | rbd | 2020-10-06 11:53:49 -0500 (Tue, 06 Oct 2020) | 2 lines More work on using 64-bit sample counts. Changed MAX_STOP from 32-bit to 64-bit limit. ------------------------------------------------------------------------ r294 | rbd | 2020-10-06 11:48:05 -0500 (Tue, 06 Oct 2020) | 2 lines Made some changes so that sample counts are int64_t (for windows) instead of long to support sample counts above 31 bits. ------------------------------------------------------------------------ r293 | rbd | 2020-10-04 21:30:55 -0500 (Sun, 04 Oct 2020) | 2 lines Fixed a few minor things for Linux and tested on Linux. ------------------------------------------------------------------------ r292 | rbd | 2020-10-04 21:00:28 -0500 (Sun, 04 Oct 2020) | 2 lines Update extensions: all are minor changes. ------------------------------------------------------------------------ r291 | rbd | 2020-09-24 13:59:31 -0500 (Thu, 24 Sep 2020) | 2 lines New implementation of seq and seqrep, added get-real-time, documented get-real-time, fixed examples.sal and examples.lsp which are now in lib rather than extensions (so they are now back in the basic installation), other cleanup. ------------------------------------------------------------------------ r290 | rbd | 2020-08-16 16:24:52 -0500 (Sun, 16 Aug 2020) | 2 lines Fixed bug in snd-gate, revised GATE and NOISE-GATE to handle multi-channel sound. RMS now handles multi-channel input. S-AVG added to take multichannel input (but not used, because RMS could not be written without making SND-SRATE convert multichannel sound to vector of floats. That seems to be going toward a fully vectorized model. Not going there for now. ------------------------------------------------------------------------ r289 | rbd | 2020-07-09 16:27:45 -0500 (Thu, 09 Jul 2020) | 2 lines Added GET-REAL-TIME function to XLISP. May not work yet on Windows. Various fixes for compiler warnings. I noticed FLAC doesn't work (I guess it never did) and I cannot figure out how this even links because flac_min seems to be undefined. Something to look at later.
This commit is contained in:
Leland Lucius
@@ -16,10 +16,10 @@
|
||||
#include <sgtty.h>
|
||||
#include "cext.h"
|
||||
|
||||
extern int IOinputfd; /* input file descriptor (usually 0) */
|
||||
int IOinputfd; /* input file descriptor (usually 0) */
|
||||
|
||||
extern int IOnochar; /* Value to be returned by IOgetchar()
|
||||
where there is no input to be had */
|
||||
int IOnochar; /* Value to be returned by IOgetchar()
|
||||
where there is no input to be had */
|
||||
|
||||
static struct sgttyb IOoldmodes, IOcurrentmodes;
|
||||
/* Initial and current tty modes */
|
||||
|
||||
@@ -36,6 +36,8 @@
|
||||
* advertised.
|
||||
* 28-OCT-05 Roger Dannenberg at CMU-SCS
|
||||
* added directory listing functions
|
||||
* 9-JUL-2020 Roger Dannenberg
|
||||
* added get-real-time lisp function
|
||||
*/
|
||||
|
||||
#include "switches.h"
|
||||
@@ -44,6 +46,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
@@ -80,12 +83,19 @@ static char lbuf[LBSIZE];
|
||||
static int lpos[LBSIZE];
|
||||
#endif
|
||||
|
||||
#if USE_RAND
|
||||
#if __APPLE__
|
||||
#else
|
||||
#include <time.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
static int echo_enabled = 1;
|
||||
|
||||
/* forward declarations */
|
||||
FORWARD LOCAL void xflush();
|
||||
FORWARD LOCAL int xcheck();
|
||||
FORWARD LOCAL void hidden_msg();
|
||||
FORWARD LOCAL void xflush(void);
|
||||
FORWARD LOCAL int xcheck(void);
|
||||
FORWARD LOCAL void hidden_msg(void);
|
||||
|
||||
/*==========================================================================*/
|
||||
/* control-c interrupt handling routines and variables. Uses B4.2 signal
|
||||
@@ -96,14 +106,13 @@ FORWARD LOCAL void hidden_msg();
|
||||
#include <signal.h>
|
||||
|
||||
static int ctc = FALSE;
|
||||
static void control_c(int x) {ctc = TRUE;}
|
||||
void ctcinit() {signal ( SIGINT, control_c );}
|
||||
static void ctcreset() {signal ( SIGINT, control_c );}
|
||||
static void control_c(int x) {ctc = TRUE;}
|
||||
void ctcinit(void) {signal ( SIGINT, control_c );}
|
||||
static void ctcreset(void) {signal ( SIGINT, control_c );}
|
||||
|
||||
|
||||
/*==========================================================================*/
|
||||
|
||||
|
||||
const char os_pathchar = '/';
|
||||
const char os_sepchar = ':';
|
||||
|
||||
@@ -112,6 +121,10 @@ const char os_sepchar = ':';
|
||||
void osinit(const char *banner)
|
||||
{
|
||||
printf("%s\n",banner);
|
||||
if (max_sample_block_len < 64) {
|
||||
printf("Warning: max_sample_block_len %d is small. Maybe you forgot"
|
||||
" to reset it after debugging.\n", max_sample_block_len);
|
||||
}
|
||||
/* start the random number generator. Older version was srand(1)
|
||||
seed of 1 makes the sequence repeatable. Random gives better
|
||||
pseudo randomness than does rand().
|
||||
@@ -164,7 +177,8 @@ void oserror(const char *msg) {printf("error: %s\n",msg);}
|
||||
|
||||
|
||||
/* osaopen - open an ascii file */
|
||||
FILE *osaopen(name,mode) const char *name,*mode; {
|
||||
FILE *osaopen(const char *name, const char *mode)
|
||||
{
|
||||
FILE *fp = NULL;
|
||||
if (ok_to_open(name, mode))
|
||||
fp = fopen(name,mode);
|
||||
@@ -237,7 +251,7 @@ int osbputc(ch,fp) int ch; FILE *fp; {return (putc(ch,fp));}
|
||||
|
||||
#ifdef OLDEST_OSTGETC
|
||||
/* ostgetc - get a character from the terminal */
|
||||
int ostgetc()
|
||||
int ostgetc(void)
|
||||
{
|
||||
int ch;
|
||||
switch (ch = term_getchar()) {
|
||||
@@ -293,7 +307,7 @@ int ostgetc()
|
||||
#else
|
||||
#if OLD_OSTGETC
|
||||
/* ostgetc - get a character from the terminal */
|
||||
int ostgetc()
|
||||
int ostgetc(void)
|
||||
{ int ch;
|
||||
|
||||
for (;;) {
|
||||
@@ -328,7 +342,7 @@ int readline_first = 1;
|
||||
|
||||
extern int xldebug;
|
||||
|
||||
int ostgetc()
|
||||
int ostgetc(void)
|
||||
{
|
||||
int rval;
|
||||
|
||||
@@ -364,7 +378,7 @@ int ostgetc()
|
||||
#else /* no readline */
|
||||
|
||||
|
||||
void end_of_line_edit()
|
||||
void end_of_line_edit(void)
|
||||
{
|
||||
line_edit = FALSE;
|
||||
if (tfp) {
|
||||
@@ -375,7 +389,7 @@ void end_of_line_edit()
|
||||
}
|
||||
|
||||
/* THIS IS THE "REAL" ostgetc(): */
|
||||
LOCAL int rawtchar()
|
||||
LOCAL int rawtchar(void)
|
||||
{
|
||||
int ch;
|
||||
if (typeahead_tail != typeahead_head) {
|
||||
@@ -392,7 +406,7 @@ LOCAL int rawtchar()
|
||||
return ch;
|
||||
}
|
||||
|
||||
int ostgetc()
|
||||
int ostgetc(void)
|
||||
{
|
||||
/*
|
||||
* NOTE: lbuf[] accumulates characters as they are typed
|
||||
@@ -561,7 +575,7 @@ void ostputc(int ch)
|
||||
}
|
||||
|
||||
/* ostoutflush - flush output buffer */
|
||||
void ostoutflush()
|
||||
void ostoutflush(void)
|
||||
{
|
||||
if (tfp) fflush(tfp);
|
||||
fflush(stdout);
|
||||
@@ -585,7 +599,7 @@ void osflush(void)
|
||||
*
|
||||
* This function assumes that '\016' has been received already.
|
||||
*/
|
||||
LOCAL void hidden_msg()
|
||||
LOCAL void hidden_msg(void)
|
||||
{
|
||||
#define MSGBUF_MAX 64
|
||||
char msgbuf[MSGBUF_MAX];
|
||||
@@ -687,14 +701,14 @@ void oscheck(void)
|
||||
}
|
||||
|
||||
/* xflush - flush the input line buffer and start a new line */
|
||||
LOCAL void xflush()
|
||||
LOCAL void xflush(void)
|
||||
{
|
||||
osflush();
|
||||
ostputc('\n');
|
||||
}
|
||||
|
||||
/* xsystem - execute a system command */
|
||||
LVAL xsystem()
|
||||
LVAL xsystem(void)
|
||||
{ /*LVAL strval;*/
|
||||
unsigned char *cmd = NULL;
|
||||
if (SAFE_NYQUIST) return NULL;
|
||||
@@ -706,7 +720,7 @@ LVAL xsystem()
|
||||
|
||||
|
||||
/* xsetdir -- set current directory of the process */
|
||||
LVAL xsetdir()
|
||||
LVAL xsetdir(void)
|
||||
{
|
||||
char *dir = (char *)getstring(xlgastring());
|
||||
int result = -1;
|
||||
@@ -738,13 +752,13 @@ LVAL xsetdir()
|
||||
}
|
||||
|
||||
/* xget_temp_path -- get a path to create temp files */
|
||||
LVAL xget_temp_path()
|
||||
LVAL xget_temp_path(void)
|
||||
{
|
||||
return cvstring("/tmp/");
|
||||
}
|
||||
|
||||
/* xget_user -- get a string identifying the user, for use in file names */
|
||||
LVAL xget_user()
|
||||
LVAL xget_user(void)
|
||||
{
|
||||
const char *user = getenv("USER");
|
||||
if (!user || !*user) {
|
||||
@@ -756,7 +770,7 @@ LVAL xget_user()
|
||||
|
||||
|
||||
/* xechoenabled -- set/clear echo_enabled flag (unix only) */
|
||||
LVAL xechoenabled()
|
||||
LVAL xechoenabled(void)
|
||||
{
|
||||
int flag = (xlgetarg() != NULL);
|
||||
xllastarg();
|
||||
@@ -789,7 +803,7 @@ int osdir_list_start(const char *path)
|
||||
|
||||
|
||||
/* osdir_list_next -- read the next entry from a directory */
|
||||
const char *osdir_list_next()
|
||||
const char *osdir_list_next(void)
|
||||
{
|
||||
if (osdir_list_status != OSDIR_LIST_STARTED) {
|
||||
return NULL;
|
||||
@@ -805,7 +819,7 @@ const char *osdir_list_next()
|
||||
|
||||
|
||||
/* osdir_list_finish -- close an open directory */
|
||||
void osdir_list_finish()
|
||||
void osdir_list_finish(void)
|
||||
{
|
||||
if (osdir_list_status != OSDIR_LIST_READY) {
|
||||
closedir(osdir_dir);
|
||||
@@ -815,18 +829,26 @@ void osdir_list_finish()
|
||||
|
||||
|
||||
/* xcheck -- return a character if one is present */
|
||||
LOCAL int xcheck()
|
||||
LOCAL int xcheck(void)
|
||||
{
|
||||
int ch = term_testchar();
|
||||
return ch;
|
||||
}
|
||||
|
||||
/* xgetkey - get a key from the keyboard */
|
||||
LVAL xgetkey() {xllastarg(); return (cvfixnum((FIXTYPE)term_getchar()));}
|
||||
LVAL xgetkey(void) {xllastarg(); return (cvfixnum((FIXTYPE)term_getchar()));}
|
||||
|
||||
/* ossymbols - enter os specific symbols */
|
||||
void ossymbols(void) {}
|
||||
|
||||
/* xsetupconsole -- used to configure window in Win32 version */
|
||||
LVAL xsetupconsole() { return NIL; }
|
||||
LVAL xsetupconsole(void) { return NIL; }
|
||||
|
||||
|
||||
/* xgetrealtime - get current time in seconds */
|
||||
LVAL xgetrealtime(void)
|
||||
{
|
||||
struct timeval te;
|
||||
gettimeofday(&te, NULL); // get current time
|
||||
return cvflonum((double) te.tv_sec + (te.tv_usec * 1e-6));
|
||||
}
|
||||
|
||||
@@ -191,7 +191,9 @@
|
||||
/* NYQUIST tells some CMT code that we're really in
|
||||
* XLISP and NYQUIST
|
||||
*/
|
||||
#ifndef NYQUIST
|
||||
#define NYQUIST 1
|
||||
#endif
|
||||
|
||||
/* If SAFE_NYQUIST is defined, Nyquist will prevent:
|
||||
* - writes anywhere except in the directory tree
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
|
||||
void ctcinit();
|
||||
void ctcinit(void);
|
||||
|
||||
/* This will be used for new terminal settings. */
|
||||
static struct termios current;
|
||||
@@ -34,14 +34,14 @@ void term_restore(void)
|
||||
}
|
||||
|
||||
/* Clean up termianl; called on exit. */
|
||||
void term_exit()
|
||||
void term_exit(void)
|
||||
{
|
||||
term_restore();
|
||||
}
|
||||
|
||||
/* Will be called when contrl-Z is pressed;
|
||||
* this correctly handles the terminal. */
|
||||
void term_ctrlz()
|
||||
void term_ctrlz(int i)
|
||||
{
|
||||
signal(SIGTSTP, term_ctrlz);
|
||||
term_restore();
|
||||
@@ -50,12 +50,18 @@ void term_ctrlz()
|
||||
|
||||
/* Will be called when the application is continued
|
||||
* after having been stopped. */
|
||||
void term_cont()
|
||||
void term_cont(int i)
|
||||
{
|
||||
signal(SIGCONT, term_cont);
|
||||
tcsetattr(0, TCSANOW, ¤t);
|
||||
}
|
||||
|
||||
/* callback for SIGQUIT is different type from atexit callback */
|
||||
void term_quit(int i)
|
||||
{
|
||||
term_exit();
|
||||
}
|
||||
|
||||
/* Needs to be called to initialize the terminal. */
|
||||
void term_init(void)
|
||||
{
|
||||
@@ -67,7 +73,7 @@ void term_init(void)
|
||||
/* We _must_ clean up when we exit. */
|
||||
/* signal(SIGINT, term_exit); */
|
||||
ctcinit(); /* XLisp wants to catch ctrl C */
|
||||
signal(SIGQUIT, term_exit);
|
||||
signal(SIGQUIT, term_quit);
|
||||
/* Control-Z must also be handled. */
|
||||
signal(SIGTSTP, term_ctrlz);
|
||||
signal(SIGCONT, term_cont);
|
||||
@@ -103,7 +109,7 @@ void term_line(void)
|
||||
*
|
||||
* if ready, return it, otherwise return -2
|
||||
*/
|
||||
int term_testchar()
|
||||
int term_testchar(void)
|
||||
{
|
||||
int n;
|
||||
char c;
|
||||
@@ -124,7 +130,7 @@ int term_testchar()
|
||||
|
||||
/* term_getchar -- get a character (block if necessary) */
|
||||
/**/
|
||||
int term_getchar()
|
||||
int term_getchar(void)
|
||||
{
|
||||
char c;
|
||||
int rslt = read(0, &c, 1);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
void term_init();
|
||||
void term_exit();
|
||||
void ctcinit(); /* not implemented in term.h */
|
||||
int term_testchar();
|
||||
int term_getchar();
|
||||
void term_character();
|
||||
void term_init(void);
|
||||
void term_exit(void);
|
||||
void ctcinit(void); /* not implemented in term.h */
|
||||
int term_testchar(void);
|
||||
int term_getchar(void);
|
||||
void term_character(void);
|
||||
|
||||
@@ -82,7 +82,7 @@ static char *linebuf = NULL, *lineptr;
|
||||
static int numChars;
|
||||
|
||||
/* input thread */
|
||||
unsigned long input_thread_handle = -1;
|
||||
static uintptr_t input_thread_handle = -1;
|
||||
#define NEED_INPUT if (input_thread_handle == -1) start_input_thread();
|
||||
#define input_buffer_max 1024
|
||||
#define input_buffer_mask (input_buffer_max - 1)
|
||||
@@ -425,3 +425,18 @@ LVAL xechoenabled()
|
||||
}
|
||||
|
||||
|
||||
/* xgetrealtime - get current time in seconds */
|
||||
LVAL xgetrealtime()
|
||||
{
|
||||
static const uint64_t EPOCH = ((uint64_t)116444736000000000ULL);
|
||||
SYSTEMTIME system_time;
|
||||
FILETIME file_time;
|
||||
uint64_t time;
|
||||
GetSystemTime(&system_time);
|
||||
SystemTimeToFileTime(&system_time, &file_time);
|
||||
time = (uint64_t) file_time.dwLowDateTime;
|
||||
time += ((uint64_t) file_time.dwHighDateTime) << 32;
|
||||
time -= EPOCH;
|
||||
time /= 10000000L;
|
||||
return cvflonum((double) time + system_time.wMilliseconds * 0.001);
|
||||
}
|
||||
Reference in New Issue
Block a user