Remove some old debugging code.

1 files changed, 0 insertions, 16 deletions

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index ae1fb3e87..7099f51c2 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -59,8 +59,6 @@
 #define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_WARNING);
 #define LOG_WARNING(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_WARNING);
 #define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
-#define LOG_DEBUG(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG);
-#define LOG_DEBUG_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_DEBUG);
 
 /* OS X strikes again */
 #undef set_key
@@ -314,9 +312,6 @@ try
 	{
 		boost::mutex::scoped_lock lock (_mutex);
 
-		/* This is for debugging only */
-		bool done_something = false;
-
 		while (true) {
 
 			if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) {
@@ -340,7 +335,6 @@ try
 		   _finish is true).
 		*/
 		if (_finish && (!have_sequenced_image_at_queue_head() || _queue.empty())) {
-			done_something = true;
 			/* (Hopefully temporarily) log anything that was not written */
 			if (!_queue.empty() && !have_sequenced_image_at_queue_head()) {
 				LOG_WARNING (N_("Finishing writer with a left-over queue of %1:"), _queue.size());
@@ -357,7 +351,6 @@ try
 		}
 		/* Write any frames that we can write; i.e. those that are in sequence. */
 		while (have_sequenced_image_at_queue_head ()) {
-			done_something = true;
 			QueueItem qi = _queue.front ();
 			_queue.pop_front ();
 			if (qi.type == QueueItem::FULL && qi.encoded) {
@@ -415,7 +408,6 @@ try
 		}
 
 		while (_queued_full_in_memory > _maximum_frames_in_memory) {
-			done_something = true;
 			/* Too many frames in memory which can't yet be written to the stream.
 			   Write some FULL frames to disk.
 			*/
@@ -449,14 +441,6 @@ try
 			--_queued_full_in_memory;
 		}
 
-		if (!done_something) {
-			LOG_DEBUG_NC ("Writer loop ran without doing anything");
-			LOG_DEBUG ("_queued_full_in_memory=%1", _queued_full_in_memory);
-			LOG_DEBUG ("_queue_size=%1", _queue.size ());
-			LOG_DEBUG ("_finish=%1", _finish);
-			LOG_DEBUG ("_last_written_frame=%1", _last_written_frame);
-		}
-
 		/* The queue has probably just gone down a bit; notify anything wait()ing on _full_condition */
 		_full_condition.notify_all ();
 	}