added cddb support (Closes issue 159)

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

18 files changed, 726 insertions, 205 deletions

diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt
index 1b088da67..b05617e1c 100644
--- a/src/plugins/Input/cdaudio/CMakeLists.txt
+++ b/src/plugins/Input/cdaudio/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 # libcdaudio
-pkg_check_modules(CDIO libcdio libcdio_cdda libcdio_paranoia)
+pkg_check_modules(CDIO libcdio libcdio_cdda libcdio_paranoia libcddb)
 
 include_directories(${CDIO_INCLUDE_DIRS})
 link_directories(${CDIO_LIBRARY_DIRS})
diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro
index c66b70ac9..d1d4a7c84 100644
--- a/src/plugins/Input/cdaudio/cdaudio.pro
+++ b/src/plugins/Input/cdaudio/cdaudio.pro
@@ -19,7 +19,7 @@ link_pkgconfig
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp -L/usr/lib  -I/usr/include
-PKGCONFIG += libcdio libcdio_cdda libcdio_paranoia
+PKGCONFIG += libcdio libcdio_cdda libcdio_paranoia libcddb
 TRANSLATIONS = translations/cdaudio_plugin_ru.ts \
                translations/cdaudio_plugin_uk_UA.ts \
                translations/cdaudio_plugin_zh_CN.ts \
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index 201d6ff63..b77598d2e 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2010 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,8 @@
 #include <QObject>
 #include <QRegExp>
 #include <QSettings>
-
+#include <QFileInfo>
+#include <QDir>
 #include <cdio/cdtext.h>
 #include <cdio/track.h>
 #include <cdio/cdda.h>
@@ -30,10 +31,11 @@
 #include <cdio/sector.h>
 #include <cdio/cd_types.h>
 #include <cdio/logging.h>
-
+#include <cddb/cddb.h>
 #include <qmmp/buffer.h>
 #include <qmmp/output.h>
 #include <qmmp/recycler.h>
+#include <qmmp/qmmpsettings.h>
 
 #define CDDA_SECTORS 8
 
@@ -145,6 +147,7 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
         cdio = 0;
         return tracks;
     }
+    bool use_cddb = TRUE;
     //fill track list
     for (int i = first_track_number; i <= last_track_number; ++i)
     {
@@ -169,17 +172,157 @@ QList <CDATrack> DecoderCDAudio::generateTrackList(const QString &device)
             t.info.setMetaData(Qmmp::TITLE, QString::fromLocal8Bit(cdtext->field[CDTEXT_TITLE]));
             t.info.setMetaData(Qmmp::ARTIST, QString::fromLocal8Bit(cdtext->field[CDTEXT_PERFORMER]));
             t.info.setMetaData(Qmmp::GENRE, QString::fromLocal8Bit(cdtext->field[CDTEXT_GENRE]));
+            use_cddb = FALSE;
         }
         else
             t.info.setMetaData(Qmmp::TITLE, QString("CDA Track %1").arg(i, 2, 10, QChar('0')));
         tracks  << t;
     }
     qDebug("DecoderCDAudio: found %d audio tracks", tracks.size());
