updated bs2b plugin, removed libbs2b-2.x support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@895 90c681e8-e032-0410-971d-27865f9a5e38

13 files changed, 323 insertions, 210 deletions

diff --git a/src/plugins/Effect/bs2b/CMakeLists.txt b/src/plugins/Effect/bs2b/CMakeLists.txt
index 57f5f44d5..21c6f63da 100644
--- a/src/plugins/Effect/bs2b/CMakeLists.txt
+++ b/src/plugins/Effect/bs2b/CMakeLists.txt
@@ -50,6 +50,11 @@ QT4_WRAP_CPP(libbs2b_MOC_SRCS ${libbs2b_MOC_HDRS})
 
 pkg_search_module(BS2B libbs2b)
 
+IF(BS2B_VERSION VERSION_LESS 3.0.0)
+UNSET(BS2B_FOUND CACHE)
+ENDIF(BS2B_VERSION VERSION_LESS 3.0.0)
+
+
 # user interface
 
 
diff --git a/src/plugins/Effect/bs2b/bs2bplugin.cpp b/src/plugins/Effect/bs2b/bs2bplugin.cpp
index 494ee43b7..45785e921 100644
--- a/src/plugins/Effect/bs2b/bs2bplugin.cpp
+++ b/src/plugins/Effect/bs2b/bs2bplugin.cpp
@@ -24,19 +24,22 @@
 #include <qmmp/qmmp.h>
 #include "bs2bplugin.h"
 
+Bs2bPlugin *Bs2bPlugin::m_instance = 0;
+
 Bs2bPlugin::Bs2bPlugin(QObject* parent) : Effect(parent)
 {
+    m_instance = this;
     m_bs2b_handler = bs2b_open();
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    bs2b_set_level(m_bs2b_handler, settings.value("bs2b/level", BS2B_DEFAULT_CLEVEL).toInt());
+    bs2b_set_level(m_bs2b_handler, settings.value("bs2b/level", BS2B_DEFAULT_CLEVEL).toUInt());
 }
 
 Bs2bPlugin::~Bs2bPlugin()
 {
+    m_instance = 0;
     bs2b_clear(m_bs2b_handler);
 }
 
-#if (BS2B_VERSION_INT) >= 0x030000
 #define CASE_BS2B(bitsPerSample, dataType, functionToCall, samples, out_data) \
     case bitsPerSample: \
         { \
@@ -44,19 +47,6 @@ Bs2bPlugin::~Bs2bPlugin()
             functionToCall(m_bs2b_handler, data, samples); \
         } \
         break;
-#else
-#define CASE_BS2B(bitsPerSample, dataType, functionToCall, samples, out_data) \
-    case bitsPerSample: \
-        { \
-            dataType * data = reinterpret_cast<dataType *>(*out_data); \
-            while (samples--) { \
-                functionToCall(m_bs2b_handler, data); \
-                data += 2; \
-            } \
-        } \
-        break;
-
-#endif
 
 ulong Bs2bPlugin::process(char *in_data, const ulong size, char **out_data)
 {
@@ -65,23 +55,17 @@ ulong Bs2bPlugin::process(char *in_data, const ulong size, char **out_data)
         return size;
 
     uint samples = size / (bitsPerSample() / 8) / 2;
-
+    m_mutex.lock();
     switch (bitsPerSample())
     {
-#if (BS2B_VERSION_INT) >= 0x030000
         CASE_BS2B(8,  int8_t,  bs2b_cross_feed_s8, samples, out_data)
         CASE_BS2B(16, int16_t, bs2b_cross_feed_s16le, samples, out_data)
         CASE_BS2B(24, bs2b_int24_t, bs2b_cross_feed_s24, samples, out_data)
         CASE_BS2B(32, int32_t,  bs2b_cross_feed_s32le, samples, out_data)
-#else
-        CASE_BS2B(8,  char,  bs2b_cross_feed_s8, samples, out_data)
-        CASE_BS2B(16, short, bs2b_cross_feed_16, samples, out_data)
-        CASE_BS2B(32, long,  bs2b_cross_feed_32, samples, out_data)
-#endif
     default:
         ; // noop
     }
-
+    m_mutex.unlock();
     return size;
 }
 
@@ -90,3 +74,15 @@ void Bs2bPlugin::configure(quint32 freq, int chan, int res)
     Effect::configure(freq, chan, res);
     bs2b_set_srate(m_bs2b_handler,freq);
 }
