properly fix all aplay RT stuff

logicomacorp · Aug 31, 2020 · c74d60e · c74d60e
1 parent 7930f08
commit c74d60e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/WaveSabreCore/CMakeLists.txt b/WaveSabreCore/CMakeLists.txt
@@ -79,8 +79,8 @@ if(MSVC)
 else()
 	# assuming GCC or clang for now
 
-	#set(CMAKE_CXX_FLAGS "-g -Og")
+	set(CMAKE_CXX_FLAGS "-g -Og")
 	# stuff to make the code smaller
-	set_property(TARGET WaveSabreCore PROPERTY INTERPROCEDURAL_OPTIMIZATION True) # enable LTO
-	set(CMAKE_CXX_FLAGS "-g -O2 -ffast-math -fno-exceptions -fno-rtti -fno-stack-protector -fno-stack-check -fno-unwind-tables -fno-asynchronous-unwind-tables -fomit-frame-pointer -fno-threadsafe-statics -march=nocona -ffunction-sections -fdata-sections -Wl,--gc-sections")
+	#set_property(TARGET WaveSabreCore PROPERTY INTERPROCEDURAL_OPTIMIZATION True) # enable LTO
+	#set(CMAKE_CXX_FLAGS "-g -O2 -ffast-math -fno-exceptions -fno-rtti -fno-stack-protector -fno-stack-check -fno-unwind-tables -fno-asynchronous-unwind-tables -fomit-frame-pointer -fno-threadsafe-statics -march=nocona -ffunction-sections -fdata-sections -Wl,--gc-sections")
 endif()
diff --git a/WaveSabrePlayerLib/CMakeLists.txt b/WaveSabrePlayerLib/CMakeLists.txt
@@ -65,8 +65,8 @@ if(MSVC)
 else()
 	# assuming GCC or clang for now
 
-	#set(CMAKE_CXX_FLAGS "-g -Og")
+	set(CMAKE_CXX_FLAGS "-g -Og")
 	# stuff to make the code smaller
-	set_property(TARGET WaveSabrePlayerLib PROPERTY INTERPROCEDURAL_OPTIMIZATION True) # enable LTO
-	set(CMAKE_CXX_FLAGS "-g -O2 -ffast-math -fno-exceptions -fno-rtti -fno-stack-protector -fno-stack-check -fno-unwind-tables -fno-asynchronous-unwind-tables -fomit-frame-pointer -fno-threadsafe-statics -march=nocona -ffunction-sections -fdata-sections -Wl,--gc-sections")
+	#set_property(TARGET WaveSabrePlayerLib PROPERTY INTERPROCEDURAL_OPTIMIZATION True) # enable LTO
+	#set(CMAKE_CXX_FLAGS "-g -O2 -ffast-math -fno-exceptions -fno-rtti -fno-stack-protector -fno-stack-check -fno-unwind-tables -fno-asynchronous-unwind-tables -fomit-frame-pointer -fno-threadsafe-statics -march=nocona -ffunction-sections -fdata-sections -Wl,--gc-sections")
 endif()
diff --git a/WaveSabrePlayerLib/include/WaveSabrePlayerLib/AplayRenderThread.h b/WaveSabrePlayerLib/include/WaveSabrePlayerLib/AplayRenderThread.h
@@ -41,7 +41,7 @@ namespace WaveSabrePlayerLib
 		int sampleRate;
 		int bufferSizeMs;
 		int bufferSizeBytes;
-		int samplesWritten;
+		int bytesWritten;
 		SongRenderer::Sample *sampleBuffer;
 		const SongRenderer::Sample *bufferToWrite;
 		size_t bufferBytesLeft;

diff --git a/WaveSabrePlayerLib/src/AplayRenderThread.cpp b/WaveSabrePlayerLib/src/AplayRenderThread.cpp
@@ -33,7 +33,7 @@ namespace WaveSabrePlayerLib
 		, callbackData(callbackData)
 		, sampleRate(sampleRate)
 		, bufferSizeMs(bufferSizeMs)
