From 11b607fc91036d4024ba982c7743dc31b0741603 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 14 Mar 2009 16:40:55 +0000 Subject: aac plugin fixes, updated Russian translation git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@852 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/aac/CMakeLists.txt | 5 +- src/plugins/Input/aac/aac.pro | 14 +- src/plugins/Input/aac/aacfile.cpp | 11 +- src/plugins/Input/aac/aacfile.h | 2 + src/plugins/Input/aac/detailsdialog.cpp | 4 +- src/plugins/Input/aac/detailsdialog.ui | 266 +++++++++------------ .../Input/aac/translations/aac_plugin_cs.ts | 155 ++++++++++++ .../Input/aac/translations/aac_plugin_de.ts | 156 ++++++++++++ .../Input/aac/translations/aac_plugin_ru.ts | 156 ++++++++++++ .../Input/aac/translations/aac_plugin_uk_UA.ts | 156 ++++++++++++ .../Input/aac/translations/aac_plugin_zh_CN.ts | 155 ++++++++++++ .../Input/aac/translations/aac_plugin_zh_TW.ts | 156 ++++++++++++ .../Input/aac/translations/translations.qrc | 11 + 13 files changed, 1078 insertions(+), 169 deletions(-) create mode 100644 src/plugins/Input/aac/translations/aac_plugin_cs.ts create mode 100644 src/plugins/Input/aac/translations/aac_plugin_de.ts create mode 100644 src/plugins/Input/aac/translations/aac_plugin_ru.ts create mode 100644 src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts create mode 100644 src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts create mode 100644 src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts create mode 100644 src/plugins/Input/aac/translations/translations.qrc (limited to 'src') diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt index 7102a2000..90e78e4f9 100644 --- a/src/plugins/Input/aac/CMakeLists.txt +++ b/src/plugins/Input/aac/CMakeLists.txt @@ -75,7 +75,7 @@ SET(libaac_MOC_HDRS aacfile.h ) -#SET(libaac_RCCS translations/translations.qrc) +SET(libaac_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libaac_RCC_SRCS ${libaac_RCCS}) @@ -94,8 +94,7 @@ QT4_WRAP_UI(libaac_UIS_H ${libaac_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FAAD_FOUND) -ADD_LIBRARY(aac SHARED ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_UIS_H} - ${libaac_RCC_SRCS}) +ADD_LIBRARY(aac SHARED ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_UIS_H} ${libaac_RCC_SRCS}) add_dependencies(aac qmmp) target_link_libraries(aac ${QT_LIBRARIES} -lqmmp -lfaad ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro index 5bc0cb38a..301a77255 100644 --- a/src/plugins/Input/aac/aac.pro +++ b/src/plugins/Input/aac/aac.pro @@ -23,13 +23,13 @@ TEMPLATE = lib QMAKE_LIBDIR += ../../../../lib LIBS += -lqmmp -lfaad -L/usr/lib -I/usr/include PKGCONFIG += taglib -#TRANSLATIONS = translations/mpc_plugin_ru.ts -# translations/mpc_plugin_uk_UA.ts -# translations/mpc_plugin_zh_CN.ts -# translations/mpc_plugin_zh_TW.ts -# translations/mpc_plugin_cs.ts -# translations/mpc_plugin_de.ts -#RESOURCES = translations/translations.qrc +TRANSLATIONS = translations/aac_plugin_ru.ts \ + translations/aac_plugin_uk_UA.ts \ + translations/aac_plugin_zh_CN.ts \ + translations/aac_plugin_zh_TW.ts \ + translations/aac_plugin_cs.ts \ + translations/aac_plugin_de.ts +RESOURCES = translations/translations.qrc isEmpty(LIB_DIR){ LIB_DIR = /lib diff --git a/src/plugins/Input/aac/aacfile.cpp b/src/plugins/Input/aac/aacfile.cpp index 1e78a9590..a3117002c 100644 --- a/src/plugins/Input/aac/aacfile.cpp +++ b/src/plugins/Input/aac/aacfile.cpp @@ -36,6 +36,7 @@ AACFile::AACFile(QIODevice *i, bool metaData) m_isValid = FALSE; m_length = 0; m_bitrate = 0; + m_samplerate = 0; m_input = i; uchar buf[AAC_BUFFER_SIZE]; qint64 buf_at = i->peek((char *) buf, AAC_BUFFER_SIZE); @@ -97,6 +98,11 @@ quint32 AACFile::bitrate() return m_bitrate; } +quint32 AACFile::samplerate() +{ + return m_samplerate; +} + bool AACFile::isValid() { return m_isValid; @@ -113,7 +119,6 @@ void AACFile::parseADTS() qint64 buf_at = 0; int frames, frame_length; int t_framelength = 0; - int samplerate = 0; float frames_per_sec, bytes_per_frame; qint64 pos = m_input->pos(); @@ -144,7 +149,7 @@ void AACFile::parseADTS() break; if (frames == 0) - samplerate = adts_sample_rates[(buf[2]&0x3c)>>2]; + m_samplerate = adts_sample_rates[(buf[2]&0x3c)>>2]; frame_length = ((((unsigned int)buf[3] & 0x3)) << 11) | (((unsigned int)buf[4]) << 3) | (buf[5] >> 5); @@ -163,7 +168,7 @@ void AACFile::parseADTS() } } m_input->seek(pos); - frames_per_sec = (float)samplerate/1024.0f; + frames_per_sec = (float) m_samplerate/1024.0f; if (frames != 0) bytes_per_frame = (float)t_framelength/(float)(frames*1000); else diff --git a/src/plugins/Input/aac/aacfile.h b/src/plugins/Input/aac/aacfile.h index 8e57b7588..9a470b01e 100644 --- a/src/plugins/Input/aac/aacfile.h +++ b/src/plugins/Input/aac/aacfile.h @@ -48,6 +48,7 @@ public: qint64 length(); quint32 bitrate(); + quint32 samplerate(); bool isValid(); const QMap metaData(); @@ -58,6 +59,7 @@ private: quint32 m_bitrate; QIODevice *m_input; bool m_isValid; + quint32 m_samplerate; QMap m_metaData; }; diff --git a/src/plugins/Input/aac/detailsdialog.cpp b/src/plugins/Input/aac/detailsdialog.cpp index fbd6511c8..9747789d4 100644 --- a/src/plugins/Input/aac/detailsdialog.cpp +++ b/src/plugins/Input/aac/detailsdialog.cpp @@ -58,8 +58,8 @@ void DetailsDialog::loadAACInfo() text = QString("%1").arg(f.length()/60); text +=":"+QString("%1").arg(f.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.samplerate()); + ui.sampleRateLabel->setText(text+" "+tr("Hz")); /*text = QString("%1").arg(f.audioProperties()->channels()); ui.channelsLabel->setText(text);*/ text = QString("%1").arg(f.bitrate()); diff --git a/src/plugins/Input/aac/detailsdialog.ui b/src/plugins/Input/aac/detailsdialog.ui index b461fa38b..bae90efb0 100644 --- a/src/plugins/Input/aac/detailsdialog.ui +++ b/src/plugins/Input/aac/detailsdialog.ui @@ -1,59 +1,60 @@ - + + DetailsDialog - - + + 0 0 545 - 374 + 346 - + Details - - - - + + + + File path: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + true - - - + + + 0 16 - + AAC Info - - + + 8 - + 6 - + - + Qt::Vertical - + 74 151 @@ -61,113 +62,70 @@ - - - + + + - - - - + + + Length: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + - - - - + + + Sample rate: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + - - - - - Qt::LeftToRight - - - Channels: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - + + + File size: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + Bitrate: - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::LeftToRight - - - - - - - - - - - - - - - - - - - Stream version: - - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + - @@ -175,115 +133,115 @@ - - - - + + + + 0 0 - + ID3v2 Tag - - - - + + + + Title: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - - - + + + Artist: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - - - + + + Album: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - - - + + + Comment: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - - - + + + Year: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - - - + + + Track number: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - - - + + + Genre: - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - - - + + + false - + Save @@ -291,12 +249,12 @@ - + - + Qt::Horizontal - + 111 20 @@ -304,9 +262,9 @@ - - - + + + Close @@ -321,11 +279,11 @@ DetailsDialog close() - + 623 353 - + 539 352 diff --git a/src/plugins/Input/aac/translations/aac_plugin_cs.ts b/src/plugins/Input/aac/translations/aac_plugin_cs.ts new file mode 100644 index 000000000..366052b85 --- /dev/null +++ b/src/plugins/Input/aac/translations/aac_plugin_cs.ts @@ -0,0 +1,155 @@ + + + + + DecoderAACFactory + + + AAC Plugin + + + + + AAC Files + + + + + About AAC Audio Plugin + + + + + Qmmp AAC Audio Plugin + + + + + Writen by: Ilya Kotov <forkotov02@hotmail.ru> + Autor: Ilja Kotov <forkotov02@hotmail.ru> + + + + DetailsDialog + + + Hz + + + + + kbps + kbps + + + + KB + KB + + + + Details + Podrobnosti + + + + File size: + Velikost souboru: + + + + + + + + + - + - + + + + Sample rate: + Vzorkovací frekvence: + + + + Save + Uložit + + + + Track number: + Číslo stopy: + + + + AAC Info + + + + + Length: + + + + + Channels: + + + + + Bitrate: + + + + + Stream version: + + + + + Year: + Rok: + + + + Genre: + Žánr: + + + + Comment: + Komentář: + + + + Album: + Album: + + + + Artist: + Umělec: + + + + Title: + Název: + + + + Close + Zavřít + + + + ID3v2 Tag + ID3v2 tag + + + + File path: + Cesta k souboru: + + + diff --git a/src/plugins/Input/aac/translations/aac_plugin_de.ts b/src/plugins/Input/aac/translations/aac_plugin_de.ts new file mode 100644 index 000000000..2c8f4aea2 --- /dev/null +++ b/src/plugins/Input/aac/translations/aac_plugin_de.ts @@ -0,0 +1,156 @@ + + + + + + DecoderAACFactory + + + AAC Plugin + + + + + AAC Files + + + + + About AAC Audio Plugin + + + + + Qmmp AAC Audio Plugin + + + + + Writen by: Ilya Kotov <forkotov02@hotmail.ru> + Autor: Ilja Kotov <forkotov02@hotmail.ru> + + + + DetailsDialog + + + Hz + + + + + kbps + kbps + + + + KB + KB + + + + Details + Details + + + + File size: + Dateigröße: + + + + + + + + + - + - + + + + Sample rate: + Abtastrate: + + + + Save + Speichern + + + + Track number: + Titelnummer: + + + + AAC Info + + + + + Length: + + + + + Channels: + + + + + Bitrate: + + + + + Stream version: + + + + + Year: + Jahr: + + + + Genre: + Genre: + + + + Comment: + Kommentar: + + + + Album: + Album: + + + + Artist: + Künstler: + + + + Title: + Titel: + + + + Close + Schließen + + + + ID3v2 Tag + ID3v2-Tag + + + + File path: + Dateipfad: + + + diff --git a/src/plugins/Input/aac/translations/aac_plugin_ru.ts b/src/plugins/Input/aac/translations/aac_plugin_ru.ts new file mode 100644 index 000000000..77a0da2a7 --- /dev/null +++ b/src/plugins/Input/aac/translations/aac_plugin_ru.ts @@ -0,0 +1,156 @@ + + + + + + DecoderAACFactory + + + AAC Plugin + Модуль AAC + + + + AAC Files + Файлы AAC + + + + About AAC Audio Plugin + Об аудио-модуле AAC + + + + Qmmp AAC Audio Plugin + Модуль AAC для Qmmp + + + + Writen by: Ilya Kotov <forkotov02@hotmail.ru> + Разработчик: Илья Котов <forkotov02@hotmail.ru> + + + + DetailsDialog + + + Save + Сохранить + + + + Track number: + Номер трека: + + + + AAC Info + Информация AAC + + + + Length: + Длительность: + + + + Channels: + Каналов: + + + + Bitrate: + Битовая частота: + + + + Stream version: + Версия потока: + + + + Year: + Год: + + + + Genre: + Жанр: + + + + Comment: + Комментарий: + + + + Album: + Альбом: + + + + Artist: + Исполнитель: + + + + Title: + Название: + + + + Close + Закрыть + + + + ID3v2 Tag + ID3v2-тег + + + + + + + + + - + - + + + + File size: + Размер файла: + + + + Sample rate: + Дискретизация: + + + + File path: + Путь к файлу: + + + + Hz + Гц + + + + KB + Кб + + + + Details + Информация + + + + kbps + Кб/с + + + diff --git a/src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts b/src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts new file mode 100644 index 000000000..53d31ad16 --- /dev/null +++ b/src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts @@ -0,0 +1,156 @@ + + + + + + DecoderAACFactory + + + AAC Plugin + + + + + AAC Files + + + + + About AAC Audio Plugin + + + + + Qmmp AAC Audio Plugin + + + + + Writen by: Ilya Kotov <forkotov02@hotmail.ru> + Розробник: Ілля Котов <forkotov02@hotmail.ru> + + + + DetailsDialog + + + Save + Зберегти + + + + Track number: + Номер треку: + + + + AAC Info + + + + + Length: + + + + + Channels: + + + + + Bitrate: + + + + + Stream version: + + + + + Year: + Рік: + + + + Genre: + Жанр: + + + + Comment: + Коментар: + + + + Album: + Альбом: + + + + Artist: + Виконавець: + + + + Title: + Назва: + + + + Close + Закрити + + + + ID3v2 Tag + ID3v2-тег + + + + + + + + + - + - + + + + File size: + Розмір файлу: + + + + Sample rate: + Дискретизація: + + + + File path: + Шлях до файлу: + + + + Hz + + + + + KB + Кб + + + + Details + Інформація + + + + kbps + Кб/с + + + diff --git a/src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts b/src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts new file mode 100644 index 000000000..9c45be1a2 --- /dev/null +++ b/src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts @@ -0,0 +1,155 @@ + + + + + DecoderAACFactory + + + AAC Plugin + + + + + AAC Files + + + + + About AAC Audio Plugin + + + + + Qmmp AAC Audio Plugin + + + + + Writen by: Ilya Kotov <forkotov02@hotmail.ru> + 作者：Ilya Kotov <forkotov02@hotmail.ru> + + + + DetailsDialog + + + Save + 保存 + + + + Track number: + 音轨： + + + + AAC Info + + + + + Length: + + + + + Channels: + + + + + Bitrate: + + + + + Stream version: + + + + + Year: + 年代： + + + + Genre: + 流派： + + + + Comment: + 备注： + + + + Album: + 专辑： + + + + Artist: + 艺术家： + + + + Title: + 标题： + + + + Close + 关闭 + + + + ID3v2 Tag + ID3v2 标签 + + + + + + + + + - + - + + + + File size: + 文件大小： + + + + Sample rate: + 取样率： + + + + File path: + 文件路径： + + + + Hz + + + + + KB + KB + + + + Details + 详细资料 + + + + kbps + kbps + + + diff --git a/src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts b/src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts new file mode 100644 index 000000000..3b51885eb --- /dev/null +++ b/src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts @@ -0,0 +1,156 @@ + + + + + + DecoderAACFactory + + + AAC Plugin + + + + + AAC Files + + + + + About AAC Audio Plugin + + + + + Qmmp AAC Audio Plugin + + + + + Writen by: Ilya Kotov <forkotov02@hotmail.ru> + 作者：Ilya Kotov <forkotov02@hotmail.ru> + + + + DetailsDialog + + + Save + 儲存 + + + + Track number: + 音軌： + + + + AAC Info + + + + + Length: + + + + + Channels: + + + + + Bitrate: + + + + + Stream version: + + + + + Year: + 年代： + + + + Genre: + 流派： + + + + Comment: + 備註： + + + + Album: + 專輯： + + + + Artist: + 藝術家： + + + + Title: + 標題： + + + + Close + 關閉 + + + + ID3v2 Tag + ID3v2 標簽 + + + + + + + + + - + - + + + + File size: + 檔案大小： + + + + Sample rate: + 取樣率： + + + + File path: + 檔案路徑： + + + + Hz + + + + + KB + KB + + + + Details + 詳細資料 + + + + kbps + kbps + + + diff --git a/src/plugins/Input/aac/translations/translations.qrc b/src/plugins/Input/aac/translations/translations.qrc new file mode 100644 index 000000000..1b6459662 --- /dev/null +++ b/src/plugins/Input/aac/translations/translations.qrc @@ -0,0 +1,11 @@ + + + + aac_plugin_ru.qm + aac_plugin_uk_UA.qm + aac_plugin_zh_CN.qm + aac_plugin_zh_TW.qm + aac_plugin_cs.qm + aac_plugin_de.qm + + -- cgit v1.2.3-13-gbd6f