diff options
author | methodus <methodus@web.de> | 2013-01-09 01:12:40 +0100 |
---|---|---|
committer | methodus <methodus@web.de> | 2013-01-09 01:12:40 +0100 |
commit | aa99a1555aed836d2a123a1880c55c99801ceacd (patch) | |
tree | a081f63b04bc3fbd7dd5dee832f4fbe62a23e64c | |
parent | c01760e78a3a33148357cb3b23f9bf5bee52246d (diff) | |
download | vdr-plugin-upnp-aa99a1555aed836d2a123a1880c55c99801ceacd.tar.gz vdr-plugin-upnp-aa99a1555aed836d2a123a1880c55c99801ceacd.tar.bz2 |
Fixed compile issue caused by previous commit
-rw-r--r-- | media/mediaManager.cpp | 2 | ||||
-rw-r--r-- | server/contentDirectory.cpp | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index eb3563c..199a942 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -454,7 +454,7 @@ int cMediaManager::Browse(BrowseRequest& request){ LOG(5, "Found %d matches, returning %d", request.totalMatches, request.numberReturned); if(request.totalMatches == 0 && request.numberReturned == 0){ - dsyslog("Container %s is empty.", request.objectID); + dsyslog("Container %s is empty.", request.objectID.c_str()); return UPNP_CDS_E_CANT_PROCESS_REQUEST; } else { return UPNP_E_SUCCESS; diff --git a/server/contentDirectory.cpp b/server/contentDirectory.cpp index 6f4b7f4..3f944fe 100644 --- a/server/contentDirectory.cpp +++ b/server/contentDirectory.cpp @@ -267,7 +267,8 @@ int cContentDirectory::Browse(Upnp_Action_Request* request){ cMediaManager::BrowseRequest browseRequest; if(this->ParseStringValue(request->ActionRequest, "ObjectID", browseRequest.objectID)){ - esyslog("UPnP\tInvalid arguments. ObjectID missing or wrong: %s", browseRequest.objectID); + esyslog("UPnP\tInvalid arguments. ObjectID missing or wrong: %s", + browseRequest.objectID.c_str()); this->SetError(request, UPNP_SOAP_E_INVALID_ARGS); return request->ErrCode; } @@ -285,14 +286,16 @@ int cContentDirectory::Browse(Upnp_Action_Request* request){ } if(this->ParseStringValue(request->ActionRequest, "Filter", browseRequest.filter)){ - esyslog("UPnP\tInvalid arguments. Filter missing or wrong: %s", browseRequest.filter); + esyslog("UPnP\tInvalid arguments. Filter missing or wrong: %s", + browseRequest.filter.c_str()); this->SetError(request, UPNP_SOAP_E_INVALID_ARGS); return request->ErrCode; } long startIndex; if(this->ParseIntegerValue(request->ActionRequest, "StartingIndex", startIndex)){ - esyslog("UPnP\tInvalid arguments. Starting index missing or wrong: %d", browseRequest.startIndex); + esyslog("UPnP\tInvalid arguments. Starting index missing or wrong: %d", + browseRequest.startIndex); this->SetError(request, UPNP_SOAP_E_INVALID_ARGS); return request->ErrCode; } @@ -300,14 +303,16 @@ int cContentDirectory::Browse(Upnp_Action_Request* request){ long requestCount; if(this->ParseIntegerValue(request->ActionRequest, "RequestedCount", requestCount)){ - esyslog("UPnP\tInvalid arguments. Requested count missing or wrong: %d", browseRequest.requestCount); + esyslog("UPnP\tInvalid arguments. Requested count missing or wrong: %d", + browseRequest.requestCount); this->SetError(request, UPNP_SOAP_E_INVALID_ARGS); return request->ErrCode; } browseRequest.requestCount = requestCount; if(this->ParseStringValue(request->ActionRequest, "SortCriteria", browseRequest.sortCriteria)){ - esyslog("UPnP\tInvalid arguments. Sort criteria missing or wrong: %s", browseRequest.sortCriteria); + esyslog("UPnP\tInvalid arguments. Sort criteria missing or wrong: %s", + browseRequest.sortCriteria.c_str()); this->SetError(request, UPNP_SOAP_E_INVALID_ARGS); return request->ErrCode; } @@ -315,7 +320,8 @@ int cContentDirectory::Browse(Upnp_Action_Request* request){ int ret = mMediaServer->GetManager().Browse(browseRequest); if(ret!=UPNP_E_SUCCESS){ this->SetError(request, ret); - esyslog("UPnP\tError while browsing object ID '%s': %s (%d)", browseRequest.objectID, request->ErrStr, request->ErrCode); + esyslog("UPnP\tError while browsing object ID '%s': %s (%d)", + browseRequest.objectID.c_str(), request->ErrStr, request->ErrCode); return request->ErrCode; } |