Mercurial > hg > beaglert
diff core/RTAudioCommandLine.cpp @ 50:be427da6fb9c newapi
Removed old testing code that stopped audio after 10 seconds; command line parameter updates; D-Box updates (not fully working yet)
author | andrewm |
---|---|
date | Sat, 30 May 2015 12:34:32 -0500 |
parents | 643cbee74eda |
children | a6d223473ea2 |
line wrap: on
line diff
--- a/core/RTAudioCommandLine.cpp Thu May 28 17:48:42 2015 -0400 +++ b/core/RTAudioCommandLine.cpp Sat May 30 12:34:32 2015 -0500 @@ -24,22 +24,22 @@ { {"period", 1, NULL, 'p'}, {"verbose", 0, NULL, 'v'}, - {"use-analog", 1, NULL, 'm'}, - {"use-digital-gpio", 1, NULL, 'g'}, + {"use-analog", 1, NULL, 'N'}, + {"use-digital", 1, NULL, 'G'}, {"analog-channels", 1, NULL, 'C'}, - {"digital-channels", 1, NULL, 'G'}, + {"digital-channels", 1, NULL, 'B'}, {"mute-speaker", 1, NULL, 'M'}, {"dac-level", 1, NULL, 'D'}, {"adc-level", 1, NULL, 'A'}, {"hp-level", 1, NULL, 'H'}, - {"receive-port", 1, NULL, 'r'}, - {"transmit-port", 1, NULL, 't'}, - {"server-name", 1, NULL, 's'}, + {"receive-port", 1, NULL, 'R'}, + {"transmit-port", 1, NULL, 'T'}, + {"server-name", 1, NULL, 'S'}, {"pru-file", 1, NULL, OPT_PRU_FILE}, {NULL, 0, NULL, 0} }; -const char gDefaultShortOptions[] = "p:vm:M:C:D:A:H:g:G:r:t:s:"; +const char gDefaultShortOptions[] = "p:vN:M:C:D:A:H:G:B:R:T:S:"; // This function sets the default settings for the BeagleRTInitSettings structure void BeagleRT_defaultSettings(BeagleRTInitSettings *settings) @@ -150,10 +150,10 @@ case 'v': settings->verbose = 1; break; - case 'm': + case 'N': settings->useAnalog = atoi(optarg); break; - case 'g': + case 'G': settings->useDigital = atoi(optarg); settings->numDigitalChannels = 0; break; @@ -166,7 +166,7 @@ else settings->numAnalogChannels = 2; break; - case 'G': + case 'B': settings->numDigitalChannels = atoi(optarg); if(settings->numDigitalChannels >= 16) settings->numDigitalChannels = 16; @@ -188,13 +188,13 @@ case 'H': settings->headphoneLevel = atof(optarg); break; - case 'r': + case 'R': settings->receivePort = atoi(optarg); break; - case 't': + case 'T': settings->transmitPort = atoi(optarg); break; - case 's': + case 'S': if(strlen(optarg)<MAX_SERVERNAME_LENGTH) strcpy(settings->serverName, optarg); else