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

Jump to bottom

Add pitch support for FlxSound #1465

Closed
wants to merge 8 commits into from
Closed

Add pitch support for FlxSound #1465

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54925d1
Add pitch support for FlxSound
kevinresol Apr 6, 2015
4d3e446
Merge branch 'dev' of https://github.com/HaxeFlixel/flixel into dev
kevinresol Apr 6, 2015
ab0ae41
should not change font
kevinresol Apr 6, 2015
0d80ef5
Prevent warnings on not-supported targets
kevinresol Apr 6, 2015
6ef5046
Wrap the whole pitch API in compiler flags
kevinresol Apr 6, 2015
6fdaba4
use openfl_legacy as well, just to play safe
kevinresol Apr 6, 2015
b41c326
better wordings
kevinresol Apr 6, 2015
9d26681
Prevent potential crash
kevinresol Apr 10, 2015
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
31 changes: 31 additions & 0 deletions flixel/system/FlxSound.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ class FlxSound extends FlxBasic
* Set volume to a value between 0 and 1 to change how this sound is.
*/
public var volume(get, set):Float;
#if ((cpp || neko) && openfl_legacy)
/**
* Set pitch, which also alters the playback speed. Default is 1.
*/
public var pitch(get, set):Float;
Copy link
Member

Choose a reason for hiding this comment

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

"Default" would probably describe this better than "Normal".

#end
/**
* The position in runtime of the music playback.
*/
Expand Down Expand Up @@ -107,6 +113,12 @@ class FlxSound extends FlxBasic
* Internal tracker for volume.
*/
private var _volume:Float;
#if ((cpp || neko) && openfl_legacy)
/**
* Internal tracker for pitch.
*/
private var _pitch:Float = 1.0;
#end
/**
* Internal tracker for total volume adjustment.
*/
Expand Down Expand Up @@ -518,6 +530,9 @@ class FlxSound extends FlxBasic
_channel = _sound.play(time, numLoops, _transform);
if (_channel != null)
{
#if ((cpp || neko) && openfl_legacy)
pitch = _pitch;
#end
_channel.addEventListener(Event.SOUND_COMPLETE, stopped);
active = true;
}
Expand Down Expand Up @@ -629,6 +644,22 @@ class FlxSound extends FlxBasic
return Volume;
}


#if ((cpp || neko) && openfl_legacy)
private inline function get_pitch():Float
{
return _pitch;
}

private function set_pitch(v:Float):Float
{
if (_channel != null)
_channel.pitch = v;
return _pitch = v;
}
#end


private inline function get_pan():Float
{
return _transform.pan;
Expand Down