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.
v4.4.5: (?? April 2014)
- updated versions of RtAudio and RtMidi
v4.4.4: (24 August 2012)
- new FreeVerb class (thanks to Greg Burlet)
- new Guitar class

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
try {
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;
exit( 1 );
}
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
// Stop the stream.
adac.stopStream();
}
catch ( RtError& e ) {
catch ( RtAudioError& e ) {
std::cout << '\n' << e.getMessage() << '\n' << std::endl;
goto cleanup;
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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