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

input/InputStreams: pass std::unique_lock<> to various methods

Browse Source
This commit is contained in:
Max Kellermann
2019-04-26 19:19:45 +02:00
parent 040573c636
commit 1b5c1f75a4
33 changed files with 212 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/input/plugins/SmbclientInputPlugin.cxx
View File

@@ -56,8 +56,9 @@ public:
return offset >= size;
}
size_t Read(void *ptr, size_t size) override;
void Seek(offset_type offset) override;
size_t Read(std::unique_lock<Mutex> &lock,
void *ptr, size_t size) override;
void Seek(std::unique_lock<Mutex> &lock, offset_type offset) override;
};
/*
@@ -118,7 +119,8 @@ input_smbclient_open(const char *uri,
}
size_t
SmbclientInputStream::Read(void *ptr, size_t read_size)
SmbclientInputStream::Read(std::unique_lock<Mutex> &,
void *ptr, size_t read_size)
{
ssize_t nbytes;
@@ -136,7 +138,8 @@ SmbclientInputStream::Read(void *ptr, size_t read_size)
}
void
SmbclientInputStream::Seek(offset_type new_offset)
SmbclientInputStream::Seek(std::unique_lock<Mutex> &,
offset_type new_offset)
{
off_t result;