[PD-cvs] pd/src s_audio_oss.c, 1.6.4.2.2.2.2.9, 1.6.4.2.2.2.2.10 s_audio_sgi.c, 1.1.4.1.4.5, 1.1.4.1.4.6 s_inter.c, 1.5.4.10.2.25.2.23, 1.5.4.10.2.25.2.24

Mathieu Bouchard matju at users.sourceforge.net
Fri Aug 3 02:14:51 CEST 2007


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

Modified Files:
      Tag: desiredata
	s_audio_oss.c s_audio_sgi.c s_inter.c 
Log Message:
remove blank lines in console


Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.5.4.10.2.25.2.23
retrieving revision 1.5.4.10.2.25.2.24
diff -C2 -d -r1.5.4.10.2.25.2.23 -r1.5.4.10.2.25.2.24
*** s_inter.c	30 Jul 2007 16:33:43 -0000	1.5.4.10.2.25.2.23
--- s_inter.c	3 Aug 2007 00:14:49 -0000	1.5.4.10.2.25.2.24
***************
*** 419,423 ****
  	int ret = recv(fd, x->inbuf+x->inhead, readto-x->inhead, 0);
          if (ret<=0) {
! 	    if (ret<0) sys_sockerror("recv"); else post("EOF on socket %d\n", fd);
  	    if (x->notifier) x->notifier(x->owner);
  	    sys_rmpollfn(fd);
--- 419,423 ----
  	int ret = recv(fd, x->inbuf+x->inhead, readto-x->inhead, 0);
          if (ret<=0) {
! 	    if (ret<0) sys_sockerror("recv"); else post("EOF on socket %d", fd);
  	    if (x->notifier) x->notifier(x->owner);
  	    sys_rmpollfn(fd);
***************
*** 641,645 ****
          param.sched_priority = 80; /* adjust 0 : 100 */
          int err = pthread_setschedparam(pthread_self(), policy, &param);
!         if (err) post("warning: high priority scheduling failed\n");
      }
  #endif /* __APPLE__ */
--- 641,645 ----
          param.sched_priority = 80; /* adjust 0 : 100 */
          int err = pthread_setschedparam(pthread_self(), policy, &param);
!         if (err) post("warning: high priority scheduling failed");
      }
  #endif /* __APPLE__ */

Index: s_audio_oss.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_oss.c,v
retrieving revision 1.6.4.2.2.2.2.9
retrieving revision 1.6.4.2.2.2.2.10
diff -C2 -d -r1.6.4.2.2.2.2.9 -r1.6.4.2.2.2.2.10
*** s_audio_oss.c	2 Aug 2007 22:27:42 -0000	1.6.4.2.2.2.2.9
--- s_audio_oss.c	3 Aug 2007 00:14:49 -0000	1.6.4.2.2.2.2.10
***************
*** 155,159 ****
              post("warning: OSS takes only power of 2 blocksize; using %d",
                  (1 << logfragsize)/(dev->bytespersamp * nchannels));
!         if (sys_verbose) post("setting nfrags = %d, fragsize %d\n", nfragment, fragbytes);
  
          param = orig = (nfragment<<16) + logfragsize;
--- 155,159 ----
              post("warning: OSS takes only power of 2 blocksize; using %d",
                  (1 << logfragsize)/(dev->bytespersamp * nchannels));
!         if (sys_verbose) post("setting nfrags = %d, fragsize %d", nfragment, fragbytes);
  
          param = orig = (nfragment<<16) + logfragsize;
***************
*** 240,244 ****
                  if ((flags = fcntl(fd, F_GETFL)) < 0)                 post("couldn't get audio device flags");
                  else if (fcntl(fd, F_SETFL, flags & (!O_NDELAY)) < 0) post("couldn't set audio device flags");
!                 if (sys_verbose) post("opened %s for reading and writing\n", devname);
                  linux_adcs[inindex].fd = fd;
              }
--- 240,244 ----
                  if ((flags = fcntl(fd, F_GETFL)) < 0)                 post("couldn't get audio device flags");
                  else if (fcntl(fd, F_SETFL, flags & (!O_NDELAY)) < 0) post("couldn't set audio device flags");
