[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/collection
From:       Alejandro Daniel Wainzinger <aikawarazuni () gmail ! com>
Date:       2009-07-16 21:05:22
Message-ID: 1247778322.355215.25522.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 998032 by awainzinger:

Fix regressions from removing signal/slot connections and replacing with direct slot \
calls, and bad git-svn dcommits cut off halfway that manage to compile somehow. \
BUG:200116

 M  +2 -2      ipodcollection/handler/IpodHandler.cpp  
 M  +7 -7      mtpcollection/handler/MtpHandler.cpp  
 M  +6 -2      mtpcollection/handler/MtpHandler.h  


--- trunk/extragear/multimedia/amarok/src/collection/ipodcollection/handler/IpodHandler.cpp \
#998031:998032 @@ -1793,7 +1793,7 @@
 {
     Q_UNUSED( job );
     debug() << "Writing to DB failed!";
-    emit databaseWritten( false );
+    slotDatabaseWritten( false );
 }
 
 void
@@ -1803,7 +1803,7 @@
     if( job->success() )
     {
         debug() << "Writing to DB succeeded!";
-        emit databaseWritten( true );
+        slotDatabaseWritten( true );
     }
     else
         debug() << "Writing to DB did not happen or failed";
--- trunk/extragear/multimedia/amarok/src/collection/mtpcollection/handler/MtpHandler.cpp \
#998031:998032 @@ -681,6 +681,7 @@
 void
 MtpHandler::findPathToCopy( const Meta::TrackPtr &srcTrack, const \
Meta::MediaDeviceTrackPtr &destTrack )  {
+    Q_UNUSED( destTrack );
     uint32_t parent_id = 0;
     if ( !m_folderStructure.isEmpty() )
     {
@@ -702,10 +703,8 @@
     }
     debug() << "Parent id : " << parent_id;
 
-    m_mtptrackhash[ destTrack ]->parent_id = parent_id; // api change, set id here
-    m_mtptrackhash[ destTrack ]->storage_id = 0; // default storage id
+    m_copyparentid = parent_id;
 
-    debug() << "set id's";
 }
 
 bool
@@ -735,15 +734,14 @@
 
 
 // TODO: nyi
-/*
+
 void
 MtpHandler::writeDatabase()
 {
-    return;
-    //ThreadWeaver::Weaver::instance()->enqueue( new DBWorkerThread( this ) );
+    slotDatabaseWritten( true );
 }
-*/
 
+
 void
 MtpHandler::libDeleteTrack( const Meta::MediaDeviceTrackPtr &track )
 {
@@ -1230,6 +1228,8 @@
 {
     m_mtptrackhash[ track ] = LIBMTP_new_track_t();
     m_mtptrackhash[ track ]->item_id = 0;
+    m_mtptrackhash[ track ]->parent_id = m_copyparentid;
+    m_mtptrackhash[ track ]->storage_id = 0; // default storage id
 }
 
 void
--- trunk/extragear/multimedia/amarok/src/collection/mtpcollection/handler/MtpHandler.h \
#998031:998032 @@ -63,7 +63,7 @@
 
     virtual void init(); // collection
     virtual bool isWritable() const;
-    virtual void writeDatabase() {}
+    virtual void writeDatabase();
 
     virtual void getCopyableUrls( const Meta::TrackList &tracks );
 
@@ -109,7 +109,7 @@
     virtual bool libCopyTrack( const Meta::TrackPtr &srcTrack, \
                Meta::MediaDeviceTrackPtr &destTrack );
     virtual bool libDeleteTrackFile( const Meta::MediaDeviceTrackPtr &track )
     {
-        Q_UNUSED( track ) return true;
+        slotFinalizeTrackRemove( Meta::TrackPtr::staticCast( track ) ); return true;
     }
     virtual void libCreateTrack( const Meta::MediaDeviceTrackPtr &track );
     virtual void libDeleteTrack( const Meta::MediaDeviceTrackPtr &track );
@@ -251,6 +251,10 @@
 
     QHash<uint32_t, LIBMTP_track_t*> m_idtrackhash;
 
+    // parentid calculated for new track copied to device
+
+    uint32_t m_copyparentid;
+
     // Used as temporary location for copying files from mtp
 
     KTempDir *m_tempdir;


[prev in list] [next in list] [prev in thread] [next in thread]