Permalink
Browse files

version numbers, minor tweaks, cleanup

  • Loading branch information...
1 parent 3f0783d commit 2616691a9c220782791c0b594f4a83550af3915c @jessevondoom jessevondoom committed Aug 16, 2010
Showing with 11 additions and 13 deletions.
  1. +4 −1 LICENSE
  2. +0 −8 README
  3. +3 −0 README.md
  4. +4 −4 uncompressed/soundplayer/flower_soundplayer.js
View
@@ -1,4 +1,7 @@
-Copyright (c) 2009, CASH Music
+Flower
+http://cashmusic.org/tools/
+
+Copyright (c) 2010, CASH Music
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
View
@@ -1,8 +0,0 @@
-These scripts are in-use throughout cashmusic.org, but need tweaks and
-updates before being released publicly. The general idea is that there's
-a single master JS object that serves as namespace and controller for
-any number of smaller script modules. It also launches external scripts
-as needed, and can auto-attach behaviors to elements.
-
-The 1.0 version of Flower will focus on SoundPlayer, adding HTML5
-capabilities and more flexible playlist and event functionality.
View
@@ -0,0 +1,3 @@
+Flower
+http://cashmusic.org/tools/
+
@@ -498,7 +498,7 @@ var SoundPlaylist = new Class({
id: theSound.url,
url: theSound.url,
onfinish: function() {
- this.SoundPlayer.fireEvent('stop');
+ this.SoundPlayer.fireEvent('stop',this.currentSound.sound.url);
this.playSound('next');
}.bind(this),
whileplaying: function() {
@@ -599,7 +599,7 @@ var SoundPlaylist = new Class({
this.makeCurrent();
if (this.currentSound.sound.paused) {
this.currentSound.sound.resume();
- this.SoundPlayer.fireEvent('resume');
+ this.SoundPlayer.fireEvent('resume',this.currentSound.sound.url);
}
},
@@ -618,15 +618,15 @@ var SoundPlaylist = new Class({
this.makeCurrent();
if (this.currentSound.sound.playState == 1) {
this.currentSound.sound.pause();
- this.SoundPlayer.fireEvent('pause');
+ this.SoundPlayer.fireEvent('pause',this.currentSound.sound.url);
}
},
stopCurrentSound: function() {
this.makeCurrent();
if (this.currentSound.sound.playState != 0) {
this.currentSound.sound.stop();
- this.SoundPlayer.fireEvent('stop');
+ this.SoundPlayer.fireEvent('stop',this.currentSound.sound.url);
}
},

0 comments on commit 2616691

Please sign in to comment.