Commit 1f016c21 authored by Miller Puckette's avatar Miller Puckette
Browse files

took various small patches

parent 27e05f64
#N canvas 376 130 488 326 12;
#X msg 67 124 bang;
#X floatatom 67 252;
#X floatatom 79 154;
#X floatatom 118 194;
#X obj 66 15 swap;
#X text 114 16 - SWAP TWO NUMBERS \, RESPECTING RIGHT-TO-LEFT ORDER;
#X text 284 309 updated for Pd version 0.27;
#X text 12 42 The swap object stores numbers from its left inlet to output on its right inlet -- after repeating its right hand input out the left.;
#X text 112 123 outputs 2 stored values;
#X obj 67 226 swap 6.5;
#X text 110 154 sets second value and outputs both;
#X text 150 195 sets first value;
#X text 142 226 creation argument initializes first value;
#X floatatom 118 254;
#X connect 0 0 9 0;
#X connect 2 0 9 0;
#X connect 3 0 9 1;
#X connect 9 0 1 0;
#X connect 9 1 13 0;
#N canvas 475 187 615 593 12;
#X msg 72 167 bang;
#X floatatom 72 292 0 0 0 0 - - -;
#X floatatom 84 200 0 0 0 0 - - -;
#X floatatom 139 237 0 0 0 0 - - -;
#X obj 33 15 swap;
#X text 81 16 - SWAP TWO NUMBERS \, RESPECTING RIGHT-TO-LEFT ORDER
;
#X text 117 166 outputs 2 stored values;
#X obj 72 266 swap 6.5;
#X text 115 200 sets second value and outputs both;
#X text 171 238 sets first value;
#X text 157 266 creation argument initializes first value;
#X floatatom 139 291 0 0 0 0 - - -;
#X obj 139 331 print right;
#X obj 72 367 print left;
#X text 43 427 A common use of swap is to reverse the operands in arithmetic
objects like this:;
#X obj 72 491 swap;
#X obj 72 519 -;
#X floatatom 72 541 5 0 0 0 - - -;
#X floatatom 103 469 3 0 0 0 - - -;
#X floatatom 72 469 3 0 0 0 - - -;
#X text 291 549 updated for Pd version 0.41;
#X text 32 52 The swap object swaps the positions of two incoming numbers.
The number coming in through the right inlet will be sent to the left
outlet and the number coming in left will come out right. Only the
left inlet is hot and triggers output on both outlets. Output order
is right to left as in [trigger].;
#X connect 0 0 7 0;
#X connect 1 0 13 0;
#X connect 2 0 7 0;
#X connect 3 0 7 1;
#X connect 7 0 1 0;
#X connect 7 1 11 0;
#X connect 11 0 12 0;
#X connect 15 0 16 0;
#X connect 15 1 16 1;
#X connect 16 0 17 0;
#X connect 18 0 15 1;
#X connect 19 0 15 0;
......@@ -14,7 +14,7 @@
#X text 39 59 The trigger object outputs its input from right to left
\, converting to the types indicated by its creation arguments. There
is also a "pointer" argument type (see the pointer object.);
#X obj 381 293 t f b l s a;
#X obj 381 293 t f b s l a;
#X msg 466 167 dog my cats;
#X obj 466 199 trigger bang anything;
#X obj 374 242 print x5;
......
......@@ -459,12 +459,12 @@ t_propertiesfn class_getpropertiesfn(t_class *c)
static t_symbol *symhash[HASHSIZE];
t_symbol *dogensym(char *s, t_symbol *oldsym)
t_symbol *dogensym(const char *s, t_symbol *oldsym)
{
t_symbol **sym1, *sym2;
unsigned int hash1 = 0, hash2 = 0;
int length = 0;
char *s2 = s;
const char *s2 = s;
while (*s2)
{
hash1 += *s2;
......@@ -491,7 +491,7 @@ t_symbol *dogensym(char *s, t_symbol *oldsym)
return (sym2);
}
t_symbol *gensym(char *s)
t_symbol *gensym(const char *s)
{
return(dogensym(s, 0));
}
......
......@@ -225,7 +225,7 @@ EXTERN t_symbol s_;
/* --------- prototypes from the central message system ----------- */
EXTERN void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv);
EXTERN void pd_forwardmess(t_pd *x, int argc, t_atom *argv);
EXTERN t_symbol *gensym(char *s);
EXTERN t_symbol *gensym(const char *s);
EXTERN t_gotfn getfn(t_pd *x, t_symbol *s);
EXTERN t_gotfn zgetfn(t_pd *x, t_symbol *s);
EXTERN void nullfn(void);
......@@ -417,6 +417,7 @@ EXTERN char *class_gethelpname(t_class *c);
EXTERN void class_setdrawcommand(t_class *c);
EXTERN int class_isdrawcommand(t_class *c);
EXTERN void class_domainsignalin(t_class *c, int onset);
EXTERN void class_set_extern_dir(t_symbol *s);
#define CLASS_MAINSIGNALIN(c, type, field) \
class_domainsignalin(c, (char *)(&((type *)0)->field) - (char *)0)
......
......@@ -250,12 +250,14 @@ static void sys_huphandler(int n)
void sys_setalarm(int microsec)
{
struct itimerval gonzo;
int sec = (int)(microsec/1000000);
microsec %= 1000000;
#if 0
fprintf(stderr, "timer %d\n", microsec);
fprintf(stderr, "timer %d:%d\n", sec, microsec);
#endif
gonzo.it_interval.tv_sec = 0;
gonzo.it_interval.tv_usec = 0;
gonzo.it_value.tv_sec = 0;
gonzo.it_value.tv_sec = sec;
gonzo.it_value.tv_usec = microsec;
if (microsec)
sys_signal(SIGALRM, sys_alarmhandler);
......
......@@ -295,7 +295,7 @@ int sys_main(int argc, char **argv)
HINSTANCE ntdll;
char filename[MAXPDSTRING];
sprintf(filename, "%s.dll", sys_externalschedlibname);
snprintf(filename, sizeof(filename), "%s.dll", sys_externalschedlibname);
sys_bashfilename(filename, filename);
ntdll = LoadLibrary(filename);
if (!ntdll)
......
/* Copyright (c) 1997-1999 Miller Puckette and others.
* For information on usage and redistribution, and for a DISCLAIMER OF ALL
* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
#include "m_pd.h"
#include "m_imp.h"
#include "s_stuff.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <limits.h>
#include <string.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
#ifdef UNISTD
#include <unistd.h>
#endif
#ifdef MSW
#include <io.h>
#include <windows.h>
#include <winbase.h>
#endif
char *pd_version;
char pd_compiletime[] = __TIME__;
char pd_compiledate[] = __DATE__;
void pd_init(void);
int sys_argparse(int argc, char **argv);
void sys_findprogdir(char *progname);
int sys_startgui(const char *guipath);
int sys_rcfile(void);
int m_mainloop(void);
void sys_addhelppath(char *p);
#ifdef USEAPI_ALSA
void alsa_adddev(char *name);
#endif
int sys_debuglevel;
int sys_verbose;
int sys_noloadbang;
int sys_nogui;
int sys_hipriority = -1; /* -1 = don't care; 0 = no; 1 = yes */
int sys_guisetportnumber; /* if started from the GUI, this is the port # */
int sys_nosleep = 0; /* skip all "sleep" calls and spin instead */
char *sys_guicmd;
t_symbol *sys_libdir;
static t_symbol *sys_guidir;
static t_namelist *sys_openlist;
static t_namelist *sys_messagelist;
static int sys_version;
int sys_oldtclversion; /* hack to warn g_rtext.c about old text sel */
int sys_nmidiout = -1;
int sys_nmidiin = -1;
int sys_midiindevlist[MAXMIDIINDEV] = {1};
int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
char sys_font[100] =
#ifdef MSW
"Courier";
#else
"Courier";
#endif
char sys_fontweight[] = "bold "; /* currently only used for iemguis */
static int sys_main_srate;
static int sys_main_advance;
static int sys_main_callback;
static int sys_listplease;
int sys_externalschedlib;
char sys_externalschedlibname[MAXPDSTRING];
int sys_extraflags;
char sys_extraflagsstring[MAXPDSTRING];
/* here the "-1" counts signify that the corresponding vector hasn't been
specified in command line arguments; sys_set_audio_settings will detect it
and fill things in. */
static int sys_nsoundin = -1;
static int sys_nsoundout = -1;
static int sys_soundindevlist[MAXAUDIOINDEV];
static int sys_soundoutdevlist[MAXAUDIOOUTDEV];
static int sys_nchin = -1;
static int sys_nchout = -1;
static int sys_chinlist[MAXAUDIOINDEV];
static int sys_choutlist[MAXAUDIOOUTDEV];
t_sample* get_sys_soundout() { return sys_soundout; }
t_sample* get_sys_soundin() { return sys_soundin; }
int* get_sys_main_advance() { return &sys_main_advance; }
double* get_sys_time_per_dsp_tick() { return &sys_time_per_dsp_tick; }
int* get_sys_schedblocksize() { return &sys_schedblocksize; }
double* get_sys_time() { return &sys_time; }
t_float* get_sys_dacsr() { return &sys_dacsr; }
int* get_sys_sleepgrain() { return &sys_sleepgrain; }
int* get_sys_schedadvance() { return &sys_schedadvance; }
typedef struct _fontinfo
{
int fi_fontsize;
int fi_maxwidth;
int fi_maxheight;
int fi_hostfontsize;
int fi_width;
int fi_height;
} t_fontinfo;
/* these give the nominal point size and maximum height of the characters
in the six fonts. */
static t_fontinfo sys_fontlist[] = {
{8, 6, 10, 0, 0, 0}, {10, 7, 13, 0, 0, 0}, {12, 9, 16, 0, 0, 0},
{16, 10, 20, 0, 0, 0}, {24, 15, 25, 0, 0, 0}, {36, 25, 45, 0, 0, 0}};
#define NFONT (sizeof(sys_fontlist)/sizeof(*sys_fontlist))
/* here are the actual font size structs on msp's systems:
MSW:
font 8 5 9 8 5 11
font 10 7 13 10 6 13
font 12 9 16 14 8 16
font 16 10 20 16 10 18
font 24 15 25 16 10 18
font 36 25 42 36 22 41
linux:
font 8 5 9 8 5 9
font 10 7 13 12 7 13
font 12 9 16 14 9 15
font 16 10 20 16 10 19
font 24 15 25 24 15 24
font 36 25 42 36 22 41
*/
static t_fontinfo *sys_findfont(int fontsize)
{
unsigned int i;
t_fontinfo *fi;
for (i = 0, fi = sys_fontlist; i < (NFONT-1); i++, fi++)
if (fontsize < fi[1].fi_fontsize) return (fi);
return (sys_fontlist + (NFONT-1));
}
int sys_nearestfontsize(int fontsize)
{
return (sys_findfont(fontsize)->fi_fontsize);
}
int sys_hostfontsize(int fontsize)
{
return (sys_findfont(fontsize)->fi_hostfontsize);
}
int sys_fontwidth(int fontsize)
{
return (sys_findfont(fontsize)->fi_width);
}
int sys_fontheight(int fontsize)
{
return (sys_findfont(fontsize)->fi_height);
}
int sys_defaultfont;
#define DEFAULTFONT 10
static void openit(const char *dirname, const char *filename)
{
char dirbuf[MAXPDSTRING], *nameptr;
int fd = open_via_path(dirname, filename, "", dirbuf, &nameptr,
MAXPDSTRING, 0);
if (fd >= 0)
{
close (fd);
glob_evalfile(0, gensym(nameptr), gensym(dirbuf));
}
else
error("%s: can't open", filename);
}
/* this is called from the gui process. The first argument is the cwd, and
succeeding args give the widths and heights of known fonts. We wait until
these are known to open files and send messages specified on the command line.
We ask the GUI to specify the "cwd" in case we don't have a local OS to get it
from; for instance we could be some kind of RT embedded system. However, to
really make this make sense we would have to implement
open(), read(), etc, calls to be served somehow from the GUI too. */
void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv)
{
char *cwd = atom_getsymbolarg(0, argc, argv)->s_name;
t_namelist *nl;
unsigned int i;
int j;
int nhostfont = (argc-2)/3;
sys_oldtclversion = atom_getfloatarg(1, argc, argv);
if (argc != 2 + 3 * nhostfont) bug("glob_initfromgui");
for (i = 0; i < NFONT; i++)
{
int best = 0;
int wantheight = sys_fontlist[i].fi_maxheight;
int wantwidth = sys_fontlist[i].fi_maxwidth;
for (j = 1; j < nhostfont; j++)
{
if (atom_getintarg(3 * j + 4, argc, argv) <= wantheight &&
atom_getintarg(3 * j + 3, argc, argv) <= wantwidth)
best = j;
}
/* best is now the host font index for the desired font index i. */
sys_fontlist[i].fi_hostfontsize =
atom_getintarg(3 * best + 2, argc, argv);
sys_fontlist[i].fi_width = atom_getintarg(3 * best + 3, argc, argv);
sys_fontlist[i].fi_height = atom_getintarg(3 * best + 4, argc, argv);
}
#if 0
for (i = 0; i < 6; i++)
fprintf(stderr, "font (%d %d %d) -> (%d %d %d)\n",
sys_fontlist[i].fi_fontsize,
sys_fontlist[i].fi_maxwidth,
sys_fontlist[i].fi_maxheight,
sys_fontlist[i].fi_hostfontsize,
sys_fontlist[i].fi_width,
sys_fontlist[i].fi_height);
#endif
/* load dynamic libraries specified with "-lib" args */
for (nl = sys_externlist; nl; nl = nl->nl_next)
if (!sys_load_lib(0, nl->nl_string))
post("%s: can't load library", nl->nl_string);
/* open patches specifies with "-open" args */
for (nl = sys_openlist; nl; nl = nl->nl_next)
openit(cwd, nl->nl_string);
namelist_free(sys_openlist);
sys_openlist = 0;
/* send messages specified with "-send" args */
for (nl = sys_messagelist; nl; nl = nl->nl_next)
{
t_binbuf *b = binbuf_new();
binbuf_text(b, nl->nl_string, strlen(nl->nl_string));
binbuf_eval(b, 0, 0, 0);
binbuf_free(b);
}
namelist_free(sys_messagelist);
sys_messagelist = 0;
}
static void sys_afterargparse(void);
static void pd_makeversion(void)
{
char foo[100];
sprintf(foo, "Pd version %d.%d-%d%s\n",PD_MAJOR_VERSION,
PD_MINOR_VERSION,PD_BUGFIX_VERSION,PD_TEST_VERSION);
pd_version = malloc(strlen(foo)+1);
strcpy(pd_version, foo);
}
/* this is called from main() in s_entry.c */
int sys_main(int argc, char **argv)
{
int i, noprefs;
sys_externalschedlib = 0;
sys_extraflags = 0;
#ifdef PD_DEBUG
fprintf(stderr, "Pd: COMPILED FOR DEBUGGING\n");
#endif
pd_init(); /* start the message system */
sys_findprogdir(argv[0]); /* set sys_progname, guipath */
for (i = noprefs = 0; i < argc; i++) /* prescan args for noprefs */
if (!strcmp(argv[i], "-noprefs"))
noprefs = 1;
if (!noprefs)
sys_loadpreferences(); /* load default settings */
#ifndef MSW
sys_rcfile(); /* parse the startup file */
#endif
if (sys_argparse(argc-1, argv+1)) /* parse cmd line */
return (1);
sys_afterargparse(); /* post-argparse settings */
/* build version string from defines in m_pd.h */
pd_makeversion();
if (sys_verbose || sys_version) fprintf(stderr, "%scompiled %s %s\n",
pd_version, pd_compiletime, pd_compiledate);
if (sys_version) /* if we were just asked our version, exit here. */
return (0);
if (sys_startgui(sys_guidir->s_name)) /* start the gui */
return(1);
if (sys_externalschedlib)
{
#ifdef MSW
typedef int (*t_externalschedlibmain)(char *);
t_externalschedlibmain externalmainfunc;
HINSTANCE ntdll;
char filename[MAXPDSTRING];
sprintf(filename, "%s.dll", sys_externalschedlibname);
sys_bashfilename(filename, filename);
ntdll = LoadLibrary(filename);
if (!ntdll)
{
post("%s: couldn't load external scheduler lib ", filename);
return (0);
}
externalmainfunc = (t_externalschedlibmain)GetProcAddress(ntdll,
"main");
return((*externalmainfunc)(sys_extraflagsstring));
#else
return (0);
#endif
}
else
{
/* open audio and MIDI */
sys_reopen_midi();
sys_reopen_audio();
/* run scheduler until it quits */
return (m_mainloop());
}
}
static char *(usagemessage[]) = {
"usage: pd [-flags] [file]...\n",
"\naudio configuration flags:\n",
"-r <n> -- specify sample rate\n",
"-audioindev ... -- audio in devices; e.g., \"1,3\" for first and third\n",
"-audiooutdev ... -- audio out devices (same)\n",
"-audiodev ... -- specify input and output together\n",
"-inchannels ... -- audio input channels (by device, like \"2\" or \"16,8\")\n",
"-outchannels ... -- number of audio out channels (same)\n",
"-channels ... -- specify both input and output channels\n",
"-audiobuf <n> -- specify size of audio buffer in msec\n",
"-blocksize <n> -- specify audio I/O block size in sample frames\n",
"-sleepgrain <n> -- specify number of milliseconds to sleep when idle\n",
"-nodac -- suppress audio output\n",
"-noadc -- suppress audio input\n",
"-noaudio -- suppress audio input and output (-nosound is synonym) \n",
"-listdev -- list audio and MIDI devices\n",
#ifdef USEAPI_OSS
"-oss -- use OSS audio API\n",
"-32bit ----- allow 32 bit OSS audio (for RME Hammerfall)\n",
#endif
#ifdef USEAPI_ALSA
"-alsa -- use ALSA audio API\n",
"-alsaadd <name> -- add an ALSA device name to list\n",
#endif
#ifdef USEAPI_JACK
"-jack -- use JACK audio API\n",
#endif
#ifdef USEAPI_PORTAUDIO
#ifdef MSW
"-asio -- use ASIO audio driver (via Portaudio)\n",
"-pa -- synonym for -asio\n",
#else
"-pa -- use Portaudio API\n",
#endif
#endif
#ifdef USEAPI_MMIO
"-mmio -- use MMIO audio API (default for Windows)\n",
#endif
" (default audio API for this platform: ", API_DEFSTRING, ")\n\n",
"\nMIDI configuration flags:\n",
"-midiindev ... -- midi in device list; e.g., \"1,3\" for first and third\n",
"-midioutdev ... -- midi out device list, same format\n",
"-mididev ... -- specify -midioutdev and -midiindev together\n",
"-nomidiin -- suppress MIDI input\n",
"-nomidiout -- suppress MIDI output\n",
"-nomidi -- suppress MIDI input and output\n",
#ifdef USEAPI_ALSA
"-alsamidi -- use ALSA midi API\n",
#endif
"\nother flags:\n",
"-path <path> -- add to file search path\n",
"-nostdpath -- don't search standard (\"extra\") directory\n",
"-stdpath -- search standard directory (true by default)\n",
"-helppath <path> -- add to help file search path\n",
"-open <file> -- open file(s) on startup\n",
"-lib <file> -- load object library(s)\n",
"-font-size <n> -- specify default font size in points\n",
"-font-face <name> -- specify default font\n",
"-font-weight <name>-- specify default font weight (normal or bold)\n",
"-verbose -- extra printout on startup and when searching for files\n",
"-version -- don't run Pd; just print out which version it is \n",
"-d <n> -- specify debug level\n",
"-noloadbang -- suppress all loadbangs\n",
"-stderr -- send printout to standard error instead of GUI\n",
"-nogui -- suppress starting the GUI\n",
"-guiport <n> -- connect to pre-existing GUI over port <n>\n",
"-guicmd \"cmd...\" -- start alternatve GUI program (e.g., remote via ssh)\n",
"-send \"msg...\" -- send a message at startup, after patches are loaded\n",
"-noprefs -- suppress loading preferences on startup\n",
#ifdef UNISTD
"-rt or -realtime -- use real-time priority\n",
"-nrt -- don't use real-time priority\n",
#endif
"-nosleep -- spin, don't sleep (may lower latency on multi-CPUs)\n",
};
static void sys_parsedevlist(int *np, int *vecp, int max, char *str)
{
int n = 0;
while (n < max)
{
if (!*str) break;
else
{
char *endp;
vecp[n] = strtol(str, &endp, 10);
if (endp == str)
break;
n++;
if (!endp)
break;
str = endp + 1;
}
}
*np = n;
}
static int sys_getmultidevchannels(int n, int *devlist)
{
int sum = 0;
if (n<0)return(-1);
if (n==0)return 0;
while(n--)sum+=*devlist++;
return sum;
}
/* this routine tries to figure out where to find the auxilliary files
Pd will need to run. This is either done by looking at the command line
invokation for Pd, or if that fails, by consulting the variable
INSTALL_PREFIX. In MSW, we don't try to use INSTALL_PREFIX. */
void sys_findprogdir(char *progname)
{
char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp;
char *lastslash;
#ifdef UNISTD
struct stat statbuf;
#endif
/* find out by what string Pd was invoked; put answer in "sbuf". */
#ifdef MSW
GetModuleFileName(NULL, sbuf2, sizeof(sbuf2));
sbuf2[MAXPDSTRING-1] = 0;
sys_unbashfilename(sbuf2, sbuf);
#endif /* MSW */
#ifdef UNISTD
strncpy(sbuf, progname, MAXPDSTRING);
sbuf[MAXPDSTRING-1] = 0;
#endif
lastslash = strrchr(sbuf, '/');
if (lastslash)
{
/* bash last slash to zero so that sbuf is directory pd was in,
e.g., ~/pd/bin */
*lastslash = 0;
/* go back to the parent from there, e.g., ~/pd */
lastslash = strrchr(sbuf, '/');
if (lastslash)
{
strncpy(sbuf2, sbuf, lastslash-sbuf);
sbuf2[lastslash-sbuf] = 0;
}
else strcpy(sbuf2, "..");
}
else
{
/* no slashes found. Try INSTALL_PREFIX. */
#ifdef INSTALL_PREFIX
strcpy(sbuf2, INSTALL_PREFIX);
#else
strcpy(sbuf2, ".");
#endif
}
/* now we believe sbuf2 holds the parent directory of the directory
pd was found in. We now want to infer the "lib" directory and the
"gui" directory. In "simple" unix installations, the layout is
.../bin/pd
.../bin/pd-gui
.../doc
and in "complicated" unix installations, it's:
.../bin/pd
.../lib/pd/bin/pd-gui
.../lib/pd/doc
To decide which, we stat .../lib/pd; if that exists, we assume it's
the complicated layout. In MSW, it's the "simple" layout, but
the gui program is straight wish80:
.../bin/pd
.../bin/wish80.exe
.../doc
*/
#ifdef MSW
sys_libdir = gensym(sbuf2);
sys_guidir = &s_; /* in MSW the guipath just depends on the libdir */
#else
strncpy(sbuf, sbuf2, MAXPDSTRING-30);
sbuf[MAXPDSTRING-30] = 0;
strcat(sbuf, "/lib/pd");
if (stat(sbuf, &statbuf) >= 0)
{
/* complicated layout: lib dir is the one we just stat-ed above */
sys_libdir = gensym(sbuf);