diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-12-06 05:29:12 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-12-06 05:29:12 +0000 |
| commit | 99754184a3696f29e27498b78bf5c8e1385ada8b (patch) | |
| tree | 6d1c0cdc90c9c21c5f4fd13695d5c6fd58b1d983 | |
| parent | 45606399bd0353ae42d4a271b916ee84f9c4e3a5 (diff) | |
| download | qmmp-99754184a3696f29e27498b78bf5c8e1385ada8b.tar.gz qmmp-99754184a3696f29e27498b78bf5c8e1385ada8b.tar.bz2 qmmp-99754184a3696f29e27498b78bf5c8e1385ada8b.zip | |
cdaudio: fixed windows support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3951 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/cdaudio/decodercdaudiofactory.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/Input/cdaudio/decodercdaudiofactory.h | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index 1667984c8..74362ea87 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2012 by Ilya Kotov * + * Copyright (C) 2009-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -19,7 +19,7 @@ ***************************************************************************/ #include <QtGui> - +#include <QRegExp> #include <cdio/version.h> #include <cddb/version.h> #include "settingsdialog.h" @@ -57,12 +57,14 @@ Decoder *DecoderCDAudioFactory::create(const QString &url, QIODevice *input) return new DecoderCDAudio(url); } -QList<FileInfo *> DecoderCDAudioFactory::createPlayList(const QString &fileName, bool useMetaData) +QList<FileInfo *> DecoderCDAudioFactory::createPlayList(const QString &url, bool useMetaData) { - qDebug("create!!"); Q_UNUSED(useMetaData); QList <FileInfo*> list; - QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(QUrl(fileName).path()); + QString device_path; + device_path.remove("cdda://"); + device_path.remove(QRegExp("#\\d+$")); + QList <CDATrack> tracks = DecoderCDAudio::generateTrackList(QUrl(url).path()); foreach(CDATrack t, tracks) { list << new FileInfo(t.info); diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.h b/src/plugins/Input/cdaudio/decodercdaudiofactory.h index 9432c261f..603b0b32e 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.h +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.h @@ -39,7 +39,7 @@ public: bool canDecode(QIODevice *input) const; const DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); - QList<FileInfo *> createPlayList(const QString &fileName, bool useMetaData); + QList<FileInfo *> createPlayList(const QString &url, bool useMetaData); MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); |