pd/src s_main.c,1.7.4.17.2.22.2.31,1.7.4.17.2.22.2.32 - Pd-cvs

3 Aug 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21379
Modified Files:
      Tag: desiredata
    s_main.c 
Log Message:
centralise newlines
Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.17.2.22.2.31
retrieving revision 1.7.4.17.2.22.2.32
diff -C2 -d -r1.7.4.17.2.22.2.31 -r1.7.4.17.2.22.2.32
*** s_main.c	31 Jul 2007 17:27:59 -0000	1.7.4.17.2.22.2.31
--- s_main.c	3 Aug 2007 00:10:21 -0000	1.7.4.17.2.22.2.32
***************
*** 180,284 ****
static char *(usagemessage[]) = {
! "usage: pd [-flags] [file]...\n",
! "\naudio configuration flags:\n",
! "-r <n>           -- specify sample rate\n",
! "-audioindev ...  -- audio in devices; e.g., "1,3" for first and third\n",
! "-audiooutdev ... -- audio out devices (same)\n",
! "-audiodev ...    -- specify input and output together\n",
! "-inchannels ...  -- audio input channels (by device, like "2" or "16,8")\n",
! "-outchannels ... -- number of audio out channels (same)\n",
! "-channels ...    -- specify both input and output channels\n",
! "-audiobuf <n>    -- specify size of audio buffer in msec\n",
! "-blocksize <n>   -- specify audio I/O block size in sample frames\n",
! "-dacblocksize <n>-- specify audio dac~block size in samples\n",
! "-sleepgrain <n>  -- specify number of milliseconds to sleep when idle\n",
! "-cb_scheduler    -- use callback-based scheduler (jack and native asio only)\n",
! "-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",
#define NOT_HERE "(support not compiled in)"
#ifdef USEAPI_OSS
! "-oss             -- use OSS audio API\n",
! "-32bit           ---- allow 32 bit OSS audio (for RME Hammerfall)\n",
  #else
! "-oss             -- OSS "NOT_HERE"\n",
! "-32bit           ---- allow 32 bit OSS audio "NOT_HERE"\n",
  #endif
#ifdef USEAPI_ALSA
! "-alsa            -- use ALSA audio API\n",
! "-alsaadd <name>  -- add an ALSA device name to list\n",
  #else
! "-alsa            -- use ALSA audio API "NOT_HERE"\n",
! "-alsaadd <name>  -- add an ALSA device name to list "NOT_HERE"\n",
  #endif
#ifdef USEAPI_JACK
! "-jack            -- use JACK audio API\n",
  #else
! "-jack            -- use JACK audio API "NOT_HERE"\n",
  #endif
#ifdef USEAPI_ASIO
! 	"-asio_native     -- use native ASIO API\n",
  #else
! 	"-asio_native     -- use native ASIO API "NOT_HERE"\n",
  #endif
#ifdef USEAPI_PORTAUDIO
! "-pa              -- use Portaudio API\n",
! "-asio            -- synonym for -pa - use ASIO via Portaudio\n",
  #else
! "-pa              -- use Portaudio API "NOT_HERE"\n",
! "-asio            -- synonym for -pa - use ASIO via Portaudio "NOT_HERE"\n",
  #endif
#ifdef USEAPI_MMIO
! "-mmio            -- use MMIO audio API\n",
  #else
! "-mmio            -- use MMIO audio API "NOT_HERE"\n",
  #endif
  #ifdef API_DEFSTRING
! "      (default audio API for this platform:  ", API_DEFSTRING, ")\n\n",
  #endif
! "\nMIDI configuration flags:\n",
! "-midiindev ...   -- midi in device list; e.g., "1,3" for first and third\n",
! "-midioutdev ...  -- midi out device list, same format\n",
! "-mididev ...     -- specify -midioutdev and -midiindev together\n",
! "-nomidiin        -- suppress MIDI input\n",
! "-nomidiout       -- suppress MIDI output\n",
! "-nomidi          -- suppress MIDI input and output\n",
  #ifdef USEAPI_ALSA
! "-alsamidi        -- use ALSA midi API\n",
  #else
! "-alsamidi        -- use ALSA midi API "NOT_HERE"\n",
  #endif
! "\nother flags:\n",
! "-rcfile <file>   -- read this rcfile instead of default\n",
! "-noprefs         -- suppress loading preferences on startup\n",
! "-path <path>     -- add to file search path\n",
! "-nostdpath       -- don't search standard ("extra") directory\n",
! "-stdpath         -- search standard directory (true by default)\n",
! "-helppath <path> -- add to help file search path\n",
! "-open <file>     -- open file(s) on startup\n",
! "-lib <file>      -- load object library(s)\n",
! "-verbose         -- extra printout on startup and when searching for files\n",
! "-version         -- don't run Pd; just print out which version it is \n",
! "-d <n>           -- specify debug level\n",
! "-noloadbang      -- suppress all loadbangs\n",
! "-stderr          -- send printout to standard error instead of GUI\n",
! "-guiport <n>     -- set port that the GUI should connect to\n",
! "-send "msg..."   -- send a message at startup, after patches are loaded\n",
  #ifdef UNISTD
! "-rt or -realtime -- use real-time priority\n",
! "-nrt             -- don't use real-time priority\n",
  #else
! "-rt or -realtime -- use real-time priority "NOT_HERE"\n",
! "-nrt             -- don't use real-time priority "NOT_HERE"\n",
  #endif
  };
