From b939c2772ca0c59ddaa4c2477a9252edf1d2a261 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 14 Dec 2023 10:16:59 -0500
Subject: [PATCH] 2023-12-14 Fred Gleason <fredg@paravelsystems.com> 	*
 Moved LINE_NUMBER macros to 'lib/rd.h'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog             | 12 ++++++++++++
 lib/rd.h              |  7 +++++++
 web/rdxport/rdxport.h |  3 ---
 web/webget/webget.h   |  3 ---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6d89ed8..c2954036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24528,3 +24528,15 @@
 2023-12-07 Fred Gleason <fredg@paravelsystems.com>
 	* Modified the schema reversion 348=>347 in rddbmgr(8) to remove
 	out-of-bounds SoundPanel button entries.
+2023-12-11 Fred Gleason <fredg@paravelsystems.com>
+	* Refactored the CAE control interface to assign session IDs
+	from the client rather than the service end.
+	* Added a 'serial' parameter to the 'Load Playback' ['LP'],
+	'Unload Playback' ['UP'], 'Play Position' ['PP'], 'Play' ['PY'],
+	'Stop Playback' ['SP'], 'Set Output Volume' ['OV'] and
+	'Fade Output Volume' ['FV'] CAE commands.
+	* Removed the 'card-num', 'port-num' and 'stream-num' parameters
+	from the 'Set Output Volume' ['OV'] and 'Fade Output Volume' ['FV']
+	CAE commands.
+2023-12-14 Fred Gleason <fredg@paravelsystems.com>
+	* Moved LINE_NUMBER macros to 'lib/rd.h'.
diff --git a/lib/rd.h b/lib/rd.h
index 25c2d841..6381627e 100644
--- a/lib/rd.h
+++ b/lib/rd.h
@@ -690,5 +690,12 @@
 #define RD_OFFSET_FORMAT "mm:ss"
 #define RD_OFFSET_TENTHS_FORMAT "mm:ss.z"
 
+/*
+ * Line number macros
+ */
+#define STRINGIZE(x) STRINGIZE2(x)
+#define STRINGIZE2(x) #x
+#define LINE_NUMBER QString(STRINGIZE(__LINE__)).toInt()
+
 
 #endif  // RD_H
diff --git a/web/rdxport/rdxport.h b/web/rdxport/rdxport.h
index 196f22c9..c7d4e78c 100644
--- a/web/rdxport/rdxport.h
+++ b/web/rdxport/rdxport.h
@@ -30,9 +30,6 @@
 #include <rdsvc.h>
 
 #define RDXPORT_CGI_USAGE "\n"
-#define STRINGIZE(x) STRINGIZE2(x)
-#define STRINGIZE2(x) #x
-#define LINE_NUMBER QString(STRINGIZE(__LINE__)).toInt()
 
 class Xport : public QObject
 {
diff --git a/web/webget/webget.h b/web/webget/webget.h
index d573334a..bf373e80 100644
--- a/web/webget/webget.h
+++ b/web/webget/webget.h
@@ -26,9 +26,6 @@
 #include <rdaudioconvert.h>
 #include <rdformpost.h>
 
-#define STRINGIZE(x) STRINGIZE2(x)
-#define STRINGIZE2(x) #x
-#define LINE_NUMBER QString(STRINGIZE(__LINE__)).toInt()
 #define WEBGET_CGI_USAGE "\n"
 
 class MainObject : public QObject