Pd-cvs November 2004

pd-cvs@lists.iem.at

12 participants
283 discussions

externals/grill/pool/source pool.cpp,1.9,1.10
by Thomas Grill 09 Nov '04

09 Nov '04

Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18754/source Modified Files: pool.cpp Log Message: roll back to working version conform to ISO C++ Index: pool.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pool.cpp 30 Oct 2004 03:59:00 -0000 1.9 --- pool.cpp 9 Nov 2004 03:33:19 -0000 1.10 *************** *** 232,236 **** { poolval *prv = NULL,*ix = NULL; ! for(I vix = 0; vix < vsize; ++vix) if(rix > vals[vix].cnt) rix -= vals[vix].cnt; else { --- 232,237 ---- { poolval *prv = NULL,*ix = NULL; ! int vix; ! for(vix = 0; vix < vsize; ++vix) if(rix > vals[vix].cnt) rix -= vals[vix].cnt; else {

1 0

externals/grill/flext changes.txt,1.59,1.60
by Thomas Grill 09 Nov '04

09 Nov '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18428 Modified Files: changes.txt Log Message: fixed a thread sensitive spot make some adaptations for 0.38 compatibility made queue length longer and added overflow checks Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** changes.txt 4 Nov 2004 03:30:38 -0000 1.59 --- changes.txt 9 Nov 2004 03:31:33 -0000 1.60 *************** *** 18,21 **** --- 18,22 ---- - finally added a autoconf system (many many thanks to Tim Blechmann) - more character escapes for attribute editor + - fixed the attribute editor for 0.38, filtered redundancies 0.4.7:

1 0

externals/grill/flext/source flattr_ed.cpp,1.24,1.25 flqueue.cpp,1.20,1.21
by Thomas Grill 09 Nov '04

09 Nov '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18428/source Modified Files: flattr_ed.cpp flqueue.cpp Log Message: fixed a thread sensitive spot make some adaptations for 0.38 compatibility made queue length longer and added overflow checks Index: flqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flqueue.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** flqueue.cpp 7 Nov 2004 03:30:45 -0000 1.20 --- flqueue.cpp 9 Nov 2004 03:31:34 -0000 1.21 *************** *** 27,32 **** ! #define QUEUE_LENGTH 512 ! #define QUEUE_ATOMS 1024 class qmsg --- 27,32 ---- ! #define QUEUE_LENGTH 2048 ! #define QUEUE_ATOMS 8192 class qmsg *************** *** 198,202 **** #endif ! for(int i = 0; i < qc; ++i) { queue.Head().Send(); queue.Pop(); --- 198,203 ---- #endif ! // once more, because flushing in destructors could have reduced the count ! for(qc = queue.Count(); qc--; ) { queue.Head().Send(); queue.Pop(); Index: flattr_ed.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flattr_ed.cpp 7 Nov 2004 03:30:42 -0000 1.24 --- flattr_ed.cpp 9 Nov 2004 03:31:34 -0000 1.25 *************** *** 44,82 **** #endif ! void flext_base::SetAttrEditor(t_classid c) { ! // widgetbehavior struct MUST be resident... (static is just ok here) ! ! #ifndef FLEXT_CLONEWIDGET ! ori_vis = c->c_wb->w_visfn; ! widgetbehavior.w_getrectfn = c->c_wb->w_getrectfn; ! widgetbehavior.w_displacefn = c->c_wb->w_displacefn; ! widgetbehavior.w_selectfn = c->c_wb->w_selectfn; ! widgetbehavior.w_activatefn = c->c_wb->w_activatefn; ! widgetbehavior.w_deletefn = c->c_wb->w_deletefn; ! widgetbehavior.w_clickfn = c->c_wb->w_clickfn; ! #else ! widgetbehavior.w_getrectfn = text_widgetbehavior.w_getrectfn; ! widgetbehavior.w_displacefn = text_widgetbehavior.w_displacefn; ! widgetbehavior.w_selectfn = text_widgetbehavior.w_selectfn; ! widgetbehavior.w_activatefn = text_widgetbehavior.w_activatefn; ! widgetbehavior.w_deletefn = text_widgetbehavior.w_deletefn; ! widgetbehavior.w_clickfn = text_widgetbehavior.w_clickfn; ! #endif ! ! #if PD_MINOR_VERSION >= 37 ! class_setpropertiesfn(c,cb_GfxProperties); ! class_setsavefn(c,cb_GfxSave); ! #else ! widgetbehavior.w_propertiesfn = cb_GfxProperties; ! widgetbehavior.w_savefn = cb_GfxSave; ! #endif ! ! widgetbehavior.w_visfn = cb_GfxVis; ! class_setwidget(c, &widgetbehavior); ! ! // generate the script for the property dialog ! sys_gui( "proc flext_escatoms {lst} {\n" "set tmp {}\n" --- 44,55 ---- #endif ! //! generate the script for the property dialog ! static void tclscript() { ! static bool havecode = false; ! if(havecode) return; ! else havecode = true; ! sys_vgui( "proc flext_escatoms {lst} {\n" "set tmp {}\n" *************** *** 85,94 **** "set a [regsub {,} $a \\\\,]\n" // replace , with \, "set a [regsub {;} $a \\\\\\;]\n" // replace ; with \; - // "set a [regsub {%} $a %%]\n" // replace % with \% "lappend tmp $a\n" "}\n" "return $tmp\n" "}\n" ! "proc flext_makevalue {id ix} {\n" // strip "." from the TK id to make a variable name suffix --- 58,67 ---- "set a [regsub {,} $a \\\\,]\n" // replace , with \, "set a [regsub {;} $a \\\\\\;]\n" // replace ; with \; "lappend tmp $a\n" "}\n" "return $tmp\n" "}\n" ! ); ! sys_vgui( "proc flext_makevalue {id ix} {\n" // strip "." from the TK id to make a variable name suffix *************** *** 124,128 **** "return $lst\n" "}\n" ! "proc flext_apply {id ix} {\n" "set lst [flext_makevalue $id $ix]\n" --- 97,102 ---- "return $lst\n" "}\n" ! ); ! sys_vgui( "proc flext_apply {id ix} {\n" "set lst [flext_makevalue $id $ix]\n" *************** *** 151,155 **** "flext_cancel $id\n" "}\n" ! "proc flext_help {id} {\n" "toplevel $id.hw\n" --- 125,130 ---- "flext_cancel $id\n" "}\n" ! ); ! sys_vgui( "proc flext_help {id} {\n" "toplevel $id.hw\n" *************** *** 178,182 **** "$id.hw.text configure -state disabled\n" "}\n" ! "proc flext_copyval {dst src} {\n" "global $src $dst\n" --- 153,158 ---- "$id.hw.text configure -state disabled\n" "}\n" ! ); ! sys_vgui( "proc flext_copyval {dst src} {\n" "global $src $dst\n" *************** *** 193,197 **** "destroy $id\n" "}\n" ! "proc flext_textzoom {id var title attr edit} {\n" "global $var\n" --- 169,174 ---- "destroy $id\n" "}\n" ! ); ! sys_vgui( "proc flext_textzoom {id var title attr edit} {\n" "global $var\n" *************** *** 231,235 **** "bind $id.w {<KeyPress-Escape>} \"destroy $id.w\"\n" "}\n" ! "proc pdtk_flext_dialog {id title attrlist} {\n" "set vid [string trimleft $id .]\n" --- 208,213 ---- "bind $id.w {<KeyPress-Escape>} \"destroy $id.w\"\n" "}\n" ! ); ! sys_vgui( "proc pdtk_flext_dialog {id title attrlist} {\n" "set vid [string trimleft $id .]\n" *************** *** 275,279 **** "grid config $id.sep -column 0 -columnspan 9 -row $row -pady 2 -sticky {snew}\n" "incr row\n" ! "set ix 1\n" "foreach {an av ai atp asv afl} $attrlist {\n" --- 253,258 ---- "grid config $id.sep -column 0 -columnspan 9 -row $row -pady 2 -sticky {snew}\n" "incr row\n" ! ); ! sys_vgui( "set ix 1\n" "foreach {an av ai atp asv afl} $attrlist {\n" *************** *** 310,314 **** "label $id.label-$ix -text \"$an :\" -font {Helvetica 8 bold}\n" "grid config $id.label-$ix -column 0 -row $row -padx 5 -sticky {e}\n" ! "if { $afl != 0 } {\n" // attribute is puttable --- 289,294 ---- "label $id.label-$ix -text \"$an :\" -font {Helvetica 8 bold}\n" "grid config $id.label-$ix -column 0 -row $row -padx 5 -sticky {e}\n" ! ); ! sys_vgui( "if { $afl != 0 } {\n" // attribute is puttable *************** *** 360,363 **** --- 340,345 ---- "grid config $id.b$i-$ix -column [expr $i + 6] -row $row \n" "}\n" + ); + sys_vgui( "} else {\n" // attribute is gettable only *************** *** 393,397 **** "incr row\n" "}\n" ! // Separator "frame $id.sep2 -relief ridge -bd 1 -height 2\n" --- 375,380 ---- "incr row\n" "}\n" ! ); ! sys_vgui( // Separator "frame $id.sep2 -relief ridge -bd 1 -height 2\n" *************** *** 425,428 **** --- 408,446 ---- } + void flext_base::SetAttrEditor(t_classid c) + { + // widgetbehavior struct MUST be resident... (static is just ok here) + + #ifndef FLEXT_CLONEWIDGET + ori_vis = c->c_wb->w_visfn; + widgetbehavior.w_getrectfn = c->c_wb->w_getrectfn; + widgetbehavior.w_displacefn = c->c_wb->w_displacefn; + widgetbehavior.w_selectfn = c->c_wb->w_selectfn; + widgetbehavior.w_activatefn = c->c_wb->w_activatefn; + widgetbehavior.w_deletefn = c->c_wb->w_deletefn; + widgetbehavior.w_clickfn = c->c_wb->w_clickfn; + #else + widgetbehavior.w_getrectfn = text_widgetbehavior.w_getrectfn; + widgetbehavior.w_displacefn = text_widgetbehavior.w_displacefn; + widgetbehavior.w_selectfn = text_widgetbehavior.w_selectfn; + widgetbehavior.w_activatefn = text_widgetbehavior.w_activatefn; + widgetbehavior.w_deletefn = text_widgetbehavior.w_deletefn; + widgetbehavior.w_clickfn = text_widgetbehavior.w_clickfn; + #endif + + #if PD_MINOR_VERSION >= 37 + class_setpropertiesfn(c,cb_GfxProperties); + class_setsavefn(c,cb_GfxSave); + #else + widgetbehavior.w_propertiesfn = cb_GfxProperties; + widgetbehavior.w_savefn = cb_GfxSave; + #endif + + widgetbehavior.w_visfn = cb_GfxVis; + class_setwidget(c, &widgetbehavior); + + tclscript(); + } + static size_t escapeit(char *dst,size_t maxlen,const char *src) { *************** *** 511,515 **** PrintAtom(lv[i],tmp,sizeof tmp); b += escapeit(b,sizeof(buf)+buf-b,tmp); ! if(i < lv.Count()-1) { *(b++) = ' '; *(b++) = 0; } } } --- 529,533 ---- PrintAtom(lv[i],tmp,sizeof tmp); b += escapeit(b,sizeof(buf)+buf-b,tmp); ! if(i < lv.Count()-1) { *(b++) = ' '; *b = 0; } } } *************** *** 525,532 **** for(int i = 0; i < lp.Count(); ++i) { ! char tmp[100]; PrintAtom(lp[i],tmp,sizeof(tmp)); b += escapeit(b,sizeof(buf)+buf-b,tmp); ! if(i < lp.Count()-1) { *(b++) = ' '; *(b++) = 0; } } } --- 543,550 ---- for(int i = 0; i < lp.Count(); ++i) { ! char tmp[256]; PrintAtom(lp[i],tmp,sizeof(tmp)); b += escapeit(b,sizeof(buf)+buf-b,tmp); ! if(i < lp.Count()-1) { *(b++) = ' '; *b = 0; } } }

1 0

pd/src m_sched.c,1.5,1.5.4.1
by Thomas Grill 08 Nov '04

08 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22186/src Modified Files: Tag: devel_0_38 m_sched.c Log Message: open sys_lock while send_dac may be sleeping Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** m_sched.c 6 Sep 2004 20:20:35 -0000 1.5 --- m_sched.c 8 Nov 2004 20:27:10 -0000 1.5.4.1 *************** *** 411,416 **** if (sched_usedacs) { timeforward = sys_send_dacs(); ! /* if dacs remain "idle" for 1 sec, they're hung up. */ if (timeforward != 0) --- 411,426 ---- if (sched_usedacs) { + #ifdef THREAD_LOCKING + /* T.Grill - send_dacs may sleep -> + unlock thread lock make that time available + - could messaging do any harm while sys_send_dacs is running? + */ + sys_unlock(); + #endif timeforward = sys_send_dacs(); ! #ifdef THREAD_LOCKING ! /* T.Grill - done */ ! sys_unlock(); ! #endif /* if dacs remain "idle" for 1 sec, they're hung up. */ if (timeforward != 0)

1 0

pd/src s_audio_asio.cpp,1.1.4.6,1.1.4.7
by Thomas Grill 08 Nov '04

08 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20201/src Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: alternative way of waiting.. but not working yet Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.6 retrieving revision 1.1.4.7 diff -C2 -d -r1.1.4.6 -r1.1.4.7 *** s_audio_asio.cpp 8 Nov 2004 13:23:47 -0000 1.1.4.6 --- s_audio_asio.cpp 8 Nov 2004 20:18:41 -0000 1.1.4.7 *************** *** 47,51 **** // seconds to wait for driver to respond ! #define DRIVERWAIT 3 #ifdef PD_DEBUG --- 47,51 ---- // seconds to wait for driver to respond ! #define DRIVERWAIT 1 #ifdef PD_DEBUG *************** *** 202,206 **** asio_driver->sysRef = 0; #endif ! status = ASIOInit(asio_driver); --- 202,206 ---- asio_driver->sysRef = 0; #endif ! status = ASIOInit(asio_driver); *************** *** 545,548 **** --- 545,550 ---- asio_ringbuffer_inoffset += DEFDACBLKSIZE; + #if 1 + // blocking method if (asio_ringbuffer_inoffset >= asio_ringbuffer_outoffset + asio_bufsize) { *************** *** 567,575 **** asio_ringbuffer_outoffset += asio_bufsize; } - if ((timenow = sys_getrealtime()) - timeref > 0.002) { return SENDDACS_SLEPT; } return SENDDACS_YES; } --- 569,589 ---- asio_ringbuffer_outoffset += asio_bufsize; } if ((timenow = sys_getrealtime()) - timeref > 0.002) { return SENDDACS_SLEPT; } + #else + // non-blocking... let PD wait -> doesn't work! + if (asio_ringbuffer_inoffset >= asio_ringbuffer_outoffset + asio_bufsize) + return SENDDACS_NO; + + if (asio_ringbuffer_inoffset == asio_ringbuffer_length) + { + asio_ringbuffer_outoffset = 0; + asio_ringbuffer_inoffset = 0; + } + else + asio_ringbuffer_outoffset += asio_bufsize; + #endif return SENDDACS_YES; }

1 0

pd/src configure.in,1.5.4.1,1.5.4.2
by IOhannes m zmölnig 08 Nov '04

08 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16239 Modified Files: Tag: devel_0_38 configure.in Log Message: seems like oneif-bracket was not closed Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -C2 -d -r1.5.4.1 -r1.5.4.2 *** configure.in 6 Nov 2004 10:21:16 -0000 1.5.4.1 --- configure.in 8 Nov 2004 17:57:50 -0000 1.5.4.2 *************** *** 179,182 **** --- 179,183 ---- MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" LDFLAGS=$LDFLAGS" -lasound" + fi if test x$portaudio == "xyes";

1 0

pd/src s_inter.c,1.5.4.1,1.5.4.2
by Thomas Grill 08 Nov '04

08 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15482/src Modified Files: Tag: devel_0_38 s_inter.c Log Message: check for too long GUI string and print error to the console Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -C2 -d -r1.5.4.1 -r1.5.4.2 *** s_inter.c 5 Nov 2004 14:27:47 -0000 1.5.4.1 --- s_inter.c 8 Nov 2004 17:54:42 -0000 1.5.4.2 *************** *** 642,645 **** --- 642,650 ---- sys_guibufsize - sys_guibufhead, fmt, ap); va_end(ap); + if(msglen < 0) + { + fprintf(stderr, "Pd: buffer space wasn't sufficient for long GUI string\n"); + return; + } if (msglen >= sys_guibufsize - sys_guibufhead) { *************** *** 652,659 **** sys_guibufsize - sys_guibufhead, fmt, ap); va_end(ap); ! if (msglen2 != msglen) ! bug("sys_vgui"); ! if (msglen >= sys_guibufsize - sys_guibufhead) ! msglen = sys_guibufsize - sys_guibufhead; } if (sys_debuglevel & DEBUG_MESSUP) --- 657,664 ---- sys_guibufsize - sys_guibufhead, fmt, ap); va_end(ap); ! if (msglen2 != msglen) ! bug("sys_vgui"); ! if (msglen >= sys_guibufsize - sys_guibufhead) ! msglen = sys_guibufsize - sys_guibufhead; } if (sys_debuglevel & DEBUG_MESSUP)

1 0

pd/src x_net.c,1.2,1.2.4.1
by Thomas Grill 08 Nov '04

08 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15326/src Modified Files: Tag: devel_0_38 x_net.c Log Message: avoid MSVC++ compiler warnings Index: x_net.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_net.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** x_net.c 6 Sep 2004 20:20:36 -0000 1.2 --- x_net.c 8 Nov 2004 17:54:02 -0000 1.2.4.1 *************** *** 82,86 **** intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! &intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); } --- 82,86 ---- intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! (char *)&intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); } *************** *** 274,278 **** intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, ! &intarg, sizeof(intarg)) < 0) post("setsockopt (SO_REUSEADDR) failed\n"); #endif --- 274,278 ---- intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, ! (char *)&intarg, sizeof(intarg)) < 0) post("setsockopt (SO_REUSEADDR) failed\n"); #endif *************** *** 288,292 **** intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! &intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); } --- 288,292 ---- intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! (char *)&intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); }

