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

Adding pitch support #2564

Merged
merged 10 commits into from
Sep 29, 2022
Merged

Adding pitch support #2564

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f41ff6d
add the pitch thing
Cheemsandfriends May 26, 2022
5a8b4a5
Merge branch 'HaxeFlixel:dev' into patch-3
Cheemsandfriends Jul 23, 2022
7a0ad39
Changing the set_pitch to something more functional
Cheemsandfriends Jul 23, 2022
411d0d1
Merge branch 'HaxeFlixel:dev' into patch-3
Cheemsandfriends Aug 31, 2022
f2a4d06
Set the FLX_PITCH define
Cheemsandfriends Sep 28, 2022
fc13519
Delete all the code pasting to be more integrated to Lime
Cheemsandfriends Sep 28, 2022
5c3f52c
Delete a small mental typo
Cheemsandfriends Sep 28, 2022
ed73f2b
change the FLX_PITCH define for flash to "work"
Cheemsandfriends Sep 29, 2022
04fb025
Polish the FLX_PITCH and FLX_NO_PITCH setting
Cheemsandfriends Sep 29, 2022
fd4c693
Can we forget I forgot a semicolon?
Cheemsandfriends Sep 29, 2022
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
24 changes: 15 additions & 9 deletions flixel/system/FlxSound.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,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 (sys && openfl_legacy)
Cheemsandfriends marked this conversation as resolved.
Show resolved Hide resolved
#if FLX_PITCH
/**
* Set pitch, which also alters the playback speed. Default is 1.
*/
public var pitch(get, set):Float;
#end

/**
* The position in runtime of the music playback in milliseconds.
* If set while paused, changes only come into effect after a `resume()` call.
Expand Down Expand Up @@ -177,14 +175,12 @@ class FlxSound extends FlxBasic
* Internal tracker for sound length, so that length can still be obtained while a sound is paused, because _sound becomes null.
*/
var _length:Float = 0;

#if (sys && openfl_legacy)
#if FLX_PITCH
/**
* Internal tracker for pitch.
*/
var _pitch:Float = 1.0;
#end

/**
* Internal tracker for total volume adjustment.
*/
Expand Down Expand Up @@ -432,6 +428,9 @@ class FlxSound extends FlxBasic
updateTransform();
exists = true;
onComplete = OnComplete;
#if FLX_PITCH
pitch = 1;
#end
_length = (_sound == null) ? 0 : _sound.length;
endTime = _length;
return this;
Expand Down Expand Up @@ -610,7 +609,7 @@ class FlxSound extends FlxBasic
_channel = _sound.play(_time, 0, _transform);
if (_channel != null)
{
#if (sys && openfl_legacy)
#if FLX_PITCH
pitch = _pitch;
#end
_channel.addEventListener(Event.SOUND_COMPLETE, stopped);
Expand Down Expand Up @@ -736,17 +735,24 @@ class FlxSound extends FlxBasic
updateTransform();
return Volume;
}

#if (sys && openfl_legacy)
#if FLX_PITCH
inline function get_pitch():Float
{
return _pitch;
}


function set_pitch(v:Float):Float
{
if (_channel != null)
#if openfl_legacy
_channel.pitch = v;
#else
@:privateAccess
if (_channel.__source != null)
_channel.__source.pitch = v;
Copy link
Member

Choose a reason for hiding this comment

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

getting errors here:

.../FlxSound.hx:752: characters 17-25 : flash.media.SoundChannel has no field __source
.../FlxSound.hx:753: characters 14-22 : flash.media.SoundChannel has no field __source

There must be a problem with the FLX_PITCH definition

#end

return _pitch = v;
}
#end
Expand Down
5 changes: 5 additions & 0 deletions flixel/system/macros/FlxDefines.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ private enum UserDefines
FLX_4_LEGACY_COLLISION;
/* Simplifies FlxPoint but can increase GC frequency */
FLX_NO_POINT_POOL;
FLX_NO_PITCH;
}

/**
Expand Down Expand Up @@ -54,6 +55,7 @@ private enum HelperDefines
FLX_ACCELEROMETER;
FLX_DRAW_QUADS;
FLX_POINT_POOL;
FLX_PITCH;
}

class FlxDefines
Expand Down Expand Up @@ -129,6 +131,9 @@ class FlxDefines
defineInversion(FLX_NO_FOCUS_LOST_SCREEN, FLX_FOCUS_LOST_SCREEN);
defineInversion(FLX_NO_DEBUG, FLX_DEBUG);
defineInversion(FLX_NO_POINT_POOL, FLX_POINT_POOL);
#if (openfl_legacy && sys || lime >= "8.0.0" && !flash)
defineInversion(FLX_NO_PITCH, FLX_PITCH);
#end
Copy link
Member

@Geokureli Geokureli Sep 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

the #if shouldn't be here, FLX_PITCH and FLX_NO_PITCH will always be inversions of each other, you need to define FLX_PITCH here:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

why it shouldn't be there?
afaik, defineInversion is for stuff that has 2 sides, the yes and the no version, which, what defineInversions() does afaik.
defineHelperDefines() only adds defines depending if it can help the first thing
unless I'm overlooking things

Copy link
Member

Choose a reason for hiding this comment

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

None of the other inversion are wrapped in #ifs, take a look at what
defineInversion() actually does. I believe this is the reason flash is failing

}

static function defineHelperDefines()
Expand Down