Skip to content

Fix: add duration to status for audio files #13

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
Technici4n wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix: add duration to status for audio files #13

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
bdf8990
Fix: add duration to status for audio files
Technici4n May 4, 2017
5f3cc18
Fixed Maps for setOption
Oct 5, 2017
18605f3
Merge pull request #1 from Riesi/master
Technici4n Oct 6, 2017
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
6 changes: 3 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ var MPlayer = function(options) {

MPlayer.prototype = _.extend({
setOptions: function(options) {
if(options && options.length) {
options.forEach(function(value, key) {
this.player.cmd('set_property', [key, value]);
if(options && Object.keys(options).length) {
Object.keys(options).forEach(function(key) {
this.player.cmd('set_property', [key, options[key]]);
}.bind(this));
}
},
Expand Down
17 changes: 11 additions & 6 deletions lib/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,17 @@ Player.prototype = _.extend({
this.emit('timechange', time)
}

if(data.indexOf('ANS_LENGTH') !== -1 && data.indexOf('ANS_VO_FULLSCREEN') !== -1 && data.indexOf('ANS_SUB_VISIBILITY') !== -1) {
this.setStatus({
duration: parseFloat(data.match(/ANS_LENGTH=([0-9\.]*)/)[1]),
fullscreen: (parseInt(data.match(/ANS_VO_FULLSCREEN=([01])/)[1]) === 1),
subtitles: (parseInt(data.match(/ANS_SUB_VISIBILITY=([01])/)[1]) === 1)
});
if(data.indexOf('ANS_LENGTH') !== -1 || data.indexOf('ANS_VO_FULLSCREEN') !== -1 || data.indexOf('ANS_SUB_VISIBILITY') !== -1) {

@depuits depuits Jun 4, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This or check seems completly unnesesary because the checks are repeated for each item below

@Technici4n Technici4n Jun 4, 2017

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. Do you want me to remove it ?

@depuits depuits Jun 4, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove it but there still needs to be a check for calling the setStatus so it isn't called when nothing is changed

var status = {};

if(data.indexOf('ANS_LENGTH') !== -1)
status.duration = parseFloat(data.match(/ANS_LENGTH=([0-9\.]*)/)[1]);
if(data.indexOf('ANS_VO_FULLSCREEN') !== -1)
status.fullscreen = (parseInt(data.match(/ANS_VO_FULLSCREEN=([01])/)[1]) === 1);
if(data.indexOf('ANS_SUB_VISIBILITY') !== -1)
status.subtitles = (parseInt(data.match(/ANS_SUB_VISIBILITY=([01])/)[1]) === 1);

this.setStatus(status);
}
},
onError: function(error) {
Expand Down