Pd-cvs January 2005

pd-cvs@lists.iem.at

8 participants
348 discussions

pd/src m_simd_sse_gcc.c,1.1.4.10,1.1.4.11
by Tim Blechmann 18 Jan '05

18 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30740 Modified Files: Tag: devel_0_38 m_simd_sse_gcc.c Log Message: Index: m_simd_sse_gcc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.c,v retrieving revision 1.1.4.10 retrieving revision 1.1.4.11 diff -C2 -d -r1.1.4.10 -r1.1.4.11 *** m_simd_sse_gcc.c 11 Jan 2005 21:41:14 -0000 1.1.4.10 --- m_simd_sse_gcc.c 18 Jan 2005 15:31:04 -0000 1.1.4.11 *************** *** 65,69 **** ".set T_FLOAT,4 \n" /* sizeof(t_float) */ "shr $4, %0 \n" ! /* loop: *dst = *src */ "1: \n" --- 65,69 ---- ".set T_FLOAT,4 \n" /* sizeof(t_float) */ "shr $4, %0 \n" ! /* loop: *dst = *src */ "1: \n"

1 0

pd/src d_delay.c,1.2.4.5,1.2.4.6
by Tim Blechmann 18 Jan '05

18 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29128 Modified Files: Tag: devel_0_38 d_delay.c Log Message: simd for delwrite Index: d_delay.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_delay.c,v retrieving revision 1.2.4.5 retrieving revision 1.2.4.6 diff -C2 -d -r1.2.4.5 -r1.2.4.6 *** d_delay.c 14 Jan 2005 18:34:13 -0000 1.2.4.5 --- d_delay.c 18 Jan 2005 15:25:01 -0000 1.2.4.6 *************** *** 176,180 **** static void sigdelwrite_dsp(t_sigdelwrite *x, t_signal **sp) { - #ifdef DEL_SIMD if (sp[0]->s_n & 7) dsp_add(sigdelwrite_perform, 3, sp[0]->s_vec, &x->x_cspace, sp[0]->s_n); --- 176,179 ---- *************** *** 184,191 **** else dsp_add(sigdelwrite_perf8, 3, sp[0]->s_vec, &x->x_cspace, sp[0]->s_n); ! #else ! dsp_add(sigdelwrite_perform, 3, sp[0]->s_vec, &x->x_cspace, sp[0]->s_n); ! #endif ! x->x_sortno = ugen_getsortno(); sigdelwrite_checkvecsize(x, sp[0]->s_n); --- 183,187 ---- else dsp_add(sigdelwrite_perf8, 3, sp[0]->s_vec, &x->x_cspace, sp[0]->s_n); ! x->x_sortno = ugen_getsortno(); sigdelwrite_checkvecsize(x, sp[0]->s_n);

1 0

pd/src makefile.mingw,NONE,1.3.2.1
by carmen rocco 18 Jan '05

18 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11821 Added Files: Tag: devel_0_38 makefile.mingw Log Message: hi tim i tried to make tim_0_38 work properly for that windows volctl~ you asked about.. but patching to ix_0_38 , pd.ini won't load: . open: No such file or directory . No such file or directory and toxy is broken and the gui spews errors like this a lot: . Pd: buffer space wasn't sufficient for long GUI string so, you can try. :P it compiles at least..(and http://whats-your.name/pd/ix038.patch works fine with miller_0_39 (CVS HEAD)) --- NEW FILE: makefile.mingw --- VPATH = ../obj:./ INSTDIR = .. OBJ_DIR = $(INSTDIR)/obj BIN_DIR = $(INSTDIR)/bin PDEXEC = pd.exe GUINAME= pdtcl.dll DLLWRAP= dllwrap GFLAGS = -DINSTALL_PREFIX=\"$(INSTDIR)\" MORECFLAGS = -O2 -funroll-loops -march=athlon-xp #-DTHREADED_SF -DGARRAY_THREAD_LOCK -D_GNU_SOURCE PADIR = $(INSTDIR)/portaudio ASIODIR = ../asio INCPA = -I$(PADIR) -I$(ASIODIR) -I$(PADIR)/pa_common -I$(PADIR)/pablio -I$(PADIR)/pa_asio INCLUDE = GINCLUDE = $(INCLUDE) -I/usr/local/include LDFLAGS = -L/usr/local/lib -lpthreadGC -lwsock32 -lportaudio -lwinmm -ltcl85 -ltk85 -lole32 LIB = -lm OPT_CFLAGS = WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Wno-unused \ -Wno-unused-parameter -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD -DPD_INTERNAL -DMSW -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -DPA19 CFLAGS += $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources PASRC = s_audio_pa.c s_audio_pablio.c s_audio_paring.c s_audio_mmio.c s_midi_mmio.c ASIOSRC = $(PADIR)/pa_asio/iasiothiscallresolver.cpp \ $(PADIR)/pa_asio/pa_asio.cpp $(ASIODIR)/asio.cpp \ $(ASIODIR)/asiodrivers.cpp $(ASIODIR)/asiolist.cpp #VSRC = s_audio_vst.c GSRC = t_main.c t_tkcmd.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ g_toggle.c g_vumeter.c m_pd.c m_class.c m_obj.c m_atom.c m_memory.c \ m_binbuf.c m_conf.c m_glob.c m_sched.c s_main.c s_inter.c s_file.c \ s_print.c s_loader.c s_path.c s_entry.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 \ d_delay.c d_resample.c x_arithmetic.c x_connective.c x_interface.c \ x_midi.c x_misc.c x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c \ d_soundfile.c g_vslider.c g_vdial.c \ m_simd.c m_simd_sse_gcc.c m_fifo.c SRSRC = u_pdsend.c u_pdreceive.c OBJ = $(SRC:.c=.o) GOBJ = $(GSRC:.c=.o) SROBJ = $(SRSRC:.c=.o) PAOBJ = $(PASRC:.c=.o) ASIOBJ = $(ASIOSRC:.cpp=.o) #VOBJ = $(VSRC:.c=.o) OBJC = $(OBJ) $(PAOBJ) $(ASIOBJ) # # ------------------ targets ------------------------------------ # .PHONY: all all: $(OBJ_DIR)/$(GUINAME) $(OBJ_DIR)/$(PDDLL) $(OBJ_DIR)/$(PDEXEC) \ $(OBJ_DIR)/pdsend.exe $(OBJ_DIR)/pdreceive.exe \ $(OBJ_DIR)/vstschedlib.dll $(OBJ_DIR)/pd.tk $(OBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c $(GOBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c $(SROBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c $(PAOBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCPA) -c -o $(OBJ_DIR)/$*.o $*.c $(ASIOBJ) : %.o : %.cpp g++ $(CFLAGS) $(INCPA) -c -o $(OBJ_DIR)/$*.o $*.cpp $(VOBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c $(OBJ_DIR)/pdsend.exe: u_pdsend.o cd $(OBJ_DIR); $(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend.exe u_pdsend.o $(LDFLAGS) $(OBJ_DIR)/pdreceive.exe: u_pdreceive.o cd $(OBJ_DIR); $(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive.exe u_pdreceive.o $(LDFLAGS) $(OBJ_DIR)/$(PDEXEC): s_entry.o cd $(OBJ_DIR); $(CC) -o $(PDEXEC) s_entry.o $(LIB) pd.a $(LDFLAGS) $(OBJ_DIR)/$(PDDLL): $(OBJC) cd $(OBJ_DIR); g++ -shared -o pd.dll $(OBJC) $(LDFLAGS) \ -Wl,--export-all-symbols -Wl,--out-implib=pd.a; \ strip --strip-unneeded ../obj/pd.dll $(OBJ_DIR)/$(GUINAME): t_tkcmd.o cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pdtcl.def \ --output-lib=pdtcl.a --dllname=$(GUINAME) t_tkcmd.o $(LDFLAGS) $(OBJ_DIR)/vstschedlib.dll: $(VOBJ) # cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def vst.def \ # --output-lib=vst.a --dllname=vstschedlib.dll s_audio_vst.o pd.a $(LDFLAGS) $(OBJ_DIR)/pd.tk: u_main.tk echo set pd_nt 1 > $(OBJ_DIR)/pd.tk grep -v "set pd_nt" < u_main.tk >> $(OBJ_DIR)/pd.tk install: all install -d $(INSTDIR)/bin install $(OBJ_DIR)/*.exe $(BIN_DIR) install $(OBJ_DIR)/*.dll $(BIN_DIR) install -m644 $(OBJ_DIR)/pd.tk $(BIN_DIR)/pd.tk install -m644 ../extra/*/*.pd $(INSTDIR)/doc/5.reference/ clean: -rm -f $(OBJ_DIR)/*.o $(OBJ_DIR)/*.a $(OBJ_DIR)/*.def -rm -f $(OBJ_DIR)/pd*.exe $(OBJ_DIR)/pd*.dll -rm -f $(PADIR)/pablio/*.o $(PADIR)/pa_common/*.o -rm -f $(PADIR)/pa_asio/*.o $(OBJ_DIR)/pd.tk -rm -f makefile.dependencies touch makefile.dependencies chmod 666 makefile.dependencies distclean: clean rm -rf config.cache config.log config.status makefile tags \ autom4te-*.cache echo all: > makefile echo -e "\t./configure" >> makefile echo -e "\tmake" >> makefile tags: $(SRC) $(GSRC); ctags *.[ch] depend: $(CC) $(INCLUDE) $(CFLAGS) -M $(SRC) > makefile.dependencies uninstall: -rm $(INSTDIR)/bin/pd*.exe -rm $(INSTDIR)/bin/pd*.dll -rm $(INSTDIR)/bin/*.tk include makefile.dependencies

1 0

externals/bbogart/popup README.txt,1.5,1.6 popup.c,1.10,1.11
by B. Bogart 17 Jan '05

17 Jan '05

Update of /cvsroot/pure-data/externals/bbogart/popup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13075 Modified Files: README.txt popup.c Log Message: Fixed resetting name on shade/minimize/desktop switch. Index: popup.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/popup.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** popup.c 14 Jan 2005 20:12:00 -0000 1.10 --- popup.c 17 Jan 2005 21:06:59 -0000 1.11 *************** *** 53,56 **** --- 53,57 ---- int x_width; + int current_selection; int x_num_options; t_symbol* x_colour; *************** *** 139,142 **** --- 140,144 ---- char text[MAXPDSTRING]; int len,i; + t_symbol* temp_name; t_canvas *canvas=glist_getcanvas(glist); x->x_rect_width = x->x_width; *************** *** 145,153 **** /* Create menubutton and empty menu widget -- maybe the menu should be created elseware?*/ /* Seems we have to delete the widget in case it already exists (Provided by Guenter)*/ sys_vgui("destroy .x%x.c.s%x\n",glist_getcanvas(glist),x); sys_vgui("set %xw .x%x.c.s%x ; menubutton $%xw -relief raised -background \"%s\" -text \"%s\" -direction flush -menu $%xw.menu ; menu $%xw.menu -tearoff 0\n", ! x,canvas,x,x,x->x_colour->s_name,x->x_name->s_name,x,x); for(i=0 ; i<x->x_num_options ; i++) --- 147,163 ---- /* Create menubutton and empty menu widget -- maybe the menu should be created elseware?*/ + /* draw using the last name if it was selected otherwise use default name. */ + if(x->current_selection < 0) + { + temp_name = x->x_name; + } else { + temp_name = x->x_options[x->current_selection]; + } + /* Seems we have to delete the widget in case it already exists (Provided by Guenter)*/ sys_vgui("destroy .x%x.c.s%x\n",glist_getcanvas(glist),x); sys_vgui("set %xw .x%x.c.s%x ; menubutton $%xw -relief raised -background \"%s\" -text \"%s\" -direction flush -menu $%xw.menu ; menu $%xw.menu -tearoff 0\n", ! x,canvas,x,x,x->x_colour->s_name,temp_name->s_name,x,x); for(i=0 ; i<x->x_num_options ; i++) *************** *** 183,186 **** --- 193,197 ---- // Output a bang to first outlet when we're ready to receive float messages the first time!. + // Too bad this is NOT always the first time... window shading makes the bang go out again. :( if(firsttime) {outlet_bang(x->x_obj.ob_outlet);} *************** *** 338,341 **** --- 349,353 ---- DEBUG(post("output start");) + x->current_selection = popup_index; outlet_symbol(x->out2, x->x_options[(int)popup_index]); outlet_float(x->x_obj.ob_outlet, popup_index); *************** *** 413,416 **** --- 425,429 ---- sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); + } else { post("popup: Valid menu selections are from %d to %d\npopup: You entered %d.", 0, x->x_num_options, i); *************** *** 478,483 **** x->x_glist = (t_glist*)NULL; - x->x_height = 25; if (argc < 5) --- 491,496 ---- x->x_glist = (t_glist*)NULL; x->x_height = 25; + x->current_selection = -1; if (argc < 5) *************** *** 519,526 **** outlet_new(&x->x_obj, &s_float); x->out2 = outlet_new(&x->x_obj, &s_symbol); - return (x); ! DEBUG(post("popup new end");) } --- 532,539 ---- outlet_new(&x->x_obj, &s_float); x->out2 = outlet_new(&x->x_obj, &s_symbol); ! DEBUG(post("popup new end");) + return (x); } Index: README.txt =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/README.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** README.txt 14 Jan 2005 20:14:36 -0000 1.5 --- README.txt 17 Jan 2005 21:06:59 -0000 1.6 *************** *** 40,47 **** - Do not use a loadbang to set a patch-default value. Will cause a segfault. The left outlet will send a "bang" message when we're ready to set values, ! see example patch on how to use this to set a default value. ! ! - If you change virtual desktops or "shade" the patcher window the selection ! visible on the popup will be reset to the popup-name. Have Fun. --- 40,46 ---- - Do not use a loadbang to set a patch-default value. Will cause a segfault. The left outlet will send a "bang" message when we're ready to set values, ! see example patch on how to use this to set a default value. Unfortunatly ! this bang message is actually set on un-minimization and un-shading as ! well as on load. Have Fun.

1 0

pd/src s_audio_asio.cpp,1.1.4.21,1.1.4.22
by Thomas Grill 17 Jan '05

17 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2293/src Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: initialize local variable Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.21 retrieving revision 1.1.4.22 diff -C2 -d -r1.1.4.21 -r1.1.4.22 *** s_audio_asio.cpp 14 Jan 2005 18:34:13 -0000 1.1.4.21 --- s_audio_asio.cpp 17 Jan 2005 20:20:18 -0000 1.1.4.22 *************** *** 196,200 **** int nchoutdev, int *choutdev, int srate, int scheduler) { ! ASIOError status; ASIOBufferInfo * buffers = NULL; int i; --- 196,200 ---- int nchoutdev, int *choutdev, int srate, int scheduler) { ! ASIOError status = ASE_OK; ASIOBufferInfo * buffers = NULL; int i;

1 0

pd/src s_file.c,1.2.4.7,1.2.4.8
by Thomas Grill 17 Jan '05

17 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2094/src Modified Files: Tag: devel_0_38 s_file.c Log Message: once again fixed registry HKEY types Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.7 retrieving revision 1.2.4.8 diff -C2 -d -r1.2.4.7 -r1.2.4.8 *** s_file.c 7 Jan 2005 12:23:26 -0000 1.2.4.7 --- s_file.c 17 Jan 2005 20:19:28 -0000 1.2.4.8 *************** *** 157,161 **** static int sys_getpreference(const char *key, char *value, int size) { ! HKEY **hkey; DWORD bigsize = size; LONG err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, --- 157,161 ---- static int sys_getpreference(const char *key, char *value, int size) { ! HKEY hkey; DWORD bigsize = size; LONG err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, *************** *** 185,189 **** static void sys_putpreference(const char *key, const char *value) { ! HKEY **hkey; LONG err = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "Software\\Pd", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, --- 185,189 ---- static void sys_putpreference(const char *key, const char *value) { ! HKEY hkey; LONG err = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "Software\\Pd", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE,

1 0

pd/src makefile.nt,1.2.4.3,1.2.4.4
by Thomas Grill 17 Jan '05

17 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1664/src Modified Files: Tag: devel_0_38 makefile.nt Log Message: added debug and optimization flags Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -C2 -d -r1.2.4.3 -r1.2.4.4 *** makefile.nt 16 Dec 2004 10:26:58 -0000 1.2.4.3 --- makefile.nt 17 Jan 2005 20:17:59 -0000 1.2.4.4 *************** *** 88,95 **** GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO $(WISHDEF) /ZI # -DUSEAPI_PORTAUDIO # -DUSEAPI_ASIO ! LFLAGS = /nologo /DEBUG /MAP /PROFILE SYSSRC = s_audio_mmio.c s_midi_mmio.c # s_audio_pa.c s_midi_pm.c --- 88,107 ---- GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO $(WISHDEF) ! ! !ifndef OFLAGS ! OFLAGS=/Ox ! !endif ! # -DUSEAPI_PORTAUDIO # -DUSEAPI_ASIO ! LFLAGS = /nologo ! ! !ifdef DEBUG ! CFLAGS = $(CFLAGS) /Zi ! LFLAGS = $(LFLAGS) /DEBUG ! !else ! CFLAGS = $(CFLAGS) $(OFLAGS) ! !endif SYSSRC = s_audio_mmio.c s_midi_mmio.c # s_audio_pa.c s_midi_pm.c

1 0

pd/src m_sched.c,1.5.4.15,1.5.4.16
by Tim Blechmann 16 Jan '05

16 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3819 Modified Files: Tag: devel_0_38 m_sched.c Log Message: improved idle callbacks Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.15 retrieving revision 1.5.4.16 diff -C2 -d -r1.5.4.15 -r1.5.4.16 *** m_sched.c 16 Jan 2005 16:07:45 -0000 1.5.4.15 --- m_sched.c 16 Jan 2005 21:51:20 -0000 1.5.4.16 *************** *** 629,635 **** t_int* argv; t_int argc; } t_sched_callback; - static t_sched_callback * idle_callback = NULL; void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) --- 629,635 ---- t_int* argv; t_int argc; + struct _sched_callback* next; /* next callback in ringbuffer */ } t_sched_callback; void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) *************** *** 641,644 **** --- 641,645 ---- new->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); new->argc = argc; + new->next = NULL; if (callback_fifo == NULL) *************** *** 648,651 **** --- 649,655 ---- } + #if 0 /* old version, todo: profiling */ + static t_sched_callback * idle_callback = NULL; + static t_int run_idle_callbacks(void) { *************** *** 671,675 **** freebytes ((void*)idle_callback, sizeof(t_sched_callback)); idle_callback = fifo_get(callback_fifo); ! /* callbacks returning 1 will be run again */ case 1: --- 675,679 ---- freebytes ((void*)idle_callback, sizeof(t_sched_callback)); idle_callback = fifo_get(callback_fifo); ! /* callbacks returning 1 will be run again */ case 1: *************** *** 678,687 **** /* callbacks returning 2 will be run during the next idle callback */ case 2: ! return 0; } } while ((idle_callback != NULL) && (remain > 0)); ! /* sleep for the rest of the time */ if(remain > 100) sys_microsleep(remain); return 0; --- 682,692 ---- /* callbacks returning 2 will be run during the next idle callback */ case 2: ! goto sleep; } } while ((idle_callback != NULL) && (remain > 0)); ! sleep: ! /* sleep for the rest of the time */ if(remain > 100) sys_microsleep(remain); return 0; *************** *** 691,693 **** --- 696,774 ---- } + + #else /* improved ringbuffer version */ + static t_sched_callback *ringbuffer_head; + + static t_int run_idle_callbacks(void) + { + t_sched_callback * new_callback; + + /* append idle callback to ringbuffer */ + new_callback = (t_sched_callback*) fifo_get(callback_fifo); + while (new_callback != NULL) + { + t_sched_callback * next; + if (ringbuffer_head == NULL) + { + ringbuffer_head = new_callback; + } + else + { + next = ringbuffer_head; + while (next->next != 0) + next = next->next; + next->next = new_callback; + } + new_callback = (t_sched_callback*) fifo_get(callback_fifo); + } + + if (ringbuffer_head != NULL) + { + double remain; + double stop = sys_getrealtime() + sys_sleepgrain; + t_sched_callback * idle_callback = ringbuffer_head; + t_sched_callback * last = NULL; + t_sched_callback * next; + + do + { + int status = (idle_callback->function)(idle_callback->argv); + remain = stop-sys_getrealtime(); + + switch (status) + { + /* callbacks returning 0 will be deleted */ + case 0: + next = idle_callback->next; + freebytes (idle_callback->argv, idle_callback->argc); + freebytes ((void*)idle_callback, sizeof(t_sched_callback)); + + if (last == NULL) + ringbuffer_head = next; + else + last->next = next; + + idle_callback = next; + + /* callbacks returning 1 will be run again */ + case 1: + break; + + /* callbacks returning 2 will be run during the next idle callback */ + case 2: + last = idle_callback; + idle_callback = idle_callback->next; + } + } + while ((idle_callback != NULL) && (remain > 0)); + + sleep: + /* sleep for the rest of the time */ + if(remain > 100) sys_microsleep(remain); + return 0; + } + else + return 1; /* sleep */ + } + #endif /* } tb */

