Differential D8174 Diff 20431 src/core-impl/collections/audiocd/AudioCdCollection.cpp

Changeset View

Standalone View

View Options

src/core-impl/collections/audiocd/AudioCdCollection.cpp

Show All 38 Lines
39#include <KIO/NetAccess> 39​#include <KIO/NetAccess>
40#include <KIO/UDSEntry> 40​#include <KIO/UDSEntry>
41 41​
42#include <solid/device.h> 42​#include <solid/device.h>
43#include <solid/opticaldrive.h> 43​#include <solid/opticaldrive.h>
44 44​
45#include <KConfigGroup> 45​#include <KConfigGroup>
46#include <KEncodingProber> 46​#include <KEncodingProber>
47 47​#include <KPluginFactory>
48#include <KSharedConfig> 48​#include <KSharedConfig>
49#include <KUrl> 49​#include <KUrl>
50 50​
51#include <QDir> 51​#include <QDir>
52#include <QTextCodec> 52​#include <QTextCodec>
53 53​
54using namespace Collections; 54​using namespace Collections;
55 55​
56AMAROK_EXPORT_COLLECTION( AudioCdCollectionFactory, audiocdcollection ) 56​AMAROK_EXPORT_COLLECTION( AudioCdCollectionFactory, audiocdcollection )
57 57​
58static const QString unknownCddbId( "unknown" ); 58​static const QString unknownCddbId( "unknown" );
59 59​
60AudioCdCollectionFactory::AudioCdCollectionFactory( QObject *parent, const QVariantList &args ) 60​AudioCdCollectionFactory::AudioCdCollectionFactory( QObject *parent, const QVariantList &args )
61 : MediaDeviceCollectionFactory<AudioCdCollection>( parent, args, new AudioCdConnectionAssistant() ) 61​ : MediaDeviceCollectionFactory<AudioCdCollection>( parent, args, new AudioCdConnectionAssistant() )
62{ 62​{
63 m_info = KPluginInfo( "amarok_collection-audiocdcollection.desktop" ); 63​ m_info = KPluginInfo( "amarok_collection-audiocdcollection.desktop" );
64} 64​}
65 65​
66AudioCdCollection::AudioCdCollection( MediaDeviceInfo* info ) 66​AudioCdCollection::AudioCdCollection( MediaDeviceInfo* info )
67 : MediaDeviceCollection() 67​ : MediaDeviceCollection()
68 , m_encodingFormat( OGG ) 68​ , m_encodingFormat( OGG )
69{ 69​{
70 DEBUG_BLOCK 70​ DEBUG_BLOCK
71 // so that `amarok --cdplay` works: 71​ // so that `amarok --cdplay` works:
72 connect( this, SIGNAL(collectionReady(Collections::Collection*)), 72​ connect( this, &AudioCdCollection::collectionReady,
73 SLOT(checkForStartPlayRequest()) ); 73​ this, &AudioCdCollection::checkForStartPlayRequest );
74 74​
75 debug() << "Getting Audio CD info"; 75​ debug() << "Getting Audio CD info";
76 AudioCdDeviceInfo *cdInfo = qobject_cast<AudioCdDeviceInfo *>( info ); 76​ AudioCdDeviceInfo *cdInfo = qobject_cast<AudioCdDeviceInfo *>( info );
77 m_udi = cdInfo->udi(); 77​ m_udi = cdInfo->udi();
78 m_device = cdInfo->device(); 78​ m_device = cdInfo->device();
79 79​
80 readAudioCdSettings(); 80​ readAudioCdSettings();
81 81​
Show All 21 Lines
103 103​
104 104​
105void 105​void
106AudioCdCollection::readCd() 106​AudioCdCollection::readCd()
107{ 107​{
108 DEBUG_BLOCK 108​ DEBUG_BLOCK
109 //get the CDDB info file if possible. 109​ //get the CDDB info file if possible.
110 KIO::ListJob *listJob = KIO::listRecursive( audiocdUrl(), KIO::HideProgressInfo, false ); 110​ KIO::ListJob *listJob = KIO::listRecursive( audiocdUrl(), KIO::HideProgressInfo, false );
111 connect( listJob, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)), 111​ connect( listJob, &KIO::ListJob::entries, this, &AudioCdCollection::audioCdEntries );
112 this, SLOT(audioCdEntries(KIO::Job*,KIO::UDSEntryList)) ); 112​ connect( listJob, &KIO::ListJob::result, this, &AudioCdCollection::slotEntriesJobDone );
113 connect( listJob, SIGNAL(result(KJob*)), SLOT(slotEntriesJobDone(KJob*)) ); ​
114} 113​}
115 114​
116void 115​void
117AudioCdCollection::audioCdEntries( KIO::Job *job, const KIO::UDSEntryList &list ) 116​AudioCdCollection::audioCdEntries( KIO::Job *job, const KIO::UDSEntryList &list )
118{ 117​{
119 DEBUG_BLOCK 118​ DEBUG_BLOCK
120 Q_UNUSED( job ) 119​ Q_UNUSED( job )
121 for( KIO::UDSEntryList::ConstIterator it = list.begin(); it != list.end(); ++it ) 120​ for( KIO::UDSEntryList::ConstIterator it = list.begin(); it != list.end(); ++it )
Show All 18 Lines137 {
140 noInfoAvailable(); 139​ noInfoAvailable();
141 return; 140​ return;
142 } 141​ }
143 142​
144 int biggestTextFile = m_cddbTextFiles.keys().last(); 143​ int biggestTextFile = m_cddbTextFiles.keys().last();
145 QUrl url = m_cddbTextFiles.value( biggestTextFile ); 144​ QUrl url = m_cddbTextFiles.value( biggestTextFile );
146 m_cddbTextFiles.clear(); // save memory 145​ m_cddbTextFiles.clear(); // save memory
147 KIO::StoredTransferJob *tjob = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo ); 146​ KIO::StoredTransferJob *tjob = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo );
148 connect( tjob, SIGNAL(result(KJob*)), SLOT(infoFetchComplete(KJob*)) ); 147​ connect( tjob, &KIO::StoredTransferJob::result, this, &AudioCdCollection::infoFetchComplete );
149} 148​}
150 149​
151void 150​void
152AudioCdCollection::infoFetchComplete( KJob *job ) 151​AudioCdCollection::infoFetchComplete( KJob *job )
153{ 152​{
154 DEBUG_BLOCK 153​ DEBUG_BLOCK
155 if( job->error() ) 154​ if( job->error() )
156 { 155​ {
▲ Show 20 Lines • Show All 480 Lines • Show Last 20 Lines