From 1b1902f398ddb42a324df1a9bee8b54785811fdb Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 3 Jul 2010 07:02:43 +0000 Subject: added global equalizer settings git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1796 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Engines/mplayer/mplayerengine.cpp | 11 ---- src/plugins/Engines/mplayer/mplayerengine.h | 4 -- src/qmmp/CMakeLists.txt | 3 + src/qmmp/abstractengine.h | 4 +- src/qmmp/eqsettings.cpp | 81 ++++++++++++++++++++++++ src/qmmp/eqsettings.h | 48 ++++++++++++++ src/qmmp/qmmp.pro | 53 ++++++++-------- src/qmmp/qmmpaudioengine.cpp | 45 ++++++-------- src/qmmp/qmmpaudioengine.h | 3 +- src/qmmp/qmmpsettings.cpp | 21 +++++++ src/qmmp/qmmpsettings.h | 11 ++++ src/qmmp/soundcore.cpp | 30 ++------- src/qmmp/soundcore.h | 18 ++---- src/ui/eqwidget.cpp | 74 ++++++++-------------- src/ui/eqwidget.h | 8 +-- src/ui/mainwindow.cpp | 11 ---- src/ui/mainwindow.h | 1 - src/ui/translations/qmmp_cs.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_de.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_hu.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_it.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_lt.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_nl.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_pl_PL.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_pt_BR.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_ru.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_tr.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_uk_UA.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_zh_CN.ts | 90 +++++++++++++-------------- src/ui/translations/qmmp_zh_TW.ts | 90 +++++++++++++-------------- 30 files changed, 840 insertions(+), 756 deletions(-) create mode 100644 src/qmmp/eqsettings.cpp create mode 100644 src/qmmp/eqsettings.h (limited to 'src') diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index a2943bfbe..2545ecb6e 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -178,17 +178,6 @@ void MplayerEngine::pause() m_process->write("pause\n"); } -void MplayerEngine::setEQ(double bands[10], double preamp) -{ - Q_UNUSED(bands[10]); - Q_UNUSED(preamp); -} - -void MplayerEngine::setEQEnabled(bool on) -{ - Q_UNUSED(on); -} - void MplayerEngine::readStdOut() { QString line = QString::fromLocal8Bit(m_process->readAll ()).trimmed(); diff --git a/src/plugins/Engines/mplayer/mplayerengine.h b/src/plugins/Engines/mplayer/mplayerengine.h index cc6b12d16..b208839bb 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.h +++ b/src/plugins/Engines/mplayer/mplayerengine.h @@ -57,10 +57,6 @@ public: void stop(); void pause(); - // Equalizer - void setEQ(double bands[10], double preamp); - void setEQEnabled(bool on); - private slots: void readStdOut(); void startMplayerProcess(); diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index 3e4df0bdd..ea86fb497 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -56,6 +56,7 @@ SET(libqmmp_SRCS replaygain.cpp qmmpsettings.cpp audioconverter.cpp + eqsettings.cpp ) SET(libqmmp_MOC_HDRS @@ -91,6 +92,7 @@ SET(libqmmp_MOC_HDRS replaygain.h qmmpsettings.h audioconverter.h + eqsettings.h ) SET(libqmmp_DEVEL_HDRS @@ -118,6 +120,7 @@ SET(libqmmp_DEVEL_HDRS enginefactory.h metadatamanager.h qmmpsettings.h + eqsettings.h ) QT4_WRAP_CPP(libqmmp_MOC_SRCS ${libqmmp_MOC_HDRS}) diff --git a/src/qmmp/abstractengine.h b/src/qmmp/abstractengine.h index f9fa32179..92c1d8d83 100644 --- a/src/qmmp/abstractengine.h +++ b/src/qmmp/abstractengine.h @@ -83,12 +83,12 @@ public: * Sets equalizer settings. Each item of \p bands[] and \p reamp should be \b -20.0..20.0 * Subclass should reimplement this function. */ - virtual void setEQ(double bands[10], double preamp) = 0; + //virtual void setEQ(double bands[10], double preamp) = 0; /*! * Enables equalizer if \p on is \b true or disables it if \p on is \b false * Subclass should reimplement this function. */ - virtual void setEQEnabled(bool on) = 0; + //virtual void setEQEnabled(bool on) = 0; /*! * Returns a list of decoder factories. */ diff --git a/src/qmmp/eqsettings.cpp b/src/qmmp/eqsettings.cpp new file mode 100644 index 000000000..81f74312a --- /dev/null +++ b/src/qmmp/eqsettings.cpp @@ -0,0 +1,81 @@ +/*************************************************************************** + * Copyright (C) 2010 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include "eqsettings.h" + +EqSettings::EqSettings() +{ + for(int i = 0; i < 10; ++i) + m_gain[i] = 0; + m_preamp = 0; +} + +bool EqSettings::isEnabled() const +{ + return m_is_enabled; +} + +double EqSettings::gain(int chan) const +{ + return m_gain[chan]; +} + +double EqSettings::preamp() const +{ + return m_preamp; +} + +void EqSettings::setEnabled(bool enabled) +{ + m_is_enabled = enabled; +} + +void EqSettings::setGain(int chan, double gain) +{ + m_gain[chan] = gain; +} + +void EqSettings::setPreamp(double preamp) +{ + m_preamp = preamp; +} + +void EqSettings::operator=(const EqSettings &s) +{ + for(int i = 0; i < 10; ++i) + m_gain[i] = s.m_gain[i]; + m_preamp = s.m_preamp; + m_is_enabled = s.m_is_enabled; +} + +bool EqSettings::operator==(const EqSettings &s) const +{ + for(int i = 0; i < 10; ++i) + { + if(m_gain[i] != s.m_gain[i]) + return false; + } + return (m_preamp == s.m_preamp) && (m_is_enabled == s.m_is_enabled); +} + +bool EqSettings::operator!=(const EqSettings &s) const +{ + return !operator==(s); +} diff --git a/src/qmmp/eqsettings.h b/src/qmmp/eqsettings.h new file mode 100644 index 000000000..b08a6753d --- /dev/null +++ b/src/qmmp/eqsettings.h @@ -0,0 +1,48 @@ +/*************************************************************************** + * Copyright (C) 2010 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef EQSETTINGS_H +#define EQSETTINGS_H + +class EqSettings +{ +public: + EqSettings(); + + bool isEnabled() const; + double gain(int chan) const; + double preamp() const; + void setEnabled(bool enabled = true); + void setGain(int chan, double gain); + void setPreamp(double preamp); + + void operator=(const EqSettings &s); + bool operator==(const EqSettings &s) const; + bool operator!=(const EqSettings &s) const; + + +private: + double m_gain[10]; + double m_preamp; + bool m_is_enabled; + +}; + +#endif // EQSETTINGS_H diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro index 018ddd00e..9aeb3354b 100644 --- a/src/qmmp/qmmp.pro +++ b/src/qmmp/qmmp.pro @@ -31,7 +31,8 @@ HEADERS += recycler.h \ metadatamanager.h \ replaygain.h \ audioconverter.h \ - qmmpsettings.h + qmmpsettings.h \ + eqsettings.h SOURCES += recycler.cpp \ decoder.cpp \ output.cpp \ @@ -56,7 +57,8 @@ SOURCES += recycler.cpp \ metadatamanager.cpp \ replaygain.cpp \ audioconverter.cpp \ - qmmpsettings.cpp + qmmpsettings.cpp \ + eqsettings.cpp FORMS += unix:TARGET = ../../lib/qmmp win32:TARGET = ../../../bin/qmmp @@ -78,29 +80,30 @@ contains(CONFIG, SVN_VERSION) { unix { target.path = $$LIB_DIR devel.files += buffer.h \ - buffer.h \ - decoder.h \ - output.h \ - outputfactory.h \ - decoderfactory.h \ - soundcore.h \ - visual.h \ - visualfactory.h \ - effect.h \ - effectfactory.h \ - statehandler.h \ - qmmp.h \ - fileinfo.h \ - volumecontrol.h \ - metadatamodel.h \ - tagmodel.h \ - abstractengine.h \ - audioparameters.h \ - inputsource.h \ - inputsourcefactory.h \ - enginefactory.h \ - metadatamanager.h \ - qmmpsettings.h + buffer.h \ + decoder.h \ + output.h \ + outputfactory.h \ + decoderfactory.h \ + soundcore.h \ + visual.h \ + visualfactory.h \ + effect.h \ + effectfactory.h \ + statehandler.h \ + qmmp.h \ + fileinfo.h \ + volumecontrol.h \ + metadatamodel.h \ + tagmodel.h \ + abstractengine.h \ + audioparameters.h \ + inputsource.h \ + inputsourcefactory.h \ + enginefactory.h \ + metadatamanager.h \ + qmmpsettings.h \ + eqsettings.h devel.path = /include/qmmp INSTALLS += target \ devel diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index bc5f91466..395109883 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -43,8 +43,6 @@ QmmpAudioEngine::QmmpAudioEngine(QObject *parent) m_useEq(false), m_eqEnabled(false) { m_output_buf = new unsigned char[QMMP_BUFFER_SIZE]; - double b[] = {0,0,0,0,0,0,0,0,0,0}; - setEQ(b, 0); qRegisterMetaType("Qmmp::State"); m_effects = Effect::create(); m_bks = QMMP_BLOCK_SIZE; @@ -53,6 +51,8 @@ QmmpAudioEngine::QmmpAudioEngine(QObject *parent) m_replayGain = new ReplayGain; m_settings = QmmpSettings::instance(); connect(m_settings,SIGNAL(replayGainSettingsChanged()), SLOT(updateReplayGainSettings())); + connect(m_settings,SIGNAL(eqSettingsChanged()), SLOT(updateEqSettings())); + updateEqSettings(); updateReplayGainSettings(); reset(); m_instance = this; @@ -150,29 +150,6 @@ qint64 QmmpAudioEngine::totalTime() return 0; } -void QmmpAudioEngine::setEQ(double bands[10], double preamp) -{ - mutex()->lock(); - set_preamp(0, 1.0 + 0.0932471 *preamp + 0.00279033 * preamp * preamp); - set_preamp(1, 1.0 + 0.0932471 *preamp + 0.00279033 * preamp * preamp); - for (int i=0; i<10; ++i) - { - double value = bands[i]; - set_gain(i,0, 0.03*value+0.000999999*value*value); - set_gain(i,1, 0.03*value+0.000999999*value*value); - } - mutex()->unlock(); -} - -void QmmpAudioEngine::setEQEnabled(bool on) -{ - mutex()->lock(); - m_eqEnabled = on; - if(m_decoder) - m_useEq = m_eqEnabled && m_decoder->audioParameters().format() == Qmmp::PCM_S16LE; - mutex()->unlock(); -} - void QmmpAudioEngine::addEffect(EffectFactory *factory) { foreach(Effect *effect, m_effects) @@ -353,6 +330,24 @@ void QmmpAudioEngine::finish() emit playbackFinished(); } +void QmmpAudioEngine::updateEqSettings() +{ + mutex()->lock(); + m_eqEnabled = m_settings->eqSettings().isEnabled(); + double preamp = m_settings->eqSettings().preamp(); + set_preamp(0, 1.0 + 0.0932471 *preamp + 0.00279033 * preamp * preamp); + set_preamp(1, 1.0 + 0.0932471 *preamp + 0.00279033 * preamp * preamp); + for(int i = 0; i < 10; ++i) + { + double value = m_settings->eqSettings().gain(i); + set_gain(i,0, 0.03*value+0.000999999*value*value); + set_gain(i,1, 0.03*value+0.000999999*value*value); + } + if(m_decoder) + m_useEq = m_eqEnabled && m_decoder->audioParameters().format() == Qmmp::PCM_S16LE; + mutex()->unlock(); +} + void QmmpAudioEngine::updateReplayGainSettings() { mutex()->lock(); diff --git a/src/qmmp/qmmpaudioengine.h b/src/qmmp/qmmpaudioengine.h index 4b57c4149..097e34697 100644 --- a/src/qmmp/qmmpaudioengine.h +++ b/src/qmmp/qmmpaudioengine.h @@ -53,8 +53,6 @@ public: void seek(qint64 time); void stop(); void pause(); - void setEQ(double bands[10], double preamp); - void setEQEnabled(bool on); void addEffect(EffectFactory *factory); void removeEffect(EffectFactory *factory); @@ -62,6 +60,7 @@ public: private slots: void finish(); + void updateEqSettings(); void updateReplayGainSettings(); private: diff --git a/src/qmmp/qmmpsettings.cpp b/src/qmmp/qmmpsettings.cpp index 9186951cc..7c4c3c6dc 100644 --- a/src/qmmp/qmmpsettings.cpp +++ b/src/qmmp/qmmpsettings.cpp @@ -51,6 +51,11 @@ QmmpSettings::QmmpSettings(QObject *parent) : QObject(parent) m_proxy_enabled = settings.value("Proxy/use_proxy", false).toBool(); m_proxy_auth = settings.value("Proxy/authentication", false).toBool(); m_proxy_url = settings.value("Proxy/url").toUrl(); + //equalizer settings + for (int i = 0; i < 10; ++i) + m_eq_settings.setGain(i, settings.value("Equalizer/band_"+ QString("%1").arg(i), 0).toDouble()); + m_eq_settings.setPreamp(settings.value("Equalizer/preamp", 0).toDouble()); + m_eq_settings.setEnabled(settings.value("Equalizer/enabled", true).toBool()); } QmmpSettings::~QmmpSettings() @@ -153,6 +158,17 @@ void QmmpSettings::setNetworkSettings(bool use_proxy, bool auth, const QUrl &pro emit networkSettingsChanged(); } +EqSettings QmmpSettings::eqSettings() const +{ + return m_eq_settings; +} + +void QmmpSettings::setEqSettings(const EqSettings &settings) +{ + m_eq_settings = settings; + emit eqSettingsChanged(); +} + void QmmpSettings::sync() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); @@ -177,6 +193,11 @@ void QmmpSettings::sync() settings.setValue("Proxy/use_proxy", m_proxy_enabled); settings.setValue("Proxy/authentication", m_proxy_auth); settings.setValue("Proxy/url", m_proxy_url); + //equalizer settings + for (int i = 0; i < 10; ++i) + settings.setValue("Equalizer/band_"+ QString("%1").arg(i), m_eq_settings.gain(i)); + settings.setValue("Equalizer/preamp", m_eq_settings.preamp()); + settings.setValue("Equalizer/enabled", m_eq_settings.isEnabled()); } QmmpSettings* QmmpSettings::instance() diff --git a/src/qmmp/qmmpsettings.h b/src/qmmp/qmmpsettings.h index 0776a33f0..7dac60da7 100644 --- a/src/qmmp/qmmpsettings.h +++ b/src/qmmp/qmmpsettings.h @@ -24,6 +24,7 @@ #include #include #include +#include "eqsettings.h" /*! @brief The QmmpSettings class provides access to global settings. * @author Ilya Kotov @@ -131,6 +132,10 @@ public: * @param proxy Proxy url. */ void setNetworkSettings(bool use_proxy, bool auth, const QUrl &proxy); + + + EqSettings eqSettings() const; + void setEqSettings(const EqSettings &settings); /*! * Returns a pointer to the QmmpSettings instance. */ @@ -153,6 +158,10 @@ signals: * Emitted when network settings are changed. */ void networkSettingsChanged(); + /*! + * Emitted when equalizer settings are changed. + */ + void eqSettingsChanged(); private slots: void sync(); @@ -175,6 +184,8 @@ private: bool m_proxy_enabled; bool m_proxy_auth; QUrl m_proxy_url; + //equalizer settings + EqSettings m_eq_settings; static QmmpSettings* m_instance; diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index d2ce9b13c..483add591 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -42,17 +42,13 @@ SoundCore::SoundCore(QObject *parent) m_instance = this; m_decoder = 0; m_paused = false; - m_useEQ = false; m_update = false; m_block = false; - m_preamp = 0; m_vis = 0; m_parentWidget = 0; m_engine = 0; m_pendingEngine = 0; m_volumeControl = 0; - for (int i = 1; i < 10; ++i) - m_bands[i] = 0; m_handler = new StateHandler(this); connect(m_handler, SIGNAL(elapsedChanged(qint64)), SIGNAL(elapsedChanged(qint64))); connect(m_handler, SIGNAL(bitrateChanged(int)), SIGNAL(bitrateChanged(int))); @@ -65,10 +61,10 @@ SoundCore::SoundCore(QObject *parent) connect(m_handler, SIGNAL(aboutToFinish()), SIGNAL(aboutToFinish())); connect(m_handler, SIGNAL(bufferingProgress(int)), SIGNAL(bufferingProgress(int))); updateVolume(); + connect(QmmpSettings::instance(), SIGNAL(eqSettingsChanged()), SIGNAL(eqSettingsChanged())); connect(QmmpSettings::instance(), SIGNAL(audioSettingsChanged()), SLOT(updateVolume())); } - SoundCore::~SoundCore() { stop(); @@ -137,26 +133,14 @@ qint64 SoundCore::totalTime() const return (m_engine) ? m_engine->totalTime() : 0; } -void SoundCore::setEQ(double bands[10], double preamp) +EqSettings SoundCore::eqSettings() const { - for (int i = 0; i < 10; ++i) - m_bands[i] = bands[i]; - m_preamp = preamp; - if (m_engine) - { - m_engine->setEQ(m_bands, m_preamp); - m_engine->setEQEnabled(m_useEQ); - } + return QmmpSettings::instance()->eqSettings(); } -void SoundCore::setEQEnabled(bool on) +void SoundCore::setEqSettings(const EqSettings &settings) { - m_useEQ = on; - if (m_engine) - { - m_engine->setEQ(m_bands, m_preamp); - m_engine->setEQEnabled(on); - } + QmmpSettings::instance()->setEqSettings(settings); } void SoundCore::setVolume(int L, int R) @@ -238,8 +222,6 @@ bool SoundCore::enqueue(InputSource *s) connect(m_engine, SIGNAL(playbackFinished()), SIGNAL(finished())); } - setEQ(m_bands, m_preamp); - setEQEnabled(m_useEQ); if(m_engine->enqueue(s)) { if(state() == Qmmp::Stopped || state() == Qmmp::Buffering) @@ -274,8 +256,6 @@ bool SoundCore::enqueue(InputSource *s) return false; } connect(engine, SIGNAL(playbackFinished()), SIGNAL(finished())); - engine->setEQ(m_bands, m_preamp); - engine->setEQEnabled(m_useEQ); if (m_handler->state() == Qmmp::Playing || m_handler->state() == Qmmp::Paused) { if(m_pendingEngine) diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h index d1baf614a..474d63c0c 100644 --- a/src/qmmp/soundcore.h +++ b/src/qmmp/soundcore.h @@ -27,6 +27,7 @@ #include "visual.h" #include "qmmp.h" #include "qmmpsettings.h" +#include "eqsettings.h" class QIODevice; class VolumeControl; @@ -53,15 +54,10 @@ public: * Returns length in milliseconds */ qint64 totalTime() const; - /*! - * Sets equalizer settings. Each item of \p bands[] and \p reamp should be - * \b -20.0..20.0 - */ - void setEQ(double bands[10], double preamp); - /*! - * Enables equalizer if \p on is \b true or disables it if \p on is \b false - */ - void setEQEnabled(bool on); + + EqSettings eqSettings() const; + void setEqSettings(const EqSettings &settings); + /*! * Returns left volume level. */ @@ -187,6 +183,7 @@ signals: * @param right Right channel volume level. It should be \b [0..100] */ void volumeChanged(int left, int right); + void eqSettingsChanged(); /*! * Emitted before the playback ends. */ @@ -202,11 +199,8 @@ private: QString m_url; uint m_error; bool m_paused; - bool m_useEQ; bool m_update; bool m_block; - double m_preamp; - double m_bands[10]; Visual *m_vis; QList m_visuals; QWidget *m_parentWidget; diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index cc5266c12..16219ca0b 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -51,9 +51,8 @@ EqWidget::EqWidget (QWidget *parent) m_preamp = new EqSlider (this); connect (m_preamp,SIGNAL (sliderMoved (double)),SLOT (setPreamp ())); - m_on = new ToggleButton (this,Skin::EQ_BT_ON_N,Skin::EQ_BT_ON_P, - Skin::EQ_BT_OFF_N,Skin::EQ_BT_OFF_P); - connect (m_on, SIGNAL (clicked(bool)), SIGNAL(valueChanged())); + m_on = new ToggleButton (this,Skin::EQ_BT_ON_N,Skin::EQ_BT_ON_P, Skin::EQ_BT_OFF_N,Skin::EQ_BT_OFF_P); + connect (m_on, SIGNAL (clicked(bool)), SLOT(writeEq())); m_autoButton = new ToggleButton(this, Skin::EQ_BT_AUTO_1_N, Skin::EQ_BT_AUTO_1_P, Skin::EQ_BT_AUTO_0_N, Skin::EQ_BT_AUTO_0_P); @@ -61,11 +60,12 @@ EqWidget::EqWidget (QWidget *parent) m_presetsMenu = new QMenu(this); m_presetButton = new Button (this, Skin::EQ_BT_PRESETS_N, Skin::EQ_BT_PRESETS_P, Skin::CUR_EQNORMAL); connect(m_presetButton, SIGNAL(clicked()), SLOT(showPresetsMenu())); + connect(SoundCore::instance(), SIGNAL(eqSettingsChanged()), SLOT(readEq())); for (int i = 0; i<10; ++i) { m_sliders << new EqSlider (this); - connect (m_sliders.at (i), SIGNAL (sliderMoved (double)),SLOT (setGain())); + connect (m_sliders.at (i), SIGNAL (sliderMoved (double)),SLOT (writeEq())); } readSettings(); createActions(); @@ -102,16 +102,6 @@ void EqWidget::updatePositions() m_sliders.at (i)->move ((78+i*18)*r,38*r); } -double EqWidget::preamp() -{ - return m_preamp->value(); -} - -double EqWidget::gain (int g) -{ - return m_sliders.at (g)->value(); -} - void EqWidget::changeEvent (QEvent * event) { if (event->type() == QEvent::ActivationChange) @@ -151,17 +141,8 @@ void EqWidget::setMimimalMode(bool b) void EqWidget::readSettings() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup ("Equalizer"); - //geometry - move (settings.value ("pos", QPoint (100, 216)).toPoint()); - //equalizer - for (int i = 0; i < m_sliders.size(); ++i) - m_sliders.at(i)->setValue(settings.value("band_"+ - QString("%1").arg(i), 0).toDouble()); - m_preamp->setValue(settings.value("preamp", 0).toDouble()); - m_on->setON(settings.value("enabled", false).toBool()); - settings.endGroup(); - setGain(); + move (settings.value ("Equalizer/pos", QPoint (100, 216)).toPoint()); //geometry + readEq(); //equalizer presets QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat); for (int i = 1; true; ++i) @@ -213,15 +194,7 @@ void EqWidget::readSettings() void EqWidget::writeSettings() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup ("Equalizer"); - //geometry - settings.setValue ("pos", this->pos()); - //equalizer - for (int i = 0; i < m_sliders.size(); ++i) - settings.setValue("band_"+QString("%1").arg(i), m_sliders.at(i)->value()); - settings.setValue("preamp", m_preamp->value()); - settings.setValue("enabled",m_on->isChecked()); - settings.endGroup(); + settings.setValue ("Equalizer/pos", this->pos()); //geometry //equalizer presets QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat); eq_preset.clear (); @@ -255,25 +228,31 @@ void EqWidget::writeSettings() } } -void EqWidget::setPreamp () -{ - emit valueChanged(); -} - -void EqWidget::setGain() +void EqWidget::readEq() { m_eqg->clear(); + EqSettings eqSettings = SoundCore::instance()->eqSettings(); + m_preamp->setValue(eqSettings.preamp()); for (int i=0; i<10; ++i) { - int value = m_sliders.at(i)->value(); - m_eqg->addValue(value); + m_sliders.at(i)->setValue(eqSettings.gain(i)); + m_eqg->addValue(m_sliders.at(i)->value()); } - emit valueChanged(); + m_on->setON(eqSettings.isEnabled()); } -bool EqWidget::isEQEnabled() +void EqWidget::writeEq() { - return m_on->isChecked(); + m_eqg->clear(); + EqSettings eqSettings; + eqSettings.setPreamp(m_preamp->value()); + for (int i=0; i<10; ++i) + { + eqSettings.setGain(i,m_sliders.at(i)->value()); + m_eqg->addValue(m_sliders.at(i)->value()); + } + eqSettings.setEnabled(m_on->isChecked()); + SoundCore::instance()->setEqSettings(eqSettings); } void EqWidget::createActions() @@ -300,7 +279,7 @@ void EqWidget::reset() for (int i = 0; i < m_sliders.size(); ++i) m_sliders.at(i)->setValue(0); m_preamp->setValue(0); - setGain(); + writeEq(); } void EqWidget::showEditor() @@ -363,7 +342,8 @@ void EqWidget::setPreset(EQPreset* preset) for (int i = 0; i<10; ++i) m_sliders.at(i)->setValue(preset->gain(i)); m_preamp->setValue(preset->preamp()); - setGain(); + //setGain(); + writeEq(); } void EqWidget::deletePreset(EQPreset* preset) diff --git a/src/ui/eqwidget.h b/src/ui/eqwidget.h index 09ead5d9e..7d0fb6086 100644 --- a/src/ui/eqwidget.h +++ b/src/ui/eqwidget.h @@ -46,9 +46,6 @@ public: ~EqWidget(); - double preamp(); - double gain(int); - bool isEQEnabled(); /*! * necessary for auto-load presets */ @@ -56,13 +53,12 @@ public: void setMimimalMode(bool b = true); signals: - void valueChanged(); void closed(); private slots: void updateSkin(); - void setPreamp(); - void setGain(); + void readEq(); + void writeEq(); void showPresetsMenu(); void reset(); void showEditor(); diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 913a7d46a..4e92f9678 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -114,7 +114,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option connect(m_display,SIGNAL(shuffleToggled(bool)),m_pl_manager,SLOT(setShuffle(bool))); connect(m_display,SIGNAL(repeatableToggled(bool)),m_pl_manager,SLOT(setRepeatableList(bool))); - connect(m_equalizer, SIGNAL(valueChanged()), SLOT(updateEQ())); connect(m_jumpDialog,SIGNAL(playRequest()), SLOT(replay())); connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(showState(Qmmp::State))); @@ -129,7 +128,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option m_display->setPL(m_playlist); dock->updateDock(); m_pl_manager->currentPlayList()->doCurrentVisibleRequest(); - updateEQ(); #ifndef Q_OS_WIN32 QString cwd = QDir::currentPath(); processCommandArgs(args,cwd); @@ -196,15 +194,6 @@ void MainWindow::previous() m_player->previous(); } -void MainWindow::updateEQ() -{ - double b[10]; - for (int i=0; i<10; ++i) - b[i] = m_equalizer->gain(i); - m_core->setEQ(b, m_equalizer->preamp()); - m_core->setEQEnabled(m_equalizer->isEQEnabled()); -} - void MainWindow::showState(Qmmp::State state) { if(m_model) diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 1561030d7..0fdabdd7b 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -94,7 +94,6 @@ private slots: void showState(Qmmp::State state); void showMetaData(); void showSettings(); - void updateEQ(); void forward(); void backward(); void handleCloseRequest(); diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index 9c4c1be24..0e0deff3b 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset předvolba - + &Load/Delete &Načíst/Odstranit - + &Save Preset &Uložit předvolbu - + &Save Auto-load Preset Uložit &automatickou předvolbu - + &Import &Importovat - + &Clear &Vynulovat - + Saving Preset Uložení předvolby - + Preset name: Název předvolby: - + preset # předvolba # - + Import Preset Importovat předvolbu @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Výběr adresáře - + Select one or more files to open Vyberte jeden či více souborů k otevření - + &Play Pře&hrát - + X X - + &Pause Pau&za - + C C - + &Stop &Stop - + V V - + &Previous &Předchozí - + Z Z - + &Next &Další - + B B - + &Jump To File Přeskočit na soubo&r - + J J - + &Settings &Nastavení - + Ctrl+P Ctrl+P - + &About O &aplikaci - + &Exit U&končit - + Ctrl+Q Ctrl+Q - - + + Playlist Files Seznamy skladeb - + Open Playlist Načíst seznam skladeb - + Save Playlist Uložit seznam skladeb - + Space Mezerník - + &About Qt O knihovně &Qt - + &Play/Pause &Přehrát/Pauza - + All Supported Bitstreams Všechny podporované formáty - + &Repeat Track &Opakovat stopu - + &Shuffle Za&míchat - + R O - + Ctrl+R Ctrl+R - + S M - + &Repeat Playlist &Opakovat seznam skladeb - + Tools Nástroje diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index a5d9ab844..b6a29c80a 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset Voreinstellung - + &Load/Delete &Laden/Löschen - + &Save Preset &Voreinstellung speichern - + &Save Auto-load Preset &Automatische Voreinstellungen speichern - + &Import &Importieren - + &Clear &Zurücksetzen - + Saving Preset Voreinstellung speichern - + Preset name: Name der Voreinstellung: - + preset # Voreinstellung # - + Import Preset Voreinstellung importieren @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Verzeichnis wählen - + Select one or more files to open Dateien hinzufügen - + &Play &Wiedergabe - + X X - + &Pause &Pause - + C C - + &Stop &Stopp - + V V - + &Previous &Vorheriger Titel - + Z Z - + &Next &Nächster Titel - + B B - + &Jump To File Springe zu &Titel - + J J - + &Settings &Einstellungen - + Ctrl+P Strg+P - + &About Ü&ber - + &Exit Be&enden - + Ctrl+Q Strg+Q - - + + Playlist Files Wiedergabelisten - + Open Playlist Wiedergabeliste öffnen - + Save Playlist Wiedergabeliste speichern - + Space Leertaste - + &About Qt Übe&r Qt - + &Play/Pause Wieder&gabe/Pause - + All Supported Bitstreams Alle unterstützten Formate - + &Repeat Track Tite&l wiederholen - + &Shuffle &Zufallswiedergabe - + R R - + Ctrl+R Strg+R - + S S - + &Repeat Playlist W&iedergabeliste wiederholen - + Tools Werkzeuge diff --git a/src/ui/translations/qmmp_hu.ts b/src/ui/translations/qmmp_hu.ts index fdf7e9499..e20f77ef1 100644 --- a/src/ui/translations/qmmp_hu.ts +++ b/src/ui/translations/qmmp_hu.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset beállítás - + &Load/Delete &Betölt/Töröl - + &Save Preset Beálítás &mentése - + &Save Auto-load Preset &Automatikusan betöltödő beállítás mentése - + &Import &Importálás - + &Clear &Törlés - + Saving Preset Beállítások mentése - + Preset name: Beállítás neve: - + preset # beállítás # - + Import Preset Beállítás importálása @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Válassz egy könyvtárat - + All Supported Bitstreams Minden támogatott bitráta - + Select one or more files to open Válassz egy vagy több fájlat megnyitásra - + &Play &Lejátszás - + X X - + &Pause &Szünet - + C C - + &Stop &Megállítás - + V V - + &Previous &Előző - + Z Z - + &Next &Következő - + B B - + &Play/Pause &Lejátszás/Szünet - + Space Szóköz - + &Repeat Playlist Lista &ismétlése - + &Repeat Track Számok i&smétlése - + &Shuffle &Véletlenszerű - + R - + Ctrl+R Crtl+R - + S S - + &Jump To File &Ugrás fájlra - + J J - + Tools Eszközök - + &Settings &Beállítások - + Ctrl+P Ctrl+P - + &About &Névjegy - + &About Qt N&évjegy: Qt - + &Exit &Kilépés - + Ctrl+Q Ctrl+Q - - + + Playlist Files Lejátszási lista fájl - + Open Playlist Lista megnyitása - + Save Playlist Lista mentése diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 1b4e1fc69..f39de974c 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset Impostazione - + &Load/Delete &Carica/Elimina - + &Save Preset &Salva preimpostazione - + &Save Auto-load Preset &Salvare preimpostazioni caricate automaticamente - + &Clear &Cancella - + Saving Preset Salvataggio preimpostazioni - + Preset name: Nome delle preimpostazioni: - + preset # Preimpostazione # - + &Import &Importa - + Import Preset Importa preimpostazione @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Scegliere una cartella - + Select one or more files to open Seleziona uno o più brani da aprire - + &Play &Esegui - + X X - + &Pause &Pausa - + C C - + &Stop &Arresta - + V V - + &Previous &Precedente - + Z Z - + &Next &Successivo - + B B - + &Jump To File &Vai al brano - + J J - + &Settings &Configurazione - + Ctrl+P Ctrl+P - + &Exit &Esci - + Ctrl+Q Ctrl+Q - + Open Playlist Apri lista di brani - + Save Playlist Salva lista di brani - + &About &Informazioni - - + + Playlist Files Brani della lista - + Space Spazio - + &About Qt &Informazioni su Qt - + &Play/Pause &Esegui / Pausa - + All Supported Bitstreams Elenco di tutti i tipi di flusso accettati - + &Repeat Track &Ripeti brano - + &Shuffle &Ordine casuale - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist &Ripeti lista brani - + Tools Strumenti diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index 6604c8acf..3f7691199 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -634,53 +634,53 @@ EqWidget - - + + preset Nustatymas - + &Load/Delete &Įkelti/Pašalinti - + &Save Preset &Išsaugoti nustatymus - + &Save Auto-load Preset &Išsaugoti auto-nustatymą - + &Clear &išvalyti - + Saving Preset Išsaugojamas nustatymas - + Preset name: Nustatymo pavadinimas: - + preset # Nustatymas # - + &Import &Importuoti - + Import Preset Importuoti nustatymus @@ -935,168 +935,168 @@ MainWindow - + Choose a directory Pasirinkite aplanką - + Select one or more files to open Pasirinkite vieną ar kelias bylas atvėrimui - + &Play &Groti - + X - + &Pause &Pristabdyti - + C - + &Stop &Sustabdyti - + V - + &Previous &Ankstesnis - + Z - + &Next &Sekantis - + B - + &Jump To File &Pereiti prie bylos - + J - + &Settings &Nustatymai - + Ctrl+P - + &Exit &Išeiti - + Ctrl+Q - + Open Playlist Atverti grojaraštį - + Save Playlist Išsaugoti grojaraštį - + &About &Apie - - + + Playlist Files Grojaraščio bylos - + Space - + &About Qt &Apie Qt - + &Play/Pause &Groti/Pristabdyti - + All Supported Bitstreams Palaikomi bylų tipai - + &Repeat Track &Kartoti takelį - + &Shuffle &Atsitiktine tvarka - + R - + Ctrl+R - + S - + &Repeat Playlist &Kartoti grojaraštį - + Tools Įrankiai diff --git a/src/ui/translations/qmmp_nl.ts b/src/ui/translations/qmmp_nl.ts index e4d9caba4..35fe607c2 100644 --- a/src/ui/translations/qmmp_nl.ts +++ b/src/ui/translations/qmmp_nl.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset voorinstelling - + &Load/Delete &Laad/Verwijder - + &Save Preset &Bewaar Instelling - + &Save Auto-load Preset &Bewaar Auto-laad Instelling - + &Import &Importeer - + &Clear &Leeghalen - + Saving Preset Bewaren van Preset - + Preset name: Instellingnaam: - + preset # instelling # - + Import Preset Importer Instelling @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Kies een map - + Select one or more files to open Kies een of meer bestanden om te openen - + &Play &Afspelen - + X X - + &Pause &Pauze - + C C - + &Stop &Stop - + V V - + &Previous &Vorige - + Z Z - + &Next &Volgende - + B B - + &Jump To File &Spring Naar Bestand - + J J - + &Settings &Instellingen - + Ctrl+P Ctrl+P - + &About &Over - + &Exit &Sluit - + Ctrl+Q Ctrl+Q - - + + Playlist Files Afspeellijst Bestanden - + Open Playlist Open Afspeellijst - + Save Playlist Bewaar Afspeellijst - + Space Spatie - + &About Qt &Over Qt - + &Play/Pause &Afspelen/Pauze - + All Supported Bitstreams Alle Ondersteunde Bitstromen - + &Repeat Track &Herhaal Nummer - + &Shuffle &Willekeurig - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist &Herhaal Afspeellijst - + Tools Gereedschappen diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index 5cf6523db..64ac57708 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset profil - + &Load/Delete Wczytaj/&Usuń - + &Save Preset Zapi&sz Profil - + &Save Auto-load Preset Zapi&sz Auto-ładowanie Profilu - + &Clear &Wyczyść - + Saving Preset Zapisywanie Profilu - + Preset name: Nazwa Profilu: - + preset # profil # - + &Import &Importuj - + Import Preset Importuj Profil @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Wybierz katalog - + Select one or more files to open Wybierz jeden lub więcej plików do otwarcia - + &Play &Odtwarzaj - + X X - + &Pause &Wstrzymaj - + C C - + &Stop &Zatrzymaj - + V V - + &Previous &Poprzedni - + Z Z - + &Next &Następny - + B B - + &Jump To File &Skocz do pliku - + J J - + &Settings &Ustawienia - + Ctrl+P Ctrl+P - + &Exit &Wyjście - + Ctrl+Q Ctrl+Q - + Open Playlist Otwórz listę odtwarzania - + Save Playlist Zapisz listę odtwarzania - + &About &O programie - - + + Playlist Files Pliki listy odtwarzania - + Space - + &About Qt &O Qt - + &Play/Pause &Odtwarzaj/Wstrzymaj - + All Supported Bitstreams Wszystkie wspierane formaty - + &Repeat Track &Powtórz utwór - + &Shuffle &Losowo - + R - + Ctrl+R - + S - + &Repeat Playlist Powtó&rz listę odtwarzania - + Tools Narzędzia diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index e823d07d9..b562b14d8 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset preset - + &Load/Delete &Carregar/Deletar - + &Save Preset %Salvar preset - + &Save Auto-load Preset &Salvar Auto-Carregar preset - + &Clear &Limpar - + Saving Preset Salvando Preset - + Preset name: Nome Preset: - + preset # Preset # - + &Import &Importar - + Import Preset Importar Preset @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Escolher o diretorio - + Select one or more files to open Selecionar um ou mais arquivos - + &Play Tocar - + X - + &Pause Pausar - + C - + &Stop Parar - + V - + &Previous Anterior - + Z - + &Next Próximo - + B - + &Jump To File Pular para arquivo - + J - + &Settings Configurações - + Ctrl+P - + &Exit Sair - + Ctrl+Q - + Open Playlist Abrir Playlist - + Save Playlist Salvar Playlist - + &About &Sobre - - + + Playlist Files ФArquivos de lista de músicas - + Space - + &About Qt - + &Play/Pause - + All Supported Bitstreams - + &Repeat Track - + &Shuffle - + R - + Ctrl+R - + S - + &Repeat Playlist - + Tools diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 865f11a8c..776b9fe7d 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset предустановка - + &Load/Delete &Загрузить/Удалить - + &Save Preset &Сохранить предустановку - + &Save Auto-load Preset &Сохранить авто-предустановку - + &Clear &Очистить - + Saving Preset Сохранение предустановки - + Preset name: Имя предустановки: - + preset # предустановка # - + &Import &Импортировать - + Import Preset Импорт предустановки @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Выберите директорию - + Select one or more files to open Выберите один или несколько файлов - + &Play &Воспроизвести - + X - + &Pause &Приостановить - + C - + &Stop &Стоп - + V - + &Previous &Предыдущий фрагмент - + Z - + &Next &Следующий фрагмент - + B - + &Jump To File &Перейти к файлу - + J - + &Settings &Настройки - + Ctrl+P - + &Exit &Выход - + Ctrl+Q - + Open Playlist Открыть список - + Save Playlist Сохранить список - + &About &О программе - - + + Playlist Files Файлы списков - + Space - + &About Qt &О библиотеке Qt - + &Play/Pause &Воспр/приост - + All Supported Bitstreams Все форматы - + &Repeat Track &Повторять трек - + &Shuffle &В случайном порядке - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторять список - + Tools Сервис diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index c7512864d..908748c52 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset tanımlanmış ayar - + &Load/Delete &Yükle/Sil - + &Save Preset Tanımlanmış &Ayarları Kaydet - + &Save Auto-load Preset &Otomatik Tanımlanmış Ayarları Kaydet - + &Clear &Temizle - + Saving Preset Tanımlanmış Ayarla Kaydediliyor - + Preset name: Tanımlanmış ayar adı: - + preset # tanımlanmış ayar # - + &Import &İçe Aktar - + Import Preset Tanımlanmış Ayarları Al @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Bir dizin seçin - + Select one or more files to open Açmak için bir yada daha çok dosya seçin - + &Play &Çal - + X X - + &Pause &Duraklat - + C C - + &Stop &Durdur - + V V - + &Previous &Önceki - + Z Z - + &Next &Sonraki - + B B - + &Jump To File &Parçaya Git - + J J - + &Settings &Ayarlar - + Ctrl+P Ctrl+P - + &Exit &Çıkış - + Ctrl+Q Ctrl+Q - + Open Playlist Çalma Listesini Aç - + Save Playlist Çalma Listesini Kaydet - + &About &Hakkında - - + + Playlist Files Çalma Listesi Dosyaları - + Space Boşluk - + &About Qt &Qt Hakkında - + &Play/Pause &Oynat/Duraklat - + All Supported Bitstreams Tüm Desteklenen Bitstreamler - + &Repeat Track &Parçayı Yinele - + &Shuffle &Rastgele - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist &Çalma Listesini Yinele - + Tools Araçlar diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index a7e9d89d9..a922810f6 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset предвстановлення - + &Load/Delete &Завантажити/Видалити - + &Save Preset &Зберегти предвстановлення - + &Save Auto-load Preset &Зберегти авто-предвстановлення - + &Clear &Очистити - + Saving Preset Збережені предвстановлення - + Preset name: Ім'я предвстановлення: - + preset # предвстановлення # - + &Import &Імпортувати - + Import Preset Імпорт предвстановлення @@ -934,168 +934,168 @@ MainWindow - + Choose a directory Виберіть теку - + Select one or more files to open Виберіть один чи кілька файлів - + &Play &Відтворити - + X - + &Pause &Пауза - + C - + &Stop &Стоп - + V - + &Previous &Назад - + Z - + &Next &Вперед - + B - + &Jump To File &Перейти до файлу - + J - + &Settings &Налаштування - + Ctrl+P - + &Exit &Вихід - + Ctrl+Q - + Open Playlist Відкрити список - + Save Playlist Зберегти список - + &About &Про програму - - + + Playlist Files Файли списків - + Space - + &About Qt &Про Qt - + &Play/Pause &Грати/Пауза - + All Supported Bitstreams Усі формати - + &Repeat Track &Повторити трек - + &Shuffle &Перемішати - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторити список - + Tools Утиліти diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index fc71fe8f2..9d50908c6 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset 预设 - + &Load/Delete 载入/删除(&L) - + &Save Preset 保存预设(&S) - + &Save Auto-load Preset 保存自动载入预设(&S) - + &Clear 清除(&C) - + Saving Preset 保存预设 - + Preset name: 预设名称： - + preset # 预设 # - + &Import 导入(&I) - + Import Preset 导入预设 @@ -934,168 +934,168 @@ MainWindow - + Choose a directory 选择一个目录 - + Select one or more files to open 选择打开一个或更多文件 - + &Play 播放(&P) - + X X - + &Pause 暂停(&P) - + C C - + &Stop 停止(&S) - + V V - + &Previous 上一曲(&P) - + Z Z - + &Next 下一曲(&N) - + B B - + &Jump To File 跳到文件(&J) - + J J - + &Settings 设置(&S) - + Ctrl+P Ctrl+P - + &Exit 退出(&E) - + Ctrl+Q Ctrl+Q - + Open Playlist 打开播放列表 - + Save Playlist 保存播放列表 - + &About 关于(&A) - - + + Playlist Files 播放列表文件 - + Space 空格 - + &About Qt 关于 Qt (&A) - + &Play/Pause 播放/暂停(&P) - + All Supported Bitstreams 支持的全部文件 - + &Repeat Track 重复音轨(&R) - + &Shuffle 乱序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重复播放列表(&R) - + Tools 工具 diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index cb59b4f03..8a21f8e50 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -633,53 +633,53 @@ EqWidget - - + + preset 預設 - + &Load/Delete 載入/移除(&L) - + &Save Preset 儲存預設(&S) - + &Save Auto-load Preset 儲存自動載入預設(&S) - + &Clear 清除(&C) - + Saving Preset 儲存預設 - + Preset name: 預設名稱： - + preset # 預設 # - + &Import 導入(&I) - + Import Preset 導入預設 @@ -934,168 +934,168 @@ MainWindow - + Choose a directory 選取一個目錄 - + Select one or more files to open 選取開啟一個或更多檔案 - + &Play 播放(&P) - + X X - + &Pause 暫停(&P) - + C C - + &Stop 停止(&S) - + V V - + &Previous 上一曲(&P) - + Z Z - + &Next 下一曲(&N) - + B B - + &Jump To File 跳到檔案(&J) - + J J - + &Settings 設定(&S) - + Ctrl+P Ctrl+P - + &Exit 結束(&E) - + Ctrl+Q Ctrl+Q - + Open Playlist 開啟播放清單 - + Save Playlist 儲存播放清單 - + &About 關於(&A) - - + + Playlist Files 播放清單檔案 - + Space 空格 - + &About Qt 關於 Qt (&A) - + &Play/Pause 播放/暫停(&P) - + All Supported Bitstreams 支援的全部檔案 - + &Repeat Track 重復音軌(&R) - + &Shuffle 亂序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重復播放清單(&R) - + Tools 工具 -- cgit v1.2.3-13-gbd6f