1 0

pd/src d_ctl.c,1.3.4.9,1.3.4.10
by Tim Blechmann 16 Jan '05

16 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15411 Modified Files: Tag: devel_0_38 d_ctl.c Log Message: removing debug message Index: d_ctl.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ctl.c,v retrieving revision 1.3.4.9 retrieving revision 1.3.4.10 diff -C2 -d -r1.3.4.9 -r1.3.4.10 *** d_ctl.c 14 Jan 2005 18:34:12 -0000 1.3.4.9 --- d_ctl.c 16 Jan 2005 17:15:21 -0000 1.3.4.10 *************** *** 187,191 **** int nticks = x->x_inletwas * x->x_dspticktomsec; if (!nticks) nticks = 1; - post("nticks %d", nticks); x->x_ticksleft = nticks; x->x_biginc = (x->x_target - x->x_value)/(float)nticks; --- 187,190 ----

1 0

pd/src s_main.c,1.7.4.7,1.7.4.8
by Tim Blechmann 16 Jan '05

16 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15236 Modified Files: Tag: devel_0_38 s_main.c Log Message: introducing -no-prefs flag Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.7 retrieving revision 1.7.4.8 diff -C2 -d -r1.7.4.7 -r1.7.4.8 *** s_main.c 14 Jan 2005 18:34:14 -0000 1.7.4.7 --- s_main.c 16 Jan 2005 17:14:38 -0000 1.7.4.8 *************** *** 269,272 **** --- 269,274 ---- int sys_main(int argc, char **argv) { + int defeat_presets = 0, i; + /* jsarlo { */ sys_externalschedlib = 0; *************** *** 278,285 **** pd_init(); /* start the message system */ sys_findprogdir(argv[0]); /* set sys_progname, guipath */ ! 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); --- 280,300 ---- pd_init(); /* start the message system */ sys_findprogdir(argv[0]); /* set sys_progname, guipath */ ! ! /* tb: command line flag to defeat preset loading { */ ! for (i = 0; i != argc; ++i) ! { ! if (!strcmp(argv[i],"-no-prefs")) ! defeat_presets = 1; ! } ! ! if (!defeat_presets) ! { ! sys_loadpreferences(); /* load default settings */ #ifndef MSW ! sys_rcfile(); /* parse the startup file */ #endif + } + /* } tb */ + if (sys_argparse(argc-1, argv+1)) /* parse cmd line */ return (1); *************** *** 782,785 **** --- 797,806 ---- argv += 2; } + /* tb: skip flag, we already parsed it */ + else if (!strcmp(*argv, "-no-prefs")) + { + argc -= 1; + argv += 1; + } /* } tb */ else if (!strcmp(*argv, "-verbose"))

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2005