+
+    use_cddb = use_cddb && settings.value("cdaudio/use_cddb", FALSE).toBool();
+    if(use_cddb)
+    {
+        qDebug("DecoderCDAudio: reading CDDB...");
+        cddb_conn_t *cddb_conn = cddb_new ();
+        cddb_disc_t *cddb_disc = NULL;
+        cddb_track_t *cddb_track = NULL;
+        lba_t lba;
+        if (!cddb_conn)
+            qWarning ("DecoderCDAudio: unable to create cddb connection");
+        else
+        {
+            cddb_cache_disable (cddb_conn); //disable libcddb cache, use own cache implementation instead
+            settings.beginGroup("cdaudio");
+            cddb_set_server_name (cddb_conn, settings.value("cddb_server", "freedb.org").toByteArray());
+            cddb_set_server_port (cddb_conn, settings.value("cddb_port", 8880).toInt());
+
+            if (QmmpSettings::instance()->isProxyEnabled())
+            {
+                QUrl proxy = QmmpSettings::instance()->proxy();
+                cddb_http_proxy_enable (cddb_conn);
+                cddb_set_http_proxy_server_name (cddb_conn, proxy.host().toAscii ());
+                cddb_set_http_proxy_server_port (cddb_conn, proxy.port());
+                if(QmmpSettings::instance()->useProxyAuth())
+                {
+                    cddb_set_http_proxy_username (cddb_conn, proxy.userName().toAscii());
+                    cddb_set_http_proxy_password (cddb_conn, proxy.password().toAscii());
+                }
+            }
+            else if (settings.value("cddb_http", FALSE).toBool())
+            {
+                cddb_http_enable (cddb_conn);
+                cddb_set_http_path_query (cddb_conn, settings.value("cddb_path").toByteArray());
+            }
+            settings.endGroup();
+
+            cddb_disc = cddb_disc_new ();
+            lba = cdio_get_track_lba (cdio, CDIO_CDROM_LEADOUT_TRACK);
+            cddb_disc_set_length (cddb_disc, FRAMES_TO_SECONDS (lba));
+
+            for (int i = first_track_number; i <= last_track_number; ++i)
+            {
+                cddb_track = cddb_track_new ();
+                cddb_track_set_frame_offset (cddb_track, cdio_get_track_lba (cdio, i));
+                cddb_disc_add_track (cddb_disc, cddb_track);
+            }
+
+            cddb_disc_calc_discid (cddb_disc);
+            qDebug ("DecoderCDAudio: disc id = %x", cddb_disc_get_discid (cddb_disc));
+            uint id = cddb_disc_get_discid (cddb_disc);
+
+            int matches = 0;
+            if(readFromCache(&tracks, id))
+                qDebug("DecoderCDAudio: using local cddb cache");
+            else if ((matches = cddb_query (cddb_conn, cddb_disc)) == -1)
+            {
+
+                qWarning ("DecoderCDAudio: unable to query the CDDB server, error: %s",
+                          cddb_error_str (cddb_errno(cddb_conn)));
+            }
+            else if (!matches)
+                qDebug ("DecoderCDAudio: no CDDB info found");
+            else
+            {
+                cddb_read(cddb_conn, cddb_disc);
+                if (cddb_errno (cddb_conn) != CDDB_ERR_OK)
+                {
+                    qWarning ("DecoderCDAudio: unable to read the CDDB info: %s",
+                              cddb_error_str (cddb_errno(cddb_conn)));
+                }
+                else
+                {
+                    for (int i = first_track_number; i <= last_track_number; ++i)
+                    {
+                        cddb_track_t *cddb_track = cddb_disc_get_track (cddb_disc, i - 1);
+                        int t = i - first_track_number;
+                        tracks[t].info.setMetaData(Qmmp::ARTIST,
+                                                   QString::fromUtf8(cddb_track_get_artist(cddb_track)));
+                        tracks[t].info.setMetaData(Qmmp::TITLE,
+                                                   QString::fromUtf8(cddb_track_get_title(cddb_track)));
+                        tracks[t].info.setMetaData(Qmmp::GENRE,
+                                                   QString::fromUtf8(cddb_disc_get_genre(cddb_disc)));
+                        tracks[t].info.setMetaData(Qmmp::ALBUM,
+                                                   QString::fromUtf8(cddb_disc_get_title(cddb_disc)));
+                    }
+                    saveToCache(tracks,  id);
+                }
+            }
+        }
+        if (cddb_disc)
+            cddb_disc_destroy (cddb_disc);
+
+        if (cddb_conn)
+            cddb_destroy (cddb_conn);
+    }
+
     cdio_destroy(cdio);
     cdio = 0;
     return tracks;
 }
 