!                 if (sys_verbose) post("opened %s for reading and writing", devname);
                  linux_adcs[inindex].fd = fd;
              }
***************
*** 254,258 ****
              if ((flags = fcntl(fd, F_GETFL)) < 0)                 post("couldn't get audio device flags");
              else if (fcntl(fd, F_SETFL, flags & (!O_NDELAY)) < 0) post("couldn't set audio device flags");
!             if (sys_verbose) post("opened %s for writing only\n", devname);
          }
          if (ioctl(fd, SNDCTL_DSP_GETCAPS, &capabilities) == -1) error("OSS: SNDCTL_DSP_GETCAPS failed %s", devname);
--- 254,258 ----
              if ((flags = fcntl(fd, F_GETFL)) < 0)                 post("couldn't get audio device flags");
              else if (fcntl(fd, F_SETFL, flags & (!O_NDELAY)) < 0) post("couldn't set audio device flags");
!             if (sys_verbose) post("opened %s for writing only", devname);
          }
          if (ioctl(fd, SNDCTL_DSP_GETCAPS, &capabilities) == -1) error("OSS: SNDCTL_DSP_GETCAPS failed %s", devname);
***************
*** 301,305 ****
              if ((flags = fcntl(fd, F_GETFL)) < 0) post("couldn't get audio device flags");
              else if (fcntl(fd, F_SETFL, flags & (!O_NDELAY)) < 0) post("couldn't set audio device flags");
!             if (sys_verbose) post("opened %s for reading only\n", devname);
          }
          linux_adcs[linux_nindevs].fd = fd;
--- 301,305 ----
              if ((flags = fcntl(fd, F_GETFL)) < 0) post("couldn't get audio device flags");
              else if (fcntl(fd, F_SETFL, flags & (!O_NDELAY)) < 0) post("couldn't set audio device flags");
!             if (sys_verbose) post("opened %s for reading only", devname);
          }
          linux_adcs[linux_nindevs].fd = fd;

Index: s_audio_sgi.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_sgi.c,v
retrieving revision 1.1.4.1.4.5
retrieving revision 1.1.4.1.4.6
diff -C2 -d -r1.1.4.1.4.5 -r1.1.4.1.4.6
*** s_audio_sgi.c	2 Aug 2007 22:25:14 -0000	1.1.4.1.4.5
--- s_audio_sgi.c	3 Aug 2007 00:14:49 -0000	1.1.4.1.4.6
***************
*** 89,94 ****
          pvbuf[0].value.ll = alDoubleToFixed(rate);
          if ((err = alSetParams(in_dev, pvbuf, 1)) < 0) {
!             post("could not set specified sample rate for input (%s)\n", sgi_get_error_message(err));
!             if(pvbuf[0].sizeOut < 0) post("rate was invalid\n");
          }
          /* check how many channels we actually got */
--- 89,94 ----
          pvbuf[0].value.ll = alDoubleToFixed(rate);
          if ((err = alSetParams(in_dev, pvbuf, 1)) < 0) {
!             post("could not set specified sample rate for input (%s)", sgi_get_error_message(err));
!             if(pvbuf[0].sizeOut < 0) post("rate was invalid");
          }
          /* check how many channels we actually got */
***************
*** 130,135 ****
          pvbuf[0].value.ll = alDoubleToFixed(rate);
          if ((err = alSetParams(out_dev, pvbuf, 1)) < 0) {
!             post("could not set specified sample rate for output (%s)\n", sgi_get_error_message(err));
!             if(pvbuf[0].sizeOut < 0) post("rate was invalid\n");
          }
          /* check how many channels we actually got */
--- 130,135 ----
          pvbuf[0].value.ll = alDoubleToFixed(rate);
          if ((err = alSetParams(out_dev, pvbuf, 1)) < 0) {
!             post("could not set specified sample rate for output (%s)", sgi_get_error_message(err));
!             if(pvbuf[0].sizeOut < 0) post("rate was invalid");
          }
          /* check how many channels we actually got */





More information about the Pd-cvs mailing list