From d67f5581008a9e78ea3306537cc5c7a98d74797d Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 17 Apr 2010 13:30:15 +0000 Subject: mms plugin: use libmms wrapper git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1674 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Transports/mms/downloader.cpp | 6 +++--- src/plugins/Transports/mms/downloader.h | 4 ++-- src/plugins/Transports/mms/mmsinputfactory.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/Transports/mms/downloader.cpp b/src/plugins/Transports/mms/downloader.cpp index 242a4f48c..b0451a38e 100644 --- a/src/plugins/Transports/mms/downloader.cpp +++ b/src/plugins/Transports/mms/downloader.cpp @@ -89,7 +89,7 @@ void Downloader::abort() m_mutex.unlock(); wait(); if (m_handle) - mms_close(m_handle); + mmsx_close(m_handle); m_handle = 0; } @@ -103,7 +103,7 @@ qint64 Downloader::bytesAvailable() void Downloader::run() { - m_handle = mms_connect (0, 0, m_url.toLocal8Bit().constData(), 128 * 1024); + m_handle = mmsx_connect (0, 0, m_url.toLocal8Bit().constData(), 128 * 1024); if(!m_handle) { qWarning("Downloader: connection failed"); @@ -127,7 +127,7 @@ void Downloader::run() m_buffer_size = m_buffer_at + to_read; m_buffer = (char *)realloc(m_buffer, m_buffer_size); } - len = mms_read (0, m_handle, m_buffer + m_buffer_at, to_read); + len = mmsx_read (0, m_handle, m_buffer + m_buffer_at, to_read); if(len < 0) { qWarning("Downloader: error: %s", strerror(len)); diff --git a/src/plugins/Transports/mms/downloader.h b/src/plugins/Transports/mms/downloader.h index 8ffcb5d0d..ba4971630 100644 --- a/src/plugins/Transports/mms/downloader.h +++ b/src/plugins/Transports/mms/downloader.h @@ -25,7 +25,7 @@ #include #include #define this var -#include +#include #undef this @@ -55,7 +55,7 @@ signals: private: QMutex m_mutex; QString m_url; - mms_t *m_handle; + mmsx_t *m_handle; bool m_aborted; qint64 m_buffer_size, m_prebuf_size; char *m_buffer; diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp index a0225620b..b0945ab70 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.cpp +++ b/src/plugins/Transports/mms/mmsinputfactory.cpp @@ -30,7 +30,7 @@ const InputSourceProperties MMSInputFactory::properties() const { InputSourceProperties p; - p.protocols = "mms"; + p.protocols = "mms mmsh mmst mmsu"; p.name = tr("MMS Plugin"); p.shortName = "mms"; p.hasAbout = true; -- cgit v1.2.3-13-gbd6f