[PD-cvs] pd/src desire.c, 1.1.2.217.2.136, 1.1.2.217.2.137 makefile.in, 1.4.4.2.2.21.2.26, 1.4.4.2.2.21.2.27

Thu Jun 28 08:41:27 CEST 2007

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

Modified Files:
      Tag: desiredata
	desire.c makefile.in 
Log Message:
d_soundfile.c goes c++

Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.21.2.26
retrieving revision 1.4.4.2.2.21.2.27
diff -C2 -d -r1.4.4.2.2.21.2.26 -r1.4.4.2.2.21.2.27
*** makefile.in	28 Jun 2007 05:23:32 -0000	1.4.4.2.2.21.2.26
--- makefile.in	28 Jun 2007 06:41:25 -0000	1.4.4.2.2.21.2.27
***************
*** 22,29 ****

  SRCXX = desire.c kernel.c builtins.c builtins_dsp.c s_path.c s_inter.c s_main.c \
! 	m_sched.c s_loader.c
! SRC = m_fifo.c m_simd.c \
!        s_audio.c s_midi.c \
!        d_ugen.c d_mayer_fft.c d_fftroutine.c d_resample.c d_soundfile.c

  # audio drivers and midi drivers
--- 22,27 ----

  SRCXX = desire.c kernel.c builtins.c builtins_dsp.c s_path.c s_inter.c s_main.c \
! 	m_sched.c s_loader.c d_soundfile.c
! SRC = m_fifo.c m_simd.c s_audio.c s_midi.c d_ugen.c d_mayer_fft.c d_fftroutine.c d_resample.c

  # audio drivers and midi drivers

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.136
retrieving revision 1.1.2.217.2.137
diff -C2 -d -r1.1.2.217.2.136 -r1.1.2.217.2.137
*** desire.c	28 Jun 2007 05:24:18 -0000	1.1.2.217.2.136
--- desire.c	28 Jun 2007 06:41:23 -0000	1.1.2.217.2.137
***************
*** 200,204 ****
  };

! t_queue *queue_new (void) {
  	t_queue *self = (t_queue *)getbytes(sizeof(t_queue));
  	self->start = self->len = 0;
--- 200,204 ----
  };

! t_queue *queue_new () {
  	t_queue *self = (t_queue *)getbytes(sizeof(t_queue));
  	self->start = self->len = 0;
***************
*** 404,408 ****
  }

! t_canvas *canvas_getcurrent(void) {return ((t_canvas *)pd_findbyclass(&s__X, canvas_class));}

  t_canvasenvironment *canvas_getenv(t_canvas *x) {
--- 404,408 ----
  }

! t_canvas *canvas_getcurrent () {return ((t_canvas *)pd_findbyclass(&s__X, canvas_class));}

  t_canvasenvironment *canvas_getenv(t_canvas *x) {
***************
*** 415,419 ****
  }

! int canvas_getdollarzero(void) {
      t_canvas *x = canvas_getcurrent();
      t_canvasenvironment *env = x ? canvas_getenv(x) : 0;
--- 415,419 ----
  }

! int canvas_getdollarzero () {
      t_canvas *x = canvas_getcurrent();
      t_canvasenvironment *env = x ? canvas_getenv(x) : 0;
***************
*** 432,436 ****
  }

! t_symbol *canvas_getcurrentdir(void) {return canvas_getenv(canvas_getcurrent())->dir;}
  t_symbol *canvas_getdir(t_canvas *x) {return canvas_getenv(                  x)->dir;}

--- 432,436 ----
  }

! t_symbol *canvas_getcurrentdir () {return canvas_getenv(canvas_getcurrent())->dir;}
  t_symbol *canvas_getdir(t_canvas *x) {return canvas_getenv(                  x)->dir;}

***************
*** 656,660 ****
  	}
  }
! extern "C" void glob_redraw(void) {canvases_each(x) canvas_redraw(x);}

  /* This is sent from the GUI to inform a toplevel that its window has been moved or resized. */
--- 656,660 ----
  	}
  }
! extern "C" void glob_redraw () {canvases_each(x) canvas_redraw(x);}

  /* This is sent from the GUI to inform a toplevel that its window has been moved or resized. */
***************
*** 938,943 ****
  typedef struct _dspcontext t_dspcontext;

! extern "C" void ugen_start(void);
! extern "C" void ugen_stop(void);
  extern "C" t_dspcontext *ugen_start_graph(int toplevel, t_signal **sp, int ninlets, int noutlets);
  extern "C" void ugen_add(t_dspcontext *dc, t_object *x);
--- 938,943 ----
  typedef struct _dspcontext t_dspcontext;

! extern "C" void ugen_start ();
! extern "C" void ugen_stop ();
  extern "C" t_dspcontext *ugen_start_graph(int toplevel, t_signal **sp, int ninlets, int noutlets);
  extern "C" void ugen_add(t_dspcontext *dc, t_object *x);
***************
*** 991,995 ****
     resume afterward, so that DSP doesn't get resorted for every DSP object
     int the patch. */
