Skip to content

Reverted the return values to property from array element #8

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

Reverted the return values to property from array element #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae99027
Reverted the return values to property from array element
Dec 7, 2015
91dfe66
Updated the return value for level to return the selected level
Dec 8, 2015
d262e0f
Updated the returned level in case of auto
Dec 8, 2015
b70ee36
Merge remote-tracking branch 'mangui/master'
Mar 28, 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
Binary file modified dist/video-js.swf
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions src/com/videojs/providers/HLSProvider.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,10 @@ package com.videojs.providers{
*/
public function get level():int
{
return _hls['level'];
if(_hls.manualLevel == -1){
return _hls.loadLevel;
}
return _hls.manualLevel;
}

/**
Expand All @@ -558,7 +561,7 @@ package com.videojs.providers{
*/
public function set level(pLevel:int):void
{
_hls['level'] = pLevel;
_hls.currentLevel = pLevel;

// For reflecting new level from the next segment. Otherwise, new setting is applied only after currently buffered data is gone.
if (!isNaN(_position) && pLevel != -1) {
Expand All @@ -571,7 +574,7 @@ package com.videojs.providers{
*/
public function get autoLevelEnabled():Boolean
{
return _hls['autolevel'];
return _hls.autoLevel;
}
}
}