From 8ba3c4bc2f133794b60d8224ef1d844fb6903344 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 15 Sep 2009 15:54:18 +0000 Subject: fixed some bugs, removed unused code git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1222 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cue/decoder_cue.cpp | 6 ++--- src/plugins/Input/cue/decoder_cue.h | 2 +- src/plugins/Input/cue/decodercuefactory.cpp | 7 +++--- src/plugins/Input/cue/decodercuefactory.h | 2 +- src/plugins/Input/mad/decoder_mad.h | 3 +-- src/plugins/Input/mad/decodermadfactory.cpp | 2 +- src/plugins/Input/mad/decodermadfactory.h | 2 +- .../Input/mad/translations/mad_plugin_ru.ts | 26 +++++++++++----------- 8 files changed, 24 insertions(+), 26 deletions(-) (limited to 'src/plugins/Input') diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index 8ee786105..944c9911a 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -32,8 +32,8 @@ #include "decoder_cue.h" -DecoderCUE::DecoderCUE(const QString &url, QIODevice *input) - : Decoder(input) +DecoderCUE::DecoderCUE(const QString &url) + : Decoder() { m_path = url; m_decoder = 0; @@ -73,7 +73,7 @@ bool DecoderCUE::initialize() m_length = parser.length(track); m_offset = parser.offset(track); - m_decoder = df->create(new QFile(m_path), m_path); + m_decoder = df->create(m_path, new QFile(m_path)); if(!m_decoder->initialize()) { qWarning("DecoderCUE: invalid audio file"); diff --git a/src/plugins/Input/cue/decoder_cue.h b/src/plugins/Input/cue/decoder_cue.h index 1f641574f..ce3bcb4b5 100644 --- a/src/plugins/Input/cue/decoder_cue.h +++ b/src/plugins/Input/cue/decoder_cue.h @@ -30,7 +30,7 @@ class QIDevice; class DecoderCUE : public Decoder { public: - DecoderCUE(const QString &url, QIODevice *input); + DecoderCUE(const QString &url); virtual ~DecoderCUE(); // Standard Decoder API diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index a25e930f7..5b7a9a716 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -53,11 +53,10 @@ const DecoderProperties DecoderCUEFactory::properties() const return properties; } -Decoder *DecoderCUEFactory::create(QIODevice *input, const QString &path) +Decoder *DecoderCUEFactory::create(const QString &path, QIODevice *input) { - //Q_UNUSED(input); - //Q_UNUSED(output); - return new DecoderCUE(path, input); + Q_UNUSED(input); + return new DecoderCUE(path); } QList DecoderCUEFactory::createPlayList(const QString &fileName, bool useMetaData) diff --git a/src/plugins/Input/cue/decodercuefactory.h b/src/plugins/Input/cue/decodercuefactory.h index d24108369..451ae5f4f 100644 --- a/src/plugins/Input/cue/decodercuefactory.h +++ b/src/plugins/Input/cue/decodercuefactory.h @@ -40,7 +40,7 @@ public: bool supports(const QString &source) const; bool canDecode(QIODevice *input) const; const DecoderProperties properties() const; - Decoder *create(QIODevice *, const QString &); + Decoder *create(const QString &, QIODevice *); QList createPlayList(const QString &fileName, bool useMetaData); MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); diff --git a/src/plugins/Input/mad/decoder_mad.h b/src/plugins/Input/mad/decoder_mad.h index 68fc35538..c78e3f8c8 100644 --- a/src/plugins/Input/mad/decoder_mad.h +++ b/src/plugins/Input/mad/decoder_mad.h @@ -29,11 +29,10 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); - -private: qint64 read(char *data, qint64 size); void seek(qint64); +private: // helper functions qint64 madOutput(char *data, qint64 size); bool fillBuffer(); diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index 47de2e828..11009d617 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -94,7 +94,7 @@ const DecoderProperties DecoderMADFactory::properties() const return properties; } -Decoder *DecoderMADFactory::create(QIODevice *input, const QString &) +Decoder *DecoderMADFactory::create(const QString&, QIODevice *input) { return new DecoderMAD(input); } diff --git a/src/plugins/Input/mad/decodermadfactory.h b/src/plugins/Input/mad/decodermadfactory.h index 6107e56f0..a4e18c8f4 100644 --- a/src/plugins/Input/mad/decodermadfactory.h +++ b/src/plugins/Input/mad/decodermadfactory.h @@ -43,7 +43,7 @@ public: bool supports(const QString &source) const; bool canDecode(QIODevice *input) const; const DecoderProperties properties() const; - Decoder *create(QIODevice *, const QString &); + Decoder *create(const QString &path, QIODevice *input); QList createPlayList(const QString &fileName, bool useMetaData); MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); diff --git a/src/plugins/Input/mad/translations/mad_plugin_ru.ts b/src/plugins/Input/mad/translations/mad_plugin_ru.ts index 6f337c558..d471fea15 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_ru.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_ru.ts @@ -44,27 +44,27 @@ Format - Формат + Формат Bitrate - Битовая частота + Битовая частота kbps - Кб/с + Кб/с Samplerate - Дискретизация + Дискретизация Hz - Гц + Гц @@ -72,49 +72,49 @@ Mode - Режим + Режим KB - Кб + Кб File size - Размер файла + Размер файла Protection - Защита + Защита Yes - Есть + Да No - Нет + Нет Copyright - Авторские права + Авторские права Original - Оригинальный + Оригинальный -- cgit v1.2.3-13-gbd6f