diff --git a/inc/session_utility.php b/inc/session_utility.php index 662b9fa2..0e19fbb3 100644 --- a/inc/session_utility.php +++ b/inc/session_utility.php @@ -3946,13 +3946,13 @@ function makeAudioPlayer($audio, $offset=0) ↻ + style="color:#09F;font-weight: bold;" title="Toggle Repeat (Now ON)"> + Toggle Repeat (Now ON) -
-
+ style="color:grey;font-weight: bold;" title="Toggle Repeat (Now OFF)"> + Toggle Repeat (Now OFF) +   @@ -4069,28 +4069,6 @@ function addjPlayerMedia () { $(this) .jPlayer("setMedia", media_obj) .jPlayer("pause", MEDIA_OFFSET); - if ($('#jquery_jplayer_1').data().jPlayer.status.playbackRateEnabled) { - $("#playbackrateContainer").css("margin-top",".2em") - .html( - ` -   - - -   - - - - 1.0 - - ` - ) - .css("cursor", "pointer"); - } } /** @@ -4112,12 +4090,12 @@ function prepareMediaInteractions() { }); $("#jquery_jplayer_1") - .on('bind', $.jPlayer.event.timeupdate, function(event) { + .on($.jPlayer.event.timeupdate, function(event) { $("#playTime").text(Math.floor(event.jPlayer.status.currentTime)); }); $("#jquery_jplayer_1") - .on('bind', $.jPlayer.event.play, function(event) { + .on($.jPlayer.event.play, function(event) { lwt_audio_controller.setCurrentPlaybackRate(); }); diff --git a/js/pgm.js b/js/pgm.js index ad6ad194..39ab17cd 100644 --- a/js/pgm.js +++ b/js/pgm.js @@ -3,7 +3,7 @@ * * @license Unlicense */ -const lwt_audio_controller={newPosition:function(position){$('#jquery_jplayer_1').jPlayer('playHead',position)},setNewPlayerSeconds:function(){const newval=$('#backtime :selected').val();do_ajax_save_setting('currentplayerseconds',newval)},setNewPlaybackRate:function(){const newval=$('#playbackrate :selected').val();do_ajax_save_setting('currentplaybackrate',newval);$('#jquery_jplayer_1').jPlayer('option','playbackRate',newval*0.1)},setCurrentPlaybackRate:function(){const val=$('#playbackrate :selected').val();$('#jquery_jplayer_1').jPlayer('option','playbackRate',val*0.1)},clickSingle:function(){$('#jquery_jplayer_1').off('bind',$.jPlayer.event.ended+'.jp-repeat');$('#do-single').addClass('hide');$('#do-repeat').removeClass('hide');do_ajax_save_setting('currentplayerrepeatmode','0')},clickRepeat:function(){$('#jquery_jplayer_1').on('bind',$.jPlayer.event.ended+'.jp-repeat',function(){$('#jquery_jplayer_1').jPlayer('play')});$('#do-repeat').addClass('hide');$('#do-single').removeClass('hide');do_ajax_save_setting('currentplayerrepeatmode','1')},clickBackward:function(){const t=parseInt($('#playTime').text(),10);const b=parseInt($('#backtime').val(),10);let nt=t-b;let st='pause';if(nt<0){nt=0} +const lwt_audio_controller={newPosition:function(position){$('#jquery_jplayer_1').jPlayer('playHead',position)},setNewPlayerSeconds:function(){const newval=$('#backtime :selected').val();do_ajax_save_setting('currentplayerseconds',newval)},setNewPlaybackRate:function(){const newval=$('#playbackrate :selected').val();do_ajax_save_setting('currentplaybackrate',newval);$('#jquery_jplayer_1').jPlayer('option','playbackRate',newval*0.1)},setCurrentPlaybackRate:function(){const val=$('#playbackrate :selected').val();$('#jquery_jplayer_1').jPlayer('option','playbackRate',val*0.1)},clickSingle:function(){$('#jquery_jplayer_1').off($.jPlayer.event.ended+'.jp-repeat');$('#do-single').addClass('hide');$('#do-repeat').removeClass('hide');do_ajax_save_setting('currentplayerrepeatmode','0')},clickRepeat:function(){$('#jquery_jplayer_1').on($.jPlayer.event.ended+'.jp-repeat',function(){$('#jquery_jplayer_1').jPlayer('play')});$('#do-repeat').addClass('hide');$('#do-single').removeClass('hide');do_ajax_save_setting('currentplayerrepeatmode','1')},clickBackward:function(){const t=parseInt($('#playTime').text(),10);const b=parseInt($('#backtime').val(),10);let nt=t-b;let st='pause';if(nt<0){nt=0} if(!$('#jquery_jplayer_1').data().jPlayer.status.paused){st='play'} $('#jquery_jplayer_1').jPlayer(st,nt)},clickForward:function(){const t=parseInt($('#playTime').text(),10);const b=parseInt($('#backtime').val(),10);const nt=t+b;let st='pause';if(!$('#jquery_jplayer_1').data().jPlayer.status.paused){st='play'} $('#jquery_jplayer_1').jPlayer(st,nt)},clickSlower:function(){const val=parseFloat($('#pbvalue').text())-0.1;if(val>=0.5){$('#pbvalue').text(val.toFixed(1)).css({color:'#BBB'}).animate({color:'#888'},150,function(){});$('#jquery_jplayer_1').jPlayer('playbackRate',val)}},clickFaster:function(){const val=parseFloat($('#pbvalue').text())+0.1;if(val<=4.0){$('#pbvalue').text(val.toFixed(1)).css({color:'#BBB'}).animate({color:'#888'},150,function(){});$('#jquery_jplayer_1').jPlayer('playbackRate',val)}},setStdSpeed:function(){$('#playbackrate').val(10);lwt_audio_controller.setNewPlaybackRate()},setSlower:function(){let val=$('#playbackrate :selected').val();if(val>5){val--;$('#playbackrate').val(val);lwt_audio_controller.setNewPlaybackRate()}},setFaster:function(){let val=$('#playbackrate :selected').val();if(val<15){val++;$('#playbackrate').val(val);lwt_audio_controller.setNewPlaybackRate()}}} diff --git a/src/js/audio_controller.js b/src/js/audio_controller.js index d7dba53a..db3edaa6 100644 --- a/src/js/audio_controller.js +++ b/src/js/audio_controller.js @@ -34,7 +34,7 @@ const lwt_audio_controller = { }, clickSingle: function () { - $('#jquery_jplayer_1').off('bind', $.jPlayer.event.ended + '.jp-repeat'); + $('#jquery_jplayer_1').off($.jPlayer.event.ended + '.jp-repeat'); $('#do-single').addClass('hide'); $('#do-repeat').removeClass('hide'); do_ajax_save_setting('currentplayerrepeatmode', '0'); @@ -42,7 +42,7 @@ const lwt_audio_controller = { clickRepeat: function () { $('#jquery_jplayer_1') - .on('bind', $.jPlayer.event.ended + '.jp-repeat', function () { + .on($.jPlayer.event.ended + '.jp-repeat', function () { $('#jquery_jplayer_1').jPlayer('play'); }); $('#do-repeat').addClass('hide');