1 0

pd/src s_audio_asio.cpp,1.1.4.5,1.1.4.6
by Thomas Grill 08 Nov '04

08 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7175/src Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: measures for handling hanging drivers Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.5 retrieving revision 1.1.4.6 diff -C2 -d -r1.1.4.5 -r1.1.4.6 *** s_audio_asio.cpp 7 Nov 2004 17:01:34 -0000 1.1.4.5 --- s_audio_asio.cpp 8 Nov 2004 13:23:47 -0000 1.1.4.6 *************** *** 32,35 **** --- 32,38 ---- #include "stdio.h" /* for sprintf */ + #include <time.h> + #include <sys/timeb.h> + #include "assert.h" #define ASSERT assert *************** *** 43,46 **** --- 46,52 ---- #include "math.h" + // seconds to wait for driver to respond + #define DRIVERWAIT 3 + #ifdef PD_DEBUG #define ASIODEBUG *************** *** 396,439 **** void asio_close_audio(void) { ! ASIOError status; ! int channels = sys_inchannels + sys_outchannels; ! int i; ! ! pthread_cond_broadcast(&asio_ringbuf_cond); ! if(asio_useoutputready) ! { ! // the DMA buffers would be played past ASIOStop ! // -> clear output buffers and notify driver ! #if 0 ! // slow, blocking method ! for(i = 0; i != sys_outchannels; ++i) ! zerovec_simd(asio_ringbuffer[i], asio_ringbuffer_length); ! // wait for bufferswitch to process silence (twice) ! pthread_cond_wait(&asio_ringbuf_cond, &asio_ringbuf_mutex); ! for(i = 0; i != sys_outchannels; ++i) ! memset(asio_ringbuffer[i], 0, asio_ringbuffer_length * sizeof (t_sample)); ! pthread_cond_wait(&asio_ringbuf_cond, &asio_ringbuf_mutex); ! #else ! // direct method - clear both hardware buffers ! for(i = 0; i < sys_outchannels; ++i) { ! long bytes = asio_bufsize*asio_out_samplewidth[i]; ! memset(asio_bufferinfo[i].buffers[0],0,bytes); ! memset(asio_bufferinfo[i].buffers[1],0,bytes); ! } ! // notify driver ! ASIOOutputReady(); ! #endif ! } ! post("ASIO: close"); ! status = ASIOStop(); ! ASSERT(status == ASE_OK); - if (asio_driver) - { - ASIOStop(); - for (i = 0; i != channels; i++) freealignedbytes(asio_ringbuffer[i], --- 402,443 ---- void asio_close_audio(void) { ! if (asio_driver) ! { ! post("ASIO: close"); ! pthread_cond_broadcast(&asio_ringbuf_cond); ! ASIOError status; ! int channels = sys_inchannels + sys_outchannels; ! int i; ! if(asio_useoutputready) ! { ! // the DMA buffers would be played past ASIOStop ! // -> clear output buffers and notify driver ! #if 0 ! // slow, blocking method ! for(i = 0; i != sys_outchannels; ++i) ! zerovec_simd(asio_ringbuffer[i], asio_ringbuffer_length); ! // wait for bufferswitch to process silence (twice) ! pthread_cond_wait(&asio_ringbuf_cond, &asio_ringbuf_mutex); ! for(i = 0; i != sys_outchannels; ++i) ! memset(asio_ringbuffer[i], 0, asio_ringbuffer_length * sizeof (t_sample)); ! pthread_cond_wait(&asio_ringbuf_cond, &asio_ringbuf_mutex); ! #else ! // direct method - clear both hardware buffers ! for(i = 0; i < sys_outchannels; ++i) { ! long bytes = asio_bufsize*asio_out_samplewidth[i]; ! memset(asio_bufferinfo[i].buffers[0],0,bytes); ! memset(asio_bufferinfo[i].buffers[1],0,bytes); ! } ! // notify driver ! ASIOOutputReady(); ! #endif ! } ! ! status = ASIOStop(); ! ASSERT(status == ASE_OK); for (i = 0; i != channels; i++) freealignedbytes(asio_ringbuffer[i], *************** *** 503,507 **** if (!asio_driver) { ! error("ASIO not running"); return SENDDACS_NO; } --- 507,513 ---- if (!asio_driver) { ! static int written = 0; ! if(written%100 == 0) error("ASIO not running"); ! written++; return SENDDACS_NO; } *************** *** 541,545 **** if (asio_ringbuffer_inoffset >= asio_ringbuffer_outoffset + asio_bufsize) { ! pthread_cond_wait(&asio_ringbuf_cond, &asio_ringbuf_mutex); if (asio_ringbuffer_inoffset == asio_ringbuffer_length) { --- 547,562 ---- if (asio_ringbuffer_inoffset >= asio_ringbuffer_outoffset + asio_bufsize) { ! struct timespec tm; ! _timeb tmb; ! _ftime(&tmb); ! tm.tv_nsec = tmb.millitm*1000000; ! tm.tv_sec = tmb.time+DRIVERWAIT; // delay ! if(pthread_cond_timedwait(&asio_ringbuf_cond, &asio_ringbuf_mutex, &tm) == ETIMEDOUT) ! { ! error("ASIO: ASIO driver non-responsive! - closing"); ! asio_close_audio(); ! return SENDDACS_SLEPT; ! } ! if (asio_ringbuffer_inoffset == asio_ringbuffer_length) { *************** *** 619,624 **** long i, j; - - // todo: store the timeInfo for later use --- 636,639 ----

