Merge lp:~max-linke/mixxx/chromaprint into lp:~mixxxdevelopers/mixxx/trunk

[Max Linke]

Hi

I decided to split up my library_features branch in smaller branches. In here are all changes relevant to fingerprinting and retreiving tags from MusicBrainz

[lp:~max-linke/mixxx/chromaprint]

3375. By Max Linke <email address hidden> on 2013-05-12

merge with trunk

3376. By Max Linke <email address hidden> on 2013-05-16

merge with trunk

[RJ Skerry-Ryan (rryan)]

Looks good to me on my first skim. I need to take a look src/chromaprint more closely but for now I'm assuming it works as expected.

* void WTrackTableView::showDlgTagFetcher(QModelIndex index)

What about when multiple tracks are selected?

[RJ Skerry-Ryan (rryan)]

Doesn't MB have more data than artist/title/album/track/year?

When you set them, what about checking whether the existing data is blank or the replacement data is blank and keeping the old one if the new one is blank?

[Max Linke (max-linke)]

'reload from MB' is grayed out if more then one song is selected. The tagfetcher class is able to handle to fetch tags from several songs at once but I haven't found a good way to display several tracks+results to the user and by this I follow the same logic as 'properties' does.

I didn't check to keep the old one if the new data is blank but I honestly also never encountered that with any track I own. I sure I can write some code that checks for this but I don't know how I'm supposed to test if it works.

[lp:~max-linke/mixxx/chromaprint]

3377. By Max Linke <email address hidden> on 2013-05-17

removed musicbrainz url that is not used

3378. By Max Linke <email address hidden> on 2013-05-17

merge with trunk

3379. By Max Linke <email address hidden> on 2013-05-17

fixed signal connection

[RJ Skerry-Ryan (rryan)]

Looks good -- thanks for the feature Max!

review: Approve

[lp:~max-linke/mixxx/chromaprint]

3380. By Max Linke <email address hidden> on 2013-05-22

trackpointer->year/tracknumber can also be 0 check for that as well

3381. By Max Linke <email address hidden> on 2013-05-22

merge with trunk

3382. By Max Linke <email address hidden> on 2013-05-22

merge with trunk and small changes

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2013-05-21 03:02:42 +0000
+++ mixxx/build/depends.py	2013-05-22 07:42:27 +0000
@@ -400,6 +400,17 @@
         if build.platform_is_windows and build.static_dependencies:
             build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')
 
+class Chromaprint(Dependence):
+    def configure(self, build, conf):
+        if not conf.CheckLib(['chromaprint', 'libchromaprint', 'chromaprint_p', 'libchromaprint_p']):
+            raise Exception("Could not find libchromaprint or its development headers.")
+        if build.platform_is_windows and build.static_dependencies:
+            build.env.Append(CPPDEFINES = 'CHROMAPRINT_NODLL')
+
+            # On Windows, we link chromaprint with FFTW3.
+            if not conf.CheckLib(['fftw', 'libfftw', 'fftw3', 'libfftw3']):
+                raise Exception("Could not find fftw3 or its development headers.")
+
 class ProtoBuf(Dependence):
     def configure(self, build, conf):
         libs = ['libprotobuf-lite', 'protobuf-lite', 'libprotobuf', 'protobuf']
@@ -447,6 +458,7 @@
                    "dlgabout.cpp",
                    "dlgprefeq.cpp",
                    "dlgprefcrossfader.cpp",
+                   "dlgtagfetcher.cpp",
                    "dlgtrackinfo.cpp",
                    "dlgprepare.cpp",
                    "dlgautodj.cpp",
@@ -545,6 +557,14 @@
 
                    "mathstuff.cpp",
 
+                   "network.cpp",
+                   "musicbrainz/tagfetcher.cpp",
+                   "musicbrainz/gzip.cpp",
+                   "musicbrainz/crc.c",
+                   "musicbrainz/acoustidclient.cpp",
+                   "musicbrainz/chromaprinter.cpp",
+                   "musicbrainz/musicbrainzclient.cpp",
+
                    "rotary.cpp",
                    "widget/wtracktableview.cpp",
                    "widget/wtracktableviewheader.cpp",
@@ -756,6 +776,7 @@
         build.env.Uic4('dlgprefnovinyldlg.ui')
         build.env.Uic4('dlgprefrecorddlg.ui')
         build.env.Uic4('dlgaboutdlg.ui')
+        build.env.Uic4('dlgtagfetcher.ui')
         build.env.Uic4('dlgtrackinfo.ui')
         build.env.Uic4('dlgprepare.ui')
         build.env.Uic4('dlgautodj.ui')
@@ -910,7 +931,8 @@
 
     def depends(self, build):
         return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt,
