Cleanup: move ScheduledFrames into its own .cc/.h.

4 files changed, 93 insertions, 33 deletions

diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h
index 9e8cb9e4d..e52a1b7ea 100644
--- a/src/lib/grok/messenger.h
+++ b/src/lib/grok/messenger.h
@@ -365,38 +365,6 @@ private:
 };
 
 
-class ScheduledFrames
-{
-public:
-	void store(DCPVideo const& val)
-	{
-		std::unique_lock<std::mutex> lk(_mutex);
-		auto it = _map.find(val.index());
-		if (it == _map.end()) {
-			_map.emplace(std::make_pair(val.index(), val));
-		}
-	}
-
-	boost::optional<DCPVideo> retrieve(size_t index)
-	{
-		std::unique_lock<std::mutex> lk(_mutex);
-		auto it = _map.find(index);
-		if (it == _map.end()) {
-			return {};
-		}
-
-		DCPVideo val = it->second;
-		_map.erase(index);
-
-		return val;
-	}
-
-private:
-	std::mutex _mutex;
-	std::map<size_t, DCPVideo> _map;
-};
-
-
 class Messenger
 {
 public:
diff --git a/src/lib/grok/scheduled_frames.cc b/src/lib/grok/scheduled_frames.cc
new file mode 100644
index 000000000..25f07d668
--- /dev/null
+++ b/src/lib/grok/scheduled_frames.cc
@@ -0,0 +1,51 @@
+/*
+    Copyright (C) 2023 Grok Image Compression Inc.
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "scheduled_frames.h"
+#include "../dcp_video.h"
+
+
+void
+ScheduledFrames::store(DCPVideo const& val)
+{
+	std::unique_lock<std::mutex> lk(_mutex);
+	auto it = _map.find(val.index());
+	if (it == _map.end()) {
+		_map.emplace(std::make_pair(val.index(), val));
+	}
+}
+
+
+boost::optional<DCPVideo>
+ScheduledFrames::retrieve(size_t index)
+{
+	std::unique_lock<std::mutex> lk(_mutex);
+	auto it = _map.find(index);
+	if (it == _map.end()) {
+		return {};
+	}
+
+	DCPVideo val = it->second;
+	_map.erase(index);
+
+	return val;
+}
+
diff --git a/src/lib/grok/scheduled_frames.h b/src/lib/grok/scheduled_frames.h
new file mode 100644
index 000000000..509718d18
--- /dev/null
+++ b/src/lib/grok/scheduled_frames.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2023 Grok Image Compression Inc.
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include <map>
+#include <mutex>
+#include <boost/optional.hpp>
+
+
+class DCPVideo;
+
+
+class ScheduledFrames
+{
+public:
+	void store(DCPVideo const& val);
+	boost::optional<DCPVideo> retrieve(size_t index);
+
+private:
+	std::mutex _mutex;
+	std::map<size_t, DCPVideo> _map;
+};
+
+
diff --git a/src/lib/wscript b/src/lib/wscript
index 058e79645..fb7fe980b 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -268,7 +268,7 @@ def build(bld):
             obj.uselib += ' POLKIT'
 
     if bld.env.ENABLE_GROK:
-        obj.source += ' grok_j2k_encoder_thread.cc grok/messenger.cc grok/synch.cc grok/util.cc'
+        obj.source += ' grok_j2k_encoder_thread.cc grok/messenger.cc grok/scheduled_frames.cc grok/synch.cc grok/util.cc'
 
     if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI OLE32 UUID'