Skip to content

Update index.html and app.js #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
J2TEAM wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update index.html and app.js #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
565502a
Add "autofocus" and "required" attributes to input
J2TEAM Aug 29, 2016
6c08832
Fix error "self.directStream is not a function"
J2TEAM Aug 29, 2016
519da5b
Merge pull request #2 from J2TeaM/patch-1
J2TEAM Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,22 @@
</div>
<div id="playerControls">
<form id="form">
<input id="input" placeholder="Paste Soundcloud URL here (https://soundcloud.com/artist/track)">
<input type="url" id="input" placeholder="Paste Soundcloud URL here (https://soundcloud.com/artist/track)" autofocus required>
<button type="submit" id="submit"><i class="icon-play"></i></button><br>
</form>
<audio id="player" controls="" autoplay="" preload autobuffer></audio>
<audio id="player" controls autoplay preload autobuffer></audio>
</div>
</div>

<div id="messageBox" class="hidden">
</div>
<div id="messageBox" class="hidden"></div>

<footer>
<a href="#" id="credit"> <i class="icon-info"></i> About</a>
<span id="github"><a href="https://github.com/michaelbromley/soundcloud-visualizer"><i class="icon-github"></i> Source on Github</a></span>
<span id="scLogo"><a href="http://soundcloud.com/"><img src="assets/powered_by_white.png"></a></span>
</footer>

<script src="http://connect.soundcloud.com/sdk.js"></script>
<script src="https://connect.soundcloud.com/sdk.js"></script>
<script src="js/app.js"></script>
</body>
</html>
</html>
10 changes: 5 additions & 5 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ var SoundCloudAudioSource = function(player) {
// public properties and methods
this.volume = 0;
this.streamData = new Uint8Array(128);
this.playStream = function(streamUrl) {
this.playStream = function(loader) {
// get the input stream from the audio element
player.addEventListener('ended', function(){
self.directStream('coasting');
loader.directStream('coasting');
});
player.setAttribute('src', streamUrl);
player.setAttribute('src', loader.streamUrl());
player.play();
}
};
Expand Down Expand Up @@ -604,7 +604,7 @@ window.onload = function init() {
loader.loadStream(trackUrl,
function() {
uiUpdater.clearInfoPanel();
audioSource.playStream(loader.streamUrl());
audioSource.playStream(loader);
uiUpdater.update(loader);
setTimeout(uiUpdater.toggleControlPanel, 3000); // auto-hide the control panel
},
Expand Down Expand Up @@ -664,4 +664,4 @@ window.onload = function init() {
}


};
};