diff -r b95ddb5a0d10 -r eff9df3d9c98 mpengine/eabi/mpengineu.def
--- a/mpengine/eabi/mpengineu.def	Fri Jun 11 16:24:02 2010 +0100
+++ b/mpengine/eabi/mpengineu.def	Thu Jul 22 16:32:33 2010 +0100
@@ -1,67 +1,131 @@
 EXPORTS
-	_ZN8MpEngine10initializeEN8MpCommon10MpViewModeE4TUid @ 1 NONAME
-	_ZN8MpEngine10setShuffleEb @ 2 NONAME
-	_ZN8MpEngine10usbBlockedEb @ 3 NONAME
-	_ZN8MpEngine11deleteSongsER5QListIiE @ 4 NONAME
-	_ZN8MpEngine11previewItemEi @ 5 NONAME
-	_ZN8MpEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 6 NONAME
-	_ZN8MpEngine11qt_metacastEPKc @ 7 NONAME
-	_ZN8MpEngine11setPositionEi @ 8 NONAME
-	_ZN8MpEngine11skipForwardEv @ 9 NONAME
-	_ZN8MpEngine12playEmbeddedE7QString @ 10 NONAME
-	_ZN8MpEngine12playEmbeddedERK14XQSharableFile @ 11 NONAME
-	_ZN8MpEngine12playbackDataEv @ 12 NONAME
-	_ZN8MpEngine12skipBackwardEv @ 13 NONAME
-	_ZN8MpEngine12songsDeletedEb @ 14 NONAME
-	_ZN8MpEngine13findPlaylistsER11QStringList @ 15 NONAME
-	_ZN8MpEngine13playlistSavedEb @ 16 NONAME
-	_ZN8MpEngine14collectionDataEv @ 17 NONAME
-	_ZN8MpEngine14createPlaylistER7QStringR5QListIiEP19MpMpxCollectionData @ 18 NONAME
-	_ZN8MpEngine14handleUsbEventE12MpxUsbEvents @ 19 NONAME
-	_ZN8MpEngine14libraryUpdatedEv @ 20 NONAME
-	_ZN8MpEngine14openCollectionE18TCollectionContext @ 21 NONAME
-	_ZN8MpEngine14refreshLibraryEv @ 22 NONAME
-	_ZN8MpEngine14renamePlaylistER7QString @ 23 NONAME
-	_ZN8MpEngine14renamePlaylistER7QStringi @ 24 NONAME
-	_ZN8MpEngine14saveToPlaylistEiR5QListIiE @ 25 NONAME
-	_ZN8MpEngine15handleDiskEventE13MpxDiskEvents @ 26 NONAME
-	_ZN8MpEngine15handleScanEndedEii @ 27 NONAME
-	_ZN8MpEngine15reorderPlaylistEiiii @ 28 NONAME
-	_ZN8MpEngine16playlistsRenamedEb @ 29 NONAME
-	_ZN8MpEngine16reopenCollectionEv @ 30 NONAME
-	_ZN8MpEngine16staticMetaObjectE @ 31 NONAME DATA 16
-	_ZN8MpEngine17handleScanStartedEv @ 32 NONAME
-	_ZN8MpEngine17verifyUsbBlockingEb @ 33 NONAME
-	_ZN8MpEngine18launchBlockingNoteEv @ 34 NONAME
-	_ZN8MpEngine18openCollectionItemEi @ 35 NONAME
-	_ZN8MpEngine19getStaticMetaObjectEv @ 36 NONAME
-	_ZN8MpEngine19setOutstandingPopupEP7HbPopup @ 37 NONAME
-	_ZN8MpEngine20checkForSystemEventsEv @ 38 NONAME
-	_ZN8MpEngine20handleUsbMtpEndEventEv @ 39 NONAME
-	_ZN8MpEngine20libraryAboutToUpdateEv @ 40 NONAME
-	_ZN8MpEngine21handleUsbMtpNotActiveEv @ 41 NONAME
-	_ZN8MpEngine21saveToCurrentPlaylistER5QListIiEP19MpMpxCollectionData @ 42 NONAME
-	_ZN8MpEngine22changeUsbBlockingStateENS_16UsbBlockingStateE @ 43 NONAME
-	_ZN8MpEngine22handleUsbMtpStartEventEv @ 44 NONAME
-	_ZN8MpEngine22openIsolatedCollectionE18TCollectionContext @ 45 NONAME
-	_ZN8MpEngine24collectionPlaylistOpenedEv @ 46 NONAME
-	_ZN8MpEngine24isolatedCollectionOpenedEP19MpMpxCollectionData @ 47 NONAME
-	_ZN8MpEngine25releaseIsolatedCollectionEv @ 48 NONAME
-	_ZN8MpEngine28handleOutstandingNoteClosingEv @ 49 NONAME
-	_ZN8MpEngine28handleUsbMassStorageEndEventEv @ 50 NONAME
-	_ZN8MpEngine30handleUsbMassStorageStartEventEv @ 51 NONAME
-	_ZN8MpEngine4backEv @ 52 NONAME
-	_ZN8MpEngine4stopEv @ 53 NONAME
-	_ZN8MpEngine5closeEv @ 54 NONAME
-	_ZN8MpEngine8instanceEv @ 55 NONAME
-	_ZN8MpEngine9playPauseEv @ 56 NONAME
-	_ZN8MpEngine9setRepeatEb @ 57 NONAME
-	_ZN8MpEngineC1Ev @ 58 NONAME
-	_ZN8MpEngineC2Ev @ 59 NONAME
-	_ZN8MpEngineD0Ev @ 60 NONAME
-	_ZN8MpEngineD1Ev @ 61 NONAME
-	_ZN8MpEngineD2Ev @ 62 NONAME
-	_ZNK8MpEngine10metaObjectEv @ 63 NONAME
-	_ZTI8MpEngine @ 64 NONAME
-	_ZTV8MpEngine @ 65 NONAME
+	_ZN13MpSongScanner10cancelScanEv @ 1 NONAME
+	_ZN13MpSongScanner11qt_metacallEN11QMetaObject4CallEiPPv @ 2 NONAME
+	_ZN13MpSongScanner11qt_metacastEPKc @ 3 NONAME
+	_ZN13MpSongScanner11scanStartedEv @ 4 NONAME
+	_ZN13MpSongScanner12scanFinishedEii @ 5 NONAME
+	_ZN13MpSongScanner15handleDiskEventE13MpxDiskEvents @ 6 NONAME
+	_ZN13MpSongScanner15handleScanEndedEii @ 7 NONAME
+	_ZN13MpSongScanner15isAutomaticScanEv @ 8 NONAME
+	_ZN13MpSongScanner16scanCountChangedEi @ 9 NONAME
+	_ZN13MpSongScanner16staticMetaObjectE @ 10 NONAME DATA 16
+	_ZN13MpSongScanner19getStaticMetaObjectEv @ 11 NONAME
+	_ZN13MpSongScanner4scanEb @ 12 NONAME
+	_ZN13MpSongScannerC1EP30MpMpxHarvesterFrameworkWrapperP7QObject @ 13 NONAME
+	_ZN13MpSongScannerC2EP30MpMpxHarvesterFrameworkWrapperP7QObject @ 14 NONAME
+	_ZN13MpSongScannerD0Ev @ 15 NONAME
+	_ZN13MpSongScannerD1Ev @ 16 NONAME
+	_ZN13MpSongScannerD2Ev @ 17 NONAME
+	_ZN15MpEngineFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 18 NONAME
+	_ZN15MpEngineFactory11qt_metacastEPKc @ 19 NONAME
+	_ZN15MpEngineFactory12sharedEngineEv @ 20 NONAME
+	_ZN15MpEngineFactory16staticMetaObjectE @ 21 NONAME DATA 16
+	_ZN15MpEngineFactory18createSharedEngineE4TUidN8MpEngine10EngineModeE @ 22 NONAME
+	_ZN15MpEngineFactory19getStaticMetaObjectEv @ 23 NONAME
+	_ZN15MpEngineFactory20createIsolatedEngineEN8MpEngine10EngineModeE @ 24 NONAME
+	_ZN15MpEngineFactory5closeEv @ 25 NONAME
+	_ZN15MpEngineFactory8instanceEv @ 26 NONAME
+	_ZN15MpEngineFactoryC1Ev @ 27 NONAME
+	_ZN15MpEngineFactoryC2Ev @ 28 NONAME
+	_ZN15MpEngineFactoryD0Ev @ 29 NONAME
+	_ZN15MpEngineFactoryD1Ev @ 30 NONAME
+	_ZN15MpEngineFactoryD2Ev @ 31 NONAME
+	_ZN8MpEngine10initializeE4TUidNS_10EngineModeE @ 32 NONAME
+	_ZN8MpEngine10setBalanceEi @ 33 NONAME
+	_ZN8MpEngine10setShuffleEb @ 34 NONAME
+	_ZN8MpEngine10shuffleAllEv @ 35 NONAME
+	_ZN8MpEngine10usbBlockedEb @ 36 NONAME
+	_ZN8MpEngine11applyPresetEi @ 37 NONAME
+	_ZN8MpEngine11deleteSongsER5QListIiE @ 38 NONAME
+	_ZN8MpEngine11presetNamesEv @ 39 NONAME
+	_ZN8MpEngine11previewItemEi @ 40 NONAME
+	_ZN8MpEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 41 NONAME
+	_ZN8MpEngine11qt_metacastEPKc @ 42 NONAME
+	_ZN8MpEngine11setLoudnessEb @ 43 NONAME
+	_ZN8MpEngine11setPositionEi @ 44 NONAME
+	_ZN8MpEngine11skipForwardEv @ 45 NONAME
+	_ZN8MpEngine11songScannerEv @ 46 NONAME
+	_ZN8MpEngine11stopSeekingEv @ 47 NONAME
+	_ZN8MpEngine12activePresetEv @ 48 NONAME
+	_ZN8MpEngine12playEmbeddedE7QString @ 49 NONAME
+	_ZN8MpEngine12playEmbeddedERK14XQSharableFile @ 50 NONAME
+	_ZN8MpEngine12playbackDataEv @ 51 NONAME
+	_ZN8MpEngine12retrieveSongEv @ 52 NONAME
+	_ZN8MpEngine12skipBackwardEv @ 53 NONAME
+	_ZN8MpEngine12songsDeletedEb @ 54 NONAME
+	_ZN8MpEngine13deleteStartedE18TCollectionContexti @ 55 NONAME
+	_ZN8MpEngine13findPlaylistsER11QStringList @ 56 NONAME
+	_ZN8MpEngine13playlistSavedEb @ 57 NONAME
+	_ZN8MpEngine14collectionDataEv @ 58 NONAME
+	_ZN8MpEngine14createPlaylistER7QStringR5QListIiEP19MpMpxCollectionData @ 59 NONAME
+	_ZN8MpEngine14equalizerReadyEv @ 60 NONAME
+	_ZN8MpEngine14findAlbumSongsEi @ 61 NONAME
+	_ZN8MpEngine14handleUsbEventE12MpxUsbEvents @ 62 NONAME
+	_ZN8MpEngine14libraryUpdatedEv @ 63 NONAME
+	_ZN8MpEngine14openCollectionE18TCollectionContext @ 64 NONAME
+	_ZN8MpEngine14playAlbumSongsEiiP19MpMpxCollectionData @ 65 NONAME
+	_ZN8MpEngine14refreshLibraryEb @ 66 NONAME
+	_ZN8MpEngine14renamePlaylistER7QString @ 67 NONAME
+	_ZN8MpEngine14renamePlaylistER7QStringi @ 68 NONAME
+	_ZN8MpEngine14saveToPlaylistEiR5QListIiE @ 69 NONAME
+	_ZN8MpEngine15aboutToAddSongsEi @ 70 NONAME
+	_ZN8MpEngine15handleDiskEventE13MpxDiskEvents @ 71 NONAME
+	_ZN8MpEngine15handleScanEndedEii @ 72 NONAME
+	_ZN8MpEngine15reorderPlaylistEiiii @ 73 NONAME
+	_ZN8MpEngine16disableEqualizerEv @ 74 NONAME
+	_ZN8MpEngine16loadActivityDataERK10QByteArray @ 75 NONAME
+	_ZN8MpEngine16playlistsRenamedEb @ 76 NONAME
+	_ZN8MpEngine16reopenCollectionEv @ 77 NONAME
+	_ZN8MpEngine16saveActivityDataER10QByteArray @ 78 NONAME
+	_ZN8MpEngine16startSeekForwardEv @ 79 NONAME
+	_ZN8MpEngine16staticMetaObjectE @ 80 NONAME DATA 16
+	_ZN8MpEngine17handleDeleteEndedEb @ 81 NONAME
+	_ZN8MpEngine17handleScanStartedEv @ 82 NONAME
+	_ZN8MpEngine17restorePathFailedEv @ 83 NONAME
+	_ZN8MpEngine17startSeekBackwardEv @ 84 NONAME
+	_ZN8MpEngine17verifyUsbBlockingEb @ 85 NONAME
+	_ZN8MpEngine18openCollectionItemEi @ 86 NONAME
+	_ZN8MpEngine19getStaticMetaObjectEv @ 87 NONAME
+	_ZN8MpEngine19handleDeleteStartedE18TCollectionContexti @ 88 NONAME
+	_ZN8MpEngine20checkForSystemEventsEv @ 89 NONAME
+	_ZN8MpEngine20handleEqualizerReadyEv @ 90 NONAME
+	_ZN8MpEngine20handleUsbMtpEndEventEv @ 91 NONAME
+	_ZN8MpEngine20libraryAboutToUpdateEv @ 92 NONAME
+	_ZN8MpEngine20libraryRefreshNeededEv @ 93 NONAME
+	_ZN8MpEngine21handleUsbMtpNotActiveEv @ 94 NONAME
+	_ZN8MpEngine21saveToCurrentPlaylistER5QListIiEP19MpMpxCollectionData @ 95 NONAME
+	_ZN8MpEngine21unableToCotinueDueUSBEv @ 96 NONAME
+	_ZN8MpEngine22changeUsbBlockingStateENS_16UsbBlockingStateE @ 97 NONAME
+	_ZN8MpEngine22handleUsbMtpStartEventEv @ 98 NONAME
+	_ZN8MpEngine22openIsolatedCollectionE18TCollectionContext @ 99 NONAME
+	_ZN8MpEngine23cancelCollectionRequestEv @ 100 NONAME
+	_ZN8MpEngine24collectionPlaylistOpenedEv @ 101 NONAME
+	_ZN8MpEngine24containerContentsChangedEv @ 102 NONAME
+	_ZN8MpEngine24isolatedCollectionOpenedEP19MpMpxCollectionData @ 103 NONAME
+	_ZN8MpEngine25releaseIsolatedCollectionEv @ 104 NONAME
+	_ZN8MpEngine25usbSynchronizationStartedEv @ 105 NONAME
+	_ZN8MpEngine26usbSynchronizationFinishedEv @ 106 NONAME
+	_ZN8MpEngine28handleUsbMassStorageEndEventEv @ 107 NONAME
+	_ZN8MpEngine30handleUsbMassStorageStartEventEv @ 108 NONAME
+	_ZN8MpEngine4backEv @ 109 NONAME
+	_ZN8MpEngine4stopEv @ 110 NONAME
+	_ZN8MpEngine7balanceEv @ 111 NONAME
+	_ZN8MpEngine8loudnessEv @ 112 NONAME
+	_ZN8MpEngine8songDataEv @ 113 NONAME
+	_ZN8MpEngine9playPauseEv @ 114 NONAME
+	_ZN8MpEngine9setRepeatEb @ 115 NONAME
+	_ZN8MpEngineC1Ev @ 116 NONAME
+	_ZN8MpEngineC2Ev @ 117 NONAME
+	_ZN8MpEngineD0Ev @ 118 NONAME
+	_ZN8MpEngineD1Ev @ 119 NONAME
+	_ZN8MpEngineD2Ev @ 120 NONAME
+	_ZNK13MpSongScanner10metaObjectEv @ 121 NONAME
+	_ZNK15MpEngineFactory10metaObjectEv @ 122 NONAME
+	_ZNK8MpEngine10metaObjectEv @ 123 NONAME
+	_ZTI13MpSongScanner @ 124 NONAME
+	_ZTI15MpEngineFactory @ 125 NONAME
+	_ZTI8MpEngine @ 126 NONAME
+	_ZTV13MpSongScanner @ 127 NONAME
+	_ZTV15MpEngineFactory @ 128 NONAME
+	_ZTV8MpEngine @ 129 NONAME