oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/io/FileOutputStream: use C++ exceptions in constructor

Browse Source
This commit is contained in:
Max Kellermann
2015-12-15 22:26:26 +01:00
parent d29be0f460
commit 24b2198668
9 changed files with 64 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/output/plugins/RecorderOutputPlugin.cxx
View File

@@ -179,7 +179,6 @@ inline bool
RecorderOutput::EncoderToFile(Error &error)
{
assert(file != nullptr);
assert(file->IsDefined());
return EncoderToOutputStream(*file, *encoder, error);
}
@@ -192,9 +191,12 @@ RecorderOutput::Open(AudioFormat &audio_format, Error &error)
if (!HasDynamicPath()) {
assert(!path.IsNull());
file = FileOutputStream::Create(path, error);
if (file == nullptr)
try {
file = new FileOutputStream(path);
} catch (const std::exception &e) {
error.Set(recorder_domain, e.what());
return false;
}
} else {
/* don't open the file just yet; wait until we have
a tag that we can use to build the path */
@@ -294,10 +296,13 @@ RecorderOutput::ReopenFormat(AllocatedPath &&new_path, Error &error)
assert(path.IsNull());
assert(file == nullptr);
FileOutputStream *new_file =
FileOutputStream::Create(new_path, error);
if (new_file == nullptr)
FileOutputStream *new_file;
try {
new_file = new FileOutputStream(path);
} catch (const std::exception &e) {
error.Set(recorder_domain, e.what());
return false;
}
AudioFormat new_audio_format = effective_audio_format;
if (!encoder->Open(new_audio_format, error)) {