Skip to content
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

WIP: Switch to Plyr #168

Open
wants to merge 1 commit into
base: soundtrack.io
Choose a base branch
from
Open

WIP: Switch to Plyr #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions public/css/plyr.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/img/sprite.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 24 additions & 14 deletions public/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ YouTube.prototype.get = function(url, params, cb) {
function volumeChangeHandler(e) {
var vol = Number( e.value );

soundtrack.player.volume( vol / 100 );
soundtrack.player.setVolume( vol / 100 );
$.cookie('lastVolume' , vol, { expires: COOKIE_EXPIRES });
};

function mutePlayer(saveState) {
// TODO: why doesn't this work with just 0? Why does it only work with 0.001?
soundtrack.player.volume( 0.00001 );
soundtrack.player.setVolume( 0.00001 );
$.cookie('lastVolume', 0);
$('.slider[data-for=volume]').slider('setValue', 0).val(0);
}
Expand All @@ -142,10 +142,10 @@ function unmutePlayer() {
var lastVol = $.cookie('lastVolume', Number);

if (lastVol) {
soundtrack.player.volume(lastVol / 100);
soundtrack.player.setVolume(lastVol / 100);
$('.slider[data-for=volume]').slider('setValue', lastVol).val(lastVol);
} else {
soundtrack.player.volume( 0.8 );
soundtrack.player.setVolume( 0.8 );
$('.slider[data-for=volume]').slider('setValue', DEFAULT_VOLUME).val( DEFAULT_VOLUME );
$.cookie('lastVolume', DEFAULT_VOLUME, { expires: COOKIE_EXPIRES });
}
Expand All @@ -155,7 +155,7 @@ function ensureVolumeCorrect() {
var lastVol = $.cookie('lastVolume', Number);
if (soundtrack.debug) console.log('setting volume to ', lastVol / 100);

soundtrack.player.volume( lastVol / 100 );
soundtrack.player.setVolume( lastVol / 100 );

if ($('.slider[data-for=volume]')[0]) {
$('.slider[data-for=volume]').slider('setValue', lastVol ).val( lastVol );
Expand Down Expand Up @@ -300,9 +300,9 @@ promise.done(function() {
}
}

ensureVolumeCorrect();
//ensureVolumeCorrect();

setInterval(function() {
/* setInterval(function() {
// TODO: use angularJS for this
var duration = soundtrack.player.duration() || 0;

Expand All @@ -319,7 +319,7 @@ promise.done(function() {
$el.html( moment( $el.attr('datetime') ).fromNow() );
});

}, 1000);
}, 1000); */
});

$(window).load(function() {
Expand All @@ -332,10 +332,12 @@ $(window).load(function() {
soundtrack = new Soundtrack();
youtube = new YouTube('AIzaSyBnCN68b8W5oGgBKKkM2cSQhSygnLPApEs');
if ($('#main-player').length) {
soundtrack.player = videojs('#main-player', {
plyr.setup();
soundtrack.player = document.querySelectorAll(".player")[0].plyr;
/* soundtrack.player = videojs('#main-player', {
techOrder: ['html5', 'youtube', 'flash']
});
soundtrack.player.controls( true );
soundtrack.player.controls( true );*/
} //else {
// soundtrack.player = videojs('#secondary-player', {
// techOrder: ['html5', 'youtube']
Expand All @@ -348,7 +350,7 @@ $(window).load(function() {
}
$('*[data-for=max-source-load-time]').val( $.cookie('maxTimeToPlaySource', Number) );

soundtrack.player.ready(function() {
//soundtrack.player.ready(function() {
if (soundtrack.debug) console.log('player loaded. :)');

soundtrack.startSockJs = function() {
Expand Down Expand Up @@ -468,6 +470,10 @@ $(window).load(function() {
});
}

console.log('source:', sources);
soundtrack.player.source( sources[0].src );
soundtrack.player.play();

function rollTrack() {
if (soundtrack.debug) console.log('rollTrack()', sources );
if (soundtrack.debug) console.log('current source:', soundtrack.player.src() );
Expand Down Expand Up @@ -535,10 +541,14 @@ $(window).load(function() {
ensureVolumeCorrect();
}

rollTrack();
//rollTrack();





var maxTimeToPlayTrack = soundtrack.settings.maxTimeToPlaySource;
var ensureTrackPlaying = setInterval( verifyTrackPlaying , maxTimeToPlayTrack );
//var ensureTrackPlaying = setInterval( verifyTrackPlaying , maxTimeToPlayTrack );


}
Expand Down Expand Up @@ -612,7 +622,7 @@ $(window).load(function() {

deferred.resolve();

});
//});

$('.message .message-content').filter('.message-content:contains("' + $('a[data-for=user-model]').data('username') + '")').parent().addClass('highlight');

Expand Down
1 change: 1 addition & 0 deletions public/js/plyr.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/index.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ block content
input.input-block-level(type="text", data-for="track-search-query", disabled, placeholder="you must be registered to do this!", data-intro="<h5>Queue a song!</h5>Search here for a track to add it to the playlist.", data-step="2", data-position="top")#search-query

.span6.unpadded
#screen-one
#screen-one.player
video(id="main-player", class="video-js vjs-default-skin", width="100%", height="295")
.chat-container
#messages.fadeout-top
Expand Down
Loading