Revert "Uprev libmtp to 1.1.12"

examples/albums.c

 /**
  * \file albums.c
  * Example program that lists the albums on the device.
  *
  * Copyright (C) 2006 Chris A. Debenham <chris@adebenham.com>
  * Copyright (C) 2007 Ted Bullock <tbullock@canada.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 16 matching lines @@
 {
   printf("Album ID: %d\n",album->album_id);
   printf("    Parent ID:   %d\n",album->parent_id);
   printf("    Name:   %s\n",album->name);
   printf("    Artist: %s\n", album->artist);
   printf("    Composer:  %s\n", album->composer);
   printf("    Genre:  %s\n", album->genre);
   printf("    Tracks: %d\n\n",album->no_tracks);
 }
 
-static void
-dump_albums(LIBMTP_mtpdevice_t *device, uint32_t storageid, int leaf)
-{
-  LIBMTP_file_t *files;
-
-  /* Get file listing. */
-  files = LIBMTP_Get_Files_And_Folders(device,
-                                       storageid,
-                                       leaf);
-  if (files == NULL) {
-    LIBMTP_Dump_Errorstack(device);
-    LIBMTP_Clear_Errorstack(device);
-  } else {
-    LIBMTP_file_t *file, *tmp;
-    file = files;
-    while (file != NULL) {
-      /* Please don't print these */
-      if (file->filetype == LIBMTP_FILETYPE_FOLDER) {
-        dump_albums(device, storageid, file->item_id);
-      } else if (file->filetype == LIBMTP_FILETYPE_ALBUM) {
-        LIBMTP_album_t *album;
-
-        album = LIBMTP_Get_Album(device, file->item_id);
-        dump_albuminfo(album);
-        LIBMTP_destroy_album_t(album);
-      }
-      tmp = file;
-      file = file->next;
-      LIBMTP_destroy_file_t(tmp);
-    }
-  }
-}
-
 int main (int argc, char *argv[]) {
-  LIBMTP_raw_device_t *rawdevices;
-  int numrawdevices;
-  LIBMTP_error_number_t err;
-  int i;
+  LIBMTP_mtpdevice_t *device_list, *device;
 
   int opt;
   extern int optind;
   extern char *optarg;
 
   while ((opt = getopt(argc, argv, "d")) != -1 ) {
     switch (opt) {
     case 'd':
       LIBMTP_Set_Debug(LIBMTP_DEBUG_PTP | LIBMTP_DEBUG_DATA);
       break;
     }
   }
 
   argc -= optind;
   argv += optind;
 
   LIBMTP_Init();
 
   fprintf(stdout, "libmtp version: " LIBMTP_VERSION_STRING "\n\n");
 
-  err = LIBMTP_Detect_Raw_Devices(&rawdevices, &numrawdevices);
-  switch(err)
+  switch(LIBMTP_Get_Connected_Devices(&device_list))
   {
   case LIBMTP_ERROR_NO_DEVICE_ATTACHED:
     fprintf(stdout, "mtp-albums: No Devices have been found\n");
     return 0;
   case LIBMTP_ERROR_CONNECTING:
     fprintf(stderr, "mtp-albums: There has been an error connecting. Exit\n");
     return 1;
   case LIBMTP_ERROR_MEMORY_ALLOCATION:
     fprintf(stderr, "mtp-albums: Memory Allocation Error. Exit\n");
     return 1;
 
   /* Unknown general errors - This should never execute */
   case LIBMTP_ERROR_GENERAL:
   default:
     fprintf(stderr, "mtp-albums: Unknown error, please report "
                     "this to the libmtp developers\n");
   return 1;
 
   /* Successfully connected at least one device, so continue */
   case LIBMTP_ERROR_NONE:
     fprintf(stdout, "mtp-albums: Successfully connected\n");
     fflush(stdout);
-    break;
   }
 
   /* iterate through connected MTP devices */
-  for (i = 0; i < numrawdevices; i++) {
-    LIBMTP_mtpdevice_t *device;
-    LIBMTP_devicestorage_t *storage;
+  for(device = device_list; device != NULL; device = device->next)
+  {
     char *friendlyname;
-
-    device = LIBMTP_Open_Raw_Device_Uncached(&rawdevices[i]);
-    if (device == NULL) {
-      fprintf(stderr, "Unable to open raw device %d\n", i);
-      continue;
-    }
+    LIBMTP_album_t *album_list, *album, *tmp;
 
     /* Echo the friendly name so we know which device we are working with */
     friendlyname = LIBMTP_Get_Friendlyname(device);
     if (friendlyname == NULL) {
       printf("Retrieving Albums on Device with name: (NULL)\n");
     } else {
       printf("Retrieving Albums on Device with name: %s\n", friendlyname);
       free(friendlyname);
     }
 
-    LIBMTP_Dump_Errorstack(device);
-    LIBMTP_Clear_Errorstack(device);
-
-    /* Loop over storages */
-    for (storage = device->storage; storage != 0; storage = storage->next) {
-      dump_albums(device, storage->id, 0);
+    album_list = LIBMTP_Get_Album_List(device);
+    album = album_list;
+    while(album != NULL)
+    {
+      dump_albuminfo(album);
+      tmp = album;
+      album = album->next;
+      LIBMTP_destroy_album_t(tmp);
     }
-    LIBMTP_Release_Device(device);
   }
 
-  free(rawdevices);
-
+  LIBMTP_Release_Device_List(device_list);
   printf("OK.\n");
   return 0;
 }