-		, samplesWritten(0)
+		, bytesWritten(0)
 		, bufferBytesLeft(0)
 		, writeBytesMax(PIPE_BUF)
 #if HAVE_PTHREAD
@@ -45,7 +45,8 @@ namespace WaveSabrePlayerLib
 #endif
 
 		bufferSizeBytes = sampleRate * SongRenderer::BlockAlign * bufferSizeMs / 1000;
-		bufferToWrite = (SongRenderer::Sample*)malloc(bufferSizeBytes);
+		sampleBuffer = (SongRenderer::Sample*)malloc(bufferSizeBytes);
+		bufferToWrite = sampleBuffer;
 
 		int fdpair[2];
 		int rv = pipe(fdpair);
@@ -141,7 +142,7 @@ namespace WaveSabrePlayerLib
 
 	int AplayRenderThread::GetPlayPositionMs()
 	{
-		return (samplesWritten * 1000) / sampleRate;
+		return (int)(bytesWritten / SongRenderer::BlockAlign * 1000 / sampleRate);
 	}
 
 	void AplayRenderThread::AplayProc(int readend, int rate)
@@ -222,7 +223,7 @@ namespace WaveSabrePlayerLib
 				//printf("written buffer %p size 0x%zx, wrote 0x%zx bytes, left: 0x%zx\n",
 				//		bufferToWrite, toWrite, (size_t)ret, bufferBytesLeft);
 				bufferToWrite   += ret / sizeof(SongRenderer::Sample);
-				samplesWritten  += ret / sizeof(SongRenderer::Sample);
+				bytesWritten    += ret;
 
 				break;
 			}

diff --git a/WaveSabreStandAlonePlayer/CMakeLists.txt b/WaveSabreStandAlonePlayer/CMakeLists.txt
@@ -15,8 +15,8 @@ if(MSVC)
 else()
 	# assuming GCC or clang for now
 
-	#set(CMAKE_CXX_FLAGS "-g -Og")
+	set(CMAKE_CXX_FLAGS "-g -Og")
 	# stuff to make the code smaller
-	set_property(TARGET WaveSabrePlayerLib PROPERTY INTERPROCEDURAL_OPTIMIZATION True) # enable LTO
-	set(CMAKE_CXX_FLAGS "-g -O2 -ffast-math -fno-exceptions -fno-rtti -fno-stack-protector -fno-stack-check -fno-unwind-tables -fno-asynchronous-unwind-tables -fomit-frame-pointer -fno-threadsafe-statics -march=nocona -ffunction-sections -fdata-sections -Wl,--gc-sections")
+	#set_property(TARGET WaveSabrePlayerLib PROPERTY INTERPROCEDURAL_OPTIMIZATION True) # enable LTO
+	#set(CMAKE_CXX_FLAGS "-g -O2 -ffast-math -fno-exceptions -fno-rtti -fno-stack-protector -fno-stack-check -fno-unwind-tables -fno-asynchronous-unwind-tables -fomit-frame-pointer -fno-threadsafe-statics -march=nocona -ffunction-sections -fdata-sections -Wl,--gc-sections")
 endif()
diff --git a/WaveSabreStandAlonePlayer/main.cpp b/WaveSabreStandAlonePlayer/main.cpp
@@ -90,14 +90,14 @@ int main(int argc, char **argv)
 		       "Writing WAV instead...\n");
 		writeWav = true;
 	}*/
-	writeWav = true;
-	preRender = true;
+	//writeWav = true;
+	//preRender = true;
 #endif
 
 #if defined(WIN32) || defined(_WIN32)
 	const int numRenderThreads = 3;
 #else
-	const int numRenderThreads = 3; // TODO
+	const int numRenderThreads = 3;
 #endif
 
 	FILE * pFile;
@@ -182,6 +182,7 @@ int main(int argc, char **argv)
 #if defined(WIN32) || defined(_WIN32)
 			Sleep(10);
 #else
+			fflush(stdout);
 			sleep( 1);
 #endif
 		}