From 69209c38968c6f4066a772e0a51a2928749217de Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 19:00:23 +0000 Subject: Re-indenting the code to use standard tabs. Yes, I know this is pretty pointless, but who cares? --- Stars45/MusicTrack.cpp | 292 ++++++++++++++++++++++++------------------------- 1 file changed, 146 insertions(+), 146 deletions(-) (limited to 'Stars45/MusicTrack.cpp') diff --git a/Stars45/MusicTrack.cpp b/Stars45/MusicTrack.cpp index 8e69890..aeb9019 100644 --- a/Stars45/MusicTrack.cpp +++ b/Stars45/MusicTrack.cpp @@ -1,16 +1,16 @@ /* Project Starshatter 4.5 - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: Stars.exe - FILE: MusicTrack.cpp - AUTHOR: John DiCamillo + SUBSYSTEM: Stars.exe + FILE: MusicTrack.cpp + AUTHOR: John DiCamillo - OVERVIEW - ======== - Music Director class to manage selection, setup, and playback - of background music tracks for both menu and game modes + OVERVIEW + ======== + Music Director class to manage selection, setup, and playback + of background music tracks for both menu and game modes */ @@ -31,47 +31,47 @@ const double SILENCE = -5000; // +-------------------------------------------------------------------+ MusicTrack::MusicTrack(const Text& txt, int m, int n) - : name(txt), sound(0), state(NONE), mode(m), index(n), - fade(0), fade_time(FADE_TIME) +: name(txt), sound(0), state(NONE), mode(m), index(n), +fade(0), fade_time(FADE_TIME) { - long max_vol = 0; + long max_vol = 0; - if (mode >= MusicDirector::FLIGHT) - max_vol = AudioConfig::GameMusic(); - else - max_vol = AudioConfig::MenuMusic(); + if (mode >= MusicDirector::FLIGHT) + max_vol = AudioConfig::GameMusic(); + else + max_vol = AudioConfig::MenuMusic(); - if (max_vol <= AudioConfig::Silence()) - return; + if (max_vol <= AudioConfig::Silence()) + return; - name.setSensitive(false); + name.setSensitive(false); - if (name.contains(".ogg")) { - sound = Sound::CreateOggStream(name); + if (name.contains(".ogg")) { + sound = Sound::CreateOggStream(name); - if (name.contains("-loop")) { - sound->SetFlags(Sound::STREAMED | - Sound::OGGVORBIS | - Sound::LOOP | - Sound::LOCKED); - } + if (name.contains("-loop")) { + sound->SetFlags(Sound::STREAMED | + Sound::OGGVORBIS | + Sound::LOOP | + Sound::LOCKED); + } - else { - sound->SetFlags(Sound::STREAMED | - Sound::OGGVORBIS | - Sound::LOCKED); - } + else { + sound->SetFlags(Sound::STREAMED | + Sound::OGGVORBIS | + Sound::LOCKED); + } - sound->SetVolume((long) SILENCE); - } + sound->SetVolume((long) SILENCE); + } } MusicTrack::~MusicTrack() { - if (sound) { - sound->Stop(); - sound->Release(); - } + if (sound) { + sound->Stop(); + sound->Release(); + } } // +--------------------------------------------------------------------+ @@ -79,68 +79,68 @@ MusicTrack::~MusicTrack() void MusicTrack::ExecFrame() { - bool music_pause = false; - - Starshatter* stars = Starshatter::GetInstance(); - if (stars) { - music_pause = (stars->GetGameMode() == Starshatter::PLAY_MODE) && - Game::Paused(); - } - - if (sound && !music_pause) { - double fvol = 1; - long volume = 0; - - switch (state) { - case PLAY: - if (sound->IsReady()) - sound->Play(); - SetVolume(volume); - break; - - case FADE_IN: - if (sound->IsReady()) - sound->Play(); - - if (fade > 0) { - fvol = fade/fade_time; - volume = (long) (fvol * SILENCE); - SetVolume(volume); - } - - if (fade < 0.01) - state = PLAY; - break; - - case FADE_OUT: - if (sound->IsReady()) - sound->Play(); - - if (fade > 0) { - fvol = 1 - fade/fade_time; - volume = (long) (fvol * SILENCE); - SetVolume(volume); - } - - if (fade < 0.01) - state = STOP; - break; - - case STOP: - if (sound->IsPlaying()) { - sound->Stop(); - sound->Release(); - sound = 0; - } - break; - } - - if (fade > 0) - fade -= Game::GUITime(); - - if (fade < 0) - fade = 0; - } + bool music_pause = false; + + Starshatter* stars = Starshatter::GetInstance(); + if (stars) { + music_pause = (stars->GetGameMode() == Starshatter::PLAY_MODE) && + Game::Paused(); + } + + if (sound && !music_pause) { + double fvol = 1; + long volume = 0; + + switch (state) { + case PLAY: + if (sound->IsReady()) + sound->Play(); + SetVolume(volume); + break; + + case FADE_IN: + if (sound->IsReady()) + sound->Play(); + + if (fade > 0) { + fvol = fade/fade_time; + volume = (long) (fvol * SILENCE); + SetVolume(volume); + } + + if (fade < 0.01) + state = PLAY; + break; + + case FADE_OUT: + if (sound->IsReady()) + sound->Play(); + + if (fade > 0) { + fvol = 1 - fade/fade_time; + volume = (long) (fvol * SILENCE); + SetVolume(volume); + } + + if (fade < 0.01) + state = STOP; + break; + + case STOP: + if (sound->IsPlaying()) { + sound->Stop(); + sound->Release(); + sound = 0; + } + break; + } + + if (fade > 0) + fade -= Game::GUITime(); + + if (fade < 0) + fade = 0; + } } // +--------------------------------------------------------------------+ @@ -148,33 +148,33 @@ MusicTrack::ExecFrame() void MusicTrack::Play() { - state = PLAY; - fade = 0; + state = PLAY; + fade = 0; } void MusicTrack::Stop() { - state = STOP; - fade = 0; + state = STOP; + fade = 0; } void MusicTrack::FadeIn() { - if (state != FADE_IN && state != PLAY) { - state = FADE_IN; - fade = fade_time; - } + if (state != FADE_IN && state != PLAY) { + state = FADE_IN; + fade = fade_time; + } } void MusicTrack::FadeOut() { - if (state != FADE_OUT && state != STOP) { - state = FADE_OUT; - fade = fade_time; - } + if (state != FADE_OUT && state != STOP) { + state = FADE_OUT; + fade = fade_time; + } } // +--------------------------------------------------------------------+ @@ -182,37 +182,37 @@ MusicTrack::FadeOut() int MusicTrack::IsReady() const { - if (sound) - return sound->IsReady(); + if (sound) + return sound->IsReady(); - return false; + return false; } int MusicTrack::IsPlaying() const { - if (sound) - return sound->IsPlaying(); + if (sound) + return sound->IsPlaying(); - return false; + return false; } int MusicTrack::IsDone() const { - if (sound) - return sound->IsDone() || sound->LoopCount() >= 5; + if (sound) + return sound->IsDone() || sound->LoopCount() >= 5; - return true; + return true; } int MusicTrack::IsLooped() const { - if (sound) - return sound->IsDone() || sound->LoopCount() >= 4; + if (sound) + return sound->IsDone() || sound->LoopCount() >= 4; - return true; + return true; } // +--------------------------------------------------------------------+ @@ -220,54 +220,54 @@ MusicTrack::IsLooped() const long MusicTrack::GetVolume() const { - if (sound) - return sound->GetVolume(); + if (sound) + return sound->GetVolume(); - return 0; + return 0; } void MusicTrack::SetVolume(long v) { - if (sound) { - long max_vol = 0; + if (sound) { + long max_vol = 0; - if (mode >= MusicDirector::FLIGHT) - max_vol = AudioConfig::GameMusic(); - else - max_vol = AudioConfig::MenuMusic(); + if (mode >= MusicDirector::FLIGHT) + max_vol = AudioConfig::GameMusic(); + else + max_vol = AudioConfig::MenuMusic(); - if (v > max_vol) - v = max_vol; + if (v > max_vol) + v = max_vol; - sound->SetVolume(v); - } + sound->SetVolume(v); + } } double MusicTrack::GetTotalTime() const { - if (sound) - return sound->GetTotalTime(); + if (sound) + return sound->GetTotalTime(); - return 0; + return 0; } double MusicTrack::GetTimeRemaining() const { - if (sound) - return sound->GetTimeRemaining(); + if (sound) + return sound->GetTimeRemaining(); - return 0; + return 0; } double MusicTrack::GetTimeElapsed() const { - if (sound) - return sound->GetTimeElapsed(); + if (sound) + return sound->GetTimeElapsed(); - return 0; + return 0; } -- cgit v1.1