Update libmtp from pre 1.1.4 git to 1.1.5 release.

src/libmtp.c

 /**
  * \file libmtp.c
  *
  * Copyright (C) 2005-2011 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2005-2008 Richard A. Low <richard@wentnet.com>
  * Copyright (C) 2007 Ted Bullock <tbullock@canada.com>
  * Copyright (C) 2007 Tero Saarni <tero.saarni@gmail.com>
  * Copyright (C) 2008 Florent Mertens <flomertens@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 27 matching lines @@
 #include "libmtp.h"
 #include "unicode.h"
 #include "ptp.h"
 #include "libusb-glue.h"
 #include "device-flags.h"
 #if 0
 #include "playlist-spl.h"
 #endif
 #include "util.h"
 
+#include "mtpz.h"
+
 #include <stdlib.h>
 #include <limits.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
 #ifdef _MSC_VER // For MSVC++
 #define USE_WINDOWS_IO_H
 #include <io.h>
 #endif
 
 
 /**
  * Global debug level
  * We use a flag system to enable a part of logs.
  *
  * The LIBMTP_DEBUG environment variable sets the debug flags for any binary
  * that uses libmtp and calls LIBMTP_Init. The value can be given in decimal
  * (must not start with "0" or it will be interpreted in octal), or in
  * hexadecimal (must start with "0x").
  *
  * The value "-1" enables all debug flags.
  *
  * Some of the utilities in examples/ also take a command-line flag "-d" that
- * enables all debug flags, as if you had set LIBMTP_DEBUG=-1.
+ * enables LIBMTP_DEBUG_PTP and LIBMTP_DEBUG_DATA (same as setting
+ * LIBMTP_DEBUG=9).
  *
  * Flags (combine by adding the hex values):
- *  0x00 [0000 0000] : no debug (default)
- *  0x01 [0000 0001] : PTP debug
- *  0x02 [0000 0010] : Playlist debug
- *  0x04 [0000 0100] : USB debug
- *  0x08 [0000 1000] : USB data debug
+ *  0x00 [0000 0000] : LIBMTP_DEBUG_NONE  : no debug (default)
+ *  0x01 [0000 0001] : LIBMTP_DEBUG_PTP   : PTP debug
+ *  0x02 [0000 0010] : LIBMTP_DEBUG_PLST  : Playlist debug
+ *  0x04 [0000 0100] : LIBMTP_DEBUG_USB   : USB debug
+ *  0x08 [0000 1000] : LIBMTP_DEBUG_DATA  : USB data debug
+ *
+ * (Please keep this list in sync with libmtp.h.)
  */
 int LIBMTP_debug = LIBMTP_DEBUG_NONE;
 
 
 /*
  * This is a mapping between libmtp internal MTP filetypes and
  * the libgphoto2/PTP equivalent defines. We need this because
  * otherwise the libmtp.h device has to be dependent on ptp.h
  * to be installed too, and we don't want that.
  */
@@ skipping 652 matching lines @@
   LIBMTP_debug = level;
 }
 
 
 /**
  * Initialize the library. You are only supposed to call this
  * one, before using the library for the first time in a program.
  * Never re-initialize libmtp!
  *
  * The only thing this does at the moment is to initialise the
- * filetype mapping table.
+ * filetype mapping table, as well as load MTPZ data if necessary.
  */
 void LIBMTP_Init(void)
 {
   const char *env_debug = getenv("LIBMTP_DEBUG");
   if (env_debug) {
     const long debug_flags = strtol(env_debug, NULL, 0);
     if (debug_flags != LONG_MIN && debug_flags != LONG_MAX &&
         INT_MIN <= debug_flags && debug_flags <= INT_MAX) {
       LIBMTP_Set_Debug(debug_flags);
     } else {
       fprintf(stderr, "LIBMTP_Init: error setting debug flags from environment "
                       "value \"%s\"\n", env_debug);
     }
   }
 
   init_filemap();
   init_propertymap();
+
+  if (mtpz_loaddata() == -1)
+    use_mtpz = 0;
+  else
+    use_mtpz = 1;
+
   return;
 }
 
 
 /**
  * This helper function returns a textual description for a libmtp
  * file type to be used in dialog boxes etc.
  * @param intype the libmtp internal filetype to get a description for.
  * @return a string representing the filetype, this must <b>NOT</b>
  *         be free():ed by the caller!
@@ skipping 1297 matching lines @@
   return mtp_device;
 }
 
 LIBMTP_mtpdevice_t *LIBMTP_Open_Raw_Device(LIBMTP_raw_device_t *rawdevice)
 {
   LIBMTP_mtpdevice_t *mtp_device = LIBMTP_Open_Raw_Device_Uncached(rawdevice);
 
   if (mtp_device == NULL)
     return NULL;
 
+  /* Check for MTPZ devices. */
+  if (use_mtpz) {
+    LIBMTP_device_extension_t *tmpext = mtp_device->extensions;
+
+    while (tmpext != NULL) {
+      if (!strcmp(tmpext->name, "microsoft.com/MTPZ")) {
+        LIBMTP_INFO("MTPZ device detected. Authenticating...\n");
+        if (PTP_RC_OK == ptp_mtpz_handshake(mtp_device->params)) {
+          LIBMTP_INFO ("(MTPZ) Successfully authenticated with device.\n");
+        } else {
+          LIBMTP_INFO ("(MTPZ) Failure - could not authenticate with device.\n");
+        }
+        break;
+      }
+      tmpext = tmpext->next;
+    }
+  }
+
   // Set up this device as cached
   mtp_device->cached = 1;
   /*
    * Then get the handles and try to locate the default folders.
    * This has the desired side effect of caching all handles from
    * the device which speeds up later operations.
    */
   flush_handles(mtp_device);
   return mtp_device;
 }
 
 /**
  * To read events sent by the device, repeatedly call this function from a secondary
  * thread until the return value is < 0.
  *
  * @param device a pointer to the MTP device to poll for events.
  * @param event contains a pointer to be filled in with the event retrieved if the call
  * is successful.
+ * @param out1 contains the param1 value from the raw event.
  * @return 0 on success, any other value means the polling loop shall be
  * terminated immediately for this session.
  */