+
+void Bs2bPlugin::setCrossfeedLevel(uint32_t level)
+{
+    m_mutex.lock();
+    bs2b_set_level(m_bs2b_handler, level);
+    m_mutex.unlock();
+}
+
+Bs2bPlugin* Bs2bPlugin::instance()
+{
+    return m_instance;
+}
diff --git a/src/plugins/Effect/bs2b/bs2bplugin.h b/src/plugins/Effect/bs2b/bs2bplugin.h
index 1ac94323f..02590d157 100644
--- a/src/plugins/Effect/bs2b/bs2bplugin.h
+++ b/src/plugins/Effect/bs2b/bs2bplugin.h
@@ -20,6 +20,7 @@
 #ifndef BS2BPLUGIN_H
 #define BS2BPLUGIN_H
 
+#include <QMutex>
 #include <bs2b/bs2b.h>
 #include <qmmp/effect.h>
 
@@ -37,9 +38,13 @@ public:
 
     ulong process(char *in_data, const ulong size, char **out_data);
     void configure(quint32 freq, int chan, int res);
+    void setCrossfeedLevel(uint32_t level);
+    static Bs2bPlugin* instance();
 
 private:
     t_bs2bdp m_bs2b_handler;
+    QMutex m_mutex;
+    static Bs2bPlugin *m_instance;
 };
 
 #endif
diff --git a/src/plugins/Effect/bs2b/settingsdialog.cpp b/src/plugins/Effect/bs2b/settingsdialog.cpp
index 68f3ecd3f..9d29a1a77 100644
--- a/src/plugins/Effect/bs2b/settingsdialog.cpp
+++ b/src/plugins/Effect/bs2b/settingsdialog.cpp
@@ -21,7 +21,7 @@
 #include <QSettings>
 #include <bs2b/bs2b.h>
 #include <qmmp/qmmp.h>
-
+#include "bs2bplugin.h"
 #include "settingsdialog.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent)
@@ -29,16 +29,12 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 {
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose, TRUE);
+    ui.feedSlider->setRange(BS2B_MINFEED, BS2B_MAXFEED);
+    ui.freqSlider->setRange(BS2B_MINFCUT, BS2B_MAXFCUT);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    ui.levelComboBox->addItem (tr("low"), BS2B_LOW_CLEVEL);
-    ui.levelComboBox->addItem (tr("middle"), BS2B_MIDDLE_CLEVEL);
-    ui.levelComboBox->addItem (tr("high"), BS2B_HIGH_CLEVEL);
-    ui.levelComboBox->addItem (tr("low (easy version)"), BS2B_LOW_ECLEVEL);
-    ui.levelComboBox->addItem (tr("middle (easy version)"), BS2B_MIDDLE_ECLEVEL);
-    ui.levelComboBox->addItem (tr("high (easy version) [default]"), BS2B_HIGH_ECLEVEL);
-    int index = ui.levelComboBox->findData(settings.value("bs2b/level", BS2B_DEFAULT_CLEVEL).toInt());
-    if (index >= 0)
-        ui.levelComboBox->setCurrentIndex(index);
+    m_level = settings.value("bs2b/level", BS2B_DEFAULT_CLEVEL).toUInt();
+    ui.feedSlider->setValue(m_level >> 16);
+    ui.freqSlider->setValue(m_level & 0xffff);
 }
 
 SettingsDialog::~SettingsDialog()
@@ -48,6 +44,45 @@ SettingsDialog::~SettingsDialog()
 void SettingsDialog::accept()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    settings.setValue("bs2b/level", ui.levelComboBox->itemData(ui.levelComboBox->currentIndex()).toInt());
+    settings.setValue("bs2b/level", ui.feedSlider->value() << 16 | ui.freqSlider->value());
     QDialog::accept();
 }
