Implement the helper decode methods inside the abstract class

10 files changed, 17 insertions, 73 deletions

diff --git a/src/decoders/qalflacaudiodecoder.cpp b/src/decoders/qalflacaudiodecoder.cpp
index 4352b33..8d61870 100644
--- a/src/decoders/qalflacaudiodecoder.cpp
+++ b/src/decoders/qalflacaudiodecoder.cpp
@@ -259,20 +259,6 @@ QALFlacAudioDecoder::sampleSize() const
     return FLAC__stream_decoder_get_bits_per_sample(d->flacStreamDecoder);
 }
 
-QByteArray
-QALFlacAudioDecoder::decode(qint64 maxlen)
-{
-    QByteArray result;
-    result.reserve(maxlen);
-
-    char *decodedData = result.data();
-
-    if (maxlen != decode(decodedData, maxlen))
-        qWarning() << Q_FUNC_INFO << "Could not to decode all the data:" << maxlen;
-
-    return result;
-}
-
 qint64
 QALFlacAudioDecoder::decode(char *decodedData, qint64 maxlen)
 {
diff --git a/src/decoders/qalflacaudiodecoder.h b/src/decoders/qalflacaudiodecoder.h
index b9b4962..3aedc0c 100644
--- a/src/decoders/qalflacaudiodecoder.h
+++ b/src/decoders/qalflacaudiodecoder.h
@@ -45,7 +45,6 @@ public:
     int sampleRate() const;
     int sampleSize() const;
 
-    QByteArray decode(qint64 maxlen);
     qint64 decode(char *decodedData, qint64 maxlen);
 
     private:
diff --git a/src/decoders/qalmpg123audiodecoder.cpp b/src/decoders/qalmpg123audiodecoder.cpp
index a7b36a4..3204825 100644
--- a/src/decoders/qalmpg123audiodecoder.cpp
+++ b/src/decoders/qalmpg123audiodecoder.cpp
@@ -136,18 +136,6 @@ QALMpg123AudioDecoder::~QALMpg123AudioDecoder()
 }
 
 bool
-QALMpg123AudioDecoder::open(const QFile &file)
-{
-    return open(file.fileName());
-}
-
-bool
-QALMpg123AudioDecoder::open(const QUrl &fileUrl)
-{
-    return open(fileUrl.toLocalFile());
-}
-
-bool
 QALMpg123AudioDecoder::open(const QString &fileName)
 {
     d->file.setFileName(fileName);
@@ -229,20 +217,6 @@ QALMpg123AudioDecoder::sampleSize() const
     return 16;
 }
 
-QByteArray
-QALMpg123AudioDecoder::decode(qint64 maxlen)
-{
-    QByteArray result;
-    result.reserve(maxlen);
-
-    char *decodedData = result.data();
-
-    if (maxlen != decode(decodedData, maxlen))
-        qWarning() << Q_FUNC_INFO << "Could not to decode all the data:" << maxlen;
-
-    return result;
-}
-
 qint64
 QALMpg123AudioDecoder::decode(char *decodedData, qint64 maxlen)
 {
diff --git a/src/decoders/qalmpg123audiodecoder.h b/src/decoders/qalmpg123audiodecoder.h
index 6a3cd4c..f1bfed9 100644
--- a/src/decoders/qalmpg123audiodecoder.h
+++ b/src/decoders/qalmpg123audiodecoder.h
@@ -45,7 +45,6 @@ public:
     int sampleRate() const;
     int sampleSize() const;
 
-    QByteArray decode(qint64 maxlen);
     qint64 decode(char *decodedData, qint64 maxlen);
 
     private:
diff --git a/src/decoders/qalsndfileaudiodecoder.cpp b/src/decoders/qalsndfileaudiodecoder.cpp
index b8e3856..f23097a 100644
--- a/src/decoders/qalsndfileaudiodecoder.cpp
+++ b/src/decoders/qalsndfileaudiodecoder.cpp
@@ -192,20 +192,6 @@ QALSndFileAudioDecoder::sampleSize() const
     return 16;
 }
 
