[PD-cvs] pd/src builtins.c, 1.1.2.25, 1.1.2.26 desire.c, 1.1.2.217.2.144, 1.1.2.217.2.145 s_inter.c, 1.5.4.10.2.25.2.19, 1.5.4.10.2.25.2.20 m_sched.c, 1.5.4.35.2.21.2.11, 1.5.4.35.2.21.2.12

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	builtins.c desire.c s_inter.c m_sched.c 
Log Message:
switch audio and midi to C++


Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.5.4.10.2.25.2.19
retrieving revision 1.5.4.10.2.25.2.20
diff -C2 -d -r1.5.4.10.2.25.2.19 -r1.5.4.10.2.25.2.20
*** s_inter.c	30 Jun 2007 22:40:13 -0000	1.5.4.10.2.25.2.19
--- s_inter.c	9 Jul 2007 17:57:57 -0000	1.5.4.10.2.25.2.20
***************
*** 8,11 ****
--- 8,12 ----
  #define WATCHDOGTHREAD
  
+ #define PD_PLUSPLUS_FACE
  #include "desire.h"
  #include "pthread.h"
***************
*** 518,522 ****
  }
  
! extern "C" void glob_ping(t_pd *dummy) {t_socketreceiver *self = sys_socketreceiver; self->waitingforping = 0;}
  
  int sys_pollgui() {
--- 519,523 ----
  }
  
! void glob_ping(t_pd *dummy) {t_socketreceiver *self = sys_socketreceiver; self->waitingforping = 0;}
  
  int sys_pollgui() {

Index: builtins.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -C2 -d -r1.1.2.25 -r1.1.2.26
*** builtins.c	9 Jul 2007 17:42:51 -0000	1.1.2.25
--- builtins.c	9 Jul 2007 17:57:55 -0000	1.1.2.26
***************
*** 2036,2040 ****
  /* MIDI. */
  
- extern "C" {
  void outmidi_noteon(int portno, int channel, int pitch, int velo);
  void outmidi_controlchange(int portno, int channel, int ctlno, int value);
--- 2036,2039 ----
***************
*** 2044,2048 ****
  void outmidi_polyaftertouch(int portno, int channel, int pitch, int value);
  void outmidi_mclk(int portno);
- };
  
  static t_symbol *midiin_sym, *sysexin_sym;
--- 2043,2046 ----

Index: m_sched.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v
retrieving revision 1.5.4.35.2.21.2.11
retrieving revision 1.5.4.35.2.21.2.12
diff -C2 -d -r1.5.4.35.2.21.2.11 -r1.5.4.35.2.21.2.12
*** m_sched.c	30 Jun 2007 20:47:43 -0000	1.5.4.35.2.21.2.11
--- m_sched.c	9 Jul 2007 17:57:57 -0000	1.5.4.35.2.21.2.12
***************
*** 537,541 ****
  static t_sched_callback *ringbuffer_head = NULL;
  
! extern "C" void run_all_idle_callbacks () {
      t_sched_callback *new_callback;
      /* append idle callback to ringbuffer */
--- 537,541 ----
  static t_sched_callback *ringbuffer_head = NULL;
  
! void run_all_idle_callbacks () {
      t_sched_callback *new_callback;
      /* append idle callback to ringbuffer */
***************
*** 645,651 ****
  }
  
! int sys_getscheduler () {
!     return sys_callbackscheduler;
! }
  
  static t_int sys_xrun_notification_callback(t_int *dummy) {
--- 645,649 ----
  }
  
! int sys_getscheduler () {return sys_callbackscheduler;}
  
  static t_int sys_xrun_notification_callback(t_int *dummy) {
***************
*** 656,662 ****
  }
  
! extern "C" void sys_xrun_notification () {
!     sys_callback(sys_xrun_notification_callback, 0, 0);
! }
  
  static t_int sys_lock_timeout_notification_callback(t_int *dummy) {
--- 654,658 ----
  }
  
! void sys_xrun_notification () {sys_callback(sys_xrun_notification_callback, 0, 0);}
  
  static t_int sys_lock_timeout_notification_callback(t_int *dummy) {
***************
*** 667,672 ****
  }
  
! extern "C" void sys_lock_timeout_notification () {
!     sys_callback(sys_lock_timeout_notification_callback, 0, 0);
! }
! 
--- 663,665 ----
  }
  
! void sys_lock_timeout_notification () {sys_callback(sys_lock_timeout_notification_callback, 0, 0);}

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.144
retrieving revision 1.1.2.217.2.145
diff -C2 -d -r1.1.2.217.2.144 -r1.1.2.217.2.145
*** desire.c	2 Jul 2007 06:16:55 -0000	1.1.2.217.2.144
--- desire.c	9 Jul 2007 17:57:55 -0000	1.1.2.217.2.145
***************
*** 7617,7622 ****
  void glob_meters(void *dummy, t_floatarg f);
  void glob_audiostatus(void *dummy);
- extern "C" {
- 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);
--- 7617,7620 ----
***************
*** 7630,7633 ****
--- 7628,7634 ----
  void glob_startup_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
  void glob_ping(t_pd *dummy);
+ extern "C" {
+ void glob_finderror(t_pd *dummy);
+ };
  /* tb: message-based audio configuration { */
  void glob_audio_testaudiosetting(t_pd * dummy, t_symbol *s, int ac, t_atom *av);
***************
*** 7645,7654 ****
  void glob_audio_getcurrent_devices ();
  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_hash *object_table;
--- 7646,7654 ----
  void glob_audio_getcurrent_devices ();
  void glob_audio_asio_latencies(t_pd * dummy, t_float f);
! void glob_midi_getindevs( t_pd *dummy, t_symbol *s, int ac, t_atom *av);
! void glob_midi_getoutdevs(t_pd *dummy, t_symbol *s, int ac, t_atom *av);
  void glob_midi_getcurrentindevs(t_pd *dummy);
  void glob_midi_getcurrentoutdevs(t_pd *dummy);
  /* tb } */
  
  extern t_hash *object_table;