+
+void SettingsDialog::SettingsDialog::reject()
+{
+    if (Bs2bPlugin::instance()) //restore crossfeed settings
+        Bs2bPlugin::instance()->setCrossfeedLevel(m_level);
+    QDialog::reject();
+}
+
+void SettingsDialog::on_freqSlider_valueChanged (int value)
+{
+    ui.freqLabel->setText(QString(tr("%1 Hz, %2 us")).arg(value).arg(bs2b_level_delay(value)));
+    if (Bs2bPlugin::instance())
+        Bs2bPlugin::instance()->setCrossfeedLevel(ui.feedSlider->value() << 16 | ui.freqSlider->value());
+}
+
+void SettingsDialog::on_feedSlider_valueChanged (int value)
+{
+    ui.feedLabel->setText(QString(tr("%1 dB")).arg((double)value/10));
+    if (Bs2bPlugin::instance())
+        Bs2bPlugin::instance()->setCrossfeedLevel(ui.feedSlider->value() << 16 | ui.freqSlider->value());
+}
+
+void SettingsDialog::on_defaultButton_pressed()
+{
+    ui.feedSlider->setValue(BS2B_DEFAULT_CLEVEL >> 16);
+    ui.freqSlider->setValue(BS2B_DEFAULT_CLEVEL & 0xffff);
+}
+
+void SettingsDialog::on_cmButton_pressed ()
+{
+    ui.feedSlider->setValue(BS2B_CMOY_CLEVEL >> 16);
+    ui.freqSlider->setValue(BS2B_CMOY_CLEVEL & 0xffff);
+}
+
+void SettingsDialog::on_jmButton_pressed ()
+{
+    ui.feedSlider->setValue(BS2B_JMEIER_CLEVEL >> 16);
+    ui.freqSlider->setValue(BS2B_JMEIER_CLEVEL & 0xffff);
+}
diff --git a/src/plugins/Effect/bs2b/settingsdialog.h b/src/plugins/Effect/bs2b/settingsdialog.h
index 0cc842fb4..8c0dd74f8 100644
--- a/src/plugins/Effect/bs2b/settingsdialog.h
+++ b/src/plugins/Effect/bs2b/settingsdialog.h
@@ -37,9 +37,18 @@ public:
 
 public slots:
     virtual void accept();
+    virtual void reject();
+
+private slots:
+    void on_freqSlider_valueChanged (int value);
+    void on_feedSlider_valueChanged (int value);
+    void on_defaultButton_pressed();
+    void on_cmButton_pressed ();
+    void on_jmButton_pressed ();
 
 private:
     Ui::SettingsDialog ui;
+    uint32_t m_level;
 
 };
 
diff --git a/src/plugins/Effect/bs2b/settingsdialog.ui b/src/plugins/Effect/bs2b/settingsdialog.ui
index 72f54da02..8d7b5298c 100644
--- a/src/plugins/Effect/bs2b/settingsdialog.ui
+++ b/src/plugins/Effect/bs2b/settingsdialog.ui
@@ -6,58 +6,113 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>293</width>
-    <height>69</height>
+    <width>383</width>
+    <height>123</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>BS2B Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>6</number>
    </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
    <property name="rightMargin">
     <number>6</number>
    </property>
    <property name="bottomMargin">
     <number>6</number>
    </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Crossfeed level:</string>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Crossfeed level</string>
      </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QSlider" name="feedSlider">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="feedLabel">
