Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26575

Modified Files: Tag: desiredata makefile.in desire.c Removed Files: Tag: desiredata m_glob.c Log Message: merged m_glob.c into desire.c

Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.3 retrieving revision 1.4.4.2.2.21.2.4 diff -C2 -d -r1.4.4.2.2.21.2.3 -r1.4.4.2.2.21.2.4 *** makefile.in 30 Nov 2006 17:18:23 -0000 1.4.4.2.2.21.2.3 --- makefile.in 2 Dec 2006 03:42:38 -0000 1.4.4.2.2.21.2.4 *************** *** 18,22 **** # from pd miller SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ --- 18,22 ---- # from pd miller SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \

Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.6 retrieving revision 1.1.2.217.2.7 diff -C2 -d -r1.1.2.217.2.6 -r1.1.2.217.2.7 *** desire.c 2 Dec 2006 03:06:57 -0000 1.1.2.217.2.6 --- desire.c 2 Dec 2006 03:42:38 -0000 1.1.2.217.2.7 *************** *** 7747,7758 **** /* formerly m_glob.c */

extern t_class *glob_pdobject; ! extern "C" void desire_glob_init(void) { ! t_class *c = glob_pdobject; ! class_addmethod3(c, glob_update_class_list, "update-class-list", "ss"); ! class_addmethod3(c, glob_update_class_info, "update-class-info", "sss"); ! class_addmethod3(c, glob_update_path, "update-path", ""); ! class_addmethod3(c, glob_help, "help", "s"); ! class_addmethod3(c, glob_redraw, "redraw", ""); }

--- 7747,7881 ---- /* formerly m_glob.c */

