diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-08-03 12:07:21 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-03 12:07:21 +0400 |
| commit | ce44d63ae1e6e76545bacd87ca8402b35a0317a0 (patch) | |
| tree | 8f209fdbd889cee39f700cf092b0045f1f87ec3a /intern/audaspace/FX | |
| parent | 8baeb4393c281b5c6765aa5ce4708a8221123b34 (diff) | |
Audaspace:
* Added an error string for audaspace exceptions.
* Fixed PyAPI exceptions.
* Minor bugfixes.
* Added a name parameter to the Jack device, so that one can define an own name via Python.
Diffstat (limited to 'intern/audaspace/FX')
| -rw-r--r-- | intern/audaspace/FX/AUD_DoubleReader.cpp | 5 | ||||
| -rw-r--r-- | intern/audaspace/FX/AUD_ReverseReader.cpp | 5 | ||||
| -rw-r--r-- | intern/audaspace/FX/AUD_SuperposeReader.cpp | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/intern/audaspace/FX/AUD_DoubleReader.cpp b/intern/audaspace/FX/AUD_DoubleReader.cpp index 6b39e01270f..5c6ca6a1fc5 100644 --- a/intern/audaspace/FX/AUD_DoubleReader.cpp +++ b/intern/audaspace/FX/AUD_DoubleReader.cpp @@ -27,6 +27,9 @@ #include <cstring> +static const char* specs_error = "AUD_DoubleReader: Both readers have to have " + "the same specs."; + AUD_DoubleReader::AUD_DoubleReader(AUD_IReader* reader1, AUD_IReader* reader2) : m_reader1(reader1), m_reader2(reader2), m_finished1(false) @@ -38,7 +41,7 @@ AUD_DoubleReader::AUD_DoubleReader(AUD_IReader* reader1, { delete reader1; delete reader2; - AUD_THROW(AUD_ERROR_READER); + AUD_THROW(AUD_ERROR_SPECS, specs_error); } } diff --git a/intern/audaspace/FX/AUD_ReverseReader.cpp b/intern/audaspace/FX/AUD_ReverseReader.cpp index a17a4a64a18..c651ea79577 100644 --- a/intern/audaspace/FX/AUD_ReverseReader.cpp +++ b/intern/audaspace/FX/AUD_ReverseReader.cpp @@ -27,13 +27,16 @@ #include <cstring> +static const char* props_error = "AUD_ReverseReader: The reader has to be " + "seekable and a finite length."; + AUD_ReverseReader::AUD_ReverseReader(AUD_IReader* reader) : AUD_EffectReader(reader), m_length(reader->getLength()), m_position(0) { if(m_length < 0 || !reader->isSeekable()) - AUD_THROW(AUD_ERROR_READER); + AUD_THROW(AUD_ERROR_PROPS, props_error); } void AUD_ReverseReader::seek(int position) diff --git a/intern/audaspace/FX/AUD_SuperposeReader.cpp b/intern/audaspace/FX/AUD_SuperposeReader.cpp index c24b01b35b3..546b79a3a77 100644 --- a/intern/audaspace/FX/AUD_SuperposeReader.cpp +++ b/intern/audaspace/FX/AUD_SuperposeReader.cpp @@ -27,6 +27,9 @@ #include <cstring> +static const char* specs_error = "AUD_SuperposeReader: Both readers have to " + "have the same specs."; + AUD_SuperposeReader::AUD_SuperposeReader(AUD_IReader* reader1, AUD_IReader* reader2) : m_reader1(reader1), m_reader2(reader2) { @@ -36,7 +39,7 @@ AUD_SuperposeReader::AUD_SuperposeReader(AUD_IReader* reader1, AUD_IReader* read s1 = reader1->getSpecs(); s2 = reader2->getSpecs(); if(memcmp(&s1, &s2, sizeof(AUD_Specs))) - AUD_THROW(AUD_ERROR_READER); + AUD_THROW(AUD_ERROR_SPECS, specs_error); } catch(AUD_Exception&) { |