Commit 88ecec72 authored by Sergey Ivanov's avatar Sergey Ivanov
Browse files

Fixed CD copying functionality.

BUG: 264050
parent 24b71758
......@@ -18,6 +18,7 @@ VERSION 2.4.1
<bhargav.1191@gmail.com>. (BR 248690)
BUGFIXES:
* Fixed CD copying functionality. (BR 264050)
* Fixed CUE tracks playback order. (BR 263237)
* Prevent crash on exit when using Phonon-VLC.
* Fixed crash in the queue editor when trying to show already
......
......@@ -367,18 +367,18 @@ AudioCdCollection::encodingFormat() const
}
QString
AudioCdCollection::copyableBasePath() const
AudioCdCollection::copyableFilePath( const QString &fileName ) const
{
switch( m_encodingFormat )
{
case WAV:
return audiocdUrl().url();
return audiocdUrl( fileName ).url();
case FLAC:
return audiocdUrl( "FLAC/" ).url();
return audiocdUrl( "FLAC/" + fileName ).url();
case OGG:
return audiocdUrl( "Ogg Vorbis/" ).url();
return audiocdUrl( "Ogg Vorbis/" + fileName ).url();
case MP3:
return audiocdUrl( "MP3/" ).url();
return audiocdUrl( "MP3/" + fileName ).url();
}
return QString();
}
......
......@@ -71,7 +71,7 @@ public:
~AudioCdCollection();
QString encodingFormat() const;
QString copyableBasePath() const;
QString copyableFilePath( const QString &fileName ) const;
void setEncodingFormat( int format ) const;
......
......@@ -42,7 +42,7 @@ void AudioCdCollectionLocation::getKIOCopyableUrls( const Meta::TrackList & trac
{
Meta::AudioCdTrackPtr cdTrack = Meta::AudioCdTrackPtr::staticCast( trackPtr );
const QString path = m_collection->copyableBasePath() + cdTrack->fileNameBase() + '.' + m_collection->encodingFormat();
const QString path = m_collection->copyableFilePath( cdTrack->fileNameBase() + '.' + m_collection->encodingFormat() );
resultMap.insert( trackPtr, KUrl( path ) );
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment