[Planeshift-cvs] CVS: planeshift/src/client/sound pssoundmngr.cpp,1.28,1.29 pssoundmngr.h,1.10,1.11

[Matze B. <mat...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv8776/src/client/sound

Modified Files:
	pssoundmngr.cpp pssoundmngr.h 
Log Message:
Several fixes and updates through the project:
  -The resource manager has been adapted to use csRef correctly.
  -Because of that changed the leslie-gui part and made it looking better,
  cleaner and closed all leaks there.
  -Sound driver updates
  -Small fixes I can't remember :)



Index: pssoundmngr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/sound/pssoundmngr.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** pssoundmngr.cpp	31 Jan 2003 19:36:16 -0000	1.28
--- pssoundmngr.cpp	1 Feb 2003 15:10:27 -0000	1.29
***************
*** 112,116 ****
  }
  
! csPtr<iSoundSource> psSoundManager::PlaySound(const char* name,bool loop)
  {
      if ( !name )
--- 112,116 ----
  }
  
! csRef<iSoundSource> psSoundManager::PlaySound(const char* name,bool loop)
  {
      if ( !name )
***************
*** 129,133 ****
      csRef<iSoundSource> sndhandle = handle->src->Play(loop);
  
!     return csPtr<iSoundSource> (sndhandle);
  }
  
--- 129,133 ----
      csRef<iSoundSource> sndhandle = handle->src->Play(loop);
  
!     return sndhandle;
  }
  
***************
*** 166,170 ****
      }
  
!     psSoundHandle* handle = sndmngr.CreateSound(name);
      if (!handle)
      {
--- 166,170 ----
      }
  
!     csRef<psSoundHandle> handle = sndmngr.CreateSound(name);
      if (!handle)
      {
***************
*** 174,178 ****
  
      backsound = handle->src->Play (loop);
!     backhandle = csPtr<psSoundHandle> (handle);
  
      return true;
--- 174,178 ----
  
      backsound = handle->src->Play (loop);
!     backhandle = handle;
  
      return true;
***************
*** 296,300 ****
      csRef<iSoundData> sounddata =
          sndloader->LoadSound (buf->GetUint8 (), buf->GetSize ());
- 
      if (!sounddata)
      {
--- 296,299 ----
***************
*** 314,328 ****
  }
  
! psSoundHandle* psSoundManager::psSndSourceMngr::CreateSound
      (const char* name)
  {
!     psTemplateRes* res = CreateResource(name, false);
      if (!res)
          return NULL;
  
!     return (psSoundHandle*) res;
  }
  
! psTemplateRes* psSoundManager::psSndSourceMngr::LoadResource (const char* name)
  {
      csHashKey key = csHashCompute(name);
--- 313,329 ----
  }
  
! csRef<psSoundHandle> psSoundManager::psSndSourceMngr::CreateSound
      (const char* name)
  {
!     csRef<psTemplateRes> rest = CreateResource(name);
!     csRef<psSoundHandle> res = (psSoundHandle*) ((psTemplateRes*) rest);
      if (!res)
          return NULL;
  
!     return res;
  }
  
! csPtr<psTemplateRes> psSoundManager::psSndSourceMngr::LoadResource
! 							    (const char* name)
  {
      csHashKey key = csHashCompute(name);
***************
*** 344,348 ****
          return NULL;
  
!     return new psSoundHandle(handle);
  }
  
--- 345,349 ----
          return NULL;
  
!     return csPtr <psTemplateRes> (new psSoundHandle(handle));
  }
  

Index: pssoundmngr.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/sound/pssoundmngr.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pssoundmngr.h	17 Jan 2003 08:21:38 -0000	1.10
--- pssoundmngr.h	1 Feb 2003 15:10:27 -0000	1.11
***************
*** 56,60 ****
      virtual float GetVolume();
      virtual void SetVolume(float vol);
!     virtual csPtr<iSoundSource> PlaySound(const char* name,bool loop);
      virtual void StopBGSong();
      virtual bool ChangeBGSong(const char* name, bool loop);
--- 56,60 ----
      virtual float GetVolume();
      virtual void SetVolume(float vol);
!     virtual csRef<iSoundSource> PlaySound(const char* name,bool loop = false);
      virtual void StopBGSong();
      virtual bool ChangeBGSong(const char* name, bool loop);
***************
*** 81,88 ****
          bool LoadSoundLib(const char* fname);
          csPtr<iSoundHandle> LoadSound(const char* fname);
!         psSoundHandle* CreateSound (const char* name);
  
      protected:
!         psTemplateRes* LoadResource (const char* name);
          csHashMap sndfiles;
          psSoundManager* parent;
--- 81,88 ----
          bool LoadSoundLib(const char* fname);
          csPtr<iSoundHandle> LoadSound(const char* fname);
!         csRef<psSoundHandle> CreateSound (const char* name);
  
      protected:
!         csPtr<psTemplateRes> LoadResource (const char* name);
          csHashMap sndfiles;
          psSoundManager* parent;