-QByteArray
-QALSndFileAudioDecoder::decode(qint64 maxlen)
-{
-    QByteArray result;
-    result.reserve(maxlen);
-
-    char *decodedData = result.data();
-
-    if (maxlen != decode(decodedData, maxlen))
-        qWarning() << Q_FUNC_INFO << "Could not to decode all the data:" << maxlen;
-
-    return result;
-}
-
 qint64
 QALSndFileAudioDecoder::decode(char *decodedData, qint64 maxlen)
 {
diff --git a/src/decoders/qalsndfileaudiodecoder.h b/src/decoders/qalsndfileaudiodecoder.h
index 80295b5..92c4534 100644
--- a/src/decoders/qalsndfileaudiodecoder.h
+++ b/src/decoders/qalsndfileaudiodecoder.h
@@ -45,7 +45,6 @@ public:
     int sampleRate() const;
     int sampleSize() const;
 
-    QByteArray decode(qint64 maxlen);
     qint64 decode(char *decodedData, qint64 maxlen);
 
     private:
diff --git a/src/decoders/qalvorbisfileaudiodecoder.cpp b/src/decoders/qalvorbisfileaudiodecoder.cpp
index 089a0bd..e4b6485 100644
--- a/src/decoders/qalvorbisfileaudiodecoder.cpp
+++ b/src/decoders/qalvorbisfileaudiodecoder.cpp
@@ -197,20 +197,6 @@ QALVorbisFileAudioDecoder::sampleSize() const
     return 16;
 }
 
-QByteArray
-QALVorbisFileAudioDecoder::decode(qint64 maxlen)
-{
-    QByteArray result;
-    result.reserve(maxlen);
-
-    char *decodedData = result.data();
-
-    if (maxlen != decode(decodedData, maxlen))
-        qWarning() << Q_FUNC_INFO << "Could not to decode all the data:" << maxlen;
-
-    return result;
-}
-
 qint64
 QALVorbisFileAudioDecoder::decode(char *decodedData, qint64 maxlen)
 {
diff --git a/src/decoders/qalvorbisfileaudiodecoder.h b/src/decoders/qalvorbisfileaudiodecoder.h
index 4542f93..74342ce 100644
--- a/src/decoders/qalvorbisfileaudiodecoder.h
+++ b/src/decoders/qalvorbisfileaudiodecoder.h
@@ -45,7 +45,6 @@ public:
     int sampleRate() const;
     int sampleSize() const;
 
-    QByteArray decode(qint64 maxlen);
     qint64 decode(char *decodedData, qint64 maxlen);
 
     private:
diff --git a/src/qalabstractaudiodecoder.cpp b/src/qalabstractaudiodecoder.cpp
index 6eaa94b..65b3336 100644
--- a/src/qalabstractaudiodecoder.cpp
+++ b/src/qalabstractaudiodecoder.cpp
@@ -22,6 +22,7 @@
 #include <QtCore/QString>
 #include <QtCore/QFile>
 #include <QtCore/QUrl>
+#include <QtCore/QDebug>
 
 QALAbstractAudioDecoder::QALAbstractAudioDecoder()
 {
@@ -48,3 +49,18 @@ QALAbstractAudioDecoder::open(const QUrl &fileUrl)
 {
     return open(fileUrl.toLocalFile());
 }
+
+QByteArray
+QALAbstractAudioDecoder::decode(qint64 maxlen)
+{
+    QByteArray result;
+    result.reserve(maxlen);
+
+    char *decodedData = result.data();
+
+    if (maxlen != decode(decodedData, maxlen))
+        qWarning() << Q_FUNC_INFO << "Could not to decode all the data:" << maxlen;
+
+    return result;
+}
+
diff --git a/src/qalabstractaudiodecoder.h b/src/qalabstractaudiodecoder.h
index 1cc3692..f3c15cc 100644
--- a/src/qalabstractaudiodecoder.h
+++ b/src/qalabstractaudiodecoder.h
@@ -51,7 +51,7 @@ public:
     virtual int sampleRate() const = 0;
     virtual int sampleSize() const = 0;
 
-    virtual QByteArray decode(qint64 maxlen) = 0;
+    virtual QByteArray decode(qint64 maxlen);
     virtual qint64 decode(char *decodedData, qint64 maxlen) = 0;
 };