* [gentoo-commits] gentoo-x86 commit in media-sound/qmmp/files: qmmp-0.2.3-fix-xspf.patch qmmp-0.2.3-fix-playlist-download.patch
@ 2009-02-21 11:49 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-02-21 11:49 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/02/21 11:49:43
Added: qmmp-0.2.3-fix-xspf.patch
qmmp-0.2.3-fix-playlist-download.patch
Log:
revbump, fixes bug #257712, thanks to Sebastian Pipping
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Revision Changes Path
1.1 media-sound/qmmp/files/qmmp-0.2.3-fix-xspf.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/qmmp/files/qmmp-0.2.3-fix-xspf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/qmmp/files/qmmp-0.2.3-fix-xspf.patch?rev=1.1&content-type=text/plain
Index: qmmp-0.2.3-fix-xspf.patch
===================================================================
--- old/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp (revision 736)
+++ new/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp (revision 737)
@@ -57,11 +57,13 @@
while (!child.isNull())
{
- QString str = QUrl(child.firstChildElement("location").text()).toString(QUrl::RemoveScheme);
- out << str;
+ QUrl url (child.firstChildElement("location").text());
+ if (url.scheme() == "file") //remove scheme for local files only
+ out << url.toString(QUrl::RemoveScheme);
+ else
+ out << url.toString();
child = child.nextSiblingElement();
}
-
return out;
}
@@ -87,7 +89,11 @@
QDomElement track = doc.createElement("track");
QDomElement ch = doc.createElement("location");
- QDomText text = doc.createTextNode(/*QString("file://") + */QFileInfo(f->path()).absoluteFilePath());
+ QDomText text;
+ if (f->path().contains("://"))
+ text = doc.createTextNode(f->path());
+ else //append protocol
+ text = doc.createTextNode(QString("file://") + QFileInfo(f->path()).absoluteFilePath());
ch.appendChild(text);
track.appendChild(ch);
1.1 media-sound/qmmp/files/qmmp-0.2.3-fix-playlist-download.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/qmmp/files/qmmp-0.2.3-fix-playlist-download.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/qmmp/files/qmmp-0.2.3-fix-playlist-download.patch?rev=1.1&content-type=text/plain
Index: qmmp-0.2.3-fix-playlist-download.patch
===================================================================
Index: src/ui/addurldialog.h
===================================================================
--- old/src/ui/addurldialog.h (revision 774)
+++ new/src/ui/addurldialog.h (working copy)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2008 by Ilya Kotov *
+ * Copyright (C) 2006-2009 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -48,8 +48,7 @@
virtual void accept();
private slots:
- void processResponse(int, bool);
- void readResponse(const QHttpResponseHeader&);
+ void readResponse(bool);
private:
void setModel(PlayListModel*);
Index: src/ui/addurldialog.cpp
===================================================================
--- old/src/ui/addurldialog.cpp (revision 774)
+++ new/src/ui/addurldialog.cpp (working copy)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2008 by Ilya Kotov *
+ * Copyright (C) 2006-2009 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -39,9 +39,7 @@
m_history = settings.value("URLDialog/history").toStringList();
urlComboBox->addItems(m_history);
m_http = new QHttp(this);
- connect(m_http, SIGNAL(requestFinished (int, bool)), SLOT(processResponse(int, bool)));
- connect(m_http, SIGNAL(readyRead (const QHttpResponseHeader&)),
- SLOT(readResponse(const QHttpResponseHeader&)));
+ connect(m_http, SIGNAL(done (bool)), SLOT(readResponse(bool)));
//use global proxy settings
if (settings.value ("Proxy/use_proxy", FALSE).toBool())
@@ -104,23 +102,16 @@
QDialog::accept();
}
-void AddUrlDialog::processResponse(int, bool error)
+void AddUrlDialog::readResponse(bool error)
{
if (error)
- {
QMessageBox::critical (this, tr("Error"), m_http->errorString ());
- QDialog::accept();
- }
-}
-
-void AddUrlDialog::readResponse(const QHttpResponseHeader&)
-{
- QString s = urlComboBox->currentText();
- PlaylistFormat* prs = PlaylistParser::instance()->findByPath(s);
- if (prs)
+ else
{
- m_model->addFiles(prs->decode(m_http->readAll()));
- return;
+ QString s = urlComboBox->currentText();
+ PlaylistFormat* prs = PlaylistParser::instance()->findByPath(s);
+ if (prs)
+ m_model->addFiles(prs->decode(m_http->readAll()));
}
QDialog::accept();
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/qmmp/files: qmmp-0.2.3-fix-xspf.patch qmmp-0.2.3-fix-playlist-download.patch
@ 2009-06-07 12:41 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-06-07 12:41 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/06/07 12:41:48
Removed: qmmp-0.2.3-fix-xspf.patch
qmmp-0.2.3-fix-playlist-download.patch
Log:
old
(Portage version: 2.2_rc33/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-07 12:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-21 11:49 [gentoo-commits] gentoo-x86 commit in media-sound/qmmp/files: qmmp-0.2.3-fix-xspf.patch qmmp-0.2.3-fix-playlist-download.patch Markos Chandras (hwoarang)
-- strict thread matches above, loose matches on Subject: below --
2009-06-07 12:41 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox