Today's misc everywhere else fixes.

git-svn-id: svn+ssh://svn.last.fm/svn/clientside/trunk/desktop@121430 ab8f4a45-97f9-0310-bbd1-854ce3dcee89
RJ · Feb 18, 2009 · 0a812b5 · 0a812b5
1 parent 5c72af8
commit 0a812b5
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/README b/README
@@ -33,6 +33,10 @@ probably go:
 I wrote that from memory as I'm working on a Mac today. If it's wrong please
 write and correct me. KTHXBAI.
 
+Ubuntu install deps line:
+
+sudo apt-get install libsqlite3-dev libqt4-sql-sqlite
+
 Mac OS X
 --------
 We suggest you grab the Qt 4.4 dmg installer from the Qt website. Then, the

diff --git a/admin/dist/mac/Makefile.dmg.pl b/admin/dist/mac/Makefile.dmg.pl
@@ -71,8 +71,6 @@ ()
 
 .PHONY = bundle bundle-clean bundle-install dmg dmg-clean everything
 
-MOOSE: all moose_extra
-
 \$(DESTDIR)\$(QMAKE_TARGET)-makefile-dmg-dummy: \$(TARGET) $plist
 	perl -pi -e 's/@VERSION@/'\$(VERSION)'/g' $plist
 	perl -pi -e 's/@SHORT_VERSION@/'`echo \$(VERSION) | cut -d'.' -f1,2,3`'/g' $plist

diff --git a/admin/include.qmake b/admin/include.qmake
@@ -11,7 +11,7 @@ mac*{
 linux*{
 	CONFIG += link_pkgconfig
 	# use KDE phonon if installed in preference
-	contains( QT, phonon ):LIBS += -L$$system( kde4-config --prefix )/lib
+	contains( QT, phonon ):LIBS += -L$$system( kde4-config --prefix &2> /dev/null )/lib
 }
 
 #default install target

diff --git a/admin/qmake/3rdparty.pro.inc b/admin/qmake/3rdparty.pro.inc
@@ -33,7 +33,7 @@ CONFIG( samplerate ) {
 }
 
 CONFIG( sqlite3 ) {
-    !macx*{
+    win32 {
         CONFIG += link_pkgconfig
         PKGCONFIG += sqlite3
     }

diff --git a/app/clientplugins/localresolver/LocalCollection.h b/app/clientplugins/localresolver/LocalCollection.h
@@ -40,7 +40,7 @@
 #include <QVariantList>
 #include "ChainableQuery.h"
 #include "lib/lastfm/core/WeightedStringList.h"
-
+#include <memory>
 
 class LocalCollection : public QObject
 {

diff --git a/lib/lastfm/radio/Radio.cpp b/lib/lastfm/radio/Radio.cpp
@@ -39,7 +39,7 @@ Radio::Radio( Phonon::AudioOutput* output )
     m_mediaObject = new Phonon::MediaObject;
     m_mediaObject->setTickInterval( 1000 );
     connect( m_mediaObject, SIGNAL(stateChanged( Phonon::State, Phonon::State )), SLOT(onPhononStateChanged( Phonon::State, Phonon::State )) );
-	connect( m_mediaObject, SIGNAL(currentSourceChanged( const Phonon::MediaSource &)), SLOT(onPhononCurrentSourceChanged( const Phonon::MediaSource &)) );
+	connect( m_mediaObject, SIGNAL(currentSourceChanged( Phonon::MediaSource )), SLOT(onPhononCurrentSourceChanged( Phonon::MediaSource )) );
     connect( m_mediaObject, SIGNAL(aboutToFinish()), SLOT(phononEnqueue()) ); // this fires when the whole queue is about to finish
     connect( m_mediaObject, SIGNAL(tick(qint64)), SIGNAL(tick(qint64)));
     Phonon::createPath( m_mediaObject, m_audioOutput );    
@@ -250,7 +250,7 @@ Radio::phononEnqueue()
         m_track = t;
         Phonon::MediaSource ms( t.url() );
 
-        // it is important to make this distinction:
+        // if we are playing a track now, enqueue, otherwise start now!
         if (m_mediaObject->currentSource().url().isValid()) {
             m_mediaObject->enqueue( ms );
         } else {

diff --git a/lib/lastfm/types/Track.h b/lib/lastfm/types/Track.h
@@ -239,7 +239,9 @@ TrackData::TrackData()
 #include <QDebug>
 inline QDebug operator<<( QDebug d, const lastfm::Track& t )
 {
-    return d << t.toString( '-' ) << t.url();
+    return !t.isNull() 
+            ? d << t.toString( '-' ) << t.url()
+            : d << "Null Track object";
 }
 
 

diff --git a/lib/listener/legacy/LegacyPlayerListener.cpp b/lib/listener/legacy/LegacyPlayerListener.cpp
@@ -93,4 +93,6 @@ LegacyPlayerListener::onDataReady()
             socket->write( s.toUtf8() );
         }
     }
+
+    socket->close();
 }