amarok1/libmtp.patch

   1
   2 --- amarok-1.4.10.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp    2008-08-14 19:10:25.000000000 +0200
   3 +++ amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp 2008-08-14 19:10:33.000000000 +0200
   4 @@ -293,12 +293,13 @@
   5          parent_id = getDefaultParentId();
   6      }
   7      debug() << "Parent id : " << parent_id << endl;
   8 +    trackmeta->parent_id = parent_id;
   9
  10      m_critical_mutex.lock();
  11      debug() << "Sending track... " << bundle.url().path().utf8() << endl;
  12      int ret = LIBMTP_Send_Track_From_File(
  13          m_device, bundle.url().path().utf8(), trackmeta,
  14 -        progressCallback, this, parent_id
  15 +        progressCallback, this
  16      );
  17      m_critical_mutex.unlock();
  18
  19 @@ -529,7 +530,7 @@
  20          for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
  21              album_object->tracks[i++] = it->track()->id();
  22          album_object->no_tracks = items->count();
  23 -        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
  24 +        ret = LIBMTP_Create_New_Album( m_device, album_object );
  25          if( ret != 0 )
  26          {
  27              debug() << "creating album failed : " << ret << endl;
  28 @@ -608,7 +609,7 @@
  29  {
  30      debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
  31      char *name_copy = qstrdup( name );
  32 -    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
  33 +    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
  34      delete(name_copy);
  35      debug() << "New folder ID: " << new_folder_id << endl;
  36      if( new_folder_id == 0 )
  37 @@ -913,7 +914,7 @@
  38      if( item->playlist()->id() == 0 )
  39      {
  40          debug() << "creating new playlist : " << metadata->name << endl;
  41 -        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
  42 +        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
  43          if( ret == 0 )
  44          {
  45              item->playlist()->setId( metadata->playlist_id );
  46