From 8277cec96ffa55082962591bca1c55abbeec8c26 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Tue, 10 Aug 2010 15:20:35 -0400 Subject: MTP: work in progress on expanded property support GetObjectPropValue and SetObjectPropValue are disabled until I figure out why Windows doesn't like what I have done. Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed Signed-off-by: Mike Lockwood --- media/mtp/MtpServer.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'media/mtp/MtpServer.h') diff --git a/media/mtp/MtpServer.h b/media/mtp/MtpServer.h index 19ccf24..68a6564 100644 --- a/media/mtp/MtpServer.h +++ b/media/mtp/MtpServer.h @@ -28,7 +28,6 @@ namespace android { class MtpDatabase; -class MtpProperty; class MtpStorage; class MtpServer { @@ -57,9 +56,6 @@ private: MtpStorageList mStorages; - MtpPropertyList mObjectProperties; - MtpPropertyList mDeviceProperties; - // handle for new object, set by SendObjectInfo and used by SendObject MtpObjectHandle mSendObjectHandle; MtpObjectFormat mSendObjectFormat; @@ -76,15 +72,10 @@ public: MtpStorage* getStorage(MtpStorageID id); void run(); - MtpProperty* getObjectProperty(MtpPropertyCode propCode); - MtpProperty* getDeviceProperty(MtpPropertyCode propCode); - void sendObjectAdded(MtpObjectHandle handle); void sendObjectRemoved(MtpObjectHandle handle); private: - void initObjectProperties(); - bool handleRequest(); MtpResponseCode doGetDeviceInfo(); @@ -98,12 +89,17 @@ private: MtpResponseCode doGetObjectReferences(); MtpResponseCode doSetObjectReferences(); MtpResponseCode doGetObjectPropValue(); + MtpResponseCode doSetObjectPropValue(); + MtpResponseCode doGetDevicePropValue(); + MtpResponseCode doSetDevicePropValue(); + MtpResponseCode doResetDevicePropValue(); MtpResponseCode doGetObjectInfo(); MtpResponseCode doGetObject(); MtpResponseCode doSendObjectInfo(); MtpResponseCode doSendObject(); MtpResponseCode doDeleteObject(); MtpResponseCode doGetObjectPropDesc(); + MtpResponseCode doGetDevicePropDesc(); }; }; // namespace android -- cgit v1.1