From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: copy 1.2 branch to trunk git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/vorbis/CMakeLists.txt | 19 +++------------ src/plugins/Input/vorbis/decodervorbisfactory.cpp | 9 ------- src/plugins/Input/vorbis/decodervorbisfactory.h | 1 + src/plugins/Input/vorbis/replaygainreader.cpp | 6 ----- .../Input/vorbis/translations/vorbis_plugin_bg.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_cs.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_de.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_el.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_en.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_es.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_fi.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_fr.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_gl_ES.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_he.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_hu.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_id.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_it.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_ja.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_kk.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_lt.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_nl.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_pl_PL.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_pt.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_pt_BR.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_ru.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_sk.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_sr_BA.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_sr_RS.ts | 28 +++++++++++----------- .../Input/vorbis/translations/vorbis_plugin_tr.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_uk_UA.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_zh_CN.ts | 28 +++++++++++----------- .../vorbis/translations/vorbis_plugin_zh_TW.ts | 28 +++++++++++----------- src/plugins/Input/vorbis/vorbismetadatamodel.cpp | 24 +++++++++---------- src/plugins/Input/vorbis/vorbismetadatamodel.h | 2 +- 34 files changed, 408 insertions(+), 437 deletions(-) (limited to 'src/plugins/Input/vorbis') diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt index 6aea0e3c1..f1088961d 100644 --- a/src/plugins/Input/vorbis/CMakeLists.txt +++ b/src/plugins/Input/vorbis/CMakeLists.txt @@ -1,20 +1,7 @@ project(libvorbis) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -40,11 +27,11 @@ SET(libvorbis_HDRS SET(libvorbis_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libvorbis_RCC_SRCS ${libvorbis_RCCS}) +QT5_ADD_RESOURCES(libvorbis_RCC_SRCS ${libvorbis_RCCS}) # user interface -QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS}) +QT5_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}) @@ -52,6 +39,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBIS_FOUND) ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS}) add_dependencies(vorbis qmmp) -target_link_libraries(vorbis ${QT_LIBRARIES} libqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(vorbis Qt5::Widgets -lqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(VORBIS_FOUND) diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index f921c451e..717be4795 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -20,13 +20,10 @@ #include #include -#include #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include -#endif #include "replaygainreader.h" #include "decoder_vorbis.h" #include "vorbismetadatamodel.h" @@ -77,12 +74,8 @@ QList DecoderVorbisFactory::createPlayList(const QString &fileName, { FileInfo *info = new FileInfo(fileName); -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(fileName), true); TagLib::Ogg::Vorbis::File fileRef(&stream); -#else - TagLib::Ogg::Vorbis::File fileRef(QStringToFileName(fileName)); -#endif TagLib::Ogg::XiphComment *tag = useMetaData ? fileRef.tag() : 0; if (tag && !tag->isEmpty()) @@ -142,5 +135,3 @@ QTranslator *DecoderVorbisFactory::createTranslator(QObject *parent) translator->load(QString(":/vorbis_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(vorbis,DecoderVorbisFactory) diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h index f574e9a9d..e79b0642d 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.h +++ b/src/plugins/Input/vorbis/decodervorbisfactory.h @@ -38,6 +38,7 @@ class DecoderVorbisFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/vorbis/replaygainreader.cpp b/src/plugins/Input/vorbis/replaygainreader.cpp index e0c509344..276848d80 100644 --- a/src/plugins/Input/vorbis/replaygainreader.cpp +++ b/src/plugins/Input/vorbis/replaygainreader.cpp @@ -22,20 +22,14 @@ #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include #include -#endif #include "replaygainreader.h" ReplayGainReader::ReplayGainReader(const QString &path) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(path), true); TagLib::Ogg::Vorbis::File fileRef(&stream); -#else - TagLib::Ogg::Vorbis::File fileRef(QStringToFileName(path)); -#endif if(fileRef.tag()) readVorbisComment(fileRef.tag()); diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts index fe2ebbcc5..a5ddb5aa8 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts index 88418154a..50772f92b 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Modul Ogg-Vorbis - + Ogg Vorbis Files Soubory Ogg-Vorbis - + About Ogg Vorbis Audio Plugin O modulu Ogg-Vorbis - + Qmmp Ogg Vorbis Audio Plugin Vstupní modul Qmmp Ogg-Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Zdrojový kód je založen na projektu mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Délka - + Sample rate Vzorkovací frekvence - + Hz Hz - + Channels Počet kanálů - + Bitrate Datový tok - + kbps kbps - + File size Velikost souboru - + KB KiB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts index 0f8e28385..e0d266ec4 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg-Vorbis-Modul - + Ogg Vorbis Files Ogg-Vorbis-Dateien - + About Ogg Vorbis Audio Plugin Über Ogg-Vorbis-Audiomodul - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg-Vorbis-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Quellcode basiert auf dem mq3-Projekt @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Länge - + Sample rate Abtastrate - + Hz Hz - + Channels Kanäle - + Bitrate Bitrate - + kbps KBit/s - + File size Dateigröße - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts index 1f91eafb1..ba1b11868 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Πρόσθετο Ogg Vorbis - + Ogg Vorbis Files Αρχεία Ogg Vorbis - + About Ogg Vorbis Audio Plugin Σχετικά με το πρόσθετο ήχου Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Qmmp πρόσθετο ήχου Ogg Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 project Ο πηγαίος κώδικας έχει βασιστεί στο έργο mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Διάρκεια - + Sample rate Ρυθμός δειγματοληψίας - + Hz Hz - + Channels Κανάλια - + Bitrate Ρυθμός bit - + kbps kbps - + File size Μέγεθος αρχείου - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts index 6d3e939ea..98ee44e9b 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts index 9745ec12f..a97e450cd 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Módulo Ogg Vorbis - + Ogg Vorbis Files Archivos Ogg Vorbis - + About Ogg Vorbis Audio Plugin Acerca del módulo de sonido Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Módulo de sonido Ogg Vorbis para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Código basado en el proyecto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duración - + Sample rate Frecuencia - + Hz Hz - + Channels Canales - + Bitrate Tasa de bits - + kbps kbps - + File size Tamaño del archivo - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts index 76daaa0b2..1ccf8adb3 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis -liitännäinen - + Ogg Vorbis Files Ogg Vorbis -tiedostot - + About Ogg Vorbis Audio Plugin Tietoja - Ogg Vorbis -ääniliitännäinen - + Qmmp Ogg Vorbis Audio Plugin Qmmp:n Ogg Vorbis -ääniliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Lähdekoodi perustuu mq3-projektiin @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Kesto - + Sample rate Näytteenottotaajuus - + Hz Hz - + Channels Kanavat - + Bitrate Bittinopeus - + kbps kbps - + File size Tiedostokoko - + KB kt diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts index d7838b409..af3d129c2 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Greffon Ogg Vorbis - + Ogg Vorbis Files Fichiers Ogg Vorbis - + About Ogg Vorbis Audio Plugin À propos du greffon audio Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Greffon audio Ogg Vorbis pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Code source basé sur le projet mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Longueur - + Sample rate Taux d'échantillonage - + Hz Hz - + Channels Canaux - + Bitrate Débit binaire - + kbps kbps - + File size Taille du fichier - + KB Ko diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts index af0c50bf4..5cb5f73da 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Engadido Ogg Vorbis - + Ogg Vorbis Files Ficheiros Ogg Vorbis - + About Ogg Vorbis Audio Plugin Sobre o engadido Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Engadido Ogg Vorbis de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Código fonte baseado no proxecto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Lonxitude - + Sample rate Taxa de mostra - + Hz Hz - + Channels Canais - + Bitrate Taxa de bits - + kbps kbps - + File size Tamaño do ficheiro - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts index 2df620204..a7d99b8ec 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin תוסף Ogg Vorbis - + Ogg Vorbis Files קבצי Ogg Vorbis - + About Ogg Vorbis Audio Plugin אודות תוסף שמע Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin תוסף שמע Ogg Vorbis של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project קוד מקוד מבוסס על פרויקט mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length אריכות - + Sample rate שיעור דגימה - + Hz הרץ - + Channels ערוצים - + Bitrate שיעור סיביות - + kbps - + File size גודל קובץ - + KB ק״ב diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts index 51453db19..0b0820046 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts index e8e8c4e4d..334f1522f 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Plugin Vorbis Ogg - + Ogg Vorbis Files File Vorbis Ogg - + About Ogg Vorbis Audio Plugin Tentang Plugin Audio Vorbis Ogg - + Qmmp Ogg Vorbis Audio Plugin Plugin Audio Vorbis Ogg Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Kode sumber berdasarkan pada proyek mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Panjang - + Sample rate Sample rate - + Hz Hz - + Channels Saluran - + Bitrate Bitrate - + kbps kbps - + File size Ukuran file - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts index 89e003116..f5d788238 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Modulo Ogg Vorbis - + Ogg Vorbis Files 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 - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Codice sorgente basato sul Progetto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Durata - + Sample rate Campionamento - + Hz Hz - + Channels Canali - + Bitrate bit al secondo - + kbps kbps - + File size Dimensione file - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts index e034561e1..c95fdb6cf 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis プラグイン - + Ogg Vorbis Files Ogg Vorbis ファイル - + About Ogg Vorbis Audio Plugin Ogg Vorbis 音響プラグインについて - + Qmmp Ogg Vorbis Audio Plugin QMMP Ogg Vorbis 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Source code based on mq3 project ソースコードは mq3 プロジェクトから流用 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length 長さ - + Sample rate サンプルレート - + Hz Hz - + Channels チャンネル - + Bitrate ビットレート - + kbps キロビット毎秒 - + File size ファイルの大きさ - + KB KiB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts index 5ef43cc9d..1a26a2b63 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts index a0ec697d4..1df433db1 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis įskiepis - + Ogg Vorbis Files Ogg Vorbis bylos - + About Ogg Vorbis Audio Plugin Apie Ogg Vorbis audio įskiepį - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis audio įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Išvesties kodas sukurtas mq3 pagrindu @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Trukmė - + Sample rate Dažnis - + Hz Hz - + Channels Kanalai - + Bitrate Kokybė - + kbps kbps - + File size Bylos dydis - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts index 065c68831..62f839032 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis Module - + Ogg Vorbis Files Ogg Vorbis Bestanden - + About Ogg Vorbis Audio Plugin Over de Ogg Vorbis Audio Module - + Qmmp Ogg Vorbis Audio Plugin Ogg Vorbis Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Broncode gebasseerd op het 'mq3 project' @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duur - + Sample rate Sample frequentie - + Hz - + Channels Kanalen - + Bitrate Bitsnelheid - + kbps - + File size Bestandsnaam - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts index 9ded30dc2..469501ea7 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Wtyczka Ogg Vorbis - + Ogg Vorbis Files Pliki Ogg Vorbis - + About Ogg Vorbis Audio Plugin O wtyczce Ogg Vorbis Audio - + Qmmp Ogg Vorbis Audio Plugin Wtyczka Ogg Vorbis dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Kod źródłowy oparty jest na projekcie mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Długość - + Sample rate Próbkowanie - + Hz Hz - + Channels Kanały - + Bitrate Szybkość transmisji - + kbps - + File size Wielkość pliku - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts index c1d1e5b49..572bdeea1 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Suplemento Ogg Vorbis - + Ogg Vorbis Files Ficheiros Ogg Vorbis - + About Ogg Vorbis Audio Plugin Sobre o suplemento Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Suplemento Qmmp Ogg Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Baseado no código fonte do projeto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do ficheiro - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts index 2d79d969d..e235cef46 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Plugin Ogg Vorbis - + Ogg Vorbis Files Arquivos Ogg Vorbis - + About Ogg Vorbis Audio Plugin Sobre o plugin Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Plugin Qmmp Ogg Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Baseado no código fonte do projeto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do arquivo - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts index 81ceb118a..fc6589422 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Модуль Ogg Vorbis - + Ogg Vorbis Files Файлы Ogg Vorbis - + About Ogg Vorbis Audio Plugin Об аудио-модуле Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Аудио-модуль Ogg Vorbis для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Source code based on mq3 project Исходный код основан на проекте mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Длительность - + Sample rate Дискретизация - + Hz Гц - + Channels Каналов - + Bitrate Битовая частота - + kbps кбит/с - + File size Размер файла - + KB КБ diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts index ca458e783..e1191a1f1 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts index 2ca985cef..db163d841 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Огг Ворбис прикључак - + Ogg Vorbis Files Огг Ворбис фајлови - + About Ogg Vorbis Audio Plugin О Огг Ворбис прикључку - + Qmmp Ogg Vorbis Audio Plugin Кумп Огг Ворбис прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Заснован на mq3 пројекту @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts index 295c55447..6477c8179 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Огг Ворбис прикључак - + Ogg Vorbis Files Огг Ворбис фајлови - + About Ogg Vorbis Audio Plugin О Огг Ворбис прикључку - + Qmmp Ogg Vorbis Audio Plugin Кумп Огг Ворбис прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Заснован на mq3 пројекту @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts index 96a015aff..78353b439 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis Eklentisi - + Ogg Vorbis Files Ogg Vorbis Dosyaları - + About Ogg Vorbis Audio Plugin Ogg Vorbis Ses Eklentisi Hakkında - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis Ses Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Kaynak kodu mq3 projesi temellidir @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB 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 58ae297e3..f14b31081 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Модуль Ogg Vorbis - + Ogg Vorbis Files Файли Ogg Vorbis - + About Ogg Vorbis Audio Plugin Про аудіо-модуль Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Аудіо-модуль Ogg Vorbis для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Source code based on mq3 project Вихідний код базується на проекті mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Тривалість - + Sample rate Частота - + Hz Гц - + Channels Канали - + Bitrate Бітрейт - + kbps Кб/с - + File size Розмір файлу - + KB Кб 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 343d7027b..c22dc674c 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis 插件 - + Ogg Vorbis Files Ogg Vorbis 文件 - + About Ogg Vorbis Audio Plugin 关于 Ogg Vorbis 音频插件 - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis 音频插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project 源代码基于 mq3 项目 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length 长度 - + Sample rate 取样率 - + Hz 赫兹 - + Channels 声音通道 - + Bitrate 比特率 - + kbps 千比特每秒 - + File size 文件大小 - + KB 千字节 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 1872f4ba5..bdd72656e 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis 外掛 - + Ogg Vorbis Files Ogg Vorbis 檔案 - + About Ogg Vorbis Audio Plugin 關於 Ogg Vorbis 聲訊插件 - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis 聲訊插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project 源碼基於 mq3 項目 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length 長度 - + Sample rate 取樣率 - + Hz Hz - + Channels 聲音通道 - + Bitrate 比特率 - + kbps kbps - + File size 文件大小 - + KB KB diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 8f95c8976..b00ad9bd7 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include #include #include @@ -25,9 +26,6 @@ #include #include "vorbismetadatamodel.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() - VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_path = path; @@ -79,7 +77,7 @@ QPixmap VorbisMetaDataModel::cover() for(uint i = 0; i < list.size(); ++i) { TagLib::String value = list[i]; - QByteArray block = QByteArray::fromBase64(TStringToQString_qt4(value).toLatin1()); + QByteArray block = QByteArray::fromBase64(TStringToQString(value).toLatin1()); if(block.size() < 32) continue; qint64 pos = 0; @@ -136,25 +134,25 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) switch((int) key) { case Qmmp::TITLE: - return TStringToQString_qt4(tag->title()); + return TStringToQString(tag->title()); case Qmmp::ARTIST: - return TStringToQString_qt4(tag->artist()); + return TStringToQString(tag->artist()); case Qmmp::ALBUMARTIST: if(tag->fieldListMap()["ALBUMARTIST"].isEmpty()) return QString(); else - return TStringToQString_qt4(tag->fieldListMap()["ALBUMARTIST"].front()); + return TStringToQString(tag->fieldListMap()["ALBUMARTIST"].front()); case Qmmp::ALBUM: - return TStringToQString_qt4(tag->album()); + return TStringToQString(tag->album()); case Qmmp::COMMENT: - return TStringToQString_qt4(tag->comment()); + return TStringToQString(tag->comment()); case Qmmp::GENRE: - return TStringToQString_qt4(tag->genre()); + return TStringToQString(tag->genre()); case Qmmp::COMPOSER: if(tag->fieldListMap()["COMPOSER"].isEmpty()) return QString(); else - return TStringToQString_qt4(tag->fieldListMap()["COMPOSER"].front()); + return TStringToQString(tag->fieldListMap()["COMPOSER"].front()); case Qmmp::YEAR: return QString::number(tag->year()); case Qmmp::TRACK: @@ -163,7 +161,7 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) if(tag->fieldListMap()["DISCNUMBER"].isEmpty()) return QString(); else - return TStringToQString_qt4(tag->fieldListMap()["DISCNUMBER"].front()); + return TStringToQString(tag->fieldListMap()["DISCNUMBER"].front()); } return QString(); } @@ -175,7 +173,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) TagLib::Ogg::XiphComment *tag = m_model->m_tag; - TagLib::String str = QStringToTString_qt4(value); + TagLib::String str = QStringToTString(value); switch((int) key) { diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h index 15f476908..a21d3d503 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.h +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h @@ -21,9 +21,9 @@ #ifndef VORBISMETADATAMODEL_H #define VORBISMETADATAMODEL_H +#include #include #include -#include class VorbisCommentModel; -- cgit v1.2.3-13-gbd6f