summaryrefslogtreecommitdiff
path: root/plugins/provider/recProvider
diff options
context:
space:
mode:
authormethodus <methodus@web.de>2012-12-10 20:49:53 +0100
committermethodus <methodus@web.de>2012-12-10 20:49:53 +0100
commit7c5e5dac8eba1e6132582f7ff549fd04dc877ce1 (patch)
tree4f937c7a5eb686d25e44be178d0e7d6867456e1b /plugins/provider/recProvider
parentb36c18930b3221fbc7cfea674472d77cdb466c98 (diff)
downloadvdr-plugin-upnp-7c5e5dac8eba1e6132582f7ff549fd04dc877ce1.tar.gz
vdr-plugin-upnp-7c5e5dac8eba1e6132582f7ff549fd04dc877ce1.tar.bz2
Ignoring signal SIGPIPE which might cause crashes
Diffstat (limited to 'plugins/provider/recProvider')
-rw-r--r--plugins/provider/recProvider/recProvider.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/plugins/provider/recProvider/recProvider.cpp b/plugins/provider/recProvider/recProvider.cpp
index c8273fd..41ca849 100644
--- a/plugins/provider/recProvider/recProvider.cpp
+++ b/plugins/provider/recProvider/recProvider.cpp
@@ -24,15 +24,6 @@ namespace upnp {
class RecProvider : public cUPnPResourceProvider {
private:
- bool IsRootContainer(const string& uri){
- if(uri.find(GetRootContainer(), 0) != 0){
- isyslog("RecProvider\tUri does not contain the root.");
- return false;
- } else {
- return true;
- }
- }
-
bool GetFileStat(const string& uri, struct stat& fileStat){
stringstream filename;
filename << VideoDirectory << "/" << uri.substr(6);
@@ -111,7 +102,7 @@ public:
}
virtual StringList GetContainerEntries(const string& u){
- if(!IsRootContainer(u)) return StringList();
+ if(!HasRootContainer(u)) return StringList();
StringList list;
string videoDir(VideoDirectory), fs, uri = u.substr(6);
@@ -169,7 +160,7 @@ public:
}
virtual bool GetMetadata(const string& uri, cMetadata& metadata){
- if(!IsRootContainer(uri)) return false;
+ if(!HasRootContainer(uri)) return false;
if(!cUPnPResourceProvider::GetMetadata(uri, metadata)) return false;
@@ -204,6 +195,8 @@ public:
}
virtual bool Open(const string& uri){
+ if(!HasRootContainer(uri)) return false;
+
filename = string(VideoDirectory) + "/" + uri.substr(6);
currentFileNumber = 1;
return ScanFiles();