From 77a5cfa4aa183e5b4a4abdd611b9d5931eead255 Mon Sep 17 00:00:00 2001 From: rhenninger Date: Sun, 11 Sep 2016 13:38:57 -0400 Subject: [PATCH 1/3] redirect non-conforming writes to cerr to oStream_ Most error messages go to oStream_. Two in guitar.cpp don't conform. --- src/Guitar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Guitar.cpp b/src/Guitar.cpp index 72a25c3..2218348 100644 --- a/src/Guitar.cpp +++ b/src/Guitar.cpp @@ -117,7 +117,7 @@ void Guitar :: setBodyFile( std::string bodyfile ) void Guitar :: setPluckPosition( StkFloat position, int string ) { if ( position < 0.0 || position > 1.0 ) { - std::cerr << "Guitar::setPluckPosition: position parameter out of range!"; + oStream_ << "Guitar::setPluckPosition: position parameter out of range!"; handleError( StkError::WARNING ); return; } @@ -136,7 +136,7 @@ void Guitar :: setPluckPosition( StkFloat position, int string ) void Guitar :: setLoopGain( StkFloat gain, int string ) { if ( gain < 0.0 || gain > 1.0 ) { - std::cerr << "Guitar::setLoopGain: gain parameter out of range!"; + oStream_ << "Guitar::setLoopGain: gain parameter out of range!"; handleError( StkError::WARNING ); return; } From 5dd605ecfd382889a78fa2f8507098edaa647856 Mon Sep 17 00:00:00 2001 From: rhenninger Date: Sun, 11 Sep 2016 13:47:25 -0400 Subject: [PATCH 2/3] redirect non-conforming writes to cerr to oStream_ One error message in mandolin.cpp was going to cerr instead of oStream_ --- src/Mandolin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mandolin.cpp b/src/Mandolin.cpp index e781c5d..9c74eb3 100644 --- a/src/Mandolin.cpp +++ b/src/Mandolin.cpp @@ -75,7 +75,7 @@ void Mandolin :: clear( void ) void Mandolin :: setPluckPosition( StkFloat position ) { if ( position < 0.0 || position > 1.0 ) { - std::cerr << "Mandolin::setPluckPosition: position parameter out of range!"; + oStream_ << "Mandolin::setPluckPosition: position parameter out of range!"; handleError( StkError::WARNING ); return; } From e03aa486dd0d7380748c662bf37e5bdb6206fa8d Mon Sep 17 00:00:00 2001 From: rhenninger Date: Sun, 11 Sep 2016 13:51:10 -0400 Subject: [PATCH 3/3] redirect non-conforming writes to cerr to oStream_ One error message was going to cerr instead of oStream_ in resonate.cpp --- src/Resonate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resonate.cpp b/src/Resonate.cpp index 4827752..a548ffb 100644 --- a/src/Resonate.cpp +++ b/src/Resonate.cpp @@ -56,7 +56,7 @@ void Resonate :: setResonance( StkFloat frequency, StkFloat radius ) } if ( radius < 0.0 || radius >= 1.0 ) { - std::cerr << "Resonate::setResonance: radius parameter is out of range!"; + oStream_ << "Resonate::setResonance: radius parameter is out of range!"; handleError( StkError::WARNING ); return; }