! int canvas_suspend_dsp(void) {
      int rval = canvas_dspstate;
      if (rval) canvas_stop_dsp();
--- 991,995 ----
     resume afterward, so that DSP doesn't get resorted for every DSP object
     int the patch. */
! int canvas_suspend_dsp () {
      int rval = canvas_dspstate;
      if (rval) canvas_stop_dsp();
***************
*** 1002,1006 ****

  /* this is equivalent to suspending and resuming in one step. */
! void canvas_update_dsp(void) {
      if (canvas_dspstate) canvas_start_dsp();
  }
--- 1002,1006 ----

  /* this is equivalent to suspending and resuming in one step. */
! void canvas_update_dsp () {
      if (canvas_dspstate) canvas_start_dsp();
  }
***************
*** 1420,1424 ****
  void pd_eval_text2(char *s) {pd_eval_text(s,strlen(s));}

! extern "C" void garray_init(void) {
      hack = 0; /* invisible canvases must be, uh, invisible */
      if (garray_arraytemplatecanvas) return;
--- 1420,1424 ----
  void pd_eval_text2(char *s) {pd_eval_text(s,strlen(s));}

! extern "C" void garray_init () {
      hack = 0; /* invisible canvases must be, uh, invisible */
      if (garray_arraytemplatecanvas) return;
***************
*** 2122,2126 ****

  /* d_soundfile.c uses this! */
! extern "C" int garray_ambigendian(void) {
      unsigned short s = 1;
      unsigned char c = *(char *)(&s);
--- 2122,2126 ----

  /* d_soundfile.c uses this! */
! int garray_ambigendian () {
      unsigned short s = 1;
      unsigned char c = *(char *)(&s);
***************
*** 7353,7357 ****
  }

! extern "C" void glob_update_path (void);

  void glob_help(t_pd *bogus, t_symbol *s) {
--- 7353,7357 ----
  }

! extern "C" void glob_update_path ();

  void glob_help(t_pd *bogus, t_symbol *s) {
***************
*** 7650,7654 ****
  //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);
--- 7650,7654 ----
  //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 glob_audio_asio_latencies(t_pd * dummy, t_float f);
  void glob_midi_getindevs(t_pd *dummy);
***************
*** 7686,7690 ****

  extern t_class *glob_pdobject;
! extern "C" void glob_init(void) {
      /* can this one really be called "max"? isn't that a name conflict? */
      maxclass = class_new2("max",0,0,sizeof(t_pd),CLASS_DEFAULT,"");
--- 7686,7690 ----

  extern t_class *glob_pdobject;
! extern "C" void glob_init () {
      /* can this one really be called "max"? isn't that a name conflict? */
      maxclass = class_new2("max",0,0,sizeof(t_pd),CLASS_DEFAULT,"");
***************
*** 7789,7793 ****
  /* what's the point? */
  void postfloat(float f) {t_atom a; SETFLOAT(&a, f); postatom(1, &a);}
! void endpost(void) {dopost("\n");}

  void error(const char *fmt, ...) {
--- 7789,7793 ----
  /* what's the point? */
  void postfloat(float f) {t_atom a; SETFLOAT(&a, f); postatom(1, &a);}
! void endpost () {dopost("\n");}

  void error(const char *fmt, ...) {
***************
*** 7871,7875 ****
  void sys_unixerror(const char *object)               {errobject=object; errstring = strerror(errno);}

! void sys_ouch(void) {
      if (*errobject) error("%s: %s", errobject, errstring);
      else error("%s", errstring);
--- 7871,7875 ----
  void sys_unixerror(const char *object)               {errobject=object; errstring = strerror(errno);}

! void sys_ouch () {
      if (*errobject) error("%s: %s", errobject, errstring);
      else error("%s", errstring);
***************
*** 7889,7916 ****
  /* formerly m_conf.c */

! #define S(name) void name##_setup(void); name##_setup();
! void conf_init_plus(void) {
!     S(builtins) S(builtins_dsp) S(desire)
  }

! #define S(name) void name##_setup(void); name##_setup();
  extern "C" {
! void conf_init(void) {
      conf_init_plus();
!     S(d_soundfile) S(d_ugen)
  }
  };

  // and just to make some externs happy:
! extern "C" void glist_grab(void) {}
! extern "C" void glist_xtopixels(void) {}
! extern "C" void glist_ytopixels(void) {}
! extern "C" void *glist_findrtext(void) {return 0;}
! extern "C" void canvas_fixlinesfor(void) {}
! extern "C" void class_setpropertiesfn(void) {}
! extern "C" void glist_eraseiofor(void) {}
! extern "C" void glist_getcanvas(void) {}
! extern "C" void rtext_gettag(void) {}
! extern "C" void class_setwidget(void) {}
! extern "C" void glist_isvisible(void) {}
! extern "C" void gobj_vis(void) {}
--- 7889,7916 ----
  /* formerly m_conf.c */

! #define S(name) void name##_setup (); name##_setup();
! void conf_init_plus () {
!     S(builtins) S(builtins_dsp) S(desire) S(d_soundfile)
  }

! #define S(name) void name##_setup (); name##_setup();
  extern "C" {
! void conf_init () {
      conf_init_plus();
!     S(d_ugen)
  }
  };

  // and just to make some externs happy:
! extern "C" void glist_grab () {}
! extern "C" void glist_xtopixels () {}
! extern "C" void glist_ytopixels () {}
! extern "C" void *glist_findrtext () {return 0;}
! extern "C" void canvas_fixlinesfor () {}
! extern "C" void class_setpropertiesfn () {}
! extern "C" void glist_eraseiofor () {}
! extern "C" void glist_getcanvas () {}
! extern "C" void rtext_gettag () {}
! extern "C" void class_setwidget () {}
! extern "C" void glist_isvisible () {}
! extern "C" void gobj_vis () {}