From 611c6bed5babcf18e9738fdf7d21bcf1af751581 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 16 Jan 2009 14:06:56 +0000 Subject: mp3 support by ffmpeg plugin (Csaba Hrushka) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@747 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/settingsdialog.cpp | 4 ++ src/plugins/Input/ffmpeg/settingsdialog.ui | 9 +++- .../Input/ffmpeg/translations/ffmpeg_plugin_cs.ts | 47 +++++++++++---------- .../Input/ffmpeg/translations/ffmpeg_plugin_de.ts | 48 ++++++++++++---------- .../Input/ffmpeg/translations/ffmpeg_plugin_ru.ts | 48 ++++++++++++---------- .../ffmpeg/translations/ffmpeg_plugin_uk_UA.ts | 48 ++++++++++++---------- .../ffmpeg/translations/ffmpeg_plugin_zh_CN.ts | 47 +++++++++++---------- .../ffmpeg/translations/ffmpeg_plugin_zh_TW.ts | 47 +++++++++++---------- 8 files changed, 168 insertions(+), 130 deletions(-) (limited to 'src') diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index a68c43ad2..d8b4c7d05 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp @@ -67,6 +67,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.alacCheckBox->setChecked(filters.contains("*.alac") && avcodec_find_decoder(CODEC_ID_ALAC)); ui.aacCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC)); ui.aacCheckBox->setChecked(filters.contains("*.aac") && avcodec_find_decoder(CODEC_ID_AAC)); + ui.mp3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_MP3)); + ui.mp3CheckBox->setChecked(filters.contains("*.mp3") && avcodec_find_decoder(CODEC_ID_MP3)); ui.mp4CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC)); ui.mp4CheckBox->setChecked(filters.contains("*.m4a") && avcodec_find_decoder(CODEC_ID_AAC)); ui.raCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_RA_288)); @@ -82,6 +84,8 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::accept() { QStringList filters; + if (ui.mp3CheckBox->isChecked()) + filters << "*.mp3"; if (ui.wmaCheckBox->isChecked()) filters << "*.wma"; if (ui.apeCheckBox->isChecked()) diff --git a/src/plugins/Input/ffmpeg/settingsdialog.ui b/src/plugins/Input/ffmpeg/settingsdialog.ui index 36d6f98c2..64f30ba0c 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.ui +++ b/src/plugins/Input/ffmpeg/settingsdialog.ui @@ -6,7 +6,7 @@ 0 0 302 - 286 + 298 @@ -80,6 +80,13 @@ + + + + MP3 (MPEG audio layer 3) + + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts index 9288d8dfe..9b1b04164 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts @@ -3,17 +3,17 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin O modulu FFmpeg - + Qmmp FFmpeg Audio Plugin Vstupní modul Qmmp FFmpeg - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> @@ -28,7 +28,7 @@ - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 @@ -56,57 +56,57 @@ Podrobnosti - + File size: Velikost souboru: - + - - - + Sample rate: Vzorkovací frakvence: - + Track number: Číslo stopy: - + Year: Rok: - + Genre: Žánr: - + Comment: Komentář: - + Album: Album: - + Artist: Umělec: - + Title: Název: - + Close Zavřít @@ -116,17 +116,17 @@ Cesta k souboru: - + Length: Délka: - + Channels: Počet kanálů: - + Bitrate: Datový tok: @@ -136,7 +136,7 @@ - + Metadata @@ -174,12 +174,12 @@ - + MPEG-4 AAC - + RealAudio 1.0/2.0 @@ -188,5 +188,10 @@ FFmpeg Plugin Settings + + + MPEG-2 MP3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts index 4951f9f08..7f9ac63e9 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts @@ -1,20 +1,19 @@ - DecoderFFmpegFactory - + About FFmpeg Audio Plugin Über FFmpeg-Audio-Plugin - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg-Audio-Plugin - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> @@ -29,7 +28,7 @@ FFmpeg-Formate - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 @@ -57,57 +56,57 @@ Details - + File size: Dateigröße: - + - - - + Sample rate: Abtastrate: - + Track number: Titelnummer: - + Year: Jahr: - + Genre: Genre: - + Comment: Kommentar: - + Album: Album: - + Artist: Künstler: - + Title: Titel: - + Close Schließen @@ -117,17 +116,17 @@ Dateipfad: - + Length: Länge: - + Channels: Kanäle: - + Bitrate: Bitrate: @@ -137,7 +136,7 @@ Audio-Info - + Metadata Metadaten @@ -175,12 +174,12 @@ ADTS AAC - + MPEG-4 AAC MPEG-4 AAC - + RealAudio 1.0/2.0 RealAudio 1.0/2.0 @@ -189,5 +188,10 @@ FFmpeg Plugin Settings Einstellungen des FFmpeg-Plugins + + + MPEG-2 MP3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts index be09bfe79..01e447199 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts @@ -1,20 +1,19 @@ - DecoderFFmpegFactory - + About FFmpeg Audio Plugin Об аудио-модуле FFmpeg - + Qmmp FFmpeg Audio Plugin Аудио-модуль FFmpeg для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> @@ -29,7 +28,7 @@ Форматы FFmepg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Собрано с libavformat-%1.%2.%3 и libavcodec-%4.%5.%6 @@ -47,72 +46,72 @@ Гц - + - - + Bitrate: Битовая частота: - + File size: Размер файла: - + Channels: Каналов: - + Sample rate: Дискретизация: - + Length: Длительность: - + Track number: Номер трека: - + Year: Год: - + Genre: Жанр: - + Comment: Комментарий: - + Album: Альбом: - + Artist: Исполнитель: - + Title: Название: - + Close Закрыть @@ -137,7 +136,7 @@ Аудио-информация - + Metadata Метаданные @@ -175,12 +174,12 @@ - + MPEG-4 AAC - + RealAudio 1.0/2.0 @@ -189,5 +188,10 @@ FFmpeg Plugin Settings Настройки модуля FFmpeg + + + MPEG-2 MP3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts index 9bc354d50..2d40be601 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts @@ -1,20 +1,19 @@ - DecoderFFmpegFactory - + About FFmpeg Audio Plugin Про аудіо-модуль FFmpeg - + Qmmp FFmpeg Audio Plugin Аудіо-модуль FFmpeg для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> @@ -29,7 +28,7 @@ Формати FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Зібрано з libavformat-%1.%2.%3 та libavcodec-%4.%5.%6 @@ -47,72 +46,72 @@ Гц - + - - + Bitrate: Бітова частота: - + File size: Розмір файлу: - + Channels: Каналів: - + Sample rate: Дискретизація: - + Length: Тривалість: - + Track number: Номер треку: - + Year: Рік: - + Genre: Жанр: - + Comment: Коментар: - + Album: Альбом: - + Artist: Виконавець: - + Title: Назва: - + Close Закрити @@ -137,7 +136,7 @@ Інфо аудіо - + Metadata Метадані @@ -175,12 +174,12 @@ - + MPEG-4 AAC - + RealAudio 1.0/2.0 @@ -189,5 +188,10 @@ FFmpeg Plugin Settings Налаштування модуля FFmpeg + + + MPEG-2 MP3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts index e68eaae13..d435646cc 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts @@ -3,17 +3,17 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin 关于 FFmpeg 音频插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 音频插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> @@ -28,7 +28,7 @@ - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 @@ -46,72 +46,72 @@ Hz - + - - - + Bitrate: 位速率： - + File size: 文件大小： - + Channels: 声音通道： - + Sample rate: 取样率： - + Length: 长度： - + Track number: 音轨： - + Year: 年代： - + Genre: 流派： - + Comment: 备注： - + Album: 专辑： - + Artist: 艺术家： - + Title: 标题： - + Close 关闭 @@ -136,7 +136,7 @@ - + Metadata @@ -174,12 +174,12 @@ - + MPEG-4 AAC - + RealAudio 1.0/2.0 @@ -188,5 +188,10 @@ FFmpeg Plugin Settings + + + MPEG-2 MP3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts index 081c40428..3e6d89ea7 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts @@ -3,17 +3,17 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin 關於 FFmpeg 聲訊插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 聲訊插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> @@ -28,7 +28,7 @@ - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 @@ -46,72 +46,72 @@ Hz - + - - - + Bitrate: 位速率： - + File size: 檔案大小： - + Channels: 音頻通道： - + Sample rate: 取樣率： - + Length: 長度： - + Track number: 音軌： - + Year: 年代： - + Genre: 流派： - + Comment: 備註： - + Album: 專輯： - + Artist: 藝術家： - + Title: 標題： - + Close 關閉 @@ -136,7 +136,7 @@ - + Metadata @@ -174,12 +174,12 @@ - + MPEG-4 AAC - + RealAudio 1.0/2.0 @@ -188,5 +188,10 @@ FFmpeg Plugin Settings + + + MPEG-2 MP3 + + -- cgit v1.2.3-13-gbd6f