-                FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf]
+                FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
+                Chromaprint]
 
     def post_dependency_check_configure(self, build, conf):
         """Sets up additional things in the Environment that must happen
 
=== modified file 'mixxx/build/qtcreator/mixxx.pro'
--- mixxx/build/qtcreator/mixxx.pro	2013-05-20 02:18:33 +0000
+++ mixxx/build/qtcreator/mixxx.pro	2013-05-22 07:42:27 +0000
@@ -105,6 +105,7 @@
     $$UI_DIR/ui_dlgpreferencesdlg.h \
     $$UI_DIR/ui_dlgprefmidibindingsdlg.h \
     $$UI_DIR/ui_dlgprefplaylistdlg.h \
+    $$UI_DIR/ui_dlgtagfetcher.h \
     $$UI_DIR/ui_dlgprefrecorddlg.h \
     $$UI_DIR/ui_dlgprefsounddlg.h \
     $$UI_DIR/ui_dlgprefvinyldlg.h \
 
=== added file 'mixxx/src/dlgtagfetcher.cpp'
--- mixxx/src/dlgtagfetcher.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgtagfetcher.cpp	2013-05-22 07:42:27 +0000
@@ -0,0 +1,159 @@
+#include <QTreeWidget>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QUrl>
+
+#include "dlgtagfetcher.h"
+
+DlgTagFetcher::DlgTagFetcher(QWidget *parent)
+             : QWidget(parent),
+               m_track(NULL),
+               m_TagFetcher(parent) {
+    setupUi(this);
+
+    connect(btnApply, SIGNAL(clicked()),
+            this, SLOT(apply()));
+    connect(btnQuit, SIGNAL(clicked()),
+            this, SLOT(quit()));
+    connect(btnPrev, SIGNAL(clicked()),
+            this, SIGNAL(previous()));
+    connect(btnNext, SIGNAL(clicked()),
+            this, SIGNAL(next()));
+    connect(results, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+            this, SLOT(resultSelected()));
+
+    connect(&m_TagFetcher, SIGNAL(resultAvailable(const TrackPointer,const QList<TrackPointer>&)),
+            this, SLOT(fetchTagFinished(const TrackPointer,const QList<TrackPointer>&)));
+    connect(&m_TagFetcher, SIGNAL(fetchProgress(QString)),
+            this, SLOT(fetchTagProgress(QString)));
+
+    // Resize columns, this can't be set in the ui file
+    results->setColumnWidth(0, 50);  // Track column
+    results->setColumnWidth(1, 50);  // Year column
+    results->setColumnWidth(2, 160); // Title column
+    results->setColumnWidth(3, 160); // Artist column
+    results->setColumnWidth(4, 160); // Album column
+
+    progressLabel->setText("");
+}
+
+DlgTagFetcher::~DlgTagFetcher() {
+}
+
+void DlgTagFetcher::init(const TrackPointer track) {
+    results->clear();
+    m_track = track;
+    m_data = Data();
+    m_TagFetcher.startFetch(m_track);
+    updateStack();
+}
+
+void DlgTagFetcher::apply() {
+    int resultIndex = m_data.m_selectedResult;
+    if (resultIndex > -1) {
+        if (!m_data.m_results[resultIndex]->getAlbum().isEmpty()) { 
+            m_track->setAlbum(m_data.m_results[resultIndex]->getAlbum());
+        }
+        if (!m_data.m_results[resultIndex]->getArtist().isEmpty()) { 
+            m_track->setArtist(m_data.m_results[resultIndex]->getArtist());
+        }
+        if (!m_data.m_results[resultIndex]->getTitle().isEmpty()) { 
+            m_track->setTitle(m_data.m_results[resultIndex]->getTitle());
+        }
+        if (!m_data.m_results[resultIndex]->getYear().isEmpty() &&
+             m_data.m_results[resultIndex]->getYear() != "0") { 
+            m_track->setYear(m_data.m_results[resultIndex]->getYear());
+        }
+        if (!m_data.m_results[resultIndex]->getTrackNumber().isEmpty() &&
+             m_data.m_results[resultIndex]->getTrackNumber() != "0") { 
+            m_track->setTrackNumber(m_data.m_results[resultIndex]->getTrackNumber());
+        }
+    }
+}
+
+void DlgTagFetcher::quit() {
+    m_TagFetcher.cancel();
+    close();
+}
+
+void DlgTagFetcher::fetchTagProgress(QString text) {
+    loading->setText(text);
+}
+
+void DlgTagFetcher::fetchTagFinished(const TrackPointer track,
+                                     const QList<TrackPointer>& tracks) {
+    // check if the answer is for this track
+    if (m_track->getLocation() != track->getLocation()) {
+        return;
+    }
+
+    m_data.m_pending = false;
+    m_data.m_results = tracks;
+    // qDebug() << "number of results = " << tracks.size();
+    updateStack();
+}
+
+void DlgTagFetcher::updateStack() {
+    if (m_data.m_pending) {
+        stack->setCurrentWidget(loading_page);
+        return;
+    } else if (m_data.m_results.isEmpty()) {
+        stack->setCurrentWidget(error_page);
+        return;
+    }
+    btnApply->setEnabled(true);
+    stack->setCurrentWidget(results_page);
+
+    results->clear();
+
+    addDivider(tr("Original tags"), results);
+    addTrack(m_track, -1, results);
+
+    addDivider(tr("Suggested tags"), results);
+
+    int trackIndex = 0;
+    foreach (const TrackPointer track, m_data.m_results) {
+        addTrack(track, trackIndex++, results);
+    }
+    
+    // Find the item that was selected last time
+    for (int i=0 ; i<results->model()->rowCount() ; ++i) {
+        const QModelIndex index = results->model()->index(i, 0);
+        const QVariant id = index.data(Qt::UserRole);
+        if (!id.isNull() && id.toInt() == m_data.m_selectedResult) {
+            results->setCurrentIndex(index);
+            break;
+        }
+    }
+}
+
+void DlgTagFetcher::addTrack(const TrackPointer track, int resultIndex,
+                             QTreeWidget* parent) const {
+    QStringList values;
+    values << track->getTrackNumber() << track->getYear() << track->getTitle()
+           << track->getArtist() << track->getAlbum();
+
+    QTreeWidgetItem* item = new QTreeWidgetItem(parent, values);
+    item->setData(0, Qt::UserRole, resultIndex);
+    item->setData(0, Qt::TextAlignmentRole, Qt::AlignRight);
+}
+
+void DlgTagFetcher::addDivider(const QString& text, QTreeWidget* parent) const {
+    QTreeWidgetItem* item = new QTreeWidgetItem(parent);
+    item->setFirstColumnSpanned(true);
+    item->setText(0, text);
+    item->setFlags(Qt::NoItemFlags);
+    item->setForeground(0, palette().color(QPalette::Disabled, QPalette::Text));
+
+    QFont bold_font(font());
+    bold_font.setBold(true);
+    item->setFont(0, bold_font);
+}
+
+void DlgTagFetcher::resultSelected() {
+  if (!results->currentItem())
+    return;
+
+  const int resultIndex = results->currentItem()->data(0, Qt::UserRole).toInt();
+  m_data.m_selectedResult = resultIndex;
+}
 
=== added file 'mixxx/src/dlgtagfetcher.h'
--- mixxx/src/dlgtagfetcher.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgtagfetcher.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,57 @@
+#ifndef DLGTAGFETCHER_H
+#define DLGTAGFETCHER_H
+
+#include <QWidget>
+#include "ui_dlgtagfetcher.h"
+#include "trackinfoobject.h"
+#include "musicbrainz/tagfetcher.h"
+
+
+class QTreeWidget;
+
+
+class DlgTagFetcher : public QWidget,  public Ui::DlgTagFetcher {
+  Q_OBJECT
+
+  public:
+    DlgTagFetcher(QWidget *parent);
+    virtual ~DlgTagFetcher();
+
+    void init(const TrackPointer track);
+
+  signals:
+    void next();
+    void previous();
+
+  public slots:
+    void fetchTagFinished(const TrackPointer,const QList<TrackPointer>& tracks);
+    void resultSelected();
+    void fetchTagProgress(QString);
+
+  private slots:
+    void apply();
+    void quit();
+
+  private:
+
+    void updateStack();
+    void addDivider(const QString& text, QTreeWidget* parent) const;
+    void addTrack(const TrackPointer track, int resultIndex,
+                  QTreeWidget* parent) const;
+
+  private:
+    struct Data {
+        Data() : m_pending(true), m_selectedResult(0) {}
+
+        bool m_pending;
+        int m_selectedResult;
+        QList<TrackPointer> m_results;
+    };
+
+    TrackPointer m_track;
+    Data m_data;
+    QString m_progress;
+    TagFetcher m_TagFetcher;
+};
+
+#endif // DLGTAGFETCHER_H
 
=== added file 'mixxx/src/dlgtagfetcher.ui'
--- mixxx/src/dlgtagfetcher.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgtagfetcher.ui	2013-05-22 07:42:27 +0000
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgTagFetcher</class>
+ <widget class="QWidget" name="DlgTagFetcher">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>810</width>
+    <height>393</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QWidget" name="verticalLayoutWidget_3">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>791</width>
+     <height>371</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_3">
+    <item>
+     <widget class="QStackedWidget" name="stack">
+      <property name="currentIndex">
+       <number>1</number>
+      </property>
+      <widget class="QWidget" name="results_page">
+       <widget class="QWidget" name="verticalLayoutWidget_2">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>791</width>
+          <height>331</height>
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="styleSheet">
+            <string notr="true">QLabel { font-weight: bold; }</string>
+           </property>
+           <property name="text">
+            <string>Select best possible match</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QTreeWidget" name="results">
+           <property name="editTriggers">
+            <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
+           </property>
+           <property name="rootIsDecorated">
+            <bool>false</bool>
+           </property>
+           <attribute name="headerDefaultSectionSize">
+            <number>150</number>
+           </attribute>
+           <attribute name="headerMinimumSectionSize">
+            <number>50</number>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Track</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Year</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Title</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Artist</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Album</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+      <widget class="QWidget" name="loading_page">
+       <widget class="QWidget" name="verticalLayoutWidget_4">
+        <property name="geometry">
+         <rect>
+          <x>-1</x>
+          <y>-1</y>
+          <width>791</width>
+          <height>341</height>
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <item>
+            <spacer name="horizontalSpacer_4">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QLabel" name="message1">
+             <property name="text">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Fetching track data from MusicBrainz&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_5">
+             <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>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <item>
+            <spacer name="horizontalSpacer_6">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QLabel" name="status">
+             <property name="text">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Status:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="loading">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_7">
+             <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>
+         <item>
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+      <widget class="QWidget" name="error_page">
+       <widget class="QWidget" name="verticalLayoutWidget">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>791</width>
+          <height>331</height>
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Sorry&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Mixxx could not find this song&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+      <widget class="QWidget" name="submit_page">
+       <widget class="QWidget" name="verticalLayoutWidget_5">
+        <property name="geometry">
+         <rect>
+          <x>1</x>
+          <y>0</y>
+          <width>791</width>
+          <height>331</height>
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_5">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QLineEdit" name="apikey">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="btnApikey">
+             <property name="text">
+              <string>get API-Key</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="btnSubmit">
+             <property name="text">
+              <string>Submit</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QTreeWidget" name="submit_tree">
+           <column>
+            <property name="text">
+             <string>Track</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Year</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>New Column</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Artist</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Album</string>
+            </property>
+           </column>
+           <item>
+            <property name="text">
+             <string>New Item</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="progressLabel">
+           <property name="text">
+            <string>TextLabel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QPushButton" name="btnPrev">
+        <property name="text">
+         <string>Prev</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnNext">
+        <property name="text">
+         <string>Next</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>
+      <item>
+       <widget class="QPushButton" name="btnApply">
+        <property name="text">
+         <string>Apply</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnQuit">
+        <property name="text">
+         <string>Close</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
 
=== modified file 'mixxx/src/dlgtrackinfo.cpp'
--- mixxx/src/dlgtrackinfo.cpp	2012-05-08 16:10:02 +0000
+++ mixxx/src/dlgtrackinfo.cpp	2013-05-22 07:42:27 +0000
@@ -7,10 +7,20 @@
 #include "library/dao/cue.h"
 #include "trackinfoobject.h"
 
-DlgTrackInfo::DlgTrackInfo(QWidget* parent) :
-        QDialog(parent),
-        m_pLoadedTrack() {
-
+DlgTrackInfo::DlgTrackInfo(QWidget* parent,
+                           DlgTagFetcher& DlgTagFetcher)
+            : QDialog(parent),
+              m_pLoadedTrack(NULL),
+              m_DlgTagFetcher(DlgTagFetcher) {
+    init();
+}
+
+DlgTrackInfo::~DlgTrackInfo() {
+    unloadTrack(false);
+    qDebug() << "~DlgTrackInfo()";
+}
+
+void DlgTrackInfo::init(){
     setupUi(this);
 
     cueTable->hideColumn(0);
@@ -24,6 +34,9 @@
     connect(btnCancel, SIGNAL(clicked()),
             this, SLOT(cancel()));
 
+    connect(btnFetchTag, SIGNAL(clicked()),
+            this, SLOT(fetchTag()));
+
     connect(bpmDouble, SIGNAL(clicked()),
             this, SLOT(slotBpmDouble()));
     connect(bpmHalve, SIGNAL(clicked()),
@@ -43,11 +56,6 @@
     }
 }
 
-DlgTrackInfo::~DlgTrackInfo() {
-    unloadTrack(false);
-    qDebug() << "~DlgTrackInfo()";
-}
-
 void DlgTrackInfo::apply() {
     unloadTrack(true);
     accept();
@@ -320,3 +328,8 @@
         populateFields(pTrack);
     }
 }
+
+void DlgTrackInfo::fetchTag() {
+    m_DlgTagFetcher.init(m_pLoadedTrack);
+    m_DlgTagFetcher.show();
+}
 
=== modified file 'mixxx/src/dlgtrackinfo.h'
--- mixxx/src/dlgtrackinfo.h	2013-05-14 18:09:35 +0000
+++ mixxx/src/dlgtrackinfo.h	2013-05-22 07:42:27 +0000
@@ -8,8 +8,8 @@
 #include <QList>
 
 #include "ui_dlgtrackinfo.h"
-
 #include "trackinfoobject.h"
+#include "dlgtagfetcher.h"
 
 /** Minimum allowed Beat per minute (BPM) */
 const int minBPM = 30;
@@ -25,7 +25,7 @@
 class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
     Q_OBJECT
   public:
-    DlgTrackInfo(QWidget* parent);
+    DlgTrackInfo(QWidget* parent, DlgTagFetcher& DlgTagFetcher);
     virtual ~DlgTrackInfo();
 
   public slots:
@@ -43,6 +43,7 @@
     void apply();
     void cancel();
     void trackUpdated();
+    void fetchTag();
 
     void cueActivate();
     void cueDelete();
@@ -58,6 +59,7 @@
     void populateCues(TrackPointer pTrack);
     void unloadTrack(bool save);
     void clear();
+    void init();
 
     QHash<int, Cue*> m_cueMap;
     TrackPointer m_pLoadedTrack;
@@ -66,6 +68,7 @@
     QTime m_bpmTapTimer;
 
     QMutex m_mutex;
+    DlgTagFetcher& m_DlgTagFetcher;
 
 };
 
 
=== modified file 'mixxx/src/dlgtrackinfo.ui'
--- mixxx/src/dlgtrackinfo.ui	2012-05-08 16:10:02 +0000
+++ mixxx/src/dlgtrackinfo.ui	2013-05-22 07:42:27 +0000
@@ -61,6 +61,13 @@
          <item row="1" column="1" colspan="3">
           <widget class="QLineEdit" name="txtArtist"/>
          </item>
+         <item row="8" column="0">
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>Duration:</string>
+           </property>
+          </widget>
+         </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_6">
            <property name="text">
@@ -68,25 +75,12 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="1" colspan="3">
-          <widget class="QLineEdit" name="txtAlbum"/>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="label_9">
-           <property name="text">
-            <string>Genre:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="label_11">
-           <property name="text">
-            <string>Composer:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1" colspan="3">
-          <widget class="QLineEdit" name="txtComposer"/>
+         <item row="6" column="0">
+          <widget class="QLabel" name="label_12">
+           <property name="text">
+            <string>Key</string>
+           </property>
+          </widget>
          </item>
          <item row="3" column="1" colspan="3">
           <widget class="QLineEdit" name="txtGenre"/>
@@ -98,33 +92,30 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="3">
-          <widget class="QLineEdit" name="txtTrackNumber"/>
-         </item>
-         <item row="5" column="1">
-          <widget class="QLineEdit" name="txtYear"/>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>Year</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="QLineEdit" name="txtKey"/>
-         </item>
-         <item row="6" column="0">
-          <widget class="QLabel" name="label_12">
-           <property name="text">
-            <string>Key</string>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="0">
-          <widget class="QLabel" name="label_7">
-           <property name="text">
-            <string>Duration:</string>
+         <item row="9" column="3">
+          <widget class="QLabel" name="txtBitrate">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+           </property>
+          </widget>
+         </item>
+         <item row="12" column="0" colspan="4">
+          <widget class="Line" name="line_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
+         <item row="11" column="0">
+          <widget class="QLabel" name="label_5">
+           <property name="text">
+            <string>Location:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
            </property>
           </widget>
          </item>
@@ -155,6 +146,16 @@
            </property>
           </widget>
          </item>
+         <item row="5" column="0">
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>Year</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <widget class="QLineEdit" name="txtKey"/>
+         </item>
          <item row="9" column="0">
           <widget class="QLabel" name="label_13">
            <property name="text">
@@ -172,30 +173,29 @@
            </property>
           </widget>
          </item>
-         <item row="9" column="3">
-          <widget class="QLabel" name="txtBitrate">
-           <property name="text">
-            <string/>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-           </property>
-          </widget>
-         </item>
-         <item row="12" column="0" colspan="4">
-          <widget class="Line" name="line_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-          </widget>
-         </item>
-         <item row="11" column="0">
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string>Location:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         <item row="4" column="0">
+          <widget class="QLabel" name="label_11">
+           <property name="text">
+            <string>Composer:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1" colspan="3">
+          <widget class="QLineEdit" name="txtComposer"/>
+         </item>
+         <item row="5" column="3">
+          <widget class="QLineEdit" name="txtTrackNumber"/>
+         </item>
+         <item row="5" column="1">
+          <widget class="QLineEdit" name="txtYear"/>
+         </item>
+         <item row="2" column="1" colspan="3">
+          <widget class="QLineEdit" name="txtAlbum"/>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>Genre:</string>
            </property>
           </widget>
          </item>
@@ -212,7 +212,7 @@
            </property>
           </widget>
          </item>
-         <item row="13" column="1" colspan="3">
+         <item row="14" column="1" colspan="3">
           <widget class="QPushButton" name="btnReloadFromFile">
            <property name="text">
             <string>Reload track metadata from file.</string>
@@ -275,6 +275,13 @@
            </property>
           </widget>
          </item>
+         <item row="13" column="1" colspan="3">
+          <widget class="QPushButton" name="btnFetchTag">
+           <property name="text">
+            <string>Reload track metadata from musicBrainz</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>
 
=== added directory 'mixxx/src/musicbrainz'
=== added file 'mixxx/src/musicbrainz/acoustidclient.cpp'
--- mixxx/src/musicbrainz/acoustidclient.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/acoustidclient.cpp	2013-05-22 07:42:27 +0000
@@ -0,0 +1,109 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+    
+#include <QCoreApplication>
+#include <QNetworkReply>
+#include <QXmlStreamReader>
+
+#include "acoustidclient.h"
+#include "gzip.h"
+#include "network.h"
+
+// see API-KEY site here http://acoustid.org/application/496
+// I registered the KEY for version 1.12 -- kain88 (may 2013)
+const QString CLIENT_APIKEY = "czKxnkyO";
+const QString CLIENT_NAME = "Mixxx1.12";
+const QString ACOUSTID_URL = "http://api.acoustid.org/v2/lookup";
+const int AcoustidClient::m_DefaultTimeout = 5000; // msec
+
+AcoustidClient::AcoustidClient(QObject* parent)
+              : QObject(parent),
+                m_network(this),
+                m_timeouts(m_DefaultTimeout, this) {
+}
+
+void AcoustidClient::setTimeout(int msec) {
+    m_timeouts.setTimeout(msec);
+}
+
+void AcoustidClient::start(int id, const QString& fingerprint, int duration) {
+    QUrl url;
+    url.addQueryItem("format", "xml");
+    url.addQueryItem("client", CLIENT_APIKEY);
+    url.addQueryItem("duration", QString::number(duration));
+    url.addQueryItem("meta", "recordingids");
+    url.addQueryItem("fingerprint", fingerprint);
+
+    QNetworkRequest req(QUrl::fromEncoded(ACOUSTID_URL.toAscii()));
+    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+    req.setRawHeader("Content-Encoding", "gzip");
+    req.setRawHeader("User-Agent", CLIENT_NAME.toAscii());
+    
+    QNetworkReply* reply = m_network.post(req, gzipCompress(url.encodedQuery()));
+    connect(reply, SIGNAL(finished()), SLOT(requestFinished()));
+    m_requests[reply] = id;
+    
+    m_timeouts.addReply(reply);
+}
+
+void AcoustidClient::cancel(int id) {
+    QNetworkReply* reply = m_requests.key(id);
+    m_requests.remove(reply);
+    delete reply;
+}
+
+void AcoustidClient::cancelAll() {
+    qDeleteAll(m_requests.keys());
+    m_requests.clear();
+}
+
+void AcoustidClient::requestFinished() {
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+    if (!reply)
+        return;
+    
+    reply->deleteLater();
+    if (!m_requests.contains(reply))
+        return;
+    
+    int id = m_requests.take(reply);
+    
+    if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
+        emit finished(id, QString());
+        return;
+    }
+
+    QXmlStreamReader reader(reply);
+    QString ID;
+    while (!reader.atEnd()) {
+        if (reader.readNext() == QXmlStreamReader::StartElement 
+            && reader.name()== "results") {
+                ID = parseResult(reader);
+            }
+    }
+
+    emit finished(id, ID);
+}
+
+QString AcoustidClient::parseResult(QXmlStreamReader& reader){
+
+    while (!reader.atEnd()) {
+        QXmlStreamReader::TokenType type = reader.readNext();
+        if (type== QXmlStreamReader::StartElement) {
+            QStringRef name = reader.name();
+            if (name == "id") {
+                return reader.readElementText();
+            }
+        }
+        if (type == QXmlStreamReader::EndElement && reader.name()=="result") {
+            break;
+        }
+    }
+    return QString();
+}
 
=== added file 'mixxx/src/musicbrainz/acoustidclient.h'
--- mixxx/src/musicbrainz/acoustidclient.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/acoustidclient.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+    
+#ifndef ACOUSTIDCLIENT_H
+#define ACOUSTIDCLIENT_H
+
+#include <QMap>
+#include <QObject>
+#include <QtNetwork>
+
+#include "network.h"
+#include "trackinfoobject.h"
+
+class QXmlStreamReader;
+
+class AcoustidClient : public QObject {
+  Q_OBJECT
+
+    // Gets a MBID from a Chromaprint fingerprint.
+    // A fingerprint identifies one particular encoding of a song and is created
+    // by Fingerprinter.  An MBID identifies the actual song and can be passed to
+    // Musicbrainz to get metadata.
+    // You can create one AcoustidClient and make multiple requests using it.
+    // IDs are provided by the caller when a request is started and included in
+    // the finished signal - they have no meaning to AcoustidClient.
+
+  public:
+    AcoustidClient(QObject* parent = 0);
+
+    // Network requests will be aborted after this interval.
+    void setTimeout(int msec);
+
+    // Starts a request and returns immediately.  Finished() will be emitted
+    // later with the same ID.
+    void start(int id, const QString& fingerprint, int duration);
+
+    // Cancels the request with the given ID.  Finished() will never be emitted
+    // for that ID.  Does nothing if there is no request with the given ID.
+    void cancel(int id);
+
+    // Cancels all requests.  Finished() will never be emitted for any pending
+    // requests.
+    void cancelAll();
+
+    QString parseResult(QXmlStreamReader& reader);
+
+  signals:
+    void finished(int id, const QString& mbid);
+
+  private slots:
+    void requestFinished();
+
+  private:
+    static const int m_DefaultTimeout;
+
+    QNetworkAccessManager m_network;
+    NetworkTimeouts m_timeouts;
+    QMap<QNetworkReply*, int> m_requests;
+};
+
+#endif // ACOUSTIDCLIENT_H
 
=== added file 'mixxx/src/musicbrainz/chromaprinter.cpp'
--- mixxx/src/musicbrainz/chromaprinter.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/chromaprinter.cpp	2013-05-22 07:42:27 +0000
@@ -0,0 +1,88 @@
+#include <QtCore>
+#include <chromaprint.h>
+
+#include "musicbrainz/chromaprinter.h"
+#include "soundsourceproxy.h"
+#include "defs.h"
+
+chromaprinter::chromaprinter(QObject* parent)
+             : QObject(parent){
+}
+
+QString chromaprinter::getFingerPrint(TrackPointer pTrack){
+    SoundSourceProxy soundSource(pTrack);
+    return calcFingerPrint(soundSource);
+}
+
+QString chromaprinter::getFingerPrint(QString location){
+    SoundSourceProxy soundSource(location);
+    return calcFingerPrint(soundSource);
+}
+
+QString chromaprinter::calcFingerPrint(SoundSourceProxy& soundSource){
+    soundSource.open();
+    m_SampleRate = soundSource.getSampleRate();
+    unsigned int length = soundSource.length();
+    if (m_SampleRate == 0 ){
+        qDebug() << "Skipping invalid file:" << soundSource.getFilename();
+        return QString();
+    }
+
+    // this is worth 2min of audio, multiply by 2 because we have 2 channels
+    // AcoustID only stores a fingerprint for the first two minutes of a song 
+    // on their server so we need only a fingerprint of the first two minutes
+    // --kain88 July 2012
+    m_NumSamples = 120*2*m_SampleRate;
+    // check that the song is actually longer then the amount of audio we use
+    if (m_NumSamples > length) {
+        m_NumSamples = length;
+    }
+
+    SAMPLE *pData = new SAMPLE[m_NumSamples];
+    QTime timerReadingFile;
+    timerReadingFile.start();
+    int read = soundSource.read(m_NumSamples, pData);
+
+    if (read!=m_NumSamples) {
+        qDebug() << "oh that's embarrasing I couldn't read the track";
+        return QString();
+    }
+    qDebug("reading file took: %d ms" , timerReadingFile.elapsed());
+
+    ChromaprintContext* ctx = chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
+    // we have 2 channels in mixxx always
+    chromaprint_start(ctx, m_SampleRate, 2);
+
+    QTime timerGeneratingFingerPrint;
+    timerGeneratingFingerPrint.start();
+    int success = chromaprint_feed(ctx, pData, m_NumSamples);
+    if (!success) {
+        qDebug() << "could not generate fingerprint";
+        return QString();
+    }
+    chromaprint_finish(ctx);
+
+    void* fprint = NULL;
+    int size = 0;
+    int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
+    QByteArray fingerprint;
+    if (ret == 1) {
+        void* encoded = NULL;
+        int encoded_size = 0;
+        chromaprint_encode_fingerprint(fprint, size,
+                                       CHROMAPRINT_ALGORITHM_DEFAULT,
+                                       &encoded,
+                                       &encoded_size, 1);
+
+        fingerprint.append(reinterpret_cast<char*>(encoded), encoded_size);
+
+        chromaprint_dealloc(fprint);
+        chromaprint_dealloc(encoded);
+    }
+    chromaprint_free(ctx);
+    delete pData;
+    
+    qDebug("generating fingerprint took: %d ms" , timerGeneratingFingerPrint.elapsed());
+
+    return fingerprint;
+}
 
=== added file 'mixxx/src/musicbrainz/chromaprinter.h'
--- mixxx/src/musicbrainz/chromaprinter.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/chromaprinter.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,25 @@
+#ifndef CHROMAPRINTER_H
+#define CHROMAPRINTER_H
+
+#include <QObject>
+
+#include "trackinfoobject.h"
+
+class SoundSourceProxy;
+
+class chromaprinter: public QObject {
+  Q_OBJECT
+
+  public:
+    chromaprinter(QObject* parent=NULL);
+    QString getFingerPrint(TrackPointer pTrack);
+    QString getFingerPrint(QString location);
+
+  private:
+
+    QString calcFingerPrint(SoundSourceProxy& soundSource);
+    unsigned int m_NumSamples;
+    unsigned int m_SampleRate;
+};
+
+#endif //CHROMAPRINTER_H
 
=== added file 'mixxx/src/musicbrainz/crc.c'
--- mixxx/src/musicbrainz/crc.c	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/crc.c	2013-05-22 07:42:27 +0000
@@ -0,0 +1,133 @@
+/**
+ * \file crc.c
+ * Functions and types for CRC checks.
+ *
+ * Generated on Sun Oct 24 10:58:31 2010,
+ * by pycrc v0.7.6, http://www.tty1.net/pycrc/
+ * using the configuration:
+ *    Width        = 32
+ *    Poly         = 0x04c11db7
+ *    XorIn        = 0xffffffff
+ *    ReflectIn    = True
+ *    XorOut       = 0xffffffff
+ *    ReflectOut   = True
+ *    Algorithm    = table-driven
+ *****************************************************************************/
+#include "crc.h"
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Static table used for the table_driven implementation.
+ *****************************************************************************/
+static const crc_t crc_table[256] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
+    0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+    0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+    0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+    0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+    0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+    0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+    0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+    0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+    0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+    0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+    0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+    0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+    0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+    0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+    0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+    0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+    0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+    0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+    0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+    0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+    0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+    0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+    0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+    0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+    0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+    0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+    0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+    0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+    0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+    0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+    0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+    0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
+    0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+    0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+/**
+ * Reflect all bits of a \a data word of \a data_len bytes.
+ *
+ * \param data         The data word to be reflected.
+ * \param data_len     The width of \a data expressed in number of bits.
+ * \return             The reflected data.
+ *****************************************************************************/
+crc_t crc_reflect(crc_t data, size_t data_len)
+{
+    unsigned int i;
+    crc_t ret;
+
+    ret = data & 0x01;
+    for (i = 1; i < data_len; i++) {
+        data >>= 1;
+        ret = (ret << 1) | (data & 0x01);
+    }
+    return ret;
+}
+
+
+/**
+ * Update the crc value with new data.
+ *
+ * \param crc      The current crc value.
+ * \param data     Pointer to a buffer of \a data_len bytes.
+ * \param data_len Number of bytes in the \a data buffer.
+ * \return         The updated crc value.
+ *****************************************************************************/
+crc_t crc_update(crc_t crc, const unsigned char *data, size_t data_len)
+{
+    unsigned int tbl_idx;
+
+    while (data_len--) {
+        tbl_idx = (crc ^ *data) & 0xff;
+        crc = (crc_table[tbl_idx] ^ (crc >> 8)) & 0xffffffff;
+
+        data++;
+    }
+    return crc & 0xffffffff;
+}
+
+
+
 
=== added file 'mixxx/src/musicbrainz/crc.h'
--- mixxx/src/musicbrainz/crc.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/crc.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,83 @@
+/**
+ * \file crc.h
+ * Functions and types for CRC checks.
+ *
+ * Generated on Sun Oct 24 10:58:41 2010,
+ * by pycrc v0.7.6, http://www.tty1.net/pycrc/
+ * using the configuration:
+ *    Width        = 32
+ *    Poly         = 0x04c11db7
+ *    XorIn        = 0xffffffff
+ *    ReflectIn    = True
+ *    XorOut       = 0xffffffff
+ *    ReflectOut   = True
+ *    Algorithm    = table-driven
+ *****************************************************************************/
+#ifndef __CRC_H__
+#define __CRC_H__
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * The definition of the used algorithm.
+ *****************************************************************************/
+#define CRC_ALGO_TABLE_DRIVEN 1
+
+
+/**
+ * The type of the CRC values.
+ *
+ * This type must be big enough to contain at least 32 bits.
+ *****************************************************************************/
+typedef unsigned long crc_t;
+
+
+/**
+ * Reflect all bits of a \a data word of \a data_len bytes.
+ *
+ * \param data         The data word to be reflected.
+ * \param data_len     The width of \a data expressed in number of bits.
+ * \return             The reflected data.
+ *****************************************************************************/
+crc_t crc_reflect(crc_t data, size_t data_len);
+
+
+/**
+ * Calculate the initial crc value.
+ *
+ * \return     The initial crc value.
+ *****************************************************************************/
+#define crc_init()      (0xffffffff)
+
+
+/**
+ * Update the crc value with new data.
+ *
+ * \param crc      The current crc value.
+ * \param data     Pointer to a buffer of \a data_len bytes.
+ * \param data_len Number of bytes in the \a data buffer.
+ * \return         The updated crc value.
+ *****************************************************************************/
+crc_t crc_update(crc_t crc, const unsigned char *data, size_t data_len);
+
+
+/**
+ * Calculate the final crc value.
+ *
+ * \param crc  The current crc value.
+ * \return     The final crc value.
+ *****************************************************************************/
+#define crc_finalize(crc)      (crc ^ 0xffffffff)
+
+
+#ifdef __cplusplus
+}           /* closing brace for extern "C" */
+#endif
+
+#endif      /* __CRC_H__ */
 
=== added file 'mixxx/src/musicbrainz/gzip.cpp'
--- mixxx/src/musicbrainz/gzip.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/gzip.cpp	2013-05-22 07:42:27 +0000
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Author: Lukáš Lalinský <[e-mail]>                                *
+ *****************************************************************************/
+
+#include "crc.h"
+#include "gzip.h"
+
+inline QByteArray render32BitInt(unsigned long value)
+{
+	unsigned char data[4];
+	data[0] = (value      ) & 255;
+	data[1] = (value >>  8) & 255;
+	data[2] = (value >> 16) & 255;
+	data[3] = (value >> 24) & 255;
+	return QByteArray((char *)data, 4);
+}
+
+inline unsigned long calculateCrc32(const QByteArray &data)
+{
+	crc_t crc;
+	crc = crc_init();
+	crc = crc_update(crc, (unsigned char *)data.data(), data.size());
+	crc = crc_finalize(crc);
+	return crc;
+}
+
+QByteArray gzipCompress(const QByteArray &data)
+{
+	const char header[10] = {
+		0x1f, 0x8b,	// ID1 + ID2
+		8,			// Compression Method
+		0,			// Flags
+		0, 0, 0, 0, // Modification Time
+		2,			// Extra Flags
+		255,		// Operating System
+	};
+
+	QByteArray compressedData = qCompress(data);
+	compressedData.remove(0, 6); // Qt size + zlib header
+	compressedData.remove(compressedData.size() - 4, 4); // zlib footer
+
+	QByteArray result;
+	result.append(header, 10);
+	result.append(compressedData);
+	result.append(render32BitInt(calculateCrc32(data)));
+	result.append(render32BitInt(data.size()));
+	return result;
+}
+
 
=== added file 'mixxx/src/musicbrainz/gzip.h'
--- mixxx/src/musicbrainz/gzip.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/gzip.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,12 @@
+/*****************************************************************************
+ * Author: Lukáš Lalinský <[e-mail]>                                *
+ *****************************************************************************/
+
+#ifndef FPSUBMIT_GZIP_H_
+#define FPSUBMIT_GZIP_H_
+
+#include <QByteArray>
+
+QByteArray gzipCompress(const QByteArray &data);
+
+#endif
 
=== added file 'mixxx/src/musicbrainz/musicbrainzclient.cpp'
--- mixxx/src/musicbrainz/musicbrainzclient.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/musicbrainzclient.cpp	2013-05-22 07:42:27 +0000
@@ -0,0 +1,180 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+    
+#include <QCoreApplication>
+#include <QNetworkReply>
+#include <QtNetwork>
+#include <QSet>
+#include <QXmlStreamReader>
+
+#include "musicbrainzclient.h"
+
+const QString MusicBrainzClient::m_TrackUrl = "http://musicbrainz.org/ws/2/recording/";
+const QString MusicBrainzClient::m_DateRegex = "^[12]\\d{3}";
+const int MusicBrainzClient::m_DefaultTimeout = 5000; // msec
+
+MusicBrainzClient::MusicBrainzClient(QObject* parent)
+                 : QObject(parent),
+                   m_network(this),
+                   m_timeouts(m_DefaultTimeout, this){
+}
+
+void MusicBrainzClient::start(int id, const QString& mbid) {
+    typedef QPair<QString, QString> Param;
+
+    QList<Param> parameters;
+    parameters << Param("inc", "artists+releases+media");
+
+    QUrl url(m_TrackUrl + mbid);
+    url.setQueryItems(parameters);
+    QNetworkRequest req(url);
+
+    QNetworkReply* reply = m_network.get(req);
+    connect(reply, SIGNAL(finished()), SLOT(requestFinished()));
+    m_requests[reply] = id;
+
+    m_timeouts.addReply(reply);
+}
+
+void MusicBrainzClient::cancel(int id) {
+    QNetworkReply* reply = m_requests.key(id);
+    m_requests.remove(reply);
+    delete reply;
+}
+
+void MusicBrainzClient::cancelAll() {
+    qDeleteAll(m_requests.keys());
+    m_requests.clear();
+}
+
+void MusicBrainzClient::requestFinished() {
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+    if (!reply)
+        return;
+
+    reply->deleteLater();
+    if (!m_requests.contains(reply))
+        return;
+
+    int id = m_requests.take(reply);
+    ResultList ret;
+
+    if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
+        emit finished(id, ret);
+        return;
+    }
+
+    QXmlStreamReader reader(reply);
+    while (!reader.atEnd()) {
+        if (reader.readNext() == QXmlStreamReader::StartElement 
+            && reader.name() == "recording") {
+
+            ResultList tracks = parseTrack(reader);
+            foreach (const Result& track, tracks) {
+                if (!track.m_title.isEmpty()) {
+                    ret << track;
+                }
+            }
+        }
+    }
+    emit finished(id, uniqueResults(ret));
+}
+
+MusicBrainzClient::ResultList MusicBrainzClient::parseTrack(QXmlStreamReader& reader) {
+    Result result;
+    QList<Release> releases;
+
+    while (!reader.atEnd()) {
+        QXmlStreamReader::TokenType type = reader.readNext();
+
+        if (type == QXmlStreamReader::StartElement) {
+            QStringRef name = reader.name();
+            if (name == "title") {
+                result.m_title = reader.readElementText();
+            } else if (name == "length") {
+                // convert msec to sec
+                result.m_duration = reader.readElementText().toInt()*10000000;
+            } else if (name == "artist") {
+                parseArtist(reader, result.m_artist);
+            } else if (name == "release") {
+                releases << parseRelease(reader);
+            }
+        }
+
+        if (type == QXmlStreamReader::EndElement && reader.name() == "recording") {
+        break;
+        }
+    }
+
+    ResultList ret;
+    foreach (const Release& release, releases) {
+        ret << release.CopyAndMergeInto(result);
+    }
+    return ret;
+}
+
+void MusicBrainzClient::parseArtist(QXmlStreamReader& reader, QString& artist) {
+    while (!reader.atEnd()) {
+        QXmlStreamReader::TokenType type = reader.readNext();
+
+        if (type == QXmlStreamReader::StartElement && reader.name() == "name") {
+            artist = reader.readElementText();
+        }
+
+        if (type == QXmlStreamReader::EndElement && reader.name() == "artist") {
+            return;
+        }
+    }
+}
+
+MusicBrainzClient::Release MusicBrainzClient::parseRelease(QXmlStreamReader& reader) {
+    Release ret;
+
+    while (!reader.atEnd()) {
+        QXmlStreamReader::TokenType type = reader.readNext();
+
+        if (type == QXmlStreamReader::StartElement) {
+            QStringRef name = reader.name();
+            if (name == "title") {
+                ret.m_album = reader.readElementText();
+            } else if (name == "date") {
+                QRegExp regex(m_DateRegex);
+                if (regex.indexIn(reader.readElementText()) == 0) {
+                ret.m_year = regex.cap(0).toInt();
+                }
+            } else if (name == "track-list") {
+                ret.m_track = reader.attributes().value("offset").toString().toInt() + 1;
+                consumeCurrentElement(reader);
+            }
+        }
+
+        if (type == QXmlStreamReader::EndElement && reader.name() == "release") {
+            break;
+        }
+    }
+
+    return ret;
+}
+
+MusicBrainzClient::ResultList MusicBrainzClient::uniqueResults(const ResultList& results) {
+    ResultList ret = QSet<Result>::fromList(results).toList();
+    qSort(ret);
+    return ret;
+}
+
+void MusicBrainzClient::consumeCurrentElement(QXmlStreamReader& reader) {
+    int level = 1;
+    while (level != 0 && !reader.atEnd()) {
+        switch (reader.readNext()) {
+        case QXmlStreamReader::StartElement: ++level; break;
+        case QXmlStreamReader::EndElement:   --level; break;
+        default: break;
+        }
+    }
+}
 
=== added file 'mixxx/src/musicbrainz/musicbrainzclient.h'
--- mixxx/src/musicbrainz/musicbrainzclient.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/musicbrainzclient.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,130 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+    
+#ifndef MUSICBRAINZCLIENT_H
+#define MUSICBRAINZCLIENT_H
+
+#include <QHash>
+#include <QMap>
+#include <QObject>
+#include <QXmlStreamReader>
+#include <QtNetwork>
+
+#include "network.h"
+
+class MusicBrainzClient : public QObject {
+  Q_OBJECT
+
+  // Gets metadata for a particular MBID.
+  // An MBID is created from a fingerprint using chromaprint library.
+  // You can create one MusicBrainzClient and make multiple requests using it.
+  // IDs are provided by the caller when a request is started and included in
+  // the Finished signal - they have no meaning to MusicBrainzClient.
+
+  public:
+    MusicBrainzClient(QObject* parent = 0);
+
+    struct Result {
+        Result() : m_duration(0), m_track(0), m_year(-1) {}
+
+        bool operator <(const Result& other) const {
+            #define cmp(field) \
+                if (field < other.field) return true; \
+                if (field > other.field) return false;
+
+            cmp(m_track);
+            cmp(m_year);
+            cmp(m_title);
+            cmp(m_artist);
+            return false;
+
+            #undef cmp
+        }
+        
+        bool operator ==(const Result& other) const {
+            return m_title == other.m_title &&
+                   m_artist == other.m_artist &&
+                   m_album == other.m_album &&
+                   m_duration == other.m_duration &&
+                   m_track == other.m_track &&
+                   m_year == other.m_year;
+        }
+
+        QString m_title;
+        QString m_artist;
+        QString m_album;
+        int m_duration;
+        int m_track;
+        int m_year;
+    };
+    typedef QList<Result> ResultList;
+
+
+    // Starts a request and returns immediately.  finished() will be emitted
+    // later with the same ID.
+    void start(int id, const QString& mbid);
+    static void consumeCurrentElement(QXmlStreamReader& reader);
+
+    // Cancels the request with the given ID.  Finished() will never be emitted
+    // for that ID.  Does nothing if there is no request with the given ID.
+    void cancel(int id);
+
+    // Cancels all requests.  Finished() will never be emitted for any pending
+    // requests.
+    void cancelAll();
+
+  signals:
+    // Finished signal emitted when fechting songs tags
+    void finished(int id, const MusicBrainzClient::ResultList& result);
+
+  private slots:
+    void requestFinished();
+
+  private:
+    struct Release {
+        Release() : m_track(0), m_year(0) {}
+
+        Result CopyAndMergeInto(const Result& orig) const {
+            Result ret(orig);
+            ret.m_album = m_album;
+            ret.m_track = m_track;
+            ret.m_year = m_year;
+            return ret;
+        }
+
+        QString m_album;
+        int m_track;
+        int m_year;
+    };
+
+    static ResultList parseTrack(QXmlStreamReader& reader);
+    static void parseArtist(QXmlStreamReader& reader, QString& artist);
+    static Release parseRelease(QXmlStreamReader& reader);
+    static ResultList uniqueResults(const ResultList& results);
+
+  private:
+    static const QString m_TrackUrl;
+    static const QString m_DateRegex;
+    static const int m_DefaultTimeout;
+    
+    QNetworkAccessManager m_network;
+    NetworkTimeouts m_timeouts;
+    QMap<QNetworkReply*, int> m_requests;
+};
+
+inline uint qHash(const MusicBrainzClient::Result& result) {
+  return qHash(result.m_album) ^
+         qHash(result.m_artist) ^
+         result.m_duration ^
+         qHash(result.m_title) ^
+         result.m_track ^
+         result.m_year;
+}
+
+#endif // MUSICBRAINZCLIENT_H
 
=== added file 'mixxx/src/musicbrainz/tagfetcher.cpp'
--- mixxx/src/musicbrainz/tagfetcher.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/tagfetcher.cpp	2013-05-22 07:42:27 +0000
@@ -0,0 +1,121 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+    
+#include <QFuture>
+#include <QUrl>
+#include <QtConcurrentMap>
+
+#include "musicbrainz/tagfetcher.h"
+#include "musicbrainz/chromaprinter.h"
+#include "musicbrainz/musicbrainzclient.h"
+
+TagFetcher::TagFetcher(QObject* parent)
+          : QObject(parent),
+            m_pFingerprintWatcher(NULL),
+            m_AcoustidClient(this),
+            m_MusicbrainzClient(this) {
+    connect(&m_AcoustidClient, SIGNAL(finished(int,QString)),
+            this, SLOT(mbidFound(int,QString)));
+    connect(&m_MusicbrainzClient, SIGNAL(finished(int,MusicBrainzClient::ResultList)),
+            this, SLOT(tagsFetched(int,MusicBrainzClient::ResultList)));
+}
+
+QString TagFetcher::getFingerprint(const TrackPointer tio) {
+    return chromaprinter(NULL).getFingerPrint(tio);
+}
+
+void TagFetcher::startFetch(const TrackPointer track) {
+    cancel();
+    // qDebug() << "start to fetch track metadata";
+    QList<TrackPointer> tracks;
+    tracks.append(track);
+    m_tracks = tracks;
+
+    QFuture<QString> future = QtConcurrent::mapped(m_tracks, getFingerprint);
+    m_pFingerprintWatcher = new QFutureWatcher<QString>(this);
+    m_pFingerprintWatcher->setFuture(future);
+    connect(m_pFingerprintWatcher, SIGNAL(resultReadyAt(int)),
+            SLOT(fingerprintFound(int)));
+
+    foreach (const TrackPointer ptrack, m_tracks) {
+        emit fetchProgress(tr("Fingerprinting track"));
+    }
+}
+
+void TagFetcher::cancel() {
+    // qDebug()<< "Cancel tagfetching";
+    if (m_pFingerprintWatcher) {
+        m_pFingerprintWatcher->cancel();
+
+        delete m_pFingerprintWatcher;
+        m_pFingerprintWatcher = NULL;
+    }
+
+    m_AcoustidClient.cancelAll();
+    m_MusicbrainzClient.cancelAll();
+    m_tracks.clear();
+}
+
+void TagFetcher::fingerprintFound(int index) {
+    QFutureWatcher<QString>* watcher = reinterpret_cast<QFutureWatcher<QString>*>(sender());
+    if (!watcher || index >= m_tracks.count()) {
+        return;
+    }
+
+    const QString fingerprint = watcher->resultAt(index);
+    const TrackPointer ptrack = m_tracks[index];
+
+    if (fingerprint.isEmpty()) {
+        emit resultAvailable(ptrack, QList<TrackPointer>());
+        return;
+    }
+
+    emit fetchProgress(tr("Identifying track"));
+    // qDebug() << "start to look up the MBID";
+    m_AcoustidClient.start(index, fingerprint, ptrack->getDuration());
+}
+
+void TagFetcher::mbidFound(int index, const QString& mbid) {
+    if (index >= m_tracks.count()) {
+        return;
+    }
+
+    const TrackPointer pTrack = m_tracks[index];
+
+    if (mbid.isEmpty()) {
+        emit resultAvailable(pTrack, QList<TrackPointer>());
+        return;
+    }
+
+    emit fetchProgress(tr("Downloading Metadata"));
+    //qDebug() << "start to fetch tags from MB";
+    m_MusicbrainzClient.start(index, mbid);
+}
+
+void TagFetcher::tagsFetched(int index, const MusicBrainzClient::ResultList& results) {
+    if (index >= m_tracks.count()) {
+        return;
+    }
+    // qDebug() << "Tagfetcher got musicbrainz results and now parses them";
+    const TrackPointer originalTrack = m_tracks[index];
+    QList<TrackPointer> tracksGuessed;
+
+    foreach (const MusicBrainzClient::Result& result, results) {
+        TrackPointer track(new TrackInfoObject(originalTrack->getLocation(),false),
+                           &QObject::deleteLater);
+        track->setTitle(result.m_title);
+        track->setArtist(result.m_artist);
+        track->setAlbum(result.m_album);
+        track->setDuration(result.m_duration);
+        track->setTrackNumber(QString::number(result.m_track));
+        track->setYear(QString::number(result.m_year));
+        tracksGuessed << track;
+    }
+    emit resultAvailable(originalTrack, tracksGuessed);
+}
 
=== added file 'mixxx/src/musicbrainz/tagfetcher.h'
--- mixxx/src/musicbrainz/tagfetcher.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/musicbrainz/tagfetcher.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,58 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+    
+#ifndef TAGFETCHER_H
+#define TAGFETCHER_H
+
+#include <QFutureWatcher>
+#include <QObject>
+
+#include "musicbrainz/musicbrainzclient.h"
+#include "musicbrainz/acoustidclient.h"
+#include "trackinfoobject.h"
+
+
+class TagFetcher : public QObject {
+  Q_OBJECT
+
+  // High level interface to Fingerprinter, AcoustidClient and
+  // MusicBrainzClient.
+
+  public:
+    TagFetcher(QObject* parent = 0);
+
+    void startFetch(const TrackPointer track);
+
+  public slots:
+    void cancel();
+
+  signals:
+    void resultAvailable(const TrackPointer originalTrack,
+                         const QList<TrackPointer>& tracksGuessed);
+    void fetchProgress(QString);
+
+  private slots:
+    void fingerprintFound(int index);
+    void mbidFound(int index, const QString& mbid);
+    void tagsFetched(int index, const MusicBrainzClient::ResultList& result);
+
+  private:
+    // has to be static so we can call it with QtConcurrent and have a nice
+    // responsive UI while the fingerprint is calculated
+    static QString getFingerprint(const TrackPointer tio);
+
+    QFutureWatcher<QString>* m_pFingerprintWatcher;
+    AcoustidClient m_AcoustidClient;
+    MusicBrainzClient m_MusicbrainzClient;
+
+    // Code can already be run on an arbitrary number of input tracks
+    QList<TrackPointer> m_tracks;
+};
+
+#endif // TAGFETCHER_H
 
=== added file 'mixxx/src/network.cpp'
--- mixxx/src/network.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/network.cpp	2013-05-22 07:42:27 +0000
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QNetworkAccessManager>
+#include <QNetworkDiskCache>
+#include <QNetworkReply>
+
+#include "network.h"
+
+NetworkAccessManager::NetworkAccessManager(QObject* parent)
+                    : QNetworkAccessManager(parent) {
+}
+
+QNetworkReply* NetworkAccessManager::createRequest(Operation op,
+                                                   const QNetworkRequest& request,
+                                                   QIODevice* outgoingData) {
+    QNetworkRequest new_request(request);
+    new_request.setRawHeader("User-Agent", QString("%1 %2").arg(
+        QCoreApplication::applicationName(),
+        QCoreApplication::applicationVersion()).toUtf8());
+    
+    if (op == QNetworkAccessManager::PostOperation &&
+        !new_request.header(QNetworkRequest::ContentTypeHeader).isValid()) {
+        new_request.setHeader(QNetworkRequest::ContentTypeHeader,
+                            "application/x-www-form-urlencoded");
+    }
+
+    // Prefer the cache unless the caller has changed the setting already
+    if (request.attribute(QNetworkRequest::CacheLoadControlAttribute).toInt()
+        == QNetworkRequest::PreferNetwork) {
+        new_request.setAttribute(QNetworkRequest::CacheLoadControlAttribute,
+                                QNetworkRequest::PreferCache);
+    }
+    
+    return QNetworkAccessManager::createRequest(op, new_request, outgoingData);
+}
+
+
+NetworkTimeouts::NetworkTimeouts(int timeout_msec, QObject* parent)
+                : QObject(parent), 
+                  m_timeout_msec(timeout_msec) {
+}
+
+void NetworkTimeouts::addReply(QNetworkReply* reply) {
+    if (m_timers.contains(reply))
+        return;
+  
+    connect(reply, SIGNAL(destroyed()), SLOT(replyFinished()));
+    connect(reply, SIGNAL(finished()), SLOT(replyFinished()));
+    m_timers[reply] = startTimer(m_timeout_msec);
+}
+
+void NetworkTimeouts::replyFinished() {
+    QNetworkReply* reply = reinterpret_cast<QNetworkReply*>(sender());
+    if (m_timers.contains(reply)) {
+        killTimer(m_timers.take(reply));
+    }
+}
+
+void NetworkTimeouts::timerEvent(QTimerEvent* e) {
+    QNetworkReply* reply = m_timers.key(e->timerId());
+    if (reply) {
+      reply->abort();
+    }
+}
 
=== added file 'mixxx/src/network.h'
--- mixxx/src/network.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/network.h	2013-05-22 07:42:27 +0000
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ *  Copyright © 2012 John Maguire <[e-mail]>                   *
+ *                   David Sansome <[e-mail]>                     *
+ *  This work is free. You can redistribute it and/or modify it under the    *
+ *  terms of the Do What The Fuck You Want To Public License, Version 2,     *
+ *  as published by Sam Hocevar.                                             *
+ *  See http://www.wtfpl.net/ for more details.                              *
+ *****************************************************************************/
+    
+#ifndef NETWORK_H
+#define NETWORK_H
+
+#include <QAbstractNetworkCache>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+class NetworkAccessManager : public QNetworkAccessManager {
+  Q_OBJECT
+
+  public:
+    NetworkAccessManager(QObject* parent = 0);
+  
+  protected:
+    QNetworkReply* createRequest(Operation op, const QNetworkRequest& request,
+                                 QIODevice* outgoingData);
+};
+  
+  
+class NetworkTimeouts : public QObject {
+    Q_OBJECT
+  
+  public:
+    NetworkTimeouts(int timeout_msec, QObject* parent = 0);
+  
+    void addReply(QNetworkReply* reply);
+    void setTimeout(int msec) { m_timeout_msec = msec; }
+  
+  protected:
+    void timerEvent(QTimerEvent* e);
+  
+  private slots:
+    void replyFinished();
+  
+  private:
+    int m_timeout_msec;
+    QMap<QNetworkReply*, int> m_timers;
+};
+
+#endif // NETWORK_H
 
=== modified file 'mixxx/src/widget/wtracktableview.cpp'
--- mixxx/src/widget/wtracktableview.cpp	2013-05-21 03:02:42 +0000
+++ mixxx/src/widget/wtracktableview.cpp	2013-05-22 07:42:27 +0000
@@ -25,14 +25,20 @@
                                       WTRACKTABLEVIEW_VSCROLLBARPOS_KEY)),
           m_pConfig(pConfig),
           m_pTrackCollection(pTrackCollection),
+          m_DlgTagFetcher(NULL) ,
           m_sorting(sorting) {
     // Give a NULL parent because otherwise it inherits our style which can make
     // it unreadable. Bug #673411
-    m_pTrackInfo = new DlgTrackInfo(NULL);
+    m_pTrackInfo = new DlgTrackInfo(NULL,m_DlgTagFetcher);
     connect(m_pTrackInfo, SIGNAL(next()),
             this, SLOT(slotNextTrackInfo()));
     connect(m_pTrackInfo, SIGNAL(previous()),
             this, SLOT(slotPrevTrackInfo()));
+    connect(&m_DlgTagFetcher, SIGNAL(next()),
+            this, SLOT(slotNextDlgTagFetcher()));
+    connect(&m_DlgTagFetcher, SIGNAL(previous()),
+            this, SLOT(slotPrevDlgTagFetcher()));
+
 
     connect(&m_loadTrackMapper, SIGNAL(mapped(QString)),
             this, SLOT(loadSelectionToGroup(QString)));
@@ -75,8 +81,8 @@
             this, SLOT(addSelectionToCrate(int)));
 }
 
-WTrackTableView::~WTrackTableView()
-{
+WTrackTableView::~WTrackTableView() {
+    qDebug() << "~WTrackTableView()";
     WTrackTableViewHeader* pHeader =
             dynamic_cast<WTrackTableViewHeader*>(horizontalHeader());
     if (pHeader) {
@@ -84,6 +90,7 @@
     }
 
     delete m_pReloadMetadataAct;
+    delete m_pReloadMetadataFromMusicBrainzAct;
     delete m_pAddToPreviewDeck;
     delete m_pAutoDJAct;
     delete m_pAutoDJTopAct;
@@ -290,6 +297,10 @@
     connect(m_pReloadMetadataAct, SIGNAL(triggered()),
             this, SLOT(slotReloadTrackMetadata()));
 
+    m_pReloadMetadataFromMusicBrainzAct = new QAction(tr("Reload from Musicbrainz"),this);
+    connect(m_pReloadMetadataFromMusicBrainzAct, SIGNAL(triggered()),
+            this, SLOT(slotShowDlgTagFetcher()));
+
     m_pAddToPreviewDeck = new QAction(tr("Load to Preview Deck"), this);
     // currently there is only one preview deck so just map it here.
     QString previewDeckGroup = PlayerManager::groupForPreviewDeck(0);
@@ -456,6 +467,42 @@
     m_pTrackInfo->show();
 }
 
+void WTrackTableView::slotNextDlgTagFetcher() {
+    QModelIndex nextRow = currentTrackInfoIndex.sibling(
+        currentTrackInfoIndex.row()+1, currentTrackInfoIndex.column());
+    if (nextRow.isValid())
+        showDlgTagFetcher(nextRow);
+}
+
+void WTrackTableView::slotPrevDlgTagFetcher() {
+    QModelIndex prevRow = currentTrackInfoIndex.sibling(
+        currentTrackInfoIndex.row()-1, currentTrackInfoIndex.column());
+    if (prevRow.isValid())
+        showDlgTagFetcher(prevRow);
+}
+
+void WTrackTableView::showDlgTagFetcher(QModelIndex index) {
+    TrackModel* trackModel = getTrackModel();
+
+    if (!trackModel) {
+        return;
+    }
+
+    TrackPointer pTrack = trackModel->getTrack(index);
+    // NULL is fine
+    m_DlgTagFetcher.init(pTrack);
+    currentTrackInfoIndex = index;
+    m_DlgTagFetcher.show();
+}
+
+void WTrackTableView::slotShowDlgTagFetcher(){
+    QModelIndexList indices = selectionModel()->selectedRows();
+
+    if (indices.size() > 0) {
+        showDlgTagFetcher(indices[0]);
+    }
+}
+
 void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
     QModelIndexList indices = selectionModel()->selectedRows();
 
@@ -613,8 +660,10 @@
     m_pMenu->addSeparator();
     if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_RELOADMETADATA)) {
         m_pMenu->addAction(m_pReloadMetadataAct);
+        m_pReloadMetadataFromMusicBrainzAct->setEnabled(oneSongSelected);
+        m_pMenu->addAction(m_pReloadMetadataFromMusicBrainzAct);
     }
-    // REMOVE and HIDE should not be at the first menu position to avoid excitedly clicks
+    // REMOVE and HIDE should not be at the first menu position to avoid accidental clicks
     if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_REMOVE)) {
         m_pRemoveAct->setEnabled(!locked);
         m_pMenu->addAction(m_pRemoveAct);
 
=== modified file 'mixxx/src/widget/wtracktableview.h'
--- mixxx/src/widget/wtracktableview.h	2013-05-21 03:02:42 +0000
+++ mixxx/src/widget/wtracktableview.h	2013-05-22 07:42:27 +0000
@@ -9,6 +9,7 @@
 #include "library/libraryview.h"
 #include "library/trackmodel.h" // Can't forward declare enums
 #include "widget/wlibrarytableview.h"
+#include "dlgtagfetcher.h"
 
 class ControlObjectThreadMain;
 class DlgTrackInfo;
@@ -44,8 +45,11 @@
     void slotHide();
     void slotOpenInFileBrowser();
     void slotShowTrackInfo();
+    void slotShowDlgTagFetcher();
     void slotNextTrackInfo();
+    void slotNextDlgTagFetcher();
     void slotPrevTrackInfo();
+    void slotPrevDlgTagFetcher();
     void slotSendToAutoDJ();
     void slotSendToAutoDJTop();
     void slotReloadTrackMetadata();
@@ -61,6 +65,7 @@
   private:
     void sendToAutoDJ(bool bTop);
     void showTrackInfo(QModelIndex index);
+    void showDlgTagFetcher(QModelIndex index);
     void createActions();
     void dragMoveEvent(QDragMoveEvent * event);
     void dragEnterEvent(QDragEnterEvent * event);
@@ -81,6 +86,7 @@
     QSignalMapper m_loadTrackMapper;
 
     DlgTrackInfo* m_pTrackInfo;
+    DlgTagFetcher m_DlgTagFetcher;
     QModelIndex currentTrackInfoIndex;
 
 
@@ -94,6 +100,7 @@
 
     // Reload Track Metadata Action:
     QAction *m_pReloadMetadataAct;
+    QAction *m_pReloadMetadataFromMusicBrainzAct;
 
     // Load Track to PreviewDeck
     QAction* m_pAddToPreviewDeck;