From 23cb6139bdd3c12d0262916583726ad9d49caf67 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Tue, 7 Feb 2023 11:23:30 -0500 Subject: [PATCH] SID: Disable SID on 2MB targets, as cRSID needs a lot of RAM. Also add a note that SID might not play in realtime on all targets Change-Id: Ic14b20a7c1427e31e38204ae3ecff6bd235ec1b4 --- lib/rbcodec/codecs/SOURCES | 2 +- lib/rbcodec/codecs/codecs.make | 2 ++ manual/appendix/file_formats.tex | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/rbcodec/codecs/SOURCES b/lib/rbcodec/codecs/SOURCES index 78b7b97498..44b79087fe 100644 --- a/lib/rbcodec/codecs/SOURCES +++ b/lib/rbcodec/codecs/SOURCES @@ -17,7 +17,6 @@ atrac3_rm.c atrac3_oma.c mpc.c wma.c -sid.c ape.c asap.c aac.c @@ -43,6 +42,7 @@ nsf.c sgc.c vgm.c #if MEMORYSIZE > 2 +sid.c kss.c #endif aac_bsf.c diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index bc6549498e..27ba73ab3c 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make @@ -65,7 +65,9 @@ include $(RBCODECLIB_DIR)/codecs/libgme/libvgm.make include $(RBCODECLIB_DIR)/codecs/libgme/libkss.make include $(RBCODECLIB_DIR)/codecs/libgme/libemu2413.make include $(RBCODECLIB_DIR)/codecs/libopus/libopus.make +ifneq ($(MEMORYSIZE),2) include $(RBCODECLIB_DIR)/codecs/cRSID/cRSID.make +endif # set CODECFLAGS per codec lib, since gcc takes the last -Ox and the last # in a -ffoo -fno-foo pair, there is no need to filter them out diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex index 4c12575b2e..c40a7d35ae 100644 --- a/manual/appendix/file_formats.tex +++ b/manual/appendix/file_formats.tex @@ -215,15 +215,16 @@ Atari SAP & \fname{.sap} & \\ + \nopt{clipv1,c200v2}{ Sound Interface Device & \fname{.sid} - & Progress bar and seek use subtracks instead of seconds.\\ + & Progress bar and seek use subtracks instead of seconds.\\} SPC700 & \fname{.spc} & \\ \end{rbtabular} - \note{NSF and VGM might not play in realtime on all devices due to CPU + \note{NSF, VGM, and SID might not play in realtime on all devices due to CPU performance requirements.} \subsection{Codec featureset}