summaryrefslogtreecommitdiffstats
path: root/lib/class
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-05 07:32:38 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-05 07:32:38 +0000
commite07f720bbcb5aa4f1539a0edeeb8c737ae2abf94 (patch)
treee44ba25c36a55fb9c9cb327ebc9d5c70782a82a7 /lib/class
parent83c7a25a76efaf74467c6654f20be3a8029040d9 (diff)
downloadampache-e07f720bbcb5aa4f1539a0edeeb8c737ae2abf94.tar.gz
ampache-e07f720bbcb5aa4f1539a0edeeb8c737ae2abf94.tar.bz2
ampache-e07f720bbcb5aa4f1539a0edeeb8c737ae2abf94.zip
semi-fixed lastfm
Diffstat (limited to 'lib/class')
-rw-r--r--lib/class/scrobbler.class.php (renamed from lib/class/audioscrobbler.class.php)0
-rw-r--r--lib/class/user.class.php5
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/class/audioscrobbler.class.php b/lib/class/scrobbler.class.php
index a90fc773..a90fc773 100644
--- a/lib/class/audioscrobbler.class.php
+++ b/lib/class/scrobbler.class.php
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 44f37bed..d2afc339 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -514,7 +514,7 @@ class User {
$song_info = new Song($song_id);
$user = $this->id;
- if (!$song_info->file) { return false; }
+ if (!strlen($song_info->file)) { return false; }
Stats::insert('song',$song_id,$user);
Stats::insert('album',$song_info->album,$user);
@@ -526,7 +526,7 @@ class User {
* because it lags like the dickens try twice on everything
*/
if (!empty($this->prefs['lastfm_user']) AND !empty($this->prefs['lastfm_pass'])) {
- $song_info->format_song();
+ $song_info->format();
$lastfm = new scrobbler($this->prefs['lastfm_user'],$this->prefs['lastfm_pass']);
/* Attempt handshake */
$handshake = $lastfm->handshake();
@@ -552,7 +552,6 @@ class User {
debug_event('LastFM','Error: Handshake failed with LastFM: ' . $lastfm->error_msg,'3');
}
} // record to LastFM
-
} // update_stats
/**