[PD-cvs] pd/src s_main.c,1.1.1.4.2.8.4.8,1.1.1.4.2.8.4.9

[Mathieu Bouchard]

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

Modified Files:
      Tag: impd_0_37
	s_main.c 
Log Message:
-help now lists unavailable options with mention " (Not Compiled In)"


Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.1.1.4.2.8.4.8
retrieving revision 1.1.1.4.2.8.4.9
diff -C2 -d -r1.1.1.4.2.8.4.8 -r1.1.1.4.2.8.4.9
*** s_main.c	3 Apr 2004 13:16:38 -0000	1.1.1.4.2.8.4.8
--- s_main.c	4 Apr 2004 19:17:57 -0000	1.1.1.4.2.8.4.9
***************
*** 280,283 ****
--- 280,313 ----
  }
  
+ #ifndef USEAPI_OSS
+ #define NOAPI_OSS " (Not Compiled In)"
+ #else
+ #define NOAPI_OSS ""
+ #endif
+ 
+ #ifndef USEAPI_ALSA
+ #define NOAPI_ALSA " (Not Compiled In)"
+ #else
+ #define NOAPI_ALSA ""
+ #endif
+ 
+ #ifndef USEAPI_JACK
+ #define NOAPI_JACK " (Not Compiled In)"
+ #else
+ #define NOAPI_JACK ""
+ #endif
+ 
+ #ifndef USEAPI_PORTAUDIO
+ #define NOAPI_PORTAUDIO " (Not Compiled In)"
+ #else
+ #define NOAPI_PORTAUDIO ""
+ #endif
+ 
+ #ifndef USEAPI_MMIO
+ #define NOAPI_MMIO " (Not Compiled In)"
+ #else
+ #define NOAPI_MMIO ""
+ #endif
+ 
  static char *(usagemessage[]) = {
  "usage: pd [-flags] [file]...\n",
***************
*** 295,327 ****
  "-nodac           -- suppress audio output\n",
  "-noadc           -- suppress audio input\n",
! "-noaudio         -- suppress audio input and output (-nosound is synonym) \n",
  "-listdev         -- list audio and MIDI devices\n",
! 
! #ifdef USEAPI_OSS
! "-oss     	  -- use OSS audio API\n",
! "-32bit     	  ----- allow 32 bit OSS audio (for RME Hammerfall)\n",
! #endif
! 
! #ifdef USEAPI_ALSA
! "-alsa            -- use ALSA audio API\n",
! "-alsadev <n>     ----- obsolete: use -audiodev\n",
! #endif
! 
! #ifdef USEAPI_JACK
! "-jack            -- use JACK audio API\n",
! #endif
! 
! #ifdef USEAPI_PORTAUDIO
  #ifdef MSW
! "-asio            -- use ASIO audio driver (via Portaudio)\n",
! "-pa              -- synonym for -asio\n",
! #else
! "-pa              -- use Portaudio API\n",
! #endif
! #endif
! 
! #ifdef USEAPI_MMIO
! "-mmio     	  -- use MMIO audio API (default for Windows)\n",
  #endif
  "      (default audio API for this platform:  ", API_DEFSTRING, ")\n\n",
  
--- 325,340 ----
  "-nodac           -- suppress audio output\n",
  "-noadc           -- suppress audio input\n",
! "-noaudio         -- suppress audio input and output (-nosound is synonym)\n",
  "-listdev         -- list audio and MIDI devices\n",
! "-oss     	  -- use OSS audio API"NOAPI_OSS"\n",
! "-32bit     	  ----- allow 32 bit OSS audio (for RME Hammerfall)"NOAPI_OSS"\n",
! "-alsa            -- use ALSA audio API"NOAPI_ALSA"\n",
! "-alsadev <n>     ----- obsolete: use -audiodev"NOAPI_ALSA"\n",
! "-jack            -- use JACK audio API"NOAPI_JACK"\n",
! "-pa              -- use Portaudio API"NOAPI_PORTAUDIO"\n",
  #ifdef MSW
! "-asio            -- use ASIO audio driver (synonym of -pa)"NOAPI_PORTAUDIO"\n",
  #endif
+ "-mmio     	  -- use MMIO audio API (default for Windows)"NOAPI_MMIO"\n",
  "      (default audio API for this platform:  ", API_DEFSTRING, ")\n\n",
  
***************
*** 347,353 ****
  "-guicmd \"cmd...\" -- substitute another GUI program (e.g., rsh)\n",
  "-send \"msg...\"   -- send a message at startup (after patches are loaded)\n",
! #ifdef __linux__
! "-rt or -realtime -- use real-time priority (needs root privilege)\n",
! #endif
  "\nimpd flags:\n",
  "-console <n>\n",
--- 360,365 ----
  "-guicmd \"cmd...\" -- substitute another GUI program (e.g., rsh)\n",
  "-send \"msg...\"   -- send a message at startup (after patches are loaded)\n",
! "-rt or -realtime -- use real-time priority (needs root privilege) (linux only)\n",
! 
  "\nimpd flags:\n",
  "-console <n>\n",