5555555555

.gitignore

@@ -12,3 +12,10 @@ admin/dist/mac/dsa_priv.pem
 *.sln
 *.suo
 .DS_Store
+*.breakpad
+*.user
+*.qm
+*.exe
+*.vscode
+Growl
+Sparkle

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lib/3rdparty/SPMediaKeyTap"]
-	path = lib/3rdparty/SPMediaKeyTap
-	url = https://github.com/eartle/SPMediaKeyTap.git

Last.fm.pro

@@ -3,8 +3,10 @@ CONFIG += ordered
 SUBDIRS = lib/logger \
           lib/unicorn \
           lib/listener \
+          i18n \
           app/client \
-          app/twiddly
+          app/twiddly \ 
+          app/fingerprinter
           #app/boffin
 
 unix:!mac:SUBDIRS -= app/twiddly

README.md

@@ -1,78 +1,174 @@
-Build Instructions
-==================
-qmake && make
+Join us for chats on IRC!
 
-Apps are styled using stylesheets which are found in the source directory
-of the app. To apply the style execute the application in the following manner:
+Server: irc.last.fm
+Channel: #last.desktop
 
-./audioscrobbler -stylesheet path/to/audioscrobbler.css
+# Build Dependencies
 
-(by default the executable path is checked for the css file on Windows and on OSX 
- the bundle Resource directory is checked)
+* Qt >= 4.8 (http://download.qt.io/archive/qt/4.8/4.8.7/qt-opensource-windows-x86-vs2010-4.8.7.exe)
+* liblastfm >= 1.0.7
 
-If building didn't work it's because:-
+You will also need depending on your chosen platform:-
 
+## Mac OS X
 
-Build Dependencies
-==================
-* Qt >= 4.8 (built with Phonon if you want sound :P)
-* Ruby
-* Perl
-* liblastfm
-* http://lloyd.github.com/yajl/
+### Homebrew
 
-Qt is readily available as a simple binary installer on all platforms.
+We recommend that you use Homebrew to install most of the dependencies.
 
-You will also need depending on your chosen platform:-
+We recommend you have XCode set as your build toolchain.
+
+```
+sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
+
+```
+
+```
+brew install ffmpeg coreutils cmake fftw libsamplerate
+```
+
+
+We recommend Qt 4.8.7, the last version with Webkit support.
+
+```
+brew install cartr/qt4/qt@4
+brew install cartr/qt4/[email protected]
+```
+
+### liblastfm
+
+Download liblastfm from https://github.com/lastfm/liblastfm parallel to the build of lastfm-desktop.
+
+As the Desktop Client supports only Qt4 at the moment, you will need to set it to Qt4 mode.
+
+In CMakeLists.txt, change
+```
+option(BUILD_WITH_QT4 "Build liblastfm with Qt4" ON)
+
+```
+
+Then build and make.
+```
+cd liblastfm
+mkdir _build && cd _build
+cmake ..
+make -j4
+make install
+```
+
+### Other dependencies
+
+You'll also need the Growl and libsparkle frameworks.
+
+Get the latest Growl SDk from here http://code.google.com/p/growl/downloads/list - latest tested 1.2.2
+
+Get the latest Sparkle from here http://sparkle.andymatuschak.org/ - latest tested 1.21.3
+
+Unzip both and put their frameworks in /Library/Frameworks/ so the build will find them.
+
+You may need to symlink the headers files into the lastfm-desktop directory:
 
-Linux
------
-* pkg-config
-* taglib
-* libsamplerate
-* fftw3
-* libmad
+```
+ln -s /Library/Frameworks/Sparkle.framework/Headers Sparkle
+ln -s /Library/Frameworks/Growl.framework/Headers Growl
+```
 
-Possibly you'll have to play around to get a phonon that works with KDE4 and 
-Qt. I can't help you there I'm afraid. An example Ubuntu installation would 
-probably go:
+### Now you're ready!
 
-	sudo apt-get install qt4-dev pkg-config libtag libsamplerate libfftw3 libmad
-	./configure && make -j2 && make install
+```
+cd lastfm-desktop
+rm -r _bin
+qmake -r
+make clean
+make -j4
+```
 
-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:
+## Windows
 
-sudo apt-get install libsqlite3-dev libqt4-sql-sqlite
+We used to build using Cygwin, but now we prefer not to.
 
-Mac OS X
---------
-We suggest you install Qt 4.8 from the Qt SDK from the Qt website. Then, the
-easiest way to install the additional dependencies is with MacPorts:-
+You should get Windows version of the tool chain. Here are some recommendations.
+
+- Git: http://code.google.com/p/msysgit/downloads/list
+- CMake: http://www.cmake.org/cmake/resources/software.html
+- pkg-config: http://www.gtk.org/download/win32.php
+- Ruby: http://rubyinstaller.org/
+- Perl: http://www.perl.org/get.html
+- Win Platform SDK:http://www.microsoft.com/en-us/download/details.aspx?id=8279
+- KDE Support: http://windows.kde.org/ Install the automoc and dbus packages.
+
+### Qt
+
+Install Qt binaries from either the Qt SDK or standalone binary package. You should be able to find everything here http://qt.nokia.com/downloads
+
+You will also need the latest Windows SDK. We build using Visual Studio 2008.
+
+### Winsparkle
+
+This is the library we use to check for app updates. You should download the latest dll and headers form here http://winsparkle.org
+
+This step should be optional really as most people will not want to add the update checking.
+
+I found that I also needed to copy the dll into the lastfm-desktop/_bin folder. Create a pkg-config file for WinSparkle like this:
+
+    Name: sparkle
+    Description: Multimedia Library
+    Version: 0.3
+    Libs: -LC:/dev/Install/WinSparkle/Release -lWinSparkle
+    Cflags: -IC:/dev/Install/WinSparkle/include
+
+## Linux
+
+On Debian or Ubuntu, you can download all the build dependencies by running:
+
+    sudo apt-get install libavformat-dev libgpod-nogtk-dev liblastfm-dev \
+                         libqt4-dev libqtwebkit-dev pkg-config \
+                         zlib1g-dev
+
+You should also install the `libqt4-sql-sqlite` plugin if you want to use the
+software to scrobble your iPod.
+
+# Build Instructions
+
+    qmake -r
+    make -j4
+
+`make install` currently does not work on Windows or OSX.
+
+Windows note: use nmake on Windows
+
+Linux note: Linux users can set the install prefix like so `qmake PREFIX=/usr/local`
+
+OSX note: if you installed Qt through homebrew it will default to a release build.
+
+# Run Instructions
+
+Apps are styled using stylesheets which are found in the source directory
+of the app. By default the executable path is checked for the css file on
+Windows and on OSX the bundle Resource directory is checked otherwise you'll
+need to tell the app where the stylesheet is, like this: 
 
-	sudo port install taglib libsamplerate fftw-3 libmad
+    ./Last.fm.exe -stylesheet path/to/Last.fm.css
+
+On Linux, if you have not run `make install`, you can run the app like this
+from the root of the source directory:
 
-Windows
--------
-We only build via cygwin. You will also need the latest Windows SDK. We build using Visual Studio 2008. Good luck with building on Windows. It's hard!
+    _bin/lastfm-scrobbler -stylesheet app/client/Last.fm\ Scrobbler.css
 
+# Build Support
 
-Build Support
-=============
 We support developers trying to build the source on any platform. 
 
 Seeing as we don't provide many varieties of binary package on Linux, we also
 support non-developers building from source there. However within reason!
 Please check around the net a little first. Ask your friends. Demand help
 from people standing at bus-stops.
 
-Maybe check the official forum: http://www.last.fm/forum/34905
+Maybe check the official forum: http://getsatisfaction.com/lastfm
 
+# Bugs
 
-Bugs
-====
 If you find a bug in the software, please let us know about it.
 
 Michael Coffey<[email protected]>

admin/dist/mac/Standard.plist

@@ -5,15 +5,15 @@
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundlePackageType</key>
-	<string>@TYPEINFO@</string>
+	<string>APPL</string>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-	<string>fm.last.@EXECUTABLE@</string>
+	<string>fm.last.Scrobbler</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.20</string>
+	<string>2.1.39</string>
 	<key>SUFeedURL</key>
-	<string>http://cdn.last.fm/client/Mac/updates.xml</string>
+	<string>https://cdn.last.fm/client/Mac/updates.xml</string>
 	<key>SUEnableAutomaticChecks</key>
 	<true/>
 	<key>SUEnableSystemProfiling</key>
@@ -32,6 +32,8 @@
 	<string>AppleScriptSuite.sdef</string>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
+	<key>NSAppleEventsUsageDescription</key>
+	<string>For Music and iTunes, this enables scrobbling. For Spotify, this lets you see Last.fm info about the currently playing song.</string>
 	<key>BreakpadProduct</key>
 	<string>@EXECUTABLE@</string>
 	<key>BreakpadVendor</key>
@@ -43,7 +45,9 @@
 	<key>BreakpadRequestComments</key>
 	<string>YES</string>
 	<key>CFBundleName</key>
-	<string>Last.fm</string>
+	<string>Last.fm Scrobbler</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
     <key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -55,5 +59,7 @@
 			</array>
 		</dict>
 	</array>
+	<key>LSUIElement</key>
+	<true/>
 </dict>
 </plist>