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

output/fifo: rename Open(), Close() to OpenFifo(), CloseFifo()

Browse Source
This commit is contained in:
Max Kellermann
2015-08-06 09:49:00 +02:00
parent 34db35c36d
commit 7dfe841876
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/plugins/FifoOutputPlugin.cxx
View File

@@ -54,7 +54,7 @@ struct FifoOutput {
created(false) {} created(false) {}
~FifoOutput() { ~FifoOutput() {
Close(); CloseFifo();
} }
bool Initialize(const ConfigBlock &block, Error &error) { bool Initialize(const ConfigBlock &block, Error &error) {
@@ -67,8 +67,8 @@ struct FifoOutput {
bool Check(Error &error); bool Check(Error &error);
void Delete(); void Delete();
bool Open(Error &error); bool OpenFifo(Error &error);
void Close(); void CloseFifo();
unsigned Delay() const; unsigned Delay() const;
size_t Play(const void *chunk, size_t size, Error &error); size_t Play(const void *chunk, size_t size, Error &error);
@@ -94,7 +94,7 @@ FifoOutput::Delete()
} }
void void
FifoOutput::Close() FifoOutput::CloseFifo()
{ {
if (input >= 0) { if (input >= 0) {
close(input); close(input);
@@ -150,7 +150,7 @@ FifoOutput::Check(Error &error)
} }
inline bool inline bool
FifoOutput::Open(Error &error) FifoOutput::OpenFifo(Error &error)
{ {
if (!Check(error)) if (!Check(error))
return false; return false;
@@ -159,7 +159,7 @@ FifoOutput::Open(Error &error)
if (input < 0) { if (input < 0) {
error.FormatErrno("Could not open FIFO \"%s\" for reading", error.FormatErrno("Could not open FIFO \"%s\" for reading",
path_utf8.c_str()); path_utf8.c_str());
Close(); CloseFifo();
return false; return false;
} }
@@ -167,7 +167,7 @@ FifoOutput::Open(Error &error)
if (output < 0) { if (output < 0) {
error.FormatErrno("Could not open FIFO \"%s\" for writing", error.FormatErrno("Could not open FIFO \"%s\" for writing",
path_utf8.c_str()); path_utf8.c_str());
Close(); CloseFifo();
return false; return false;
} }
@@ -196,7 +196,7 @@ FifoOutput::Create(const ConfigBlock &block, Error &error)
return nullptr; return nullptr;
} }
if (!fd->Open(error)) { if (!fd->OpenFifo(error)) {
delete fd; delete fd;
return nullptr; return nullptr;
} }