add CUE_FPS macro exposed to external consumers

ciros88 · lipnitsk · commit f35fd675703d · 2026-02-28T11:02:57.000-08:00
diff --git a/libcue.h b/libcue.h
@@ -18,6 +18,9 @@ extern "C" {
 	#define CUE_EXPORT __attribute__((visibility("default")))
 #endif
 
+/* Frames per second */
+#define CUE_FPS (75)
+
 /*
  * disc modes
  * DATA FORM OF MAIN DATA (5.29.2.8)
diff --git a/t/multiple_files.c b/t/multiple_files.c
@@ -6,9 +6,7 @@
 
 int tests_run;
 
-/* Frames per second */
-#define FPS (75)
-#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*FPS)
+#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*CUE_FPS)
 
 static char cue[] = "FILE \"The Specials - Singles - 01 - Gangsters.wav\" WAVE\n"
                         "TRACK 01 AUDIO\n"
diff --git a/t/noncompliant.c b/t/noncompliant.c
@@ -6,9 +6,7 @@
 
 int tests_run;
 
-/* Frames per second */
-#define FPS (75)
-#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*FPS)
+#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*CUE_FPS)
 
 static char cue[] = 
                "FILE \"The Specials - Singles - 01 - Gangsters.flac\" FLAC\n"
diff --git a/t/single_idx_00.c b/t/single_idx_00.c
@@ -6,9 +6,7 @@
 
 int tests_run;
 
-/* Frames per second */
-#define FPS (75)
-#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*FPS)
+#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*CUE_FPS)
 
 static char cue[] =
 "PERFORMER \"Bloc Party\"\n"
diff --git a/t/standard_cue.c b/t/standard_cue.c
@@ -6,9 +6,7 @@
 
 int tests_run;
 
-/* Frames per second */
-#define FPS (75)
-#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*FPS)
+#define MSF_TO_F(m,s,f) ((f) + ((m)*60 + (s))*CUE_FPS)
 
 static char cue[] =   "REM GENRE Alternative\n"
                       "REM DATE 1991\n"
diff --git a/time.c b/time.c
@@ -10,19 +10,20 @@
 #include <string.h>
 
 #include "cue_time.h"
+#include "libcue.h"
 
 long time_msf_to_frame(int m, int s, int f)
 {
-	if (m < 0 || m > 99 || s < 0 || s >= 60 || f < 0 || f >= 75) {
+	if (m < 0 || m > 99 || s < 0 || s >= 60 || f < 0 || f >= CUE_FPS) {
 		return -1;
 	}
-	return (m * 60 + s) * 75 + f;
+	return (m * 60 + s) * CUE_FPS + f;
 }
 
 void time_frame_to_msf(long frame, int *m, int *s, int *f)
 {
-	*f = frame % 75;           /* 0 <= frames <= 74 */
-	frame /= 75;
+	*f = frame % CUE_FPS;           /* 0 <= frames <= 74 */
+	frame /= CUE_FPS;
 	*s = frame % 60;          /* 0 <= seconds <= 59 */
 	frame /= 60;
 	*m = frame;               /* 0 <= minutes */
@@ -34,7 +35,7 @@ char *time_frame_to_mmssff(long f)
 	static char msf[9];
 	int minutes, seconds, frames;
 
-	if (f < 0 || f >= 75 * 60 * 100) {
+	if (f < 0 || f >= CUE_FPS * 60 * 100) {
 		strcpy(msf, "00:00:00");
 		return msf;
 	}

Original file line number	Diff line number	Diff line change
`@@ -10,19 +10,20 @@`
`10`	`10`	`#include <string.h>`
`11`	`11`
`12`	`12`	`#include "cue_time.h"`
	`13`	`+#include "libcue.h"`
`13`	`14`
`14`	`15`	`long time_msf_to_frame(int m, int s, int f)`
`15`	`16`	`{`
`16`		`- if (m < 0 \|\| m > 99 \|\| s < 0 \|\| s >= 60 \|\| f < 0 \|\| f >= 75) {`
	`17`	`+ if (m < 0 \|\| m > 99 \|\| s < 0 \|\| s >= 60 \|\| f < 0 \|\| f >= CUE_FPS) {`
`17`	`18`	`return -1;`
`18`	`19`	`}`
`19`		`- return (m * 60 + s) * 75 + f;`
	`20`	`+ return (m * 60 + s) * CUE_FPS + f;`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`void time_frame_to_msf(long frame, int m, int s, int *f)`
`23`	`24`	`{`
`24`		`- f = frame % 75; / 0 <= frames <= 74 */`
`25`		`- frame /= 75;`
	`25`	`+ f = frame % CUE_FPS; / 0 <= frames <= 74 */`
	`26`	`+ frame /= CUE_FPS;`
`26`	`27`	`s = frame % 60; / 0 <= seconds <= 59 */`
`27`	`28`	`frame /= 60;`
`28`	`29`	`m = frame; / 0 <= minutes */`
`@@ -34,7 +35,7 @@ char *time_frame_to_mmssff(long f)`
`34`	`35`	`static char msf[9];`
`35`	`36`	`int minutes, seconds, frames;`
`36`	`37`
`37`		`- if (f < 0 \|\| f >= 75 * 60 * 100) {`
	`38`	`+ if (f < 0 \|\| f >= CUE_FPS * 60 * 100) {`
`38`	`39`	`strcpy(msf, "00:00:00");`
`39`	`40`	`return msf;`
`40`	`41`	`}`