aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/mad
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Input/mad')
-rw-r--r--src/plugins/Input/mad/decoder_mad.h3
-rw-r--r--src/plugins/Input/mad/decodermadfactory.cpp2
-rw-r--r--src/plugins/Input/mad/decodermadfactory.h2
-rw-r--r--src/plugins/Input/mad/translations/mad_plugin_ru.ts26
4 files changed, 16 insertions, 17 deletions
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<FileInfo *> 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 @@
<message>
<location filename="../mpegmetadatamodel.cpp" line="69"/>
<source>Format</source>
- <translation type="unfinished">Формат</translation>
+ <translation>Формат</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="71"/>
<source>Bitrate</source>
- <translation type="unfinished">Битовая частота</translation>
+ <translation>Битовая частота</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="71"/>
<source>kbps</source>
- <translation type="unfinished">Кб/с</translation>
+ <translation>Кб/с</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="73"/>
<source>Samplerate</source>
- <translation type="unfinished">Дискретизация</translation>
+ <translation>Дискретизация</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="73"/>
<source>Hz</source>
- <translation type="unfinished">Гц</translation>
+ <translation>Гц</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="77"/>
@@ -72,49 +72,49 @@
<location filename="../mpegmetadatamodel.cpp" line="83"/>
<location filename="../mpegmetadatamodel.cpp" line="86"/>
<source>Mode</source>
- <translation type="unfinished">Режим</translation>
+ <translation>Режим</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="89"/>
<source>KB</source>
- <translation type="unfinished">Кб</translation>
+ <translation>Кб</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="90"/>
<source>File size</source>
- <translation type="unfinished">Размер файла</translation>
+ <translation>Размер файла</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="92"/>
<location filename="../mpegmetadatamodel.cpp" line="94"/>
<source>Protection</source>
- <translation type="unfinished">Защита</translation>
+ <translation>Защита</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="92"/>
<location filename="../mpegmetadatamodel.cpp" line="96"/>
<location filename="../mpegmetadatamodel.cpp" line="100"/>
<source>Yes</source>
- <translation type="unfinished">Есть</translation>
+ <translation>Да</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="94"/>
<location filename="../mpegmetadatamodel.cpp" line="98"/>
<location filename="../mpegmetadatamodel.cpp" line="102"/>
<source>No</source>
- <translation type="unfinished">Нет</translation>
+ <translation>Нет</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="96"/>
<location filename="../mpegmetadatamodel.cpp" line="98"/>
<source>Copyright</source>
- <translation type="unfinished">Авторские права</translation>
+ <translation>Авторские права</translation>
</message>
<message>
<location filename="../mpegmetadatamodel.cpp" line="100"/>
<location filename="../mpegmetadatamodel.cpp" line="102"/>
<source>Original</source>
- <translation type="unfinished">Оригинальный</translation>
+ <translation>Оригинальный</translation>
</message>
</context>
<context>