aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Transports
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Transports')
-rw-r--r--src/plugins/Transports/http/downloader.cpp14
-rw-r--r--src/plugins/Transports/http/httpinputfactory.cpp4
-rw-r--r--src/plugins/Transports/http/httpinputsource.cpp2
-rw-r--r--src/plugins/Transports/http/streamreader.cpp10
4 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/Transports/http/downloader.cpp b/src/plugins/Transports/http/downloader.cpp
index 7ef56a373..e904fced1 100644
--- a/src/plugins/Transports/http/downloader.cpp
+++ b/src/plugins/Transports/http/downloader.cpp
@@ -71,7 +71,7 @@ static size_t curl_header(void *data, size_t size, size_t nmemb,
else if (str.left(4).contains("ICY"))
{
qDebug("Downloader: shoutcast header received");
- //dl->stream()->icy_meta_data = TRUE;
+ //dl->stream()->icy_meta_data = true;
}
else
{
@@ -83,7 +83,7 @@ static size_t curl_header(void *data, size_t size, size_t nmemb,
if (key == "icy-metaint")
{
dl->stream()->icy_metaint = value.toInt();
- dl->stream()->icy_meta_data = TRUE;
+ dl->stream()->icy_meta_data = true;
}
}
dl->mutex()->unlock();
@@ -113,7 +113,7 @@ Downloader::Downloader(QObject *parent, const QString &url)
m_stream.buf_fill = 0;
m_stream.buf = 0;
m_stream.icy_meta_data = FALSE;
- m_stream.aborted = TRUE;
+ m_stream.aborted = true;
m_stream.icy_metaint = 0;
m_handle = 0;
m_metacount = 0;
@@ -137,7 +137,7 @@ Downloader::~Downloader()
{
abort();
curl_global_cleanup();
- m_stream.aborted = TRUE;
+ m_stream.aborted = true;
m_stream.buf_fill = 0;
if (m_stream.buf)
free(m_stream.buf);
@@ -210,7 +210,7 @@ void Downloader::abort()
m_mutex.unlock();
return;
}
- m_stream.aborted = TRUE;
+ m_stream.aborted = true;
m_mutex.unlock();
wait();
if (m_handle)
@@ -315,7 +315,7 @@ void Downloader::checkBuffer()
{
if (m_stream.buf_fill > m_buffer_size && !m_ready)
{
- m_ready = TRUE;
+ m_ready = true;
qDebug("Downloader: ready");
if(!m_meta_sent && stream()->icy_meta_data)
{
@@ -398,7 +398,7 @@ void Downloader::parseICYMetaData(char *data, qint64 size)
metaData.insert(Qmmp::GENRE, m_stream.header.value("icy-genre"));
metaData.insert(Qmmp::URL, m_url);
StateHandler::instance()->dispatch(metaData);
- m_meta_sent = TRUE;
+ m_meta_sent = true;
break;
}
}
diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp
index a7f5e22b8..e1229a04b 100644
--- a/src/plugins/Transports/http/httpinputfactory.cpp
+++ b/src/plugins/Transports/http/httpinputfactory.cpp
@@ -33,8 +33,8 @@ const InputSourceProperties HTTPInputFactory::properties() const
p.protocols = "http";
p.name = tr("HTTP Plugin");
p.shortName = "http";
- p.hasAbout = TRUE;
- p.hasSettings = TRUE;
+ p.hasAbout = true;
+ p.hasSettings = true;
return p;
}
diff --git a/src/plugins/Transports/http/httpinputsource.cpp b/src/plugins/Transports/http/httpinputsource.cpp
index e2b517ce2..3493c5f6c 100644
--- a/src/plugins/Transports/http/httpinputsource.cpp
+++ b/src/plugins/Transports/http/httpinputsource.cpp
@@ -35,7 +35,7 @@ QIODevice *HTTPInputSource::ioDevice()
bool HTTPInputSource::initialize()
{
m_reader->downloadFile();
- return TRUE;
+ return true;
}
bool HTTPInputSource::isReady()
diff --git a/src/plugins/Transports/http/streamreader.cpp b/src/plugins/Transports/http/streamreader.cpp
index 2cc07d682..de3193315 100644
--- a/src/plugins/Transports/http/streamreader.cpp
+++ b/src/plugins/Transports/http/streamreader.cpp
@@ -62,7 +62,7 @@ void StreamReader::close ()
bool StreamReader::isSequential () const
{
- return TRUE;
+ return true;
}
bool StreamReader::open ( OpenMode mode )
@@ -72,7 +72,7 @@ bool StreamReader::open ( OpenMode mode )
//downloadFile();
setOpenMode(QIODevice::ReadOnly);
if (m_downloader->isReady())
- return TRUE;
+ return true;
else
return FALSE;
}
@@ -80,7 +80,7 @@ bool StreamReader::open ( OpenMode mode )
bool StreamReader::reset ()
{
QIODevice::reset();
- return TRUE;
+ return true;
}
bool StreamReader::seek ( qint64 pos )
@@ -98,14 +98,14 @@ bool StreamReader::waitForBytesWritten (int msecs)
{
Q_UNUSED(msecs);
//usleep(msecs*1000);
- return TRUE;
+ return true;
}
bool StreamReader::waitForReadyRead (int msecs)
{
Q_UNUSED(msecs);
//usleep(msecs*1000);
- return TRUE;
+ return true;
}
qint64 StreamReader::readData(char* data, qint64 maxlen)