Skip to content

Commit

Permalink
Use Playdar.setup_player instead of calling the Playdar.Player constr…
Browse files Browse the repository at this point in the history
…uctor directly.
  • Loading branch information
jwheare committed Apr 10, 2009
1 parent 2afa009 commit f1ce2ef
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion demos/haudio.html
Expand Up @@ -129,7 +129,7 @@ <h2>hAudio Demo</h2>
soundManager.url = '\/static\/soundmanager2_flash9.swf';
soundManager.flashVersion = 9;
soundManager.onload = function () {
new Playdar.Player(soundManager);
Playdar.setup_player(soundManager);
Playdar.client.init();
};
Expand Down
2 changes: 1 addition & 1 deletion demos/search.html
Expand Up @@ -250,7 +250,7 @@ <h3 style="margin: 10px 0 5px 0;">Search Results <span style="background-color:l
soundManager.url = '\/static\/soundmanager2_flash9.swf';
soundManager.flashVersion = 9;
soundManager.onload = function () {
new Playdar.Player(soundManager);
Playdar.setup_player(soundManager);
Playdar.client.init();
};
</script>
Expand Down
2 changes: 1 addition & 1 deletion download/playdar_lastfm.user.js
Expand Up @@ -56,7 +56,7 @@ function setup_playdar () {
soundManager.url = 'http://' + playdar_web_host + '/static/soundmanager2_flash9.swf';
soundManager.flashVersion = 9;
soundManager.onload = function () {
new Playdar.Player(soundManager);
Playdar.setup_player(soundManager);
Playdar.client.init();
};
};
Expand Down
4 changes: 2 additions & 2 deletions js.html
Expand Up @@ -99,12 +99,12 @@ <h3>Streaming</h3>
</code></pre>

<p>
The Playdar library also has a built in wrapper for the <a href="http://www.schillmania.com/projects/soundmanager2/">SoundManager 2 audio library</a>, available through the <code>Playdar.player</code> module. Simply include the <code>soundmanager2.js</code> file, configure the global <code>soundManager</code> object it creates and pass it into the <code>Playdar.Player</code> constructor to initialise the <code>Playdar.player</code> module. (note case difference)
The Playdar library also has a built in wrapper for the <a href="http://www.schillmania.com/projects/soundmanager2/">SoundManager 2 audio library</a>, available through the <code>Playdar.player</code> module. Simply include the <code>soundmanager2.js</code> file, configure the global <code>soundManager</code> object it creates and pass it into the <code>Playdar.setup_player</code> function to initialise the <code>Playdar.player</code> module.
</p>
<pre><code>soundManager.url = '/path/to/soundmanager2_flash9.swf';
soundManager.flashVersion = 9;
soundManager.onload = function () {
new Playdar.Player(soundManager);
Playdar.setup_player(soundManager);
Playdar.client.init();
};
</code></pre>
Expand Down
2 changes: 1 addition & 1 deletion static/0.4-changes.txt
Expand Up @@ -7,7 +7,7 @@ playdar.init();

Use this:
Playdar.setup();
new Playdar.Player(soundManager);
Playdar.setup_player(soundManager);
Playdar.client.init();

Soundmanager wrapper in player namespace now
Expand Down
5 changes: 3 additions & 2 deletions static/playdar.js
Expand Up @@ -17,6 +17,9 @@ Playdar = {
player: null,
setup: function (auth_details) {
Playdar.client = new Playdar.Client(auth_details);
},
setup_player: function (soundmanager) {
Playdar.player = new Playdar.Player(soundmanager);
}
};

Expand Down Expand Up @@ -385,8 +388,6 @@ Playdar.Player = function (soundmanager) {
this.streams = {};
this.nowplayingid = null;
this.soundmanager = soundmanager;

Playdar.player = this;
};
Playdar.Player.prototype = {
register_stream: function (result, options) {
Expand Down
2 changes: 1 addition & 1 deletion static/tracks.js
Expand Up @@ -126,7 +126,7 @@ PlaydarTracks = {
soundManager.url = '/static/soundmanager2_flash9.swf';
soundManager.flashVersion = 9;
soundManager.onload = function () {
new Playdar.Player(soundManager);
Playdar.setup_player(soundManager);
Playdar.client.init();
};
},
Expand Down

0 comments on commit f1ce2ef

Please sign in to comment.