+ t_class *glob_pdobject; + static t_class *maxclass; + + #define IGN(sym) if (s==gensym(sym)) return; + void max_default(t_pd *x, t_symbol *s, int argc, t_atom *argv) { + IGN("audioindev"); + IGN("audiooutdev"); + IGN("audioininfo"); + IGN("audiooutinfo"); + IGN("testaudiosettingresult"); + IGN("audiodevice"); + IGN("xrun"); + IGN("audio_started"); + IGN("sys_lock_timeout"); + IGN("midiindev"); + IGN("midioutdev"); + IGN("midicurrentindev"); + IGN("midicurrentoutdev"); + IGN("audiocurrentininfo"); + IGN("audiocurrentoutinfo"); + IGN("asiolatency"); + startpost("%s: unknown message %s ", class_getname(pd_class(x)), s->s_name); + for (int i = 0; i < argc; i++) { + char str[80]; + atom_string(argv+i, str, 80); + poststring(str); + } + endpost(); + } + + extern "C" { + void glob_watchdog(t_pd *dummy); + void glob_meters(void *dummy, t_floatarg f); + void glob_audiostatus(void *dummy); + void glob_finderror(t_pd *dummy); + void glob_audio_properties(t_pd *dummy, t_floatarg flongform); + void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv); + void glob_audio_setapi(t_pd *dummy, t_floatarg f); + void glob_midi_properties(t_pd *dummy, t_floatarg flongform); + void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv); + void glob_midi_setapi(t_pd *dummy, t_floatarg f); + void glob_start_path_dialog(t_pd *dummy, t_floatarg flongform); + void glob_path_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv); + void glob_start_startup_dialog(t_pd *dummy, t_floatarg flongform); + void glob_startup_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv); + void glob_ping(t_pd *dummy); + void glob_savepreferences(t_pd *dummy); + void glob_tooltips(t_pd *dummy, t_float f); + /* tb: message-based audio configuration { */ + void glob_audio_testaudiosetting(t_pd * dummy, t_symbol *s, int ac, t_atom *av); + void glob_audio_getaudioindevices(t_pd * dummy, t_symbol *s, int ac, t_atom *av); + void glob_audio_getaudiooutdevices(t_pd * dummy, t_symbol *s, int ac, t_atom *av); + void glob_audio_getaudioininfo(t_pd * dummy, t_float f); + void glob_audio_getaudiooutinfo(t_pd * dummy, t_float f); + //void glob_audio_samplerate(t_pd * dummy, t_float f); + //void glob_audio_delay(t_pd * dummy, t_float f); + //void glob_audio_dacblocksize(t_pd * dummy, t_float f); + //void glob_audio_scheduler(t_pd * dummy, t_float f); + void glob_audio_device(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); + //void glob_audio_device_in(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); + //void glob_audio_device_out(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); + void glob_audio_getcurrent_devices(void); + void glob_audio_asio_latencies(t_pd * dummy, t_float f); + void glob_midi_getindevs(t_pd *dummy); + void glob_midi_getoutdevs(t_pd *dummy); + void glob_midi_getcurrentindevs(t_pd *dummy); + void glob_midi_getcurrentoutdevs(t_pd *dummy); + /* tb } */ + }; + extern t_class *glob_pdobject; ! extern "C" void glob_init(void) { ! ! maxclass = class_new(gensym("max"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); ! class_addanything(maxclass, max_default); ! pd_bind((t_pd *)&maxclass, gensym("max")); ! ! t_class *c = glob_pdobject = class_new(gensym("pd"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); ! ! class_addmethod3(c,glob_initfromgui, "init", "*"); ! class_addmethod3(c,glob_setfilename, "filename", "ss"); ! class_addmethod3(c,glob_evalfile, "open", "ss"); ! class_addmethod3(c,glob_quit, "quit", ""); ! class_addmethod3(c,glob_dsp, "dsp", "*"); ! class_addmethod3(c,glob_meters, "meters", "f"); ! class_addmethod3(c,glob_audiostatus, "audiostatus", ""); ! class_addmethod3(c,glob_finderror, "finderror", ""); ! class_addmethod3(c,glob_audio_properties, "audio-properties", "F"); ! class_addmethod3(c,glob_audio_dialog, "audio-dialog", "*"); ! class_addmethod3(c,glob_audio_setapi, "audio-setapi", "f"); ! class_addmethod3(c,glob_midi_setapi, "midi-setapi", "f"); ! class_addmethod3(c,glob_midi_properties, "midi-properties", "F"); ! class_addmethod3(c,glob_midi_dialog, "midi-dialog", "*"); ! class_addmethod3(c,glob_start_path_dialog,"start-path-dialog", ""); ! class_addmethod3(c,glob_path_dialog, "path-dialog", "*"); ! class_addmethod3(c,glob_start_startup_dialog,"start-startup-dialog", ""); ! class_addmethod3(c,glob_startup_dialog, "startup-dialog", "*"); ! class_addmethod3(c,glob_ping, "ping",""); ! class_addmethod3(c,glob_savepreferences, "save-preferences", ""); ! class_addmethod3(c,glob_tooltips, "tooltips", "F"); ! /* tb: message-based audio configuration { */ ! // class_addmethod3(c,glob_audio_samplerate, "audio-samplerate", "F"); ! // class_addmethod3(c,glob_audio_delay, "audio-delay", "F"); ! // class_addmethod3(c,glob_audio_dacblocksize,"audio-dacblocksize", "F"); ! // class_addmethod3(c,glob_audio_scheduler, "audio-scheduler", "F"); ! class_addmethod3(c,glob_audio_device, "audio-device", "*"); ! // class_addmethod3(c,glob_audio_device_in, "audio-device-in", "*"); ! // class_addmethod3(c,glob_audio_device_out, "audio-device-out", "*"); ! class_addmethod3(c,glob_audio_getaudioindevices, "getaudioindev", "*"); ! class_addmethod3(c,glob_audio_getaudiooutdevices,"getaudiooutdev", "*"); ! class_addmethod3(c,glob_audio_getaudioininfo, "getaudioininfo", "f"); ! class_addmethod3(c,glob_audio_getaudiooutinfo, "getaudiooutinfo", "f"); ! class_addmethod3(c,glob_audio_testaudiosetting, "testaudiosetting", "*"); ! class_addmethod3(c,glob_audio_getcurrent_devices,"getaudiodevice", ""); ! class_addmethod3(c,glob_audio_asio_latencies, "getasiolatencies", "F"); ! class_addmethod3(c,glob_midi_getoutdevs,"getmidioutdev", "*"); ! class_addmethod3(c,glob_midi_getindevs, "getmidiindev", "*"); ! class_addmethod3(c,glob_midi_getcurrentoutdevs, "getmidicurrentoutdev", ""); ! class_addmethod3(c,glob_midi_getcurrentindevs, "getmidicurrentindev", ""); ! /* tb } */ ! ! #ifdef UNIX ! class_addmethod3(c,glob_watchdog, "watchdog", ""); ! #endif ! class_addmethod3(c,glob_update_class_list, "update-class-list", "ss"); ! class_addmethod3(c,glob_update_class_info, "update-class-info", "sss"); ! class_addmethod3(c,glob_update_path, "update-path", ""); ! class_addmethod3(c,glob_help, "help", "s"); ! class_addmethod3(c,glob_redraw, "redraw", ""); ! class_addanything(c, max_default); ! pd_bind((t_pd *)&glob_pdobject, gensym("pd")); }

--- m_glob.c DELETED ---