Differential D11867 Diff 31103 src/core-impl/collections/umscollection/UmsCollection.cpp

Changeset View

Standalone View

View Options

src/core-impl/collections/umscollection/UmsCollection.cpp

Show All 16 Lines
17#define DEBUG_PREFIX "UmsCollection" 17​#define DEBUG_PREFIX "UmsCollection"
18 18​
19#include "UmsCollection.h" 19​#include "UmsCollection.h"
20 20​
21#include "amarokconfig.h" 21​#include "amarokconfig.h"
22#include "ui_UmsConfiguration.h" 22​#include "ui_UmsConfiguration.h"
23#include "collectionscanner/Track.h" 23​#include "collectionscanner/Track.h"
24#include "core/capabilities/ActionsCapability.h" 24​#include "core/capabilities/ActionsCapability.h"
25#include "core/interfaces/Logger.h" 25​#include "core/logger/Logger.h"
26#include "core/meta/Meta.h" 26​#include "core/meta/Meta.h"
27#include "core/support/Components.h" 27​#include "core/support/Components.h"
28#include "core/support/Debug.h" 28​#include "core/support/Debug.h"
29#include "core-impl/collections/support/MemoryQueryMaker.h" 29​#include "core-impl/collections/support/MemoryQueryMaker.h"
30#include "core-impl/collections/support/MemoryMeta.h" 30​#include "core-impl/collections/support/MemoryMeta.h"
31#include "core-impl/collections/umscollection/UmsCollectionLocation.h" 31​#include "core-impl/collections/umscollection/UmsCollectionLocation.h"
32#include "core-impl/collections/umscollection/UmsTranscodeCapability.h" 32​#include "core-impl/collections/umscollection/UmsTranscodeCapability.h"
33#include "core-impl/meta/file/File.h" 33​#include "core-impl/meta/file/File.h"
▲ Show 20 Lines • Show All 249 Lines • ▼ Show 20 Line(s)280 {
283 m_musicUrl.setPath(m_musicUrl.path() + '/' + ( entries.readPathEntry( s_musicFolderKey, QString() ) )); 283​ m_musicUrl.setPath(m_musicUrl.path() + '/' + ( entries.readPathEntry( s_musicFolderKey, QString() ) ));
284 m_musicUrl.setPath( QDir::cleanPath(m_musicUrl.path()) ); 284​ m_musicUrl.setPath( QDir::cleanPath(m_musicUrl.path()) );
285 if( !QDir( m_musicUrl.toLocalFile() ).exists() ) 285​ if( !QDir( m_musicUrl.toLocalFile() ).exists() )
286 { 286​ {
287 QString message = i18n( "File <i>%1</i> suggests that we should use <i>%2</i> " 287​ QString message = i18n( "File <i>%1</i> suggests that we should use <i>%2</i> "
288 "as music folder on the device, but it doesn't exist. Falling back to " 288​ "as music folder on the device, but it doesn't exist. Falling back to "
289 "<i>%3</i> instead", m_mountPoint + '/' + s_settingsFileName, 289​ "<i>%3</i> instead", m_mountPoint + '/' + s_settingsFileName,
290 m_musicUrl.toLocalFile(), m_mountPoint ); 290​ m_musicUrl.toLocalFile(), m_mountPoint );
291 Amarok::Components::logger()->longMessage( message, Amarok::Logger::Warning ); 291​ Amarok::Logger::longMessage( message, Amarok::Logger::Warning );
292 m_musicUrl = QUrl::fromLocalFile(m_mountPoint); 292​ m_musicUrl = QUrl::fromLocalFile(m_mountPoint);
293 } 293​ }
294 } 294​ }
295 else if( !entries.keyList().isEmpty() ) 295​ else if( !entries.keyList().isEmpty() )
296 // config file exists, but has no s_musicFolderKey -> music should be disabled 296​ // config file exists, but has no s_musicFolderKey -> music should be disabled
297 m_musicUrl = QUrl(); 297​ m_musicUrl = QUrl();
298 else 298​ else
299 m_musicUrl = QUrl::fromLocalFile(m_mountPoint); // related BR 259849 299​ m_musicUrl = QUrl::fromLocalFile(m_mountPoint); // related BR 259849
▲ Show 20 Lines • Show All 445 Lines • Show Last 20 Lines