Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-02-08 07:48:48 +01:00
Code Issues Releases Wiki Activity

Fix CD playback.

Browse Source
This commit is contained in:
Jonas Kvinge 2018-03-10 13:01:26 +01:00
parent e5426500a8
commit 07a95b56ff
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/device/cddasongloader.cpp
View File

@ -40,10 +40,8 @@ CddaSongLoader::~CddaSongLoader() {
QUrl CddaSongLoader::GetUrlFromTrack(int track_number) const { QUrl CddaSongLoader::GetUrlFromTrack(int track_number) const {
qLog(Debug) << url_;
if (url_.isEmpty()) { if (url_.isEmpty()) {
return QUrl(QString("cdda://%1").arg(track_number)); return QUrl(QString("cdda://%1a").arg(track_number));
} }
else { else {
return QUrl(QString("cdda://%1/%2").arg(url_.path()).arg(track_number)); return QUrl(QString("cdda://%1/%2").arg(url_.path()).arg(track_number));
@ -58,6 +56,7 @@ void CddaSongLoader::LoadSongs() {
if (cdio_ == nullptr) { if (cdio_ == nullptr) {
return; return;
} }
// Create gstreamer cdda element // Create gstreamer cdda element
GError *error = nullptr; GError *error = nullptr;
cdda_ = gst_element_make_from_uri(GST_URI_SRC, "cdda://", nullptr, &error); cdda_ = gst_element_make_from_uri(GST_URI_SRC, "cdda://", nullptr, &error);
@ -194,8 +193,7 @@ void CddaSongLoader::AudioCDTagsLoaded(const QString &artist, const QString &alb
song.set_id(track_number); song.set_id(track_number);
song.set_filetype(Song::Type_Cdda); song.set_filetype(Song::Type_Cdda);
song.set_valid(true); song.set_valid(true);
// We need to set url: that's how playlist will find the correct item to // We need to set url: that's how playlist will find the correct item to update
// update
song.set_url(GetUrlFromTrack(track_number++)); song.set_url(GetUrlFromTrack(track_number++));
songs << song; songs << song;
} }