--- 180,284 ----
static char *(usagemessage[]) = {
! "usage: pd [-flags] [file]...","",
! "audio configuration flags:",
! "-r <n>           -- specify sample rate",
! "-audioindev ...  -- audio in devices; e.g., "1,3" for first and third",
! "-audiooutdev ... -- audio out devices (same)",
! "-audiodev ...    -- specify input and output together",
! "-inchannels ...  -- audio input channels (by device, like "2" or "16,8")",
! "-outchannels ... -- number of audio out channels (same)",
! "-channels ...    -- specify both input and output channels",
! "-audiobuf <n>    -- specify size of audio buffer in msec",
! "-blocksize <n>   -- specify audio I/O block size in sample frames",
! "-dacblocksize <n>-- specify audio dac~block size in samples",
! "-sleepgrain <n>  -- specify number of milliseconds to sleep when idle",
! "-cb_scheduler    -- use callback-based scheduler (jack and native asio only)",
! "-nodac           -- suppress audio output",
! "-noadc           -- suppress audio input",
! "-noaudio         -- suppress audio input and output (-nosound is synonym)",
! "-listdev         -- list audio and MIDI devices",
#define NOT_HERE "(support not compiled in)"
#ifdef USEAPI_OSS
! "-oss             -- use OSS audio API",
! "-32bit           ---- allow 32 bit OSS audio (for RME Hammerfall)",
  #else
! "-oss             -- OSS "NOT_HERE,
! "-32bit           ---- allow 32 bit OSS audio "NOT_HERE,
  #endif
#ifdef USEAPI_ALSA
! "-alsa            -- use ALSA audio API",
! "-alsaadd <name>  -- add an ALSA device name to list",
  #else
! "-alsa            -- use ALSA audio API "NOT_HERE,
! "-alsaadd <name>  -- add an ALSA device name to list "NOT_HERE,
  #endif
#ifdef USEAPI_JACK
! "-jack            -- use JACK audio API",
  #else
! "-jack            -- use JACK audio API "NOT_HERE,
  #endif
#ifdef USEAPI_ASIO
! 	"-asio_native     -- use native ASIO API",
  #else
! 	"-asio_native     -- use native ASIO API "NOT_HERE,
  #endif
#ifdef USEAPI_PORTAUDIO
! "-pa              -- use Portaudio API",
! "-asio            -- synonym for -pa - use ASIO via Portaudio",
  #else
! "-pa              -- use Portaudio API "NOT_HERE,
! "-asio            -- synonym for -pa - use ASIO via Portaudio "NOT_HERE,
  #endif
#ifdef USEAPI_MMIO
! "-mmio            -- use MMIO audio API",
  #else
! "-mmio            -- use MMIO audio API "NOT_HERE,
  #endif
  #ifdef API_DEFSTRING
! "      (default audio API for this platform:  "API_DEFSTRING")","",
  #endif
! "MIDI configuration flags:",
! "-midiindev ...   -- midi in device list; e.g., "1,3" for first and third",
! "-midioutdev ...  -- midi out device list, same format",
! "-mididev ...     -- specify -midioutdev and -midiindev together",
! "-nomidiin        -- suppress MIDI input",
! "-nomidiout       -- suppress MIDI output",
! "-nomidi          -- suppress MIDI input and output",
  #ifdef USEAPI_ALSA
! "-alsamidi        -- use ALSA midi API",
  #else
! "-alsamidi        -- use ALSA midi API "NOT_HERE,
  #endif
! "","other flags:",
! "-rcfile <file>   -- read this rcfile instead of default",
! "-noprefs         -- suppress loading preferences on startup",
! "-path <path>     -- add to file search path",
! "-nostdpath       -- don't search standard ("extra") directory",
! "-stdpath         -- search standard directory (true by default)",
! "-helppath <path> -- add to help file search path",
! "-open <file>     -- open file(s) on startup",
! "-lib <file>      -- load object library(s)",
! "-verbose         -- extra printout on startup and when searching for files",
! "-version         -- don't run Pd; just print out which version it is",
! "-d <n>           -- specify debug level",
! "-noloadbang      -- suppress all loadbangs",
! "-stderr          -- send printout to standard error instead of GUI",
! "-guiport <n>     -- set port that the GUI should connect to",
! "-send "msg..."   -- send a message at startup, after patches are loaded",
  #ifdef UNISTD
! "-rt or -realtime -- use real-time priority",
! "-nrt             -- don't use real-time priority",
  #else
! "-rt or -realtime -- use real-time priority "NOT_HERE,
! "-nrt             -- don't use real-time priority "NOT_HERE,
  #endif
  };
***************
*** 577,581 ****
        if (argc) fprintf(stderr, "Can't handle option '%s'.\n",*argv);
              for (size_t i=0; i < sizeof(usagemessage)/sizeof(*usagemessage); i++)
!                 fprintf(stderr, "%s", usagemessage[i]);
              return 1;
      }
--- 577,581 ----
        if (argc) fprintf(stderr, "Can't handle option '%s'.\n",*argv);
              for (size_t i=0; i < sizeof(usagemessage)/sizeof(*usagemessage); i++)
!                 fprintf(stderr, "%s\n", usagemessage[i]);
              return 1;
      }