+        <property name="text">
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QSlider" name="freqSlider">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="freqLabel">
+        <property name="text">
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="levelComboBox"/>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>228</width>
-       <height>24</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="defaultButton">
+       <property name="text">
+        <string>Default</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cmButton">
+       <property name="text">
+        <string>C.Moy</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="jmButton">
+       <property name="text">
+        <string>J. Meier</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>142</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts
index 375716be7..9febe1683 100644
--- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts
+++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts
@@ -47,43 +47,44 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="33"/>
-        <source>low</source>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>BS2B Plugin Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="34"/>
-        <source>middle</source>
+        <location filename="../settingsdialog.ui" line="32"/>
+        <source>Crossfeed level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="35"/>
-        <source>high</source>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <location filename="../settingsdialog.ui" line="59"/>
+        <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="36"/>
-        <source>low (easy version)</source>
+        <location filename="../settingsdialog.ui" line="71"/>
+        <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="37"/>
-        <source>middle (easy version)</source>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>C.Moy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="38"/>
-        <source>high (easy version) [default]</source>
+        <location filename="../settingsdialog.ui" line="85"/>
+        <source>J. Meier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="14"/>
-        <source>BS2B Plugin Settings</source>
+        <location filename="../settingsdialog.cpp" line="60"/>
+        <source>%1 Hz, %2 us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="29"/>
-        <source>Crossfeed level:</source>
+        <location filename="../settingsdialog.cpp" line="67"/>
+        <source>%1 dB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts
index 2b06a190e..3a0673f37 100644
--- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts
+++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts
@@ -48,43 +48,44 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="33"/>
-        <source>low</source>
-        <translation>Niedrig</translation>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>BS2B Plugin Settings</source>
+        <translation>Einstellungen des BS2B-Plugins</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="34"/>
-        <source>middle</source>
-        <translation>Mittel</translation>
+        <location filename="../settingsdialog.ui" line="32"/>
+        <source>Crossfeed level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="35"/>
-        <source>high</source>
-        <translation>Hoch</translation>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <location filename="../settingsdialog.ui" line="59"/>
+        <source>-</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="36"/>
-        <source>low (easy version)</source>
+        <location filename="../settingsdialog.ui" line="71"/>
+        <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="37"/>
-        <source>middle (easy version)</source>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>C.Moy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="38"/>
-        <source>high (easy version) [default]</source>
+        <location filename="../settingsdialog.ui" line="85"/>
+        <source>J. Meier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="14"/>
-        <source>BS2B Plugin Settings</source>
-        <translation>Einstellungen des BS2B-Plugins</translation>
+        <location filename="../settingsdialog.cpp" line="60"/>
+        <source>%1 Hz, %2 us</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="29"/>
-        <source>Crossfeed level:</source>
+        <location filename="../settingsdialog.cpp" line="67"/>
+        <source>%1 dB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl.ts
index 0b6084f45..b1913ed69 100644
--- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl.ts
+++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl.ts
@@ -47,44 +47,45 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="33"/>
-        <source>low</source>
-        <translation>niska</translation>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>BS2B Plugin Settings</source>
+        <translation>Ustawienia wtyczki BS2B</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="34"/>
-        <source>middle</source>
-        <translation>średnia</translation>
+        <location filename="../settingsdialog.ui" line="32"/>
+        <source>Crossfeed level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="35"/>
-        <source>high</source>
-        <translation>wysoka</translation>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <location filename="../settingsdialog.ui" line="59"/>
+        <source>-</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="36"/>
-        <source>low (easy version)</source>
-        <translation>niska (łatwa wersja)</translation>
+        <location filename="../settingsdialog.ui" line="71"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="37"/>
-        <source>middle (easy version)</source>
-        <translation>średnia (łatwa wersja)</translation>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>C.Moy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="38"/>
-        <source>high (easy version) [default]</source>
-        <translation>wysoka (łatwa wersja)</translation>
+        <location filename="../settingsdialog.ui" line="85"/>
+        <source>J. Meier</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="14"/>
-        <source>BS2B Plugin Settings</source>
-        <translation>Ustawienia wtyczki BS2B</translation>
+        <location filename="../settingsdialog.cpp" line="60"/>
+        <source>%1 Hz, %2 us</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="29"/>
-        <source>Crossfeed level:</source>
-        <translation>Poziom Crossfeed:</translation>
+        <location filename="../settingsdialog.cpp" line="67"/>
+        <source>%1 dB</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts
index 4bd1d222d..19c4f3f87 100644
--- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts
+++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts
@@ -47,44 +47,45 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="33"/>
-        <source>low</source>
-        <translation>низкий</translation>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>BS2B Plugin Settings</source>
+        <translation>Настройки модуля BS2B</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="34"/>
-        <source>middle</source>
-        <translation>средний</translation>
+        <location filename="../settingsdialog.ui" line="32"/>
+        <source>Crossfeed level</source>
+        <translation>Уровень взаимосмешения</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="35"/>
-        <source>high</source>
-        <translation>высокий</translation>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <location filename="../settingsdialog.ui" line="59"/>
+        <source>-</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="36"/>
-        <source>low (easy version)</source>
-        <translation>низкий (упрощённая версия)</translation>
+        <location filename="../settingsdialog.ui" line="71"/>
+        <source>Default</source>
+        <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="37"/>
-        <source>middle (easy version)</source>
-        <translation>средний (упрощённая версия)</translation>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>C.Moy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="38"/>
-        <source>high (easy version) [default]</source>
-        <translation>выскоий (упр. версия) [по-умолчанию]</translation>
+        <location filename="../settingsdialog.ui" line="85"/>
+        <source>J. Meier</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="14"/>
-        <source>BS2B Plugin Settings</source>
-        <translation>Настройки модуля BS2B</translation>
+        <location filename="../settingsdialog.cpp" line="60"/>
+        <source>%1 Hz, %2 us</source>
+        <translation>%1 Гц, %2 мкс</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="29"/>
-        <source>Crossfeed level:</source>
-        <translation>Уровень взаимосмешения:</translation>
+        <location filename="../settingsdialog.cpp" line="67"/>
+        <source>%1 dB</source>
+        <translation>%1 дБ</translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts
index 5711e4722..71de1fb3c 100644
--- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts
+++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="uk">
+<!DOCTYPE TS>
+<TS version="2.0" language="uk">
 <defaultcodec></defaultcodec>
 <context>
     <name>EffectBs2bFactory</name>
