[Gcblue-commits] gcb_wx/src/common tcSound.cpp,1.26,1.27

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2989/src/common

Modified Files:
	tcSound.cpp 
Log Message:


Index: tcSound.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSound.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** tcSound.cpp	4 Mar 2005 00:46:16 -0000	1.26
--- tcSound.cpp	15 Mar 2005 00:36:37 -0000	1.27
***************
*** 173,176 ****
--- 173,177 ----
      if (!mbInitialized) return;
      if (!oggStreamer) return;
+ 
      std::string musicPath = OGG_PATH;
      musicPath += song;
***************
*** 178,183 ****
      meMusicState = MS_WAIT;
      oggStreamer->Open(musicPath);
      // oggStreamer->Display(); // uncomment to log ogg info to stdout
!     oggStreamer->Play();
      oggStreamer->SetPause(false);
  }
--- 179,185 ----
      meMusicState = MS_WAIT;
      oggStreamer->Open(musicPath);
+ 
      // oggStreamer->Display(); // uncomment to log ogg info to stdout
!     //oggStreamer->Play();
      oggStreamer->SetPause(false);
  }
***************
*** 260,270 ****
  
      if (meMusicState == MS_STOPPED) return;
!     if (!oggStreamer->IsPlaying())
      {
          oggStreamer->Play();
      }
  //    bool isPlaying = oggStreamer->IsPlaying();
!     if (oggStreamer->IsSongQueued()) return;
!     QueueRandomMusic();
  
     // oggStreamer->Playback();
--- 262,277 ----
  
      if (meMusicState == MS_STOPPED) return;
! 
!     if (oggStreamer->IsPaused())
      {
          oggStreamer->Play();
      }
  //    bool isPlaying = oggStreamer->IsPlaying();
!     if (!oggStreamer->IsSongQueued())
!     {
!         QueueRandomMusic();
!     }
! 
!     oggStreamer->Update();
  
     // oggStreamer->Playback();