From 1eef96342df93be653ec498f73f26b608381fd54 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 8 Aug 2009 14:35:03 +0000 Subject: vorbis plugin: added support for composer and disc number tags git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1123 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/vorbis/CMakeLists.txt | 8 +- src/plugins/Input/vorbis/decoder_vorbis.cpp | 8 + src/plugins/Input/vorbis/decodervorbisfactory.cpp | 25 +- src/plugins/Input/vorbis/detailsdialog.cpp | 116 +++--- src/plugins/Input/vorbis/detailsdialog.h | 17 +- src/plugins/Input/vorbis/detailsdialog.ui | 412 --------------------- .../Input/vorbis/translations/vorbis_plugin_cs.ts | 141 ++----- .../Input/vorbis/translations/vorbis_plugin_de.ts | 141 ++----- .../Input/vorbis/translations/vorbis_plugin_it.ts | 141 ++----- .../Input/vorbis/translations/vorbis_plugin_lt.ts | 141 ++----- .../Input/vorbis/translations/vorbis_plugin_pl.ts | 143 ++----- .../Input/vorbis/translations/vorbis_plugin_ru.ts | 139 ++----- .../Input/vorbis/translations/vorbis_plugin_tr.ts | 149 ++------ .../vorbis/translations/vorbis_plugin_uk_UA.ts | 141 ++----- .../vorbis/translations/vorbis_plugin_zh_CN.ts | 141 ++----- .../vorbis/translations/vorbis_plugin_zh_TW.ts | 141 ++----- src/plugins/Input/vorbis/vorbis.pro | 54 ++- 17 files changed, 351 insertions(+), 1707 deletions(-) delete mode 100644 src/plugins/Input/vorbis/detailsdialog.ui (limited to 'src') diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt index 63fcf8bdf..5b10c736b 100644 --- a/src/plugins/Input/vorbis/CMakeLists.txt +++ b/src/plugins/Input/vorbis/CMakeLists.txt @@ -51,19 +51,13 @@ QT4_WRAP_CPP(libvorbis_MOC_SRCS ${libvorbis_MOC_HDRS}) # user interface - -SET(libvorbis_UIS - detailsdialog.ui -) - QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBIS_FOUND) -ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_UIS_H} - ${libvorbis_RCC_SRCS}) +ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_RCC_SRCS}) add_dependencies(vorbis qmmp) target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LDFLAGS} ${VORBIS_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index 3a8a45916..7325967b0 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -210,6 +210,14 @@ void DecoderVorbis::updateTags() "date=", strlen ("date="))) metaData.insert(Qmmp::YEAR, QString::number(atoi(comments->user_comments[i] + strlen ("date=")))); + else if (!strncasecmp(comments->user_comments[i], + "composer=", strlen ("composer="))) + metaData.insert(Qmmp::COMPOSER, QString::fromUtf8 (comments->user_comments[i] + + strlen ("composer="))); + else if (!strncasecmp(comments->user_comments[i], + "discnumber=", strlen ("discnumber="))) + metaData.insert(Qmmp::DISCNUMBER, QString::number(atoi(comments->user_comments[i] + + strlen ("discnumber=")))); } stateHandler()->dispatch(metaData); diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index 124b001e7..8dcd738c7 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "detailsdialog.h" #include "decoder_vorbis.h" @@ -63,13 +63,12 @@ Decoder *DecoderVorbisFactory::create(QObject *parent, QIODevice *input, return new DecoderVorbis(parent, this, input, output); } -//FileInfo *DecoderVorbisFactory::createFileInfo(const QString &source) QList DecoderVorbisFactory::createPlayList(const QString &fileName, bool useMetaData) { FileInfo *info = new FileInfo(fileName); - TagLib::FileRef fileRef(fileName.toLocal8Bit ()); - TagLib::Tag *tag = useMetaData ? fileRef.tag() : 0; + TagLib::Ogg::Vorbis::File fileRef(fileName.toLocal8Bit ()); + TagLib::Ogg::XiphComment *tag = useMetaData ? fileRef.tag() : 0; if (tag && !tag->isEmpty()) { @@ -89,6 +88,17 @@ QList DecoderVorbisFactory::createPlayList(const QString &fileName, if (fileRef.audioProperties()) info->setLength(fileRef.audioProperties()->length()); + //additional metadata + if(tag) + { + TagLib::StringList fld; + if(!(fld = tag->fieldListMap()["COMPOSER"]).isEmpty()) + info->setMetaData(Qmmp::COMPOSER, + QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + if(!(fld = tag->fieldListMap()["DISCNUMBER"]).isEmpty()) + info->setMetaData(Qmmp::DISCNUMBER, + QString::fromUtf8(fld.toString().toCString(TRUE)).trimmed()); + } QList list; list << info; @@ -103,10 +113,7 @@ QObject* DecoderVorbisFactory::showDetails(QWidget *parent, const QString &path) } void DecoderVorbisFactory::showSettings(QWidget *) -{ - /*SettingsDialog *s = new SettingsDialog(parent); - s -> show();*/ -} +{} void DecoderVorbisFactory::showAbout(QWidget *parent) { diff --git a/src/plugins/Input/vorbis/detailsdialog.cpp b/src/plugins/Input/vorbis/detailsdialog.cpp index bbe441703..d3f1095c3 100644 --- a/src/plugins/Input/vorbis/detailsdialog.cpp +++ b/src/plugins/Input/vorbis/detailsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Ilya Kotov * + * Copyright (C) 2006-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -17,9 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #include #include #include +#include +#include #include #include @@ -27,94 +30,75 @@ #include "detailsdialog.h" #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) +#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(TRUE)).trimmed() DetailsDialog::DetailsDialog(QWidget *parent, const QString &path) - : QDialog(parent) + : AbstractDetailsDialog(parent) { - ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); m_path = path; - setWindowTitle (path.section('/',-1)); - path.section('/',-1); - ui.pathLineEdit->setText(m_path); - if(QFile::exists(m_path)) + if (QFile::exists(m_path)) { loadVorbisInfo(); - loadTag(); + loadTags(); + blockSaveButton(!QFileInfo(m_path).isWritable()); } + else + blockSaveButton(); } - DetailsDialog::~DetailsDialog() {} void DetailsDialog::loadVorbisInfo() { TagLib::Ogg::Vorbis::File f (m_path.toLocal8Bit()); - //l.label - //ui. f.audioProperties()->level(); - QString text; - text = QString("%1").arg(f.audioProperties()->length()/60); + QMap ap; + QString text = QString("%1").arg(f.audioProperties()->length()/60); text +=":"+QString("%1").arg(f.audioProperties()->length()%60,2,10,QChar('0')); - ui.lengthLabel->setText(text); - text = QString("%1").arg(f.audioProperties()->sampleRate()); - ui.sampleRateLabel->setText(text+" "+tr("Hz")); - text = QString("%1").arg(f.audioProperties()->channels()); - ui.channelsLabel->setText(text); - text = QString("%1").arg(f.audioProperties()->bitrateNominal()); - ui.nominalLabel->setText(text+" "+tr("kbps")); - text = QString("%1").arg(f.audioProperties()->bitrateMaximum()); - ui.maximumLabel->setText(text+" "+tr("kbps")); - text = QString("%1").arg(f.audioProperties()->bitrateMinimum()); - ui.minimumLabel->setText(text+" "+tr("kbps")); - text = QString("%1 "+tr("KB")).arg(f.length()/1024); - ui.fileSizeLabel->setText(text); - + ap.insert(tr("Length"), text); + ap.insert(tr("Sample rate"), QString("%1 " + tr("Hz")).arg(f.audioProperties()->sampleRate())); + ap.insert(tr("Channels"), QString("%1").arg(f.audioProperties()->channels())); + ap.insert(tr("Bitrate"), QString("%1 " + tr("kbps")).arg(f.audioProperties()->bitrate())); + ap.insert(tr("File size"), QString("%1 "+tr("KB")).arg(f.length()/1024)); + setAudioProperties(ap); } -void DetailsDialog::loadTag() +void DetailsDialog::loadTags() { TagLib::FileRef f (m_path.toLocal8Bit()); - - if (f.tag()) - { //TODO: load codec name from config - - TagLib::String title = f.tag()->title(); - TagLib::String artist = f.tag()->artist(); - TagLib::String album = f.tag()->album(); - TagLib::String comment = f.tag()->comment(); - TagLib::String genre = f.tag()->genre(); - QString string = QString::fromUtf8(title.toCString(TRUE)).trimmed(); - ui.titleLineEdit->setText(string); - string = QString::fromUtf8(artist.toCString(TRUE)).trimmed(); - ui.artistLineEdit->setText(string); - string = QString::fromUtf8(album.toCString(TRUE)).trimmed(); - ui.albumLineEdit->setText(string); - string = QString::fromUtf8(comment.toCString(TRUE)).trimmed(); - ui.commentLineEdit->setText(string); - string = QString("%1").arg(f.tag()->year()); - ui.yearLineEdit->setText(string); - string = QString("%1").arg(f.tag()->track()); - ui.trackLineEdit->setText(string); - string = QString::fromUtf8(genre.toCString(TRUE)).trimmed(); - ui.genreLineEdit->setText(string); - } - QFileInfo info(m_path); - ui.saveButton->setEnabled(info.isWritable()); - connect(ui.saveButton, SIGNAL(clicked()), SLOT(saveTag())); + setMetaData(Qmmp::TITLE, TStringToQString_qt4(f.tag()->title())); + setMetaData(Qmmp::ARTIST, TStringToQString_qt4(f.tag()->artist())); + setMetaData(Qmmp::ALBUM, TStringToQString_qt4(f.tag()->album())); + setMetaData(Qmmp::COMMENT, TStringToQString_qt4(f.tag()->comment())); + setMetaData(Qmmp::GENRE, TStringToQString_qt4(f.tag()->genre())); + setMetaData(Qmmp::YEAR, f.tag()->year()); + setMetaData(Qmmp::TRACK, f.tag()->track()); + setMetaData(Qmmp::URL, m_path); + TagLib::Ogg::Vorbis::File *file = dynamic_cast(f.file()); + TagLib::StringList fld; + if(file->tag() && !(fld = file->tag()->fieldListMap()["COMPOSER"]).isEmpty()) + setMetaData(Qmmp::COMPOSER, TStringToQString_qt4(fld.toString())); + if(file->tag() && !(fld = file->tag()->fieldListMap()["DISCNUMBER"]).isEmpty()) + setMetaData(Qmmp::DISCNUMBER, TStringToQString_qt4(fld.toString())); } -void DetailsDialog::saveTag() +void DetailsDialog::writeTags() { TagLib::FileRef f (m_path.toLocal8Bit()); - - f.tag()->setTitle(QStringToTString_qt4(ui.titleLineEdit->text())); - f.tag()->setArtist(QStringToTString_qt4(ui.artistLineEdit->text())); - f.tag()->setAlbum(QStringToTString_qt4(ui.albumLineEdit->text())); - f.tag()->setComment(QStringToTString_qt4(ui.commentLineEdit->text())); - f.tag()->setGenre(QStringToTString_qt4(ui.genreLineEdit->text())); - f.tag()->setYear(ui.yearLineEdit->text().toUInt()); - f.tag()->setTrack(ui.trackLineEdit->text().toUInt()); - + f.tag()->setTitle(QStringToTString_qt4(strMetaData(Qmmp::TITLE))); + f.tag()->setArtist(QStringToTString_qt4(strMetaData(Qmmp::ARTIST))); + f.tag()->setAlbum(QStringToTString_qt4(strMetaData(Qmmp::ALBUM))); + f.tag()->setComment(QStringToTString_qt4(strMetaData(Qmmp::COMMENT))); + f.tag()->setGenre(QStringToTString_qt4(strMetaData(Qmmp::GENRE))); + f.tag()->setYear(intMetaData(Qmmp::YEAR)); + f.tag()->setTrack(intMetaData(Qmmp::TRACK)); + TagLib::Ogg::Vorbis::File *file = dynamic_cast(f.file()); + strMetaData(Qmmp::COMPOSER).isEmpty() ? + file->tag()->removeField("COMPOSER"): + file->tag()->addField("COMPOSER", QStringToTString_qt4(strMetaData(Qmmp::COMPOSER)), TRUE); + intMetaData(Qmmp::DISCNUMBER) == 0 ? + file->tag()->removeField("DISCNUMBER"): + file->tag()->addField("DISCNUMBER", + QStringToTString_qt4(strMetaData(Qmmp::DISCNUMBER)), TRUE); f.save(); } diff --git a/src/plugins/Input/vorbis/detailsdialog.h b/src/plugins/Input/vorbis/detailsdialog.h index 94d4243b8..2504108bc 100644 --- a/src/plugins/Input/vorbis/detailsdialog.h +++ b/src/plugins/Input/vorbis/detailsdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Ilya Kotov * + * Copyright (C) 2006-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,14 +20,12 @@ #ifndef DETAILSDIALOG_H #define DETAILSDIALOG_H -#include - -#include "ui_detailsdialog.h" +#include /** @author Ilya Kotov */ -class DetailsDialog : public QDialog +class DetailsDialog : public AbstractDetailsDialog { Q_OBJECT public: @@ -35,13 +33,10 @@ public: ~DetailsDialog(); -private slots: - void saveTag(); - -private: +private: void loadVorbisInfo(); - void loadTag(); - Ui::DetailsDialog ui; + void loadTags(); + void writeTags(); QString m_path; }; diff --git a/src/plugins/Input/vorbis/detailsdialog.ui b/src/plugins/Input/vorbis/detailsdialog.ui deleted file mode 100644 index 50e2a5afb..000000000 --- a/src/plugins/Input/vorbis/detailsdialog.ui +++ /dev/null @@ -1,412 +0,0 @@ - - DetailsDialog - - - - 0 - 0 - 545 - 374 - - - - Details - - - - - - File path: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - true - - - - - - - - 0 - 16 - - - - Ogg Vorbis Info - - - - 8 - - - 8 - - - 8 - - - 8 - - - 6 - - - 6 - - - - - - - - - - - - - Qt::LeftToRight - - - - - - - - - - - Length: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - Sample rate: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - Qt::LeftToRight - - - Channels: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Bit Rate - - - Qt::AlignHCenter - - - - 8 - - - 8 - - - 8 - - - 8 - - - 6 - - - 6 - - - - - - - - - - - - - - - - - - - - - Qt::LeftToRight - - - Minimum: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - Maximum: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Nominal: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - File size: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - 0 - 0 - - - - Ogg Vorbis Tag - - - - 8 - - - 8 - - - 8 - - - 8 - - - 6 - - - 6 - - - - - false - - - Save - - - - - - - - - - Track number: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - Year: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Genre: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Comment: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Album: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Artist: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Title: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 111 - 20 - - - - - - - - Close - - - - - - - - - pushButton_3 - clicked() - DetailsDialog - close() - - - 623 - 353 - - - 539 - 352 - - - - - diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts index e4600f7b7..496909b25 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts @@ -14,22 +14,22 @@ Soubory Ogg-Vorbis - + About Ogg Vorbis Audio Plugin O modulu Ogg-Vorbis - + Qmmp Ogg Vorbis Audio Plugin Vstupní modul Qmmp Ogg-Vorbis - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Zdrojový kód je založen na projektu mq3 @@ -37,137 +37,44 @@ DetailsDialog - - - + kbps kbps - + Hz Hz - - KB - KB - - - - Details - Podrobnosti + + Length + - - File size: - Velikost souboru: + + Sample rate + - - - - - - - - - - - + + Channels + - - Sample rate: - Vzorkovací frekvence: - - - - Save - Uložit - - - - Track number: - Číslo stopy: - - - - Year: - Rok: - - - - Genre: - Žánr: - - - - Comment: - Komentář: - - - - Album: - Album: - - - - Artist: - Umělec: - - - - Title: - Název: - - - - Close - Zavřít - - - - File path: - Cesta k souboru: - - - - Ogg Vorbis Info - Informace Ogg-Vorbis - - - - Length: - Délka: - - - - Channels: - Počet kanálů: - - - - Bit Rate - Datový tok - - - - Minimum: - Minimální: - - - - Maximum: - Maximální: + + Bitrate + - - Nominal: - Nominální: + + KB + KB - - Ogg Vorbis Tag - Ogg-Vorbis tag + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts index 11f49b210..6a92529d3 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts @@ -14,22 +14,22 @@ Ogg-Vorbis-Dateien - + About Ogg Vorbis Audio Plugin Über Ogg-Vorbis-Audio-Modul - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg-Vorbis-Audio-Modul - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Quellcode basiert auf dem mq3-Projekt @@ -37,137 +37,44 @@ DetailsDialog - - - + kbps kbps - + Hz Hz - - KB - KB - - - - Details - Details + + Length + - - File size: - Dateigröße: + + Sample rate + - - - - - - - - - - - + + Channels + - - Sample rate: - Abtastrate: - - - - Save - Speichern - - - - Track number: - Titelnummer: - - - - Year: - Jahr: - - - - Genre: - Genre: - - - - Comment: - Kommentar: - - - - Album: - Album: - - - - Artist: - Interpret: - - - - Title: - Titel: - - - - Close - Schließen - - - - File path: - Dateipfad: - - - - Ogg Vorbis Info - Ogg-Vorbis-Info - - - - Length: - Länge: - - - - Channels: - Kanäle: - - - - Bit Rate - Bitrate - - - - Minimum: - Minimum: - - - - Maximum: - Maximum: + + Bitrate + - - Nominal: - Nominell: + + KB + KB - - Ogg Vorbis Tag - Ogg-Vorbis-Tag + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts index 8e3711a0c..76022101c 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts @@ -14,22 +14,22 @@ Brani Ogg Vorbis - + About Ogg Vorbis Audio Plugin Info sul modulo audio Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Modulo audio Ogg Vorbis per Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Codice sorgente basato sul Progetto mq3 @@ -37,137 +37,44 @@ DetailsDialog - - - + kbps kbps - + Hz Hz - - KB - KB - - - - Details - Dettagli + + Length + - - File size: - Dimensione: + + Sample rate + - - - - - - - - - - - + + Channels + - - Sample rate: - Campionamento: - - - - Save - Salva - - - - Track number: - Traccia numero: - - - - Year: - Anno: - - - - Genre: - Genere: - - - - Comment: - Commento: - - - - Album: - Album: - - - - Artist: - Interprete: - - - - Title: - TItolo: - - - - Close - Chiudi - - - - File path: - File: - - - - Ogg Vorbis Info - Info Ogg Vorbis - - - - Length: - Durata: - - - - Channels: - Canali: - - - - Bit Rate - Bitrate - - - - Minimum: - Minimo: - - - - Maximum: - Massimo: + + Bitrate + - - Nominal: - Nominale: + + KB + KB - - Ogg Vorbis Tag - Etichettatura Ogg Vorbis + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts index c974c49a1..857a793a4 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts @@ -14,22 +14,22 @@ Ogg Vorbis bylos - + About Ogg Vorbis Audio Plugin Apie Ogg Vorbis audio įskiepį - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis audio įskiepis - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Sukūrė: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Išvesties kodas sukurtas mq3 pagrindu @@ -37,137 +37,44 @@ DetailsDialog - + Hz Hz - - Save - Išsaugoti - - - - Track number: - Takelio numeris: - - - - Year: - Metai: - - - - Genre: - Žanras: - - - - Comment: - Komentaras: - - - - Album: - Albumas: - - - - Artist: - Atlikėjas: - - - - Title: - Pavadinimas: - - - - Close - Užverti - - - - - - - - - - - - - - - - File size: - Byloas dydis: + + Length + - - Sample rate: - Sample rate: + + Sample rate + - - File path: - Bylos kelias: + + Channels + - - Ogg Vorbis Info - Ogg Vorbis informacija - - - - Length: - Ilgis: - - - - Channels: - Kanalai: - - - - Bit Rate - Bit Rate - - - - Minimum: - Minimalus: - - - - Maximum: - Maksimalus: - - - - Nominal: - Nominalus: - - - - Ogg Vorbis Tag - Оgg Vorbis Tag - - - - - + kbps kbps - + + Bitrate + + + + KB KB - - Details - Informacija + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_pl.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_pl.ts index 2e1ce1c61..9602ad754 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_pl.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_pl.ts @@ -14,22 +14,22 @@ Pliki Ogg Vorbis - + About Ogg Vorbis Audio Plugin O wtyczce Ogg Vorbis Audio - + Qmmp Ogg Vorbis Audio Plugin Wtyczka Ogg Vorbis dla Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Kod źródłowy oparty jest na projekcie mq3 @@ -37,137 +37,44 @@ DetailsDialog - - Hz - - - - - - - kbps - - - - - KB - - - - - Details - Szczegóły pliku - - - - File path: - Ścieżka do pliku: - - - - Ogg Vorbis Info - + + Length + - - - - - - - - - + + Hz - - Length: - Długość: - - - - Sample rate: - Próbkowanie: + + Sample rate + - - Channels: - Kanały: + + Channels + - - Bit Rate - Szyb. transmisji - - - - Minimum: + + kbps - - Maximum: - Maksimum: - - - - Nominal: - Nominalny: - - - - File size: - Wielkość pliku: + + Bitrate + - - Ogg Vorbis Tag + + KB - - Save - Zapisz - - - - Track number: - Numer utworu: - - - - Year: - Rok: - - - - Genre: - Gatunek: - - - - Comment: - Komentarz: - - - - Album: - Album: - - - - Artist: - Artysta: - - - - Title: - Tytuł: - - - - Close - Zamknij + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts index 9f32ad675..1cac01d3b 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts @@ -14,22 +14,22 @@ Файлы Ogg Vorbis - + About Ogg Vorbis Audio Plugin Об аудио-модуле Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Аудио-модуль Ogg Vorbis для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> - + Source code based on mq3 progect Исходный код основан на проекте mq3 @@ -37,137 +37,44 @@ DetailsDialog - + Hz Гц - - Save - Сохранить - - - - Track number: - Номер трека: - - - - Year: - Год: - - - - Genre: - Жанр: - - - - Comment: - Комментарий: - - - - Album: - Альбом: - - - - Artist: - Исполнитель: - - - - Title: - Название: - - - - Close - Закрыть - - - - - - - - - - - - - - - - File size: - Размер файла: + + Length + Длительность - - Sample rate: - Дискретизация: + + Sample rate + Дискретизация - - File path: - Путь к файлу: + + Channels + Каналов - - Ogg Vorbis Info - Информация Ogg Vorbis - - - - Length: - Длительность: - - - - Channels: - Каналов: + + kbps + Кб/с - - Bit Rate + + Bitrate Битовая частота - - Minimum: - Минимальная: - - - - Maximum: - Максимальная: - - - - Nominal: - Номинальная: - - - - Ogg Vorbis Tag - Оgg Vorbis-тег - - - - - - kbps - Кб/с - - - + KB Кб - - Details - Информация + + File size + Размер файла diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts index d1c9b77cf..0a6c3c920 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts @@ -14,22 +14,22 @@ Ogg Vorbis Dosyaları - + About Ogg Vorbis Audio Plugin Ogg Vorbis Ses Eklentisi Hakkında - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis Ses Eklentisi - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Kaynak kodu mq3 projesi temellidir @@ -37,137 +37,44 @@ DetailsDialog - - Hz - Hz - - - - - - kbps - kbps - - - - KB - KB - - - - Details - Detaylar - - - - File path: - Dosya konumu: - - - - Ogg Vorbis Info - Ogg Vorbis Bilgisi - - - - - - - - - - - - - - - - - Length: - Uzunluk: - - - - Sample rate: - Örnekleme oranı: - - - - Channels: - Kanallar: + + Length + - - Bit Rate - Bit Oranı - - - - Minimum: - Asgari: - - - - Maximum: - Azami: - - - - Nominal: - Tanımlanmış: - - - - File size: - Dosya boyutu: - - - - Ogg Vorbis Tag - Ogg Vorbis Etiketi - - - - Save - Kaydet - - - - Track number: - Parça numarası: - - - - Year: - Yıl: + + Hz + Hz - - Genre: - Tür: + + Sample rate + - - Comment: - Yorum: + + Channels + - - Album: - Albüm: + + kbps + kbps - - Artist: - Artist: + + Bitrate + - - Title: - Başlık: + + KB + KB - - Close - Kapat + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts index 416f1052f..ec2ed94a9 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts @@ -14,22 +14,22 @@ Файли Ogg Vorbis - + About Ogg Vorbis Audio Plugin Про аудіо-модуль Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Аудіо-модуль Ogg Vorbis для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> - + Source code based on mq3 progect Вихідний код базується на проекті mq3 @@ -37,137 +37,44 @@ DetailsDialog - + Hz Гц - - Save - Зберегти - - - - Track number: - Номер треку: - - - - Year: - Рік: - - - - Genre: - Жанр: - - - - Comment: - Коментар: - - - - Album: - Альбом: - - - - Artist: - Виконавець: - - - - Title: - Назва: - - - - Close - Закрити - - - - - - - - - - - - - - - - - File size: - Розмір файлу: + + Length + - - Sample rate: - Дискретизація: + + Sample rate + - - File path: - Шлях до файлу: + + Channels + - - Ogg Vorbis Info - Інформація Ogg Vorbis - - - - Length: - Тривалість: - - - - Channels: - Каналів: - - - - Bit Rate - Бітова частота - - - - Minimum: - Мінімальна: - - - - Maximum: - Максимальна: - - - - Nominal: - Номінальна: - - - - Ogg Vorbis Tag - Оgg Vorbis-тег - - - - - + kbps Кб/с - + + Bitrate + + + + KB Кб - - Details - Інформація + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts index fd4538026..392a252e4 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts @@ -14,22 +14,22 @@ Ogg Vorbis 文件 - + About Ogg Vorbis Audio Plugin 关于 Ogg Vorbis 音频插件 - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis 音频插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect 源代码基于 mq3 项目 @@ -37,137 +37,44 @@ DetailsDialog - + Hz Hz - - Save - 保存 - - - - Track number: - 音轨： - - - - Year: - 年代： - - - - Genre: - 流派： - - - - Comment: - 备注： - - - - Album: - 专辑： - - - - Artist: - 艺术家： - - - - Title: - 标题： - - - - Close - 关闭 - - - - - - - - - - - - - - - - - File size: - 文件大小： + + Length + - - Sample rate: - 取样率： + + Sample rate + - - File path: - 文件路径： + + Channels + - - Ogg Vorbis Info - Ogg Vorbis 信息 - - - - Length: - 长度： - - - - Channels: - 声音通道： - - - - Bit Rate - 位速率 - - - - Minimum: - 最小位速率： - - - - Maximum: - 最大位速率： - - - - Nominal: - 名义位速率： - - - - Ogg Vorbis Tag - Ogg Vorbis 标签 - - - - - + kbps kbps - + + Bitrate + + + + KB KB - - Details - 详细资料 + + File size + diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts index ea6fcf6ea..34f32f6eb 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts @@ -14,22 +14,22 @@ Ogg Vorbis 檔案 - + About Ogg Vorbis Audio Plugin 關於 Ogg Vorbis 聲訊插件 - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis 聲訊插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect 源碼基於 mq3 項目 @@ -37,137 +37,44 @@ DetailsDialog - + Hz Hz - - Save - 儲存 - - - - Track number: - 音軌： - - - - Year: - 年代： - - - - Genre: - 流派： - - - - Comment: - 備註： - - - - Album: - 專輯： - - - - Artist: - 藝術家： - - - - Title: - 標題： - - - - Close - 關閉 - - - - - - - - - - - - - - - - - File size: - 檔案大小： + + Length + - - Sample rate: - 取樣率： + + Sample rate + - - File path: - 檔案路徑： + + Channels + - - Ogg Vorbis Info - Ogg Vorbis 資訊 - - - - Length: - 長度： - - - - Channels: - 音頻通道： - - - - Bit Rate - 位速率 - - - - Minimum: - 最小位速率： - - - - Maximum: - 最大位速率： - - - - Nominal: - 名義位速率： - - - - Ogg Vorbis Tag - Ogg Vorbis 標簽 - - - - - + kbps kbps - + + Bitrate + + + + KB KB - - Details - 詳細資料 + + File size + diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro index d8fd097c1..08ae89b20 100644 --- a/src/plugins/Input/vorbis/vorbis.pro +++ b/src/plugins/Input/vorbis/vorbis.pro @@ -1,39 +1,37 @@ include(../../plugins.pri) - -FORMS += detailsdialog.ui +FORMS += HEADERS += decodervorbisfactory.h \ - decoder_vorbis.h \ - detailsdialog.h + decoder_vorbis.h \ + detailsdialog.h SOURCES += decoder_vorbis.cpp \ - decodervorbisfactory.cpp \ - detailsdialog.cpp - -TARGET=$$PLUGINS_PREFIX/Input/vorbis -QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libvorbis.so - + decodervorbisfactory.cpp \ + detailsdialog.cpp +TARGET = $$PLUGINS_PREFIX/Input/vorbis +QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libvorbis.so INCLUDEPATH += ../../../ CONFIG += release \ -warn_on \ -plugin \ -link_pkgconfig + warn_on \ + plugin \ + link_pkgconfig TEMPLATE = lib QMAKE_LIBDIR += ../../../../lib -LIBS += -lqmmp -L/usr/lib -PKGCONFIG += taglib ogg vorbisfile vorbis +LIBS += -lqmmp \ + -L/usr/lib +PKGCONFIG += taglib \ + ogg \ + vorbisfile \ + vorbis TRANSLATIONS = translations/vorbis_plugin_ru.ts \ - translations/vorbis_plugin_uk_UA.ts \ - translations/vorbis_plugin_zh_CN.ts \ - translations/vorbis_plugin_zh_TW.ts \ - translations/vorbis_plugin_cs.ts \ - translations/vorbis_plugin_pl.ts \ - translations/vorbis_plugin_de.ts \ - translations/vorbis_plugin_it.ts \ - translations/vorbis_plugin_tr.ts \ - translations/vorbis_plugin_lt.ts + translations/vorbis_plugin_uk_UA.ts \ + translations/vorbis_plugin_zh_CN.ts \ + translations/vorbis_plugin_zh_TW.ts \ + translations/vorbis_plugin_cs.ts \ + translations/vorbis_plugin_pl.ts \ + translations/vorbis_plugin_de.ts \ + translations/vorbis_plugin_it.ts \ + translations/vorbis_plugin_tr.ts \ + translations/vorbis_plugin_lt.ts RESOURCES = translations/translations.qrc - -isEmpty (LIB_DIR){ -LIB_DIR = /lib -} +isEmpty (LIB_DIR):LIB_DIR = /lib target.path = $$LIB_DIR/qmmp/Input INSTALLS += target -- cgit v1.2.3-13-gbd6f