diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp
index b805d8d9ca..f36face850 100644
--- a/stepmania/src/RageSoundManager.cpp
+++ b/stepmania/src/RageSoundManager.cpp
@@ -241,7 +241,7 @@ int RageSoundManager::GetDriverSampleRate( int iRate ) const
 	if( m_pDriver == NULL )
 		return 44100;
 
-	return m_pDriver->GetSampleRate( iRate );
+	return m_pDriver->GetSampleRate();
 }
 
 /* The return value of PlaySound and PlayCopyOfSound is only valid in the main
diff --git a/stepmania/src/arch/Sound/RageSoundDriver.h b/stepmania/src/arch/Sound/RageSoundDriver.h
index 51c6679798..82970503a5 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver.h
@@ -45,7 +45,7 @@ public:
 	 * hearing it.  (This isn't necessarily the same as the buffer latency.) */
 	virtual float GetPlayLatency() const { return 0.0f; }
 
-	virtual int GetSampleRate( int rate ) const { return 44100; }
+	virtual int GetSampleRate() const { return 44100; }
 
 	virtual ~RageSoundDriver() { }
 };
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
index f03c1366c1..91c1add857 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
@@ -17,7 +17,7 @@ public:
 	/* virtuals: */
 	int64_t GetPosition() const;
 	float GetPlayLatency() const;
-	int GetSampleRate( int iRate ) const { return m_iSampleRate; }
+	int GetSampleRate() const { return m_iSampleRate; }
 
 	void SetupDecodingThread();
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_AU.h b/stepmania/src/arch/Sound/RageSoundDriver_AU.h
index 287da2d391..a1345663c9 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_AU.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_AU.h
@@ -12,7 +12,7 @@ public:
 	RString Init();
 	~RageSoundDriver_AU();
 	float GetPlayLatency() const;
-	int GetSampleRate( int rate ) const { return m_iSampleRate; }
+	int GetSampleRate() const { return m_iSampleRate; }
 	int64_t GetPosition() const;
 	
 protected:
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_CA.h b/stepmania/src/arch/Sound/RageSoundDriver_CA.h
index 8076e5144a..467dbd0259 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_CA.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_CA.h
@@ -16,7 +16,7 @@ public:
 	RString Init();
 	~RageSoundDriver_CA();
 	float GetPlayLatency() const { return m_fLatency; }
-	int GetSampleRate( int rate ) const { return m_iSampleRate; }
+	int GetSampleRate() const { return m_iSampleRate; }
 	int64_t GetPosition() const;
 	void SetupDecodingThread();
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
index 65226878b4..1366f45fec 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
@@ -138,7 +138,7 @@ float RageSoundDriver_DSound_Software::GetPlayLatency() const
 	return (1.0f / m_iSampleRate) * g_iMaxWriteahead;
 }
 
-int RageSoundDriver_DSound_Software::GetSampleRate( int rate ) const
+int RageSoundDriver_DSound_Software::GetSampleRate() const
 {
 	return m_iSampleRate;
 }
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
index 424c19ca77..5c3dd163fd 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
@@ -14,7 +14,7 @@ public:
 
 	int64_t GetPosition() const;
 	float GetPlayLatency() const;
-	int GetSampleRate( int rate ) const;
+	int GetSampleRate() const;
 	
 protected:
 	void SetupDecodingThread();
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
index a6e16231f5..52b52b7efe 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
@@ -93,7 +93,7 @@ RageSoundMixBuffer &RageSound_Generic_Software::MixIntoBuffer( int iFrames, int6
 			/* If the sound is supposed to start at a time past this buffer, insert silence. */
 			const int64_t iFramesUntilThisBuffer = iFrameNumber - iCurrentFrame;
 			const float fSecondsBeforeStart = -s.m_StartTime.Ago();
-			const int64_t iFramesBeforeStart = int64_t(fSecondsBeforeStart * GetSampleRate(0));
+			const int64_t iFramesBeforeStart = int64_t(fSecondsBeforeStart * GetSampleRate());
 			const int iSilentFramesInThisBuffer = clamp( int(iFramesBeforeStart-iFramesUntilThisBuffer), 0, iFramesLeft );
 
 			iGotFrames += iSilentFramesInThisBuffer;
@@ -180,7 +180,7 @@ void RageSound_Generic_Software::DecodeThread()
 	{
 		/* Fill each playing sound, round-robin. */
 		{
-			int iSampleRate = GetSampleRate(0);
+			int iSampleRate = GetSampleRate();
 			ASSERT_M( iSampleRate > 0, ssprintf("%i", iSampleRate) );
 			int iUsecs = 1000000*chunksize() / iSampleRate;
 			usleep( iUsecs );
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp
index 283770a273..806fee8ed8 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp
@@ -35,7 +35,7 @@ RageSoundDriver_Null::RageSoundDriver_Null()
 	StartDecodeThread();
 }
 
-int RageSoundDriver_Null::GetSampleRate( int iRate ) const
+int RageSoundDriver_Null::GetSampleRate() const
 {
 	return m_iSampleRate;
 }
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.h b/stepmania/src/arch/Sound/RageSoundDriver_Null.h
index 87258bc8d7..3949e878ce 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_Null.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.h
@@ -8,7 +8,7 @@ class RageSoundDriver_Null: public RageSound_Generic_Software
 public:
 	RageSoundDriver_Null();
 	int64_t GetPosition() const;
-	int GetSampleRate( int iRate ) const;
+	int GetSampleRate() const;
 	void Update();
 
 private:
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
index f99ace703c..7ba43ac42a 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
@@ -21,7 +21,7 @@ class RageSoundDriver_OSS: public RageSound_Generic_Software
 	
 public:
 	bool GetData();
-	int GetSampleRate( int rate ) const { return samplerate; }
+	int GetSampleRate() const { return samplerate; }
 
 	/* virtuals: */
 	int64_t GetPosition() const;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.cpp
index d4b2909791..68bb025e85 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.cpp
@@ -1356,7 +1356,7 @@ RageSoundDriver_WDMKS::~RageSoundDriver_WDMKS()
 	CloseHandle( m_hSignal );
 }
 
-int RageSoundDriver_WDMKS::GetSampleRate( int iRate ) const
+int RageSoundDriver_WDMKS::GetSampleRate() const
 {
 	return m_pStream->m_iSampleRate;
 }
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h b/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h
index 16a1c88ea0..8eff77d307 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h
@@ -17,7 +17,7 @@ public:
 
 	int64_t GetPosition() const;
 	float GetPlayLatency() const;
-	int GetSampleRate( int iRate ) const;
+	int GetSampleRate() const;
 
 private:
 	static int MixerThread_start( void *p );
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
index 6dde12e9a7..8306a4360e 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
@@ -15,7 +15,7 @@ public:
 
 	int64_t GetPosition() const;
 	float GetPlayLatency() const;
-	int GetSampleRate( int rate ) const { return m_iSampleRate; }
+	int GetSampleRate() const { return m_iSampleRate; }
 
 private:
 	static int MixerThread_start( void *p );