-int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *device, LIBMTP_event_t *event)
+int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *device, LIBMTP_event_t *event, uint32_t *out1)
 {
   /*
    * FIXME: Potential race-condition here, if client deallocs device
    * while we're *not* waiting for input. As we'll be waiting for
    * input most of the time, it's unlikely but still worth considering
    * for improvement. Also we cannot affect the state of the cache etc
    * unless we know we are the sole user on the device. A spinlock or
    * mutex in the LIBMTP_mtpdevice_t is needed for this to work.
    */
   PTPParams *params = (PTPParams *) device->params;
@@ skipping 30 matching lines @@
       break;
     case PTP_EC_ObjectAdded:
       LIBMTP_INFO("Received event PTP_EC_ObjectAdded in session %u\n", session_id);
       break;
     case PTP_EC_ObjectRemoved:
       LIBMTP_INFO("Received event PTP_EC_ObjectRemoved in session %u\n", session_id);
       break;
     case PTP_EC_StoreAdded:
       LIBMTP_INFO("Received event PTP_EC_StoreAdded in session %u\n", session_id);
       /* TODO: rescan storages */
+      *event = LIBMTP_EVENT_STORE_ADDED;
+      *out1 = param1;
       break;
     case PTP_EC_StoreRemoved:
       LIBMTP_INFO("Received event PTP_EC_StoreRemoved in session %u\n", session_id);
       /* TODO: rescan storages */
       break;
     case PTP_EC_DevicePropChanged:
       LIBMTP_INFO("Received event PTP_EC_DevicePropChanged in session %u\n", session_id);
       /* TODO: update device properties */
       break;
     case PTP_EC_ObjectInfoChanged:
@@ skipping 6608 matching lines @@
   sampledata->width = get_u32_from_object(device, id, PTP_OPC_RepresentativeSampleWidth, 0);
   sampledata->height = get_u32_from_object(device, id, PTP_OPC_RepresentativeSampleHeight, 0);
   sampledata->duration = get_u32_from_object(device, id, PTP_OPC_RepresentativeSampleDuration, 0);
   sampledata->filetype = map_ptp_type_to_libmtp_type(
         get_u16_from_object(device, id, PTP_OPC_RepresentativeSampleFormat, LIBMTP_FILETYPE_UNKNOWN));
 
   return 0;
 }
 
 /**
+ * Retrieve the thumbnail for a file.
+ * @param device a pointer to the device to get the thumbnail from.
+ * @param id the object ID of the file to retrieve the thumbnail for.
+ * @return 0 on success, any other value means failure.
+ */
+int LIBMTP_Get_Thumbnail(LIBMTP_mtpdevice_t *device, uint32_t const id,
+                         unsigned char **data, unsigned int *size)
+{
+  PTPParams *params = (PTPParams *) device->params;
+  uint16_t ret;
+
+  ret = ptp_getthumb(params, id, data, size);
+  if (ret == PTP_RC_OK)
+      return 0;
+  return -1;
+}
+
+/**
  * This routine updates an album based on the metadata
  * supplied. If the <code>tracks</code> field of the metadata
  * contains a track listing, these tracks will be added to the
  * album in place of those already present, i.e. the
  * previous track listing will be deleted.
  * @param device a pointer to the device to create the new album on.
  * @param metadata the metadata for the album to be updated.
  *                 notice that the field <code>album_id</code>
  *                 must contain the apropriate album ID.
  * @return 0 on success, any other value means failure.
@@ skipping 44 matching lines @@
  * @param device the device which may have a cache to which the object should be updated.
  * @param object_id the object to update.
  */
 static void update_metadata_cache(LIBMTP_mtpdevice_t *device, uint32_t object_id)
 {
   PTPParams *params = (PTPParams *)device->params;
 
   ptp_remove_object_from_cache(params, object_id);
   add_object_to_cache(device, object_id);
 }