1 0

pd/src makefile.nt,1.2.4.1,1.2.4.2
by Thomas Grill 08 Nov '04

08 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20923/src Modified Files: Tag: devel_0_38 makefile.nt Log Message: make it a bit more general Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** makefile.nt 5 Nov 2004 14:27:46 -0000 1.2.4.1 --- makefile.nt 8 Nov 2004 09:37:29 -0000 1.2.4.2 *************** *** 1,8 **** # Makefile for PD on MSW # ! # This should ideally be started from the compiler console so that it will have # the compiler, include and lib paths defined by environment settings # - # nmake -f makefile.nt all: pd gui ..\bin\pd.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe --- 1,15 ---- # Makefile for PD on MSW # ! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! # This should be started from the compiler console so that it will have # the compiler, include and lib paths defined by environment settings + # (the set the environment call VCVARS32.BAT) + # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + # + # invoke with e.g. + # nmake -f makefile.nt PMDIR="f:\prog\audio\portmidi" + # ASIODIR="f:\prog\audio\asiosdk2" + # PTHREADS="f:\prog\packs\pthreads" TCLDIR="c:\programme\prog\tcl" # all: pd gui ..\bin\pd.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe *************** *** 13,17 **** !ifndef VC - VC = "E:\Programme\Microsoft Visual Studio 8\VC" #VC="\Program Files\DevStudio\Vc" !endif --- 20,23 ---- *************** *** 29,34 **** !endif ! ASIODIR = g:\asiosdk2 ASIOINC = -I$(ASIODIR)\common -I$(ASIODIR)\host -I$(ASIODIR)\host\pc --- 35,41 ---- !endif ! !ifndef ASIODIR ASIODIR = g:\asiosdk2 + !endif ASIOINC = -I$(ASIODIR)\common -I$(ASIODIR)\host -I$(ASIODIR)\host\pc *************** *** 60,74 **** INC = -I.\ -I$(TCLINC) -I$(PTHREADS) $(ASIOINC) !ifdef VC ! INC = $(INC) -I$(VC)\include -I"E:\Programme\Microsoft Platform SDK for Windows XP SP2"\include !endif # the library directory might automatically be found ! #!ifdef LIB ! #LDIR = ! #!else # the trailing slash is important!! ! #LDIR = $(VC)\lib\ ! LDIR = "E:\Programme\Microsoft Platform SDK for Windows XP SP2"\Lib/ ! #!endif #LIBS = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ --- 67,80 ---- INC = -I.\ -I$(TCLINC) -I$(PTHREADS) $(ASIOINC) !ifdef VC ! INC = $(INC) -I$(VC)\include !endif # the library directory might automatically be found ! !ifdef LIB ! LDIR = ! !else # the trailing slash is important!! ! LDIR = $(VC)\lib\ ! !endif #LIBS = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ *************** *** 77,87 **** # $(LDIR)wsock32.lib $(LDIR)winmm.lib $(PTHREADS)\pthreadVC.lib ! LIBS = $(LDIR)\wsock32.lib $(LDIR)\winmm.lib $(PTHREADS)\pthreadVC.lib \ ! $(LDIR)\ole32.lib $(LDIR)\user32.lib $(LDIR)\advapi32.lib GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ -DPA_LITTLE_ENDIAN -DUSEAPI_ASIO -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO \ ! $(WISHDEF) /ZI /DDONTUSESIMD LFLAGS = /nologo /DEBUG /MAP /PROFILE --- 83,93 ---- # $(LDIR)wsock32.lib $(LDIR)winmm.lib $(PTHREADS)\pthreadVC.lib ! LIBS = wsock32.lib winmm.lib $(PTHREADS)\pthreadVC.lib ole32.lib user32.lib advapi32.lib ! GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ -DPA_LITTLE_ENDIAN -DUSEAPI_ASIO -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO \ ! $(WISHDEF) /ZI LFLAGS = /nologo /DEBUG /MAP /PROFILE *************** *** 108,113 **** SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp ! PAOBJ = pa_lib.obj pa_trace.obj pa_asio.obj pablio.obj pa_asio.obj \ ! ringbuffer.obj INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime --- 114,118 ---- SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp ! PAOBJ = pa_lib.obj pa_trace.obj pa_asio.obj pablio.obj ringbuffer.obj INCPM = -I$(PMDIR)\pm_common -I$(PMDIR)\pm_win -I$(PMDIR)\porttime

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
29
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 November 2004