Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- Fixed MP3 play bug on the psp. MP3 files need to have NO Id3v2 tag, or they won't play. Also, volume control is broken
- added dt to moving W's easter egg movement.
- Added fullscreen for windows version
- other stuff ?
This commit is contained in:
wagic.the.homebrew
2008-11-19 12:21:23 +00:00
parent 2434571fa2
commit 349de34106
27 changed files with 1270 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
JGE/src/JSfx.cpp
View File

@@ -10,8 +10,9 @@
#include "../include/JSoundSystem.h"
#include "../include/JAudio.h"
#include "../include/JCooleyesMP3.h"
#include "../include/JMP3.h"
#include <string>
using std::string;
JMusic::JMusic()
{
@@ -26,6 +27,10 @@ JMusic::~JMusic()
delete mTrack;
}
void JMusic::Update(){
//if (mTrack) mTrack->update();
}
JSample::JSample()
{
mSample = NULL;
@@ -93,29 +98,17 @@ void JSoundSystem::DestroySoundSystem()
JMusic *JSoundSystem::LoadMusic(const char *fileName)
{
//char s[strlen(fileName)+1];
//strcpy(s, fileName);
string s = "Res/";
s.append(fileName);
JMusic *music = new JMusic();
if (music)
{
music->mTrack = new JCooleyesMP3();
if (music->mTrack)
music->mTrack->Load(fileName);
music->mTrack = new JMP3(s);
}
JMP3::mInstance = music->mTrack;
return music;
}
// void JSoundSystem::FreeMusic(JMusic *music)
// {
// if (music)
// {
// if (music->mTrack)
// delete music->mTrack;
//
// }
// }
JSample *JSoundSystem::LoadSample(const char *fileName)
{
@@ -132,30 +125,8 @@ JSample *JSoundSystem::LoadSample(const char *fileName)
return sample;
}
//
// void JSoundSystem::FreeMusic(JMusic *music)
// {
// if (music)
// {
// if (music->mTrack)
// {
// music->mTrack->Release();
// delete music->mTrack;
// }
// delete music;
// }
// }
// void JSoundSystem::FreeSample(JSample *sample)
// {
// if (sample)
// {
// releaseWaveData(sample->mSample);
// delete sample;
// }
// }
void JSoundSystem::PlayMusic(JMusic *music, bool looping)
{
@@ -174,8 +145,8 @@ void JSoundSystem::PlaySample(JSample *sample)
void JSoundSystem::SetVolume(int volume)
{
mVolume = volume;
JMP3 * mp3 = JMP3::mInstance;
if (mp3) mp3->setVolume(volume);
}
@@ -188,7 +159,7 @@ void JSoundSystem::StopMusic(JMusic *music)
void JSoundSystem::ResumeMusic(JMusic *music)
{
ResumeMP3();
ResumeMP3(music->mTrack);
}