Skip to content

Commit 847b75e

Browse files
hiimjasmine00hiimjasmine00
committed
FMODMusic and FMODQueuedMusic
1 parent fa940ba commit 847b75e

File tree

5 files changed

+58
-57
lines changed

5 files changed

+58
-57
lines changed

‎bindings/2.2074/Extras.bro‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,19 @@ class FMODSoundTween {
223223

224224
class FMODQueuedMusic {
225225
gd::string m_filePath;
226-
float m_unkFloat1;
226+
float m_pitch;
227227
float m_unkFloat2;
228-
float m_unkFloat3;
229-
int m_unkInt1;
230-
int m_unkInt2;
231-
int m_unkInt3;
232-
int m_unkInt4;
233-
bool m_unkBool1;
234-
int m_keyForFMODMusicMap1;
235-
bool m_unkBool2;
236-
int m_keyForFMODMusicMap2;
237-
bool m_unkBool3;
238-
float m_unkFloat4;
228+
float m_volume;
229+
int m_start;
230+
int m_end;
231+
int m_fadeIn;
232+
int m_fadeOut;
233+
bool m_loop;
234+
int m_musicID;
235+
bool m_stopMusic;
236+
int m_channelID;
237+
bool m_noPrepare;
238+
int m_queuedStatus;
239239
FMOD::Sound* m_sound;
240240
bool m_dontReset;
241241
}

‎bindings/2.2074/GeometryDash.bro‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6119,7 +6119,7 @@ class FMODAudioEngine : cocos2d::CCNode {
61196119
int lengthForSound(gd::string path) = win 0x599d0;
61206120
TodoReturn loadAndPlayMusic(gd::string, unsigned int, int);
61216121
TodoReturn loadAudioState(FMODAudioState&);
6122-
void loadMusic(gd::string path, float speed, float p2, float volume, bool shouldLoop, int p5, int p6, bool dontReset) = win 0x5a280, imac 0x3ced40, m1 0x356464, ios 0x13d3f4;
6122+
void loadMusic(gd::string path, float speed, float p2, float volume, bool shouldLoop, int musicID, int channelID, bool dontReset) = win 0x5a280, imac 0x3ced40, m1 0x356464, ios 0x13d3f4;
61236123
void loadMusic(gd::string path) {
61246124
this->loadMusic(path, 1.f, 0.f, 1.f, false, 0, 0, false);
61256125
}
@@ -6134,7 +6134,7 @@ class FMODAudioEngine : cocos2d::CCNode {
61346134
}
61356135
void pauseAllMusic(bool force) = ios 0x1402f0, win inline, imac 0x3d4930, m1 0x35ade0 {
61366136
for (auto& [id, channel] : m_musicChannels) {
6137-
if (force || !channel.m_unkBool2) {
6137+
if (force || !channel.m_dontReset) {
61386138
if (auto ch = this->channelForChannelID(channel.m_channelID))
61396139
ch->setPaused(true);
61406140
}
@@ -6157,8 +6157,8 @@ class FMODAudioEngine : cocos2d::CCNode {
61576157
FMOD::Sound* preloadMusic(gd::string path, bool p1, int p2) = win 0x5c790, imac 0x3d5220, m1 0x35b618, ios 0x1408d0;
61586158
TodoReturn printResult(FMOD_RESULT);
61596159
TodoReturn queuedEffectFinishedLoading(gd::string);
6160-
int queuePlayEffect(gd::string, float, float, float, float, bool, bool, int, int, int, int, bool, int, bool, int, float, int) = win 0x57920;
6161-
void queueStartMusic(gd::string audioFilename, float, float, float, bool, int ms, int, int, int, int, bool, int, bool, bool) = win 0x5aa70, imac 0x3d5af0, m1 0x35bdb8, ios 0x140e60;
6160+
int queuePlayEffect(gd::string audioFilename, float speed, float, float volume, float pitch, bool fastFourierTransform, bool reverb, int start, int end, int fadeIn, int fadeOut, bool loop, int effectID, bool override, int uniqueID, float minInterval, int group) = win 0x57920;
6161+
void queueStartMusic(gd::string audioFilename, float pitch, float, float volume, bool loop, int start, int end, int fadeIn, int fadeOut, int musicID, bool, int channelID, bool noPrepare, bool dontReset) = win 0x5aa70, imac 0x3d5af0, m1 0x35bdb8, ios 0x140e60;
61626162
TodoReturn registerChannel(FMOD::Channel*, int, int);
61636163
void releaseRemovedSounds();
61646164
void resumeAllAudio() = ios 0x13bb8c, win inline, imac 0x3cb2e0, m1 0x353b48 {
@@ -6197,7 +6197,7 @@ class FMODAudioEngine : cocos2d::CCNode {
61976197
void setup() = win 0x53bc0, m1 0x352b4c, imac 0x3ca220, ios 0x13b128;
61986198
void setupAudioEngine() = win 0x540a0, m1 0x352f40, imac 0x3ca670, ios 0x13b3b4;
61996199
void start() = win 0x55280;
6200-
TodoReturn startMusic(int, int, int, int, bool, int, bool, bool);
6200+
void startMusic(int start, int end, int fadeIn, int fadeOut, bool loop, int musicID, bool noResume, bool) = win 0x5a5f0;
62016201
void stop();
62026202
void stopAllEffects() = ios 0x13bc58, win 0x598b0, m1 0x353c3c, imac 0x3cb410;
62036203
void stopAllMusic(bool) = ios 0x13bd04, win 0x59d70, imac 0x3cbbf0, m1 0x353f28;
@@ -6317,11 +6317,10 @@ class FMODLevelVisualizer : cocos2d::CCNode {
63176317

63186318
class FMODMusic {
63196319
int m_channelID;
6320-
PAD = win 0x8, android 0x8, mac 0x8, ios 0x8;
6320+
FMOD::Sound* m_sound;
63216321
gd::string m_filePath;
6322-
bool m_unkBool1;
6323-
bool m_unkBool2;
6324-
// there might be other things, hard to know the size
6322+
bool m_ogg;
6323+
bool m_dontReset;
63256324
}
63266325

63276326
[[link(android)]]
@@ -15012,6 +15011,8 @@ class LevelSettingsObject : cocos2d::CCNode {
1501215011
bool m_fadeIn;
1501315012
// property kA16
1501415013
bool m_fadeOut;
15014+
// property kA46
15015+
bool m_dontReset;
1501515016
// property kA6
1501615017
int m_backgroundIndex;
1501715018
// property kA7

‎test/members/Android32.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -650,19 +650,19 @@ GEODE_MEMBER_CHECK(FMODSoundTween, m_unkDouble3, 0x10);
650650

651651
GEODE_SIZE_CHECK(FMODQueuedMusic, 0x40);
652652
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_filePath, 0x0);
653-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat1, 0x4);
653+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_pitch, 0x4);
654654
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat2, 0x8);
655-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat3, 0xc);
656-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt1, 0x10);
657-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt2, 0x14);
658-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt3, 0x18);
659-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt4, 0x1c);
660-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool1, 0x20);
661-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_keyForFMODMusicMap1, 0x24);
662-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool2, 0x28);
663-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_keyForFMODMusicMap2, 0x2c);
664-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool3, 0x30);
665-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat4, 0x34);
655+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_volume, 0xc);
656+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_start, 0x10);
657+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_end, 0x14);
658+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_fadeIn, 0x18);
659+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_fadeOut, 0x1c);
660+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_loop, 0x20);
661+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_musicID, 0x24);
662+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_stopMusic, 0x28);
663+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_channelID, 0x2c);
664+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_noPrepare, 0x30);
665+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_queuedStatus, 0x34);
666666
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_sound, 0x38);
667667
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_dontReset, 0x3c);
668668

