Include names for events when dumping device info

3 files changed, 39 insertions, 1 deletions

diff --git a/src/libmtp.c b/src/libmtp.c
index 02431c1..77e9139 100644
--- a/src/libmtp.c
+++ b/src/libmtp.c
@@ -3182,7 +3182,7 @@ void LIBMTP_Dump_Device_Info(LIBMTP_mtpdevice_t *device)
     printf("   None.\n");
   } else {
     for (i=0;i<params->deviceinfo.EventsSupported_len;i++) {
-      printf("   0x%04x (%s)\n", params->deviceinfo.EventsSupported[i], ptp_strerror(params->deviceinfo.EventsSupported[i], params->deviceinfo.VendorExtensionID));
+      printf("   0x%04x: %s\n", params->deviceinfo.EventsSupported[i], ptp_get_event_code_name(params, params->deviceinfo.EventsSupported[i]));
     }
   }
   printf("Device Properties Supported:\n");
diff --git a/src/ptp.c b/src/ptp.c
index b144b22..04d6768 100644
--- a/src/ptp.c
+++ b/src/ptp.c
@@ -6331,6 +6331,43 @@ ptp_get_opcode_name(PTPParams* params, uint16_t opcode)
 
 
 struct {
+	uint16_t code;
+	const char *name;
+} ptp_event_codes[] = {
+	{PTP_EC_Undefined, "Undefined"},
+	{PTP_EC_CancelTransaction, "CancelTransaction"},
+	{PTP_EC_ObjectAdded, "ObjectAdded"},
+	{PTP_EC_ObjectRemoved, "ObjectRemoved"},
+	{PTP_EC_StoreAdded, "StoreAdded"},
+	{PTP_EC_StoreRemoved, "StoreRemoved"},
+	{PTP_EC_DevicePropChanged, "DevicePropChanged"},
+	{PTP_EC_ObjectInfoChanged, "ObjectInfoChanged"},
+	{PTP_EC_DeviceInfoChanged, "DeviceInfoChanged"},
+	{PTP_EC_RequestObjectTransfer, "RequestObjectTransfer"},
+	{PTP_EC_StoreFull, "StoreFull"},
+	{PTP_EC_DeviceReset, "DeviceReset"},
+	{PTP_EC_StorageInfoChanged, "StorageInfoChanged"},
+	{PTP_EC_CaptureComplete, "CaptureComplete"},
+	{PTP_EC_UnreportedStatus, "UnreportedStatus"},
+
+	{PTP_EC_MTP_ObjectPropChanged, "ObjectPropChanged"},
+	{PTP_EC_MTP_ObjectPropDescChanged, "ObjectPropDescChanged"},
+	{PTP_EC_MTP_ObjectReferencesChanged, "ObjectReferencesChanged"},
+};
+
+
+const char*
+ptp_get_event_code_name(PTPParams* params, uint16_t event_code)
+{
+	unsigned int i;
+	for (i=0; i<sizeof(ptp_event_codes)/sizeof(ptp_event_codes[0]); i++)
+		if (event_code == ptp_event_codes[i].code)
+			return _(ptp_event_codes[i].name);
+	return _("Unknown Event");
+}
+
+
+struct {
 	uint16_t id;
 	const char *name;
 } ptp_opc_trans[] = {
diff --git a/src/ptp.h b/src/ptp.h
index 88baa54..4e8973d 100644
--- a/src/ptp.h
+++ b/src/ptp.h
@@ -3356,6 +3356,7 @@ void ptp_error			(PTPParams *params, const char *format, ...);
 const char* ptp_get_property_description(PTPParams* params, uint16_t dpc);
 
 const char* ptp_get_opcode_name(PTPParams* params, uint16_t opcode);
+const char* ptp_get_event_code_name(PTPParams* params, uint16_t event_code);
 
 int
 ptp_render_property_value(PTPParams* params, uint16_t dpc,