diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp index b1b1876b..9b345478 100644 --- a/src/CacheDisk.cpp +++ b/src/CacheDisk.cpp @@ -519,7 +519,7 @@ void CacheDisk::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -529,7 +529,7 @@ void CacheDisk::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp index 7bd480e4..4ffed949 100644 --- a/src/CacheMemory.cpp +++ b/src/CacheMemory.cpp @@ -372,7 +372,7 @@ void CacheMemory::SetJson(string value) { delete reader; if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -382,7 +382,7 @@ void CacheMemory::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp index 9fc8756c..a463c90e 100644 --- a/src/ChunkReader.cpp +++ b/src/ChunkReader.cpp @@ -292,7 +292,7 @@ void ChunkReader::SetJson(string value) { delete reader; if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -302,7 +302,7 @@ void ChunkReader::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/Clip.cpp b/src/Clip.cpp index 3bf6030d..7e82ff01 100644 --- a/src/Clip.cpp +++ b/src/Clip.cpp @@ -235,7 +235,7 @@ ReaderBase* Clip::Reader() return reader; else // Throw error if reader not initialized - throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method.", ""); + throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method."); } // Open the internal reader @@ -252,7 +252,7 @@ void Clip::Open() } else // Throw error if reader not initialized - throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method.", ""); + throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method."); } // Close the internal reader @@ -266,7 +266,7 @@ void Clip::Close() } else // Throw error if reader not initialized - throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method.", ""); + throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method."); } // Get end position of clip (trim end of video), which can be affected by the time curve. @@ -282,7 +282,7 @@ float Clip::End() fps = reader->info.fps.ToFloat(); else // Throw error if reader not initialized - throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method.", ""); + throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method."); return float(time.GetLength()) / fps; } @@ -350,7 +350,7 @@ std::shared_ptr Clip::GetFrame(int64_t requested_frame) } else // Throw error if reader not initialized - throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method.", ""); + throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method."); } // Get file extension @@ -394,7 +394,7 @@ void Clip::get_time_mapped_frame(std::shared_ptr frame, int64_t frame_num // Check for valid reader if (!reader) // Throw error if reader not initialized - throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method.", ""); + throw ReaderClosed("No Reader has been initialized for this Clip. Call Reader(*reader) before calling this method."); // Check for a valid time map curve if (time.Values.size() > 1) @@ -812,7 +812,7 @@ void Clip::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -822,7 +822,7 @@ void Clip::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/Color.cpp b/src/Color.cpp index b219e695..1c314aa9 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -120,7 +120,7 @@ void Color::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -130,7 +130,7 @@ void Color::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp index 739d693f..eaa65dea 100644 --- a/src/Coordinate.cpp +++ b/src/Coordinate.cpp @@ -83,7 +83,7 @@ void Coordinate::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -93,7 +93,7 @@ void Coordinate::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp index 3af5e3fc..4ce30149 100644 --- a/src/DecklinkReader.cpp +++ b/src/DecklinkReader.cpp @@ -278,7 +278,7 @@ void DecklinkReader::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -288,7 +288,7 @@ void DecklinkReader::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/DecklinkWriter.cpp b/src/DecklinkWriter.cpp index 7dcede04..4ebbd1f0 100644 --- a/src/DecklinkWriter.cpp +++ b/src/DecklinkWriter.cpp @@ -234,7 +234,7 @@ void DecklinkWriter::WriteFrame(std::shared_ptr frame) { // Check for open reader (or throw exception) if (!is_open) - throw WriterClosed("The DecklinkWriter is closed. Call Open() before calling this method.", ""); + throw WriterClosed("The DecklinkWriter is closed. Call Open() before calling this method."); delegate->WriteFrame(frame); } diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp index 346430dc..bdfb7cb5 100644 --- a/src/DummyReader.cpp +++ b/src/DummyReader.cpp @@ -156,7 +156,7 @@ void DummyReader::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -166,7 +166,7 @@ void DummyReader::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp index 30909420..77bfec9b 100644 --- a/src/EffectBase.cpp +++ b/src/EffectBase.cpp @@ -112,7 +112,7 @@ void EffectBase::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -122,7 +122,7 @@ void EffectBase::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index c9e21271..b617156f 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -2445,7 +2445,7 @@ void FFmpegReader::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { // Set all values that match @@ -2453,7 +2453,7 @@ void FFmpegReader::SetJson(string value) { } catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp index ff7cf1ce..40d1899e 100644 --- a/src/FrameMapper.cpp +++ b/src/FrameMapper.cpp @@ -75,7 +75,7 @@ ReaderBase* FrameMapper::Reader() return reader; else // Throw error if reader not initialized - throw ReaderClosed("No Reader has been initialized for FrameMapper. Call Reader(*reader) before calling this method.", ""); + throw ReaderClosed("No Reader has been initialized for FrameMapper. Call Reader(*reader) before calling this method."); } void FrameMapper::AddField(int64_t frame) @@ -707,7 +707,7 @@ void FrameMapper::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -717,7 +717,7 @@ void FrameMapper::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp index a0b7e8f3..b719ee3d 100644 --- a/src/ImageReader.cpp +++ b/src/ImageReader.cpp @@ -169,7 +169,7 @@ void ImageReader::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -179,7 +179,7 @@ void ImageReader::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp index 94618135..37e005d9 100644 --- a/src/KeyFrame.cpp +++ b/src/KeyFrame.cpp @@ -379,7 +379,7 @@ void Keyframe::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -389,7 +389,7 @@ void Keyframe::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/Point.cpp b/src/Point.cpp index fd23da55..72eedebc 100644 --- a/src/Point.cpp +++ b/src/Point.cpp @@ -146,7 +146,7 @@ void Point::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -156,7 +156,7 @@ void Point::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/Profiles.cpp b/src/Profiles.cpp index e57f7aa3..752bdb1e 100644 --- a/src/Profiles.cpp +++ b/src/Profiles.cpp @@ -177,7 +177,7 @@ void Profile::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -187,7 +187,7 @@ void Profile::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp index 9107e51f..e223510e 100644 --- a/src/QtImageReader.cpp +++ b/src/QtImageReader.cpp @@ -310,7 +310,7 @@ void QtImageReader::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -320,7 +320,7 @@ void QtImageReader::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/TextReader.cpp b/src/TextReader.cpp index 27f503e1..e92ec285 100644 --- a/src/TextReader.cpp +++ b/src/TextReader.cpp @@ -230,7 +230,7 @@ void TextReader::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -240,7 +240,7 @@ void TextReader::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/Timeline.cpp b/src/Timeline.cpp index 296e7a93..b8dabf68 100644 --- a/src/Timeline.cpp +++ b/src/Timeline.cpp @@ -746,7 +746,7 @@ std::shared_ptr Timeline::GetFrame(int64_t requested_frame) // Check for open reader (or throw exception) if (!is_open) - throw ReaderClosed("The Timeline is closed. Call Open() before calling this method.", ""); + throw ReaderClosed("The Timeline is closed. Call Open() before calling this method."); // Check cache again (due to locking) #pragma omp critical (T_GetFrame) @@ -1040,7 +1040,7 @@ void Timeline::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -1050,7 +1050,7 @@ void Timeline::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } @@ -1139,7 +1139,7 @@ void Timeline::ApplyJsonDiff(string value) { if (!success || !root.isArray()) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid).", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)."); try { @@ -1167,7 +1167,7 @@ void Timeline::ApplyJsonDiff(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } } diff --git a/src/WriterBase.cpp b/src/WriterBase.cpp index f677215a..3344c55a 100644 --- a/src/WriterBase.cpp +++ b/src/WriterBase.cpp @@ -209,7 +209,7 @@ void WriterBase::SetJson(string value) { if (!success) // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)", ""); + throw InvalidJSON("JSON could not be parsed (or is invalid)"); try { @@ -219,7 +219,7 @@ void WriterBase::SetJson(string value) { catch (const std::exception& e) { // Error parsing JSON (or missing keys) - throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", ""); + throw InvalidJSON("JSON is invalid (missing keys or invalid data types)"); } }