fix player error reporting

server/djrandom/frontend/static/js/djr/djr.js

@@ -183,6 +183,23 @@ djr.debug = function(msg) {
   $('#debug').append('<p>' + msg + '</p>');
 };
 
+// Report a player error.
+djr.playerError = function(event) {
+  console.log(event.jPlayer.error);
+  console.log(event.jPlayer.error.type);
+  switch(event.jPlayer.error.type) {
+  case $.jPlayer.error.URL:
+    djr.debug('Error downloading song, skipping...')
+    if (djr.state.player) {
+      djr.state.player.nextSong();
+    }
+    break;
+  default:
+    djr.debug('Error: unexpected error (' + event.jPlayer.error.type + ')');
+    break;
+  }
+};
+
 // Utility functions.
 var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
 djr.generateRandomId = function() {

server/djrandom/frontend/static/js/djr/player.js

@@ -16,9 +16,7 @@ djr.Player = function(backend, selector) {
     solution: "html,flash",
     swfPath: "/static/js",
     cssSelectorAncestor: "#cp_container",
-    error: function(e) {
-      djr.state.player.reportError(e);
-    }
+    error: djr.playerError
   });
   this.player = this.circleplayer.player;
 
@@ -338,21 +336,5 @@ djr.Player.prototype.streamCurrentPlaylist = function(enable) {
   // Nothing for now.
 };
 
-// An error has occurred in the player. Report it on the javascript
-// console.
-djr.Player.prototype.reportError = function(event) {
-  console.log(event.jPlayer.error);
-  console.log(event.jPlayer.error.type);
-  switch(event.jPlayer.error.type) {
-  case $.jPlayer.error.URL:
-    djr.debug('Error downloading song, skipping...')
-    this.nextSong();
-    break;
-  case $.jPlayer.error.NO_SOLUTION:
-    djr.debug('Error: unexpected error!');
-    break;
-  }  
-};
-
 
 // Fine