[PD-cvs] pd/src s_midi.c, 1.4.4.1.2.2, 1.4.4.1.2.3 s_midi_alsa.c, 1.1.2.2.2.4, 1.1.2.2.2.5 s_midi_oss.c, 1.3, 1.3.8.1

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	s_midi.c s_midi_alsa.c s_midi_oss.c 
Log Message:
fixed warnings


Index: s_midi.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v
retrieving revision 1.4.4.1.2.2
retrieving revision 1.4.4.1.2.3
diff -C2 -d -r1.4.4.1.2.2 -r1.4.4.1.2.3
*** s_midi.c	16 Jul 2005 11:02:37 -0000	1.4.4.1.2.2
--- s_midi.c	27 Nov 2005 08:08:44 -0000	1.4.4.1.2.3
***************
*** 155,159 ****
  static void sys_queuemidimess(int portno, int onebyte, int a, int b, int c)
  {
-     t_midiqelem *midiqelem;
      int newhead = midi_outhead +1;
      if (newhead == MIDIQSIZE)
--- 155,158 ----
***************
*** 426,430 ****
  {
      static int warned = 0;
-     t_midiqelem *midiqelem;
      int newhead = midi_inhead +1;
      if (newhead == MIDIQSIZE)
--- 425,428 ----
***************
*** 531,535 ****
      midi_oss_init();
  #endif
!     if (enable)
  #ifdef USEAPI_ALSA
  		if (sys_midiapi == API_ALSA)
--- 529,533 ----
      midi_oss_init();
  #endif
!     if (enable) {
  #ifdef USEAPI_ALSA
  		if (sys_midiapi == API_ALSA)
***************
*** 538,541 ****
--- 536,540 ----
  #endif /* ALSA */
  			sys_do_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev);
+     }
      sys_save_midi_params(nmidiindev, midiindev,
          nmidioutdev, midioutdev);
***************
*** 717,722 ****
  void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv)
  {
-     int nmidiindev, midiindev[MAXMIDIINDEV];
-     int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
      int i, nindev, noutdev;
      int newmidiindev[4], newmidioutdev[4];
--- 716,719 ----

Index: s_midi_oss.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi_oss.c,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -C2 -d -r1.3 -r1.3.8.1
*** s_midi_oss.c	6 Sep 2004 20:20:36 -0000	1.3
--- s_midi_oss.c	27 Nov 2005 08:08:44 -0000	1.3.8.1
***************
*** 230,238 ****
  {
      int i, throttle = 100;
!     struct timeval timout;
!     int did = 1, maxfd = 0;
      while (did)
      {
-         fd_set readset, writeset, exceptset;
          did = 0;
          if (throttle-- < 0)
--- 230,236 ----
  {
      int i, throttle = 100;
!     int did = 1;
      while (did)
      {
          did = 0;
          if (throttle-- < 0)

Index: s_midi_alsa.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi_alsa.c,v
retrieving revision 1.1.2.2.2.4
retrieving revision 1.1.2.2.2.5
diff -C2 -d -r1.1.2.2.2.4 -r1.1.2.2.2.5
*** s_midi_alsa.c	6 Oct 2005 18:41:42 -0000	1.1.2.2.2.4
--- s_midi_alsa.c	27 Nov 2005 08:08:44 -0000	1.1.2.2.2.5
***************
*** 239,243 ****
      {
          // repack into 1 byte char and put somewhere to point at
-         unsigned char data = (unsigned char)byte;
          unsigned char *dataptr = malloc(1);
          memcpy(dataptr,&byte,1);
--- 239,242 ----
***************
*** 296,300 ****
  void midi_alsa_init(void)     
  {
-     int i;
      if (alsa_initted)
          return;
--- 295,298 ----