@@ -47,44 +48,45 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="33"/>
-        <source>low</source>
-        <translation>низький</translation>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>BS2B Plugin Settings</source>
+        <translation>Налаштування модуля BS2B</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="34"/>
-        <source>middle</source>
-        <translation>середній</translation>
+        <location filename="../settingsdialog.ui" line="32"/>
+        <source>Crossfeed level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="35"/>
-        <source>high</source>
-        <translation>високий</translation>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <location filename="../settingsdialog.ui" line="59"/>
+        <source>-</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="36"/>
-        <source>low (easy version)</source>
-        <translation>низький (спрощена версія)</translation>
+        <location filename="../settingsdialog.ui" line="71"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="37"/>
-        <source>middle (easy version)</source>
-        <translation>середній (спрощена версія)</translation>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>C.Moy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="38"/>
-        <source>high (easy version) [default]</source>
-        <translation>високий (спрощена версія) [за умовчанням]</translation>
+        <location filename="../settingsdialog.ui" line="85"/>
+        <source>J. Meier</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="14"/>
-        <source>BS2B Plugin Settings</source>
-        <translation>Налаштування модуля BS2B</translation>
+        <location filename="../settingsdialog.cpp" line="60"/>
+        <source>%1 Hz, %2 us</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="29"/>
-        <source>Crossfeed level:</source>
-        <translation>Рівень взаємозмішування:</translation>
+        <location filename="../settingsdialog.cpp" line="67"/>
+        <source>%1 dB</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts
index 375716be7..9febe1683 100644
--- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts
+++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts
@@ -47,43 +47,44 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="33"/>
-        <source>low</source>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>BS2B Plugin Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="34"/>
-        <source>middle</source>
+        <location filename="../settingsdialog.ui" line="32"/>
+        <source>Crossfeed level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="35"/>
-        <source>high</source>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <location filename="../settingsdialog.ui" line="59"/>
+        <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="36"/>
-        <source>low (easy version)</source>
+        <location filename="../settingsdialog.ui" line="71"/>
+        <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="37"/>
-        <source>middle (easy version)</source>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>C.Moy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="38"/>
-        <source>high (easy version) [default]</source>
+        <location filename="../settingsdialog.ui" line="85"/>
+        <source>J. Meier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="14"/>
-        <source>BS2B Plugin Settings</source>
+        <location filename="../settingsdialog.cpp" line="60"/>
+        <source>%1 Hz, %2 us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="29"/>
-        <source>Crossfeed level:</source>
+        <location filename="../settingsdialog.cpp" line="67"/>
+        <source>%1 dB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts
index 375716be7..9febe1683 100644
--- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts
+++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts
@@ -47,43 +47,44 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="33"/>
-        <source>low</source>
+        <location filename="../settingsdialog.ui" line="14"/>
+        <source>BS2B Plugin Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="34"/>
-        <source>middle</source>
+        <location filename="../settingsdialog.ui" line="32"/>
+        <source>Crossfeed level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="35"/>
-        <source>high</source>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <location filename="../settingsdialog.ui" line="59"/>
+        <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="36"/>
-        <source>low (easy version)</source>
+        <location filename="../settingsdialog.ui" line="71"/>
+        <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="37"/>
-        <source>middle (easy version)</source>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>C.Moy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="38"/>
-        <source>high (easy version) [default]</source>
+        <location filename="../settingsdialog.ui" line="85"/>
+        <source>J. Meier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="14"/>
-        <source>BS2B Plugin Settings</source>
+        <location filename="../settingsdialog.cpp" line="60"/>
+        <source>%1 Hz, %2 us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="29"/>
-        <source>Crossfeed level:</source>
+        <location filename="../settingsdialog.cpp" line="67"/>
+        <source>%1 dB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>