$OpenBSD: patch-src_lastfmapplication_cpp,v 1.4 2011/09/19 12:50:57 dcoppa Exp $
--- src/lastfmapplication.cpp.orig	Mon Sep 19 11:46:55 2011
+++ src/lastfmapplication.cpp	Mon Sep 19 11:58:53 2011
@@ -25,8 +25,6 @@
 #include "configwizard.h"
 #include "container.h"
 #include "LastMessageBox.h"
-#include "libFingerprint/FingerprintCollector.h"
-#include "libFingerprint/FingerprintQueryer.h"
 #include "logger.h"
 #include "loginwidget.h"
 #include "MediaDeviceScrobbler.h"
@@ -128,7 +126,7 @@ LastFmApplication::LastFmApplication( int& argc, char*
 
     setQuitOnLastWindowClosed( false );
   #ifdef Q_WS_X11
-    setWindowIcon( QIcon( MooseUtils::dataPath( "icons/as.ico" ) ) );
+    setWindowIcon( QIcon( MooseUtils::dataPath( "icons/as.png" ) ) );
   #endif
 
   #ifdef WIN32
@@ -167,11 +165,6 @@ LastFmApplication::LastFmApplication( int& argc, char*
     new ITunesScript( this, m_listener );
   #endif
 
-    m_fpCollector = new FingerprintCollector( 1 /*number of threads*/, this );
-    m_fpQueryer = new FingerprintQueryer( this );
-    connect( m_fpQueryer, SIGNAL( trackFingerprinted( TrackInfo, bool ) ),
-                          SLOT( onFingerprintQueryDone( TrackInfo, bool ) ) );
-
     m_radio = new Radio( this );
     connect( m_radio, SIGNAL( stateChanged( RadioState ) ), SLOT( onRadioStateChanged( RadioState ) ) );
 
@@ -234,7 +227,8 @@ LastFmApplication::init()
         }
 
         LOGL( 3, "First run, launching config wizard" );
-        QFile( MooseUtils::savePath( "mediadevice.db" ) ).remove();
+        QFile mediadevicedb( MooseUtils::savePath( "mediadevice.db" ) );
+        mediadevicedb.remove();
 
         ConfigWizard wiz( NULL, ConfigWizard::Login );
 
@@ -245,7 +239,7 @@ LastFmApplication::init()
             return;
         }
     }
-  #ifndef LINUX
+  #ifndef Q_WS_X11
     else
     {
       #ifdef Q_OS_MAC
@@ -343,9 +337,6 @@ LastFmApplication::~LastFmApplication()
     sendPostedEvents( m_scrobbler, 0 /*all event types*/ );
     //TODO send events to individual scrobblers in the manager too?
 
-    delete m_fpQueryer;
-    delete m_fpCollector;
-
     #ifdef Q_WS_MAC
         if ( !m_pidFile.remove() )
         {
@@ -498,15 +489,6 @@ LastFmApplication::onProxyTestComplete( bool proxySet,
     QString password = m_user->settings().password();
     QString version = The::settings().version();
 
-    // as you can see we are initialising the fingerprinter, I like this comment
-    m_fpCollector->setUsername( username );
-    m_fpCollector->setPasswordMd5( password );
-    m_fpCollector->setPasswordMd5Lower( password ); // FIXME: surely they can't be the same!
-    m_fpQueryer->setUsername( username );
-    m_fpQueryer->setPasswordMd5( password );
-    m_fpQueryer->setPasswordMd5Lower( password ); // FIXME: surely they can't be the same!
-    m_fpQueryer->setVersion( The::settings().version() );
-
     // init radio YTIO
     m_radio->init( username, password, version );
 
@@ -812,13 +794,6 @@ LastFmApplication::onAppEvent( int event, const QVaria
 
                 if ( m_container->isVisible() )
                     fetchMetaData();
-
-                if ( QFile::exists( m_currentTrack.path() ) &&
-                     The::settings().currentUser().fingerprintingEnabled() )
-                {
-                    m_activeNorman = 0;
-                    m_fpQueryer->fingerprint( m_currentTrack );
-                }
             }
         }
         break;
@@ -1128,40 +1103,6 @@ LastFmApplication::onBootstrapReady( QString userName,
     PluginBootstrapper* bootstrapper = new PluginBootstrapper( pluginId, this );
     bootstrapper->submitBootstrap();
     #endif
-}
-
-
-void
-LastFmApplication::onFingerprintQueryDone( TrackInfo track, bool fullFpRequested )
-{
-    // We're using the path here as the track metadata could have been changed by
-    // a metadata request in-between requesting the fp and getting it.
-
-    if ( m_currentTrack.path() != track.path() )
-        return;
-
-    m_currentTrack.setFpId( track.fpId() );
-
-    if ( fullFpRequested && The::settings().currentUser().fingerprintingEnabled() )
-    {
-        m_fpCollector->fingerprint( QList<TrackInfo>() << m_currentTrack );
-    }
-
-    if ( qApp->arguments().contains( "--norman" ) )
-    {
-        if ( track.fpId() != "0" && !track.fpId().isEmpty() && !fullFpRequested )
-        {
-            m_activeNorman = new FrikkinNormanRequest();
-            m_activeNorman->setFpId( track.fpId() );
-            connect( m_activeNorman, SIGNAL( result( Request* ) ), SLOT( onNormanRequestDone( Request* ) ) );
-            m_activeNorman->start();
-        }
-        else
-        {
-            m_activeNorman = 0;
-            //m_container->statusBar()->showMessage( "Norman sez: I not know dis one" );
-        }
-    }
 }
 
 
