From: Carl Hetherington <cth@carlh.net>
Date: Thu, 5 Jun 2014 10:44:13 +0000 (+0100)
Subject: A few small fixes.
X-Git-Tag: v2.0.48~551^2~135
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=3f9891137747cd7434ce20f69b8d88b967dbdfaf;p=dcpomatic.git

A few small fixes.
---

diff --git a/hacks/analog.py b/hacks/analog.py
index 473913de9..cac57d803 100644
--- a/hacks/analog.py
+++ b/hacks/analog.py
@@ -92,10 +92,12 @@ while True:
         add_encoder_thread_event(thread, T, 'wake')
     elif message.startswith('encoder thread begins local encode'):
         add_encoder_thread_event(thread, T, 'begin_encode')
-    elif message.startswith('MagickImageProxy begins read and decode'):
+    elif message.startswith('MagickImageProxy begins decode and convert') or message.startswith('MagickImageProxy begins read and decode'):
         add_encoder_thread_event(thread, T, 'magick_begin_decode')
-    elif message.startswith('MagickImageProxy completes read and decode'):
+    elif message.startswith('MagickImageProxy decode finished'):
         add_encoder_thread_event(thread, T, 'magick_end_decode')
+    elif message.startswith('MagickImageProxy completes decode and convert'):
+        add_encoder_thread_event(thread, T, 'magick_end_unpack')
     elif message.startswith('encoder thread finishes local encode'):
         add_encoder_thread_event(thread, T, 'end_encode')
 
@@ -143,7 +145,6 @@ elif args.encoder_threads:
 
         plt.plot(x, y)
         n += 1
-        break
 
     plt.show()
 elif args.plot_first_encoder: