From 483a305c6b92cf410efd12d3ef3e5f26a748a6f5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 11 Apr 2003 15:55:20 +0000 Subject: [PATCH] Get rid of inline function; doesn't need to be. Reduce dependencies. --- stepmania/src/RandomSample.cpp | 13 +++++++++++++ stepmania/src/RandomSample.h | 17 +++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/stepmania/src/RandomSample.cpp b/stepmania/src/RandomSample.cpp index ddec41705a..5e90e68e9d 100644 --- a/stepmania/src/RandomSample.cpp +++ b/stepmania/src/RandomSample.cpp @@ -12,6 +12,7 @@ #include "RandomSample.h" +#include "RageSound.h" #include "RageUtil.h" #include "RageLog.h" @@ -29,6 +30,18 @@ RandomSample::~RandomSample() } +bool RandomSample::Load( CString sFilePath, int iMaxToLoad ) +{ + CString sDir, sFName, sExt; + splitrelpath( sFilePath, sDir, sFName, sExt ); + + sExt.MakeLower(); + + if( sExt == "" ) return LoadSoundDir( sFilePath, iMaxToLoad ); + else return LoadSound( sFilePath ); +} + + bool RandomSample::LoadSoundDir( CString sDir, int iMaxToLoad ) { if( sDir == "" ) diff --git a/stepmania/src/RandomSample.h b/stepmania/src/RandomSample.h index e360411974..4e498d7dbc 100644 --- a/stepmania/src/RandomSample.h +++ b/stepmania/src/RandomSample.h @@ -11,26 +11,15 @@ ----------------------------------------------------------------------------- */ -#include "RageSound.h" -#include "RageUtil.h" +class RageSound; class RandomSample { public: RandomSample(); - virtual ~RandomSample(); - - virtual bool Load( CString sFilePath, int iMaxToLoad = 1000 /*load all*/ ) - { - CString sDir, sFName, sExt; - splitrelpath( sFilePath, sDir, sFName, sExt ); - - sExt.MakeLower(); - - if( sExt == "" ) return LoadSoundDir( sFilePath, iMaxToLoad ); - else return LoadSound( sFilePath ); - }; + ~RandomSample(); + bool Load( CString sFilePath, int iMaxToLoad = 1000 /*load all*/ ); void PlayRandom(); void Stop();