More RtError updates in various project files.

This commit is contained in:
Gary Scavone
2014-04-11 09:44:49 -04:00
parent caf7d2f2eb
commit a239b58651
13 changed files with 39 additions and 36 deletions

View File

@@ -2,6 +2,9 @@ The Synthesis ToolKit in C++ (STK)
By Perry R. Cook and Gary P. Scavone, 1995--2014. By Perry R. Cook and Gary P. Scavone, 1995--2014.
v4.4.5: (?? April 2014)
- updated versions of RtAudio and RtMidi
v4.4.4: (24 August 2012) v4.4.4: (24 August 2012)
- new FreeVerb class (thanks to Greg Burlet) - new FreeVerb class (thanks to Greg Burlet)
- new Guitar class - new Guitar class

View File

@@ -256,7 +256,7 @@ int main( int argc, char *argv[] )
try { try {
adac.openStream( &oparameters, &iparameters, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data ); adac.openStream( &oparameters, &iparameters, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
} }
catch ( RtError& error ) { catch ( RtAudioError& error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -270,7 +270,7 @@ int main( int argc, char *argv[] )
try { try {
adac.startStream(); adac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -285,7 +285,7 @@ int main( int argc, char *argv[] )
try { try {
adac.closeStream(); adac.closeStream();
} }
catch ( RtError& error ) { catch ( RtAudioError& error ) {
error.printMessage(); error.printMessage();
} }

View File

@@ -302,7 +302,7 @@ int main( int argc, char *argv[] )
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
} }
catch ( RtError& error ) { catch ( RtAudioError& error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -338,7 +338,7 @@ int main( int argc, char *argv[] )
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -363,7 +363,7 @@ int main( int argc, char *argv[] )
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError& error ) { catch ( RtAudioError& error ) {
error.printMessage(); error.printMessage();
} }
} }

View File

@@ -59,7 +59,7 @@ int main()
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
} }
catch ( RtError& error ) { catch ( RtAudioError& error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -78,7 +78,7 @@ int main()
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -91,7 +91,7 @@ int main()
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
} }

View File

@@ -133,7 +133,7 @@ int main( int argc, char *argv[] )
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -152,7 +152,7 @@ int main( int argc, char *argv[] )
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -165,7 +165,7 @@ int main( int argc, char *argv[] )
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
} }

View File

@@ -36,7 +36,7 @@ int main()
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&sine ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&sine );
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -46,7 +46,7 @@ int main()
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -60,7 +60,7 @@ int main()
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
} }

View File

@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
try { try {
adac.openStream( &oParams, &iParams, FORMAT, fs, &bufferFrames, &inout, (void *)&bufferBytes, &options ); adac.openStream( &oParams, &iParams, FORMAT, fs, &bufferFrames, &inout, (void *)&bufferBytes, &options );
} }
catch ( RtError& e ) { catch ( RtAudioError& e ) {
std::cout << '\n' << e.getMessage() << '\n' << std::endl; std::cout << '\n' << e.getMessage() << '\n' << std::endl;
exit( 1 ); exit( 1 );
} }
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
// Stop the stream. // Stop the stream.
adac.stopStream(); adac.stopStream();
} }
catch ( RtError& e ) { catch ( RtAudioError& e ) {
std::cout << '\n' << e.getMessage() << '\n' << std::endl; std::cout << '\n' << e.getMessage() << '\n' << std::endl;
goto cleanup; goto cleanup;
} }

View File

@@ -82,7 +82,7 @@ int main( int argc, char *argv[] )
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&grani ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&grani );
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -90,7 +90,7 @@ int main( int argc, char *argv[] )
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -105,7 +105,7 @@ int main( int argc, char *argv[] )
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
} }

View File

@@ -17,7 +17,7 @@ int main()
try { try {
midiin = new RtMidiIn(); midiin = new RtMidiIn();
} }
catch ( RtError &error ) { catch ( RtMidiError &error ) {
error.printMessage(); error.printMessage();
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
@@ -31,7 +31,7 @@ int main()
try { try {
portName = midiin->getPortName(i); portName = midiin->getPortName(i);
} }
catch ( RtError &error ) { catch ( RtMidiError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -42,7 +42,7 @@ int main()
try { try {
midiout = new RtMidiOut(); midiout = new RtMidiOut();
} }
catch ( RtError &error ) { catch ( RtMidiError &error ) {
error.printMessage(); error.printMessage();
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
@@ -54,7 +54,7 @@ int main()
try { try {
portName = midiout->getPortName(i); portName = midiout->getPortName(i);
} }
catch ( RtError &error ) { catch ( RtMidiError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }

View File

@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&input ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&input );
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
} }

View File

@@ -36,7 +36,7 @@ int main( int argc, char *argv[] )
try { try {
midiout = new RtMidiOut(); midiout = new RtMidiOut();
} }
catch ( RtError& error ) { catch ( RtMidiError& error ) {
error.printMessage(); error.printMessage();
exit(0); exit(0);
} }
@@ -48,7 +48,7 @@ int main( int argc, char *argv[] )
try { try {
midiout->openVirtualPort(); midiout->openVirtualPort();
} }
catch ( RtError& error ) { catch ( RtMidiError& error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -62,7 +62,7 @@ int main( int argc, char *argv[] )
try { try {
midiout->openPort( port ); midiout->openPort( port );
} }
catch ( RtError& error ) { catch ( RtMidiError& error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }

View File

@@ -133,7 +133,7 @@ int main()
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -157,7 +157,7 @@ int main()
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -170,7 +170,7 @@ int main()
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
} }

View File

@@ -294,7 +294,7 @@ int main( int argc, char *argv[] )
try { try {
dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data ); dac.openStream( &parameters, NULL, format, (unsigned int)Stk::sampleRate(), &bufferFrames, &tick, (void *)&data );
} }
catch ( RtError& error ) { catch ( RtAudioError& error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -317,7 +317,7 @@ int main( int argc, char *argv[] )
try { try {
dac.startStream(); dac.startStream();
} }
catch ( RtError &error ) { catch ( RtAudioError &error ) {
error.printMessage(); error.printMessage();
goto cleanup; goto cleanup;
} }
@@ -332,7 +332,7 @@ int main( int argc, char *argv[] )
try { try {
dac.closeStream(); dac.closeStream();
} }
catch ( RtError& error ) { catch ( RtAudioError& error ) {
error.printMessage(); error.printMessage();
} }