diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index 1fe7e29f99..6b0eee5a9e 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -410,8 +410,7 @@ bool RageSound::GetDataToPlay( int16_t *pBuffer, int iFrames, int &iStreamFrame,
 }
 
 /* Indicate that a block of audio data has been written to the device. */
-// XXX: pos should be int64_t
-void RageSound::CommitPlayingPosition( int64_t frameno, int pos, int iGotFrames )
+void RageSound::CommitPlayingPosition( int64_t frameno, int64_t pos, int iGotFrames )
 {
 	m_Mutex.Lock();
 	m_HardwareToStreamMap.Insert( frameno, iGotFrames, pos );
diff --git a/stepmania/src/RageSound.h b/stepmania/src/RageSound.h
index fe2d94d99a..51e51ad75c 100644
--- a/stepmania/src/RageSound.h
+++ b/stepmania/src/RageSound.h
@@ -193,7 +193,7 @@ public:
 	 * is still playing. */
 	int GetPCM( char *pBuffer, int iSize, int64_t iFrameno );
 	bool GetDataToPlay( int16_t *pBuffer, int iSize, int &iPosition, int &iBytesRead );
-	void CommitPlayingPosition( int64_t iFrameno, int iPosition, int iBytesRead );
+	void CommitPlayingPosition( int64_t iFrameno, int64_t iPosition, int iBytesRead );
 };
 
 #endif
diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp
index e58e4ebf9b..d6897ecb9c 100644
--- a/stepmania/src/RageSoundManager.cpp
+++ b/stepmania/src/RageSoundManager.cpp
@@ -183,7 +183,7 @@ int RageSoundManager::GetUniqueID()
 	return ++iID;
 }
 
-void RageSoundManager::CommitPlayingPosition( int ID, int64_t frameno, int pos, int got_frames )
+void RageSoundManager::CommitPlayingPosition( int ID, int64_t frameno, int64_t pos, int got_frames )
 {
 	/* This can be called from realtime threads; don't lock any mutexes. */
 	queued_pos_map_t p;
diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h
index 29d2eaf8a5..d85b937dad 100644
--- a/stepmania/src/RageSoundManager.h
+++ b/stepmania/src/RageSoundManager.h
@@ -41,7 +41,7 @@ public:
 	void RegisterSound( RageSound *p );		/* used by RageSound */
 	void UnregisterSound( RageSound *p );	/* used by RageSound */
 	int GetUniqueID();						/* used by RageSound */
-	void CommitPlayingPosition( int ID, int64_t frameno, int pos, int got_bytes );	/* used by drivers */
+	void CommitPlayingPosition( int ID, int64_t frameno, int64_t pos, int got_bytes );	/* used by drivers */
 	float GetPlayLatency() const;
 	int GetDriverSampleRate( int iRate ) const;
 
@@ -76,8 +76,9 @@ private:
 
 	struct queued_pos_map_t
 	{
-		int ID, pos, got_frames;
+		int ID, got_frames;
 		int64_t frameno;
+		int64_t pos;
 	};
 
 	CircBuf<queued_pos_map_t> pos_map_queue;