diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2008-08-07 17:29:34 -0400 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2008-08-07 17:29:34 -0400 |
| commit | 12450f0cd87fccdba328e51b7cbf4b7b9bd9de49 (patch) | |
| tree | a72573453755668f389a78101833a6032c319f15 | |
| parent | Included more definate phonon headers. (diff) | |
| download | zmusicplayer-12450f0cd87fccdba328e51b7cbf4b7b9bd9de49.tar.xz zmusicplayer-12450f0cd87fccdba328e51b7cbf4b7b9bd9de49.zip | |
Upgraded to new authentication scheme and fixed header includes.
| -rw-r--r-- | Credentials.cpp | 4 | ||||
| -rw-r--r-- | PlayerWindow.cpp | 2 | ||||
| -rw-r--r-- | PlayerWindow.h | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Credentials.cpp b/Credentials.cpp index fd7a926..c1e93f6 100644 --- a/Credentials.cpp +++ b/Credentials.cpp @@ -66,7 +66,7 @@ Credentials::Credentials(QString host, QString listingPath, QString songPath, QW QUrl Credentials::songUrl(QString hash) const { return QUrl( - QString("http://%1:%2@%3:%4/%5") + QString("http://%3:%4/%5&username=%1&password=%2") .arg(m_usernameEdit->text()) .arg(m_passwordEdit->text()) .arg(m_host) @@ -86,7 +86,7 @@ void Credentials::login() m_networkAccess = new QNetworkAccessManager(this); } m_reply = m_networkAccess->get(QNetworkRequest(QUrl( - QString("http://%1:%2@%3:%4/%5") + QString("http://%3:%4/%5&username=%1&password=%2") .arg(m_usernameEdit->text()) .arg(m_passwordEdit->text()) .arg(m_host) diff --git a/PlayerWindow.cpp b/PlayerWindow.cpp index 3d38f11..8ec680e 100644 --- a/PlayerWindow.cpp +++ b/PlayerWindow.cpp @@ -19,7 +19,7 @@ #include <QVBoxLayout> #include <QSortFilterProxyModel> #include <QPushButton> -#include <AudioOutput> +//#include <AudioOutput> //BEGIN CONSTRUCT OBJECTS PlayerWindow::PlayerWindow(QWidget *parent, Qt::WindowFlags flags) diff --git a/PlayerWindow.h b/PlayerWindow.h index e952855..cddb948 100644 --- a/PlayerWindow.h +++ b/PlayerWindow.h @@ -8,9 +8,10 @@ #include <QMainWindow> #include <QTimer> #include <QModelIndex> -#include <MediaObject> -#include <SeekSlider> -#include <VolumeSlider> +//#include <MediaObject> +//#include <SeekSlider> +//#include <VolumeSlider> +#include <phonon> class Song; class QBuffer; |