‎test/members/Android64.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -643,19 +643,19 @@ GEODE_MEMBER_CHECK(FMODSoundTween, m_unkDouble3, 0x10);
643643

644644
GEODE_SIZE_CHECK(FMODQueuedMusic, 0x50);
645645
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_filePath, 0x0);
646-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat1, 0x8);
646+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_pitch, 0x8);
647647
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat2, 0xc);
648-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat3, 0x10);
649-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt1, 0x14);
650-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt2, 0x18);
651-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt3, 0x1c);
652-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt4, 0x20);
653-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool1, 0x24);
654-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_keyForFMODMusicMap1, 0x28);
655-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool2, 0x2c);
656-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_keyForFMODMusicMap2, 0x30);
657-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool3, 0x34);
658-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat4, 0x38);
648+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_volume, 0x10);
649+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_start, 0x14);
650+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_end, 0x18);
651+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_fadeIn, 0x1c);
652+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_fadeOut, 0x20);
653+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_loop, 0x24);
654+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_musicID, 0x28);
655+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_stopMusic, 0x2c);
656+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_channelID, 0x30);
657+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_noPrepare, 0x34);
658+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_queuedStatus, 0x38);
659659
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_sound, 0x40);
660660
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_dontReset, 0x48);
661661

‎test/members/Windows.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -646,19 +646,19 @@ GEODE_MEMBER_CHECK(FMODSoundTween, m_unkDouble3, 0x10);
646646

647647
GEODE_SIZE_CHECK(FMODQueuedMusic, 0x68);
648648
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_filePath, 0x0);
649-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat1, 0x20);
649+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_pitch, 0x20);
650650
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat2, 0x24);
651-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat3, 0x28);
652-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt1, 0x2c);
653-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt2, 0x30);
654-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt3, 0x34);
655-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkInt4, 0x38);
656-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool1, 0x3c);
657-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_keyForFMODMusicMap1, 0x40);
658-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool2, 0x44);
659-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_keyForFMODMusicMap2, 0x48);
660-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkBool3, 0x4c);
661-
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_unkFloat4, 0x50);
651+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_volume, 0x28);
652+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_start, 0x2c);
653+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_end, 0x30);
654+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_fadeIn, 0x34);
655+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_fadeOut, 0x38);
656+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_loop, 0x3c);
657+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_musicID, 0x40);
658+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_stopMusic, 0x44);
659+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_channelID, 0x48);
660+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_noPrepare, 0x4c);
661+
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_queuedStatus, 0x50);
662662
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_sound, 0x58);
663663
GEODE_MEMBER_CHECK(FMODQueuedMusic, m_dontReset, 0x60);
664664

0 commit comments

Comments
 (0)