+void DecoderCDAudio::saveToCache(QList <CDATrack> tracks,  uint disc_id)
+{
+    QString path = QFileInfo(Qmmp::configFile()).absoluteDir().path();
+    QDir dir(path);
+    if(!dir.exists("cddbcache"))
+        dir.mkdir("cddbcache");
+    dir.cd("cddbcache");
+    path = dir.absolutePath() + QString("/%1").arg(disc_id, 0, 16);
+    QSettings settings(path, QSettings::IniFormat);
+    settings.clear();
+    settings.setValue("count", tracks.size());
+    for(int i = 0; i < tracks.size(); ++i)
+    {
+        CDATrack track = tracks[i];
+        QMap<Qmmp::MetaData, QString> meta = track.info.metaData();
+        settings.setValue(QString("artist%1").arg(i), meta[Qmmp::ARTIST]);
+        settings.setValue(QString("title%1").arg(i), meta[Qmmp::TITLE]);
+        settings.setValue(QString("genre%1").arg(i), meta[Qmmp::GENRE]);
+        settings.setValue(QString("album%1").arg(i), meta[Qmmp::ALBUM]);
+    }
+}
+
+bool DecoderCDAudio::readFromCache(QList <CDATrack> *tracks, uint disc_id)
+{
+    QString path = QFileInfo(Qmmp::configFile()).absoluteDir().path();
+    path += QString("/cddbcache/%1").arg(disc_id, 0, 16);
+    if(!QFile::exists(path))
+        return FALSE;
+    QSettings settings(path, QSettings::IniFormat);
+    int count = settings.value("count").toInt();
+    if(count != tracks->count())
+        return FALSE;
+    for(int i = 0; i < count; ++i)
+    {
+        (*tracks)[i].info.setMetaData(Qmmp::ARTIST, settings.value(QString("artist%1").arg(i)).toString());
+        (*tracks)[i].info.setMetaData(Qmmp::TITLE, settings.value(QString("title%1").arg(i)).toString());
+        (*tracks)[i].info.setMetaData(Qmmp::GENRE, settings.value(QString("genre%1").arg(i)).toString());
+        (*tracks)[i].info.setMetaData(Qmmp::ALBUM, settings.value(QString("album%1").arg(i)).toString());
+    }
+    return TRUE;
+}
+
 qint64 DecoderCDAudio::calculateTrackLength(lsn_t startlsn, lsn_t endlsn)
 {
     return ((endlsn - startlsn + 1) * 1000) / 75;
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.h b/src/plugins/Input/cdaudio/decoder_cdaudio.h
index 7c7ace199..582aed033 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.h
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2010 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 #include <cdio/cdio.h>
-
+#include <QMultiHash>
 #include <qmmp/decoder.h>
 
 class CDATrack
@@ -46,7 +46,7 @@ public:
     DecoderCDAudio(const QString &url);
     virtual ~DecoderCDAudio();
 
-    static QList <CDATrack> generateTrackList(const QString &device = QString());
+    static QList <CDATrack> generateTrackList(const QString &device);
     static qint64 calculateTrackLength(lsn_t startlsn, lsn_t endlsn);
 
      // Standard Decoder API
@@ -57,6 +57,9 @@ public:
     void seek(qint64 time);
 
 private:
+    //helper functions
+    static void saveToCache(QList <CDATrack> tracks,  uint disc_id);
+    static bool readFromCache(QList <CDATrack> *tracks, uint disc_id);
     // libcdio variables
     lsn_t m_first_sector;
     lsn_t m_last_sector;
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index ae88ea6e6..4786259c5 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2010 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,7 @@
 #include <QtGui>
 
 #include <cdio/version.h>
+#include <cddb/version.h>
 #include "settingsdialog.h"
 #include "decoder_cdaudio.h"
 #include "decodercdaudiofactory.h"
@@ -86,7 +87,8 @@ void DecoderCDAudioFactory::showAbout(QWidget *parent)
 {
     QMessageBox::about (parent, tr("About CD Audio Plugin"),
                         tr("Qmmp CD Audio Plugin")+"\n"+
-                        tr("Compiled against libcdio version:")+ " "+CDIO_VERSION+"\n"+
+                        QString(tr("Compiled against libcdio-%1 and libcddb-%2")).arg(CDIO_VERSION)
+                        .arg(CDDB_VERSION) + "\n" +
                         tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>")+"\n"+
                         tr("Usage: open cdda:/// using Add URL dialog or command line"));
 }
diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp
index dcafbeed4..9151d06e9 100644
--- a/src/plugins/Input/cdaudio/settingsdialog.cpp
+++ b/src/plugins/Input/cdaudio/settingsdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2010 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,9 +19,8 @@
  ***************************************************************************/
 #include <QTextCodec>
 #include <QSettings>
-
+#include <QDir>
 #include <qmmp/qmmp.h>
-
 #include "settingsdialog.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent)
@@ -37,10 +36,14 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.speedCheckBox->setChecked(speed > 0);
     ui.speedSpinBox->setValue(speed);
     ui.cdtextCheckBox->setChecked(settings.value("cdtext", TRUE).toBool());
+    ui.cddbGroupBox->setChecked(settings.value("use_cddb", FALSE).toBool());
+    ui.httpCheckBox->setChecked(settings.value("cddb_http", FALSE).toBool());
+    ui.serverLineEdit->setText(settings.value("cddb_server", "freedb.org").toString());
+    ui.pathLineEdit->setText(settings.value("cddb_path").toString());
+    ui.portLineEdit->setText(settings.value("cddb_port", 8880).toString());
     settings.endGroup();
 }
 
-
 SettingsDialog::~SettingsDialog()
 {}
 
@@ -57,6 +60,22 @@ void SettingsDialog::accept()
     else
         settings.setValue("speed", 0);
     settings.setValue("cdtext", ui.cdtextCheckBox->isChecked());
+    settings.setValue("cdtext", ui.cdtextCheckBox->isChecked());
+    settings.setValue("use_cddb", ui.cddbGroupBox->isChecked());
+    settings.setValue("cddb_http", ui.httpCheckBox->isChecked());
+    settings.setValue("cddb_server",  ui.serverLineEdit->text());
+    settings.setValue("cddb_path", ui.pathLineEdit->text());
+    settings.setValue("cddb_port", ui.portLineEdit->text());
     settings.endGroup();
     QDialog::accept();
 }
+
+void SettingsDialog::on_clearCacheButton_clicked()
+{
+    QString path = QFileInfo(Qmmp::configFile()).absoluteDir().path();
+    QDir dir(path);
+    dir.cd("cddbcache");
+    QStringList list = dir.entryList(QStringList() << "*", QDir::Files);
+    foreach(QString name, list)
+        dir.remove(name);
+}
diff --git a/src/plugins/Input/cdaudio/settingsdialog.h b/src/plugins/Input/cdaudio/settingsdialog.h
index df030cc1d..e2728ca62 100644
--- a/src/plugins/Input/cdaudio/settingsdialog.h
+++ b/src/plugins/Input/cdaudio/settingsdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2010 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,7 +21,6 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-
 #include "ui_settingsdialog.h"
 
 /**
@@ -38,6 +37,7 @@ public:
 
 public slots:
     virtual void accept();
+    void on_clearCacheButton_clicked();
 
 private:
     Ui::SettingsDialog ui;
diff --git a/src/plugins/Input/cdaudio/settingsdialog.ui b/src/plugins/Input/cdaudio/settingsdialog.ui
index cc5a19b57..f833a998f 100644
--- a/src/plugins/Input/cdaudio/settingsdialog.ui
+++ b/src/plugins/Input/cdaudio/settingsdialog.ui
@@ -1,93 +1,147 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SettingsDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>295</width>
-    <height>128</height>
+    <width>262</width>
+    <height>299</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>CD Audio Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <property name="leftMargin" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="leftMargin">
     <number>6</number>
    </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="rightMargin">
     <number>6</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="bottomMargin">
     <number>6</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QCheckBox" name="deviceCheckBox" >
-     <property name="text" >
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="deviceCheckBox">
+     <property name="text">
       <string>Override device:</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="deviceLineEdit" />
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="deviceLineEdit"/>
    </item>
-   <item row="1" column="0" >
-    <widget class="QCheckBox" name="speedCheckBox" >
-     <property name="text" >
+   <item row="1" column="0">
+    <widget class="QCheckBox" name="speedCheckBox">
+     <property name="text">
       <string>Limid cd speed:</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QSpinBox" name="speedSpinBox" >
-     <property name="minimum" >
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="speedSpinBox">
+     <property name="minimum">
       <number>1</number>
      </property>
-     <property name="maximum" >
+     <property name="maximum">
       <number>48</number>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QCheckBox" name="cdtextCheckBox" >
-     <property name="text" >
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="cdtextCheckBox">
+     <property name="text">
       <string>Use cd-text</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <layout class="QHBoxLayout" name="horizontalLayout" >
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>144</width>
-         <height>30</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox" >
-       <property name="standardButtons" >
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="cddbGroupBox">
+     <property name="title">
+      <string>CDDB</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QCheckBox" name="httpCheckBox">
+        <property name="text">
+         <string>Use HTTP instead of CDDBP</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="serverLineEdit"/>
+      </item>
+      <item row="1" column="0" rowspan="2">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Server:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Path:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="pathLineEdit"/>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Port:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="portLineEdit"/>
+      </item>
+      <item row="5" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QPushButton" name="clearCacheButton">
+          <property name="text">
+           <string>Clear CDDB cache</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -99,11 +153,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>253</x>
      <y>118</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>95</x>
      <y>53</y>
     </hint>
@@ -115,11 +169,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>253</x>
      <y>118</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>130</x>
      <y>63</y>
     </hint>
@@ -131,11 +185,11 @@
    <receiver>deviceLineEdit</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>84</x>
      <y>17</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>151</x>
      <y>17</y>
     </hint>
@@ -147,11 +201,11 @@
    <receiver>speedSpinBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>99</x>
      <y>42</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>134</x>
      <y>45</y>
     </hint>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts
index 26681d3a9..e5cd7ba88 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>Modul pro zvuková CD</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>O modulu pro zvuková CD</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Modul Qmmp pro zvuková CD</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Autor: Ilja Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Použití: otevřete cdda:/// v dialogu Přidat URL nebo z příkazové řádky</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Přeloženo s libcdio verze:</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>Nastavení modulu pro zvuková CD</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>Zařízení:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>Omezit rychlost CD:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>Použít CD-TEXT</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts
index 9ed0049af..93bf063f1 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>CD-Audio-Modul</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>Über CD-Audio-Modul</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Qmmp CD-Audio-Modul</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Autor: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Verwendung: Geben Sie cdda:/// in den „URL hinzufügen“-Dialog oder in die Befehlszeile ein</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Kompiliert gegen libcdio-Version:</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>Einstellungen CD-Audio-Modul</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>Einhängepunkt des CD-Laufwerks:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>CD-Geschwindigkeit begrenzen:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>CD-Text verwenden</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts
index 95e211c92..28995773f 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>Modulo CD-Audio</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>Informazioni sul modulo CD-Audio</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Modulo CD-Audio per Qmmp</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Autore: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Uso: aprire cdda:// nella finestra di dialgo degli URL, o via linea di comando</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Compilato con libcdio, versione:</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>Impostazioni del modulo CD-Audio</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>Sovrascrivi dispositivo</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>Limita la velocità del CD:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>Usa CD-Text</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts
index 47655c182..90fd5d759 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>CD Audio Įskiepis</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>Apie CD Audio įskiepį</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Apie CD Audio Qmmp įskiepį</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Sukūrė: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Naudojimas: atverti cdda:/// naudojant Prideti interneto adresą arba komandinė eilutę</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Surinkta iš libcdio versijos :</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>CD Audio įskiepio nustatymai</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>Nepaisyti įrangos:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>Riboti cd apsisukimų greitį:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>cd-text naudojimas</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts
index 7cd11622d..a82da9cd1 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts
@@ -4,32 +4,32 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>Wtyczka CD Audio</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>O wtyczce CD Audio</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Wtyczka CD Audio dla Qmmp</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Skompilowane przy użyciu biblioteki libcdio w wersji:</translation>
+        <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Autor: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Instrukcja: otwórz cdda:/// używając Dodaj URL lib z linii poleceń</translation>
     </message>
@@ -37,24 +37,54 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>Ustawienia wtyczki CD Audio</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>Wymuś urządzenie:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>Limit prędkości cd:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>Użyj cd-text</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts
index d100fdb97..546052e57 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>Модуль CD Audio</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>О Модуле CD Audio</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Модуль CD Audio для Qmmp</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation>Собрано с libcdio-%1 и libcddb-%2</translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Разработчик: Илья Котов &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Использование: откройте cdda:/// с помощью диалога добавления URL или командной строки</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Собрано с libcdio версии:</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>Настройки модуля CD Audio</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>Переопределить устройство:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>Ограничить скорость cd:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>Использовать cd-text</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation>CDDB</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation>Использовать HTTP вместо CDDBP</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation>Сервер:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation>Путь:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation>Очистить кэш CDDB</translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts
index a9803ab79..54f421f8b 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts
@@ -4,32 +4,32 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>CD Ses Eklentisi</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>CD Ses Eklentisi Hakkında</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Qmmp CD Ses Eklentisi</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Derlendiği libcdio sürümü:</translation>
+        <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Yazan: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Kullanımı: komut satırından veya URL Ekle diyaloğundan open cdda:/// şeklindedir</translation>
     </message>
@@ -37,24 +37,54 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>CD Ses Eklentisi Ayarları</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>CD hızını sınırla:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts
index 847b09aca..8b31effea 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>Модуль AudioCD</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>Про модуль AudioCD</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Модуль AudioCD для Qmmp</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>Розробник: Ілля Котов &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>Використання: відкрийте cdda:/// використовуючи діалог &quot;Додати адресу&quot; чи командний рядок</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>Зібрано з libcdio версії:</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>Налаштування модуля AudioCD</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>Перевизначити пристрій:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>Обмежити швидкість CD:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>Використовувати cd-text</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts
index b4e9a5aad..26b218edb 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>CD 音频插件</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>关于 CD 音频插件</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Qmmp CD 音频插件</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>作者：Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>用法：open cdda:/// 使用添加 URL 对话或命令行</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>编译依赖 libcdio 版本：</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>CD 音频插件设置</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>跳过设备：</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>限制 CD 速度：</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>使用 cd-text</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts
index c6e7c7af8..1aef13927 100644
--- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts
+++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts
@@ -4,57 +4,87 @@
 <context>
     <name>DecoderCDAudioFactory</name>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="44"/>
+        <location filename="../decodercdaudiofactory.cpp" line="45"/>
         <source>CD Audio Plugin</source>
         <translation>CD 聲訊插件</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="87"/>
+        <location filename="../decodercdaudiofactory.cpp" line="88"/>
         <source>About CD Audio Plugin</source>
         <translation>關於 CD 聲訊插件</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="88"/>
+        <location filename="../decodercdaudiofactory.cpp" line="89"/>
         <source>Qmmp CD Audio Plugin</source>
         <translation>Qmmp CD 聲訊插件</translation>
     </message>
     <message>
         <location filename="../decodercdaudiofactory.cpp" line="90"/>
+        <source>Compiled against libcdio-%1 and libcddb-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../decodercdaudiofactory.cpp" line="92"/>
         <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
         <translation>作者：Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</translation>
     </message>
     <message>
-        <location filename="../decodercdaudiofactory.cpp" line="91"/>
+        <location filename="../decodercdaudiofactory.cpp" line="93"/>
         <source>Usage: open cdda:/// using Add URL dialog or command line</source>
         <translation>用法：open cdda:/// 使用添加 URL會話或命令行</translation>
     </message>
-    <message>
-        <location filename="../decodercdaudiofactory.cpp" line="89"/>
-        <source>Compiled against libcdio version:</source>
-        <translation>編譯依賴 libcdio 版本：</translation>
-    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="../settingsdialog.ui" line="14"/>
         <source>CD Audio Plugin Settings</source>
         <translation>CD 聲訊插件設置</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="31"/>
+        <location filename="../settingsdialog.ui" line="29"/>
         <source>Override device:</source>
         <translation>忽略設備：</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="44"/>
+        <location filename="../settingsdialog.ui" line="42"/>
         <source>Limid cd speed:</source>
         <translation>限制 CD 速度：</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="64"/>
+        <location filename="../settingsdialog.ui" line="62"/>
         <source>Use cd-text</source>
         <translation>使用 cd-text</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="69"/>
+        <source>CDDB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="78"/>
+        <source>Use HTTP instead of CDDBP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="88"/>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="95"/>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="105"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="117"/>
+        <source>Clear CDDB cache</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>