pd/src s_main.c,1.7.4.17.2.20,1.7.4.17.2.21 - Pd-cvs

23 Nov 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv968
Modified Files:
      Tag: devel_0_39
    s_main.c 
Log Message:
simplified previous change
Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.17.2.20
retrieving revision 1.7.4.17.2.21
diff -C2 -d -r1.7.4.17.2.20 -r1.7.4.17.2.21
*** s_main.c	23 Nov 2006 15:03:31 -0000	1.7.4.17.2.20
--- s_main.c	23 Nov 2006 19:14:03 -0000	1.7.4.17.2.21
***************
*** 645,649 ****
#undef NOT_HERE
! #define NOT_HERE(x) fprintf(stderr,"option "x" not compiled into this pd\n")
int sys_argparse(int argc, char **argv)
--- 645,649 ----
#undef NOT_HERE
! #define NOT_HERE fprintf(stderr,"option %s not compiled into this pd\n", *argv)
int sys_argparse(int argc, char **argv)
***************
*** 742,746 ****
              sys_set_audio_api(API_OSS);
  #else
! 	    NOT_HERE("-oss");
  #endif
              argc--; argv++;
--- 742,746 ----
              sys_set_audio_api(API_OSS);
  #else
! 	    NOT_HERE;
  #endif
              argc--; argv++;
***************
*** 751,755 ****
              sys_set_audio_api(API_OSS);
  #else
! 	    NOT_HERE("-32bit");
  #endif
              oss_set32bit();
--- 751,755 ----
              sys_set_audio_api(API_OSS);
  #else
! 	    NOT_HERE;
  #endif
              oss_set32bit();
***************
*** 761,765 ****
              sys_set_audio_api(API_ALSA);
  #else
! 	    NOT_HERE("-alsa");
  #endif
              argc--; argv++;
--- 761,765 ----
              sys_set_audio_api(API_ALSA);
  #else
! 	    NOT_HERE;
  #endif
              argc--; argv++;
***************
*** 772,776 ****
              else goto usage;
  #else
! 	    NOT_HERE("-alsaadd");
  #endif
              argc -= 2; argv +=2;
--- 772,776 ----
              else goto usage;
  #else
! 	    NOT_HERE;
  #endif
              argc -= 2; argv +=2;
***************
*** 781,785 ****
            sys_set_midi_api(API_ALSA);
  #else
! 	    NOT_HERE("-alsamidi");
  #endif
              argc--; argv++;
--- 781,785 ----
            sys_set_midi_api(API_ALSA);
  #else
! 	    NOT_HERE;
  #endif
              argc--; argv++;
***************
*** 790,794 ****
              sys_set_audio_api(API_JACK);
  #else
! 	    NOT_HERE("-jack");
  #endif
              argc--; argv++;
--- 790,794 ----
              sys_set_audio_api(API_JACK);
  #else
! 	    NOT_HERE;
  #endif
              argc--; argv++;
***************
*** 800,804 ****
              sys_set_audio_api(API_PORTAUDIO);
  #else
! 	    NOT_HERE("-portaudio");
  #endif
              sys_mmio = 0;
--- 800,804 ----
              sys_set_audio_api(API_PORTAUDIO);
  #else
! 	    NOT_HERE;
  #endif
              sys_mmio = 0;
***************
*** 810,814 ****
      	    sys_set_audio_api(API_ASIO);
  #else
! 	    NOT_HERE("-asio_native");
  #endif
        sys_mmio = 0;
--- 810,814 ----
      	    sys_set_audio_api(API_ASIO);
  #else
! 	    NOT_HERE;
  #endif
        sys_mmio = 0;
***************
*** 820,824 ****
              sys_set_audio_api(API_MMIO);
  #else
! 	    NOT_HERE("-mmio");
  #endif
              sys_mmio = 1;
--- 820,824 ----
              sys_set_audio_api(API_MMIO);
  #else
! 	    NOT_HERE;
  #endif
              sys_mmio = 1;