Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/amarok/patches/amarok-1.4.10-libmtp-0.3.0-API.patch

    Contents of /trunk/amarok/patches/amarok-1.4.10-libmtp-0.3.0-API.patch

    Parent Directory Parent Directory | Revision Log Revision Log

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