Skip to content

Commit a1963af

Browse files
committed
fix GetObjectPropDesc - missing object format in API/request
1 parent 3bb604c commit a1963af

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cli/Session.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ namespace cli
948948
mtp::print("properties supported: ");
949949
for(mtp::ObjectProperty prop: ops.ObjectPropertyCodes)
950950
{
951-
PrintFormat(_session->GetObjectPropertyDesc(prop), _session->GetObjectProperty(id, prop));
951+
PrintFormat(_session->GetObjectPropertyDesc(prop, format), _session->GetObjectProperty(id, prop));
952952
}
953953
}
954954

mtp/ptp/Session.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ namespace mtp
226226
msg::ObjectPropertiesSupported Session::GetObjectPropertiesSupported(ObjectFormat format)
227227
{ return ParseResponse<msg::ObjectPropertiesSupported>(RunTransaction(_defaultTimeout, OperationCode::GetObjectPropsSupported, static_cast<u32>(format))); }
228228

229-
ByteArray Session::GetObjectPropertyDesc(ObjectProperty code)
230-
{ return RunTransaction(_defaultTimeout, OperationCode::GetObjectPropDesc, static_cast<u32>(code)); }
229+
ByteArray Session::GetObjectPropertyDesc(ObjectProperty code, ObjectFormat format)
230+
{ return RunTransaction(_defaultTimeout, OperationCode::GetObjectPropDesc, static_cast<u32>(code), static_cast<u32>(format)); }
231231

232232
void Session::GetObject(ObjectId objectId, const IObjectOutputStreamPtr &outputStream)
233233
{

mtp/ptp/Session.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ namespace mtp
107107
{ return std::make_shared<ObjectEditSession>(session, objectId); }
108108

109109
msg::ObjectPropertiesSupported GetObjectPropertiesSupported(ObjectFormat format);
110-
ByteArray GetObjectPropertyDesc(ObjectProperty code);
110+
ByteArray GetObjectPropertyDesc(ObjectProperty code, ObjectFormat format);
111111

112112
void SetObjectProperty(ObjectId objectId, ObjectProperty property, const ByteArray &value);
113113
void SetObjectProperty(ObjectId objectId, ObjectProperty property, u64 value);

0 commit comments

Comments
 (0)