Changed internal naming convention (local variables now start with a lower case character)

Removed the AudioResource class

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1166 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2009-07-11 22:17:24 +00:00
parent 7cc00085d8
commit 45b150648d
245 changed files with 7865 additions and 8065 deletions

View file

@ -14,28 +14,28 @@
void PlaySound()
{
// Load a sound buffer from a wav file
sf::SoundBuffer Buffer;
if (!Buffer.LoadFromFile("datas/sound/footsteps.wav"))
sf::SoundBuffer buffer;
if (!buffer.LoadFromFile("datas/sound/footsteps.wav"))
return;
// Display sound informations
std::cout << "footsteps.wav :" << std::endl;
std::cout << " " << Buffer.GetDuration() << " sec" << std::endl;
std::cout << " " << Buffer.GetSampleRate() << " samples / sec" << std::endl;
std::cout << " " << Buffer.GetChannelsCount() << " channels" << std::endl;
std::cout << " " << buffer.GetDuration() << " sec" << std::endl;
std::cout << " " << buffer.GetSampleRate() << " samples / sec" << std::endl;
std::cout << " " << buffer.GetChannelsCount() << " channels" << std::endl;
// Create a sound instance and play it
sf::Sound Sound(Buffer);
Sound.Play();
sf::Sound sound(buffer);
sound.Play();
// Loop while the sound is playing
while (Sound.GetStatus() == sf::Sound::Playing)
while (sound.GetStatus() == sf::Sound::Playing)
{
// Leave some CPU time for other processes
sf::Sleep(0.1f);
// Display the playing position
std::cout << "\rPlaying... " << std::fixed << std::setprecision(2) << Sound.GetPlayingOffset() << " sec ";
std::cout << "\rPlaying... " << std::fixed << std::setprecision(2) << sound.GetPlayingOffset() << " sec ";
}
std::cout << std::endl << std::endl;
}
@ -48,27 +48,27 @@ void PlaySound()
void PlayMusic()
{
// Load an ogg music file
sf::Music Music;
if (!Music.OpenFromFile("datas/sound/lepidoptera.ogg"))
sf::Music music;
if (!music.OpenFromFile("datas/sound/lepidoptera.ogg"))
return;
// Display music informations
std::cout << "lepidoptera.ogg :" << std::endl;
std::cout << " " << Music.GetDuration() << " sec" << std::endl;
std::cout << " " << Music.GetSampleRate() << " samples / sec" << std::endl;
std::cout << " " << Music.GetChannelsCount() << " channels" << std::endl;
std::cout << " " << music.GetDuration() << " sec" << std::endl;
std::cout << " " << music.GetSampleRate() << " samples / sec" << std::endl;
std::cout << " " << music.GetChannelsCount() << " channels" << std::endl;
// Play it
Music.Play();
music.Play();
// Loop while the music is playing
while (Music.GetStatus() == sf::Music::Playing)
while (music.GetStatus() == sf::Music::Playing)
{
// Leave some CPU time for other processes
sf::Sleep(0.1f);
// Display the playing position
std::cout << "\rPlaying... " << std::fixed << std::setprecision(2) << Music.GetPlayingOffset() << " sec ";
std::cout << "\rPlaying... " << std::fixed << std::setprecision(2) << music.GetPlayingOffset() << " sec ";
}
std::cout << std::endl;
}