From 8e1f888fec4065c24503456a5124fc654d03d201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= Date: Wed, 19 Jun 2013 16:17:42 +0200 Subject: [PATCH] avoid unnecessary gen_freq_bits override --- grayscale.py | 4 +--- sstv.py | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/grayscale.py b/grayscale.py index 6b2ca15..d58d117 100644 --- a/grayscale.py +++ b/grayscale.py @@ -6,9 +6,7 @@ from sstv import SSTV, byte_to_freq class GrayscaleSSTV(SSTV): - def gen_freq_bits(self): - for item in SSTV.gen_freq_bits(self): - yield item + def gen_image_tuples(self): for line in xrange(self.HEIGHT): for item in self.horizontal_sync(): yield item diff --git a/sstv.py b/sstv.py index b4a3dd9..b855d68 100644 --- a/sstv.py +++ b/sstv.py @@ -97,6 +97,11 @@ class SSTV(object): parity_freq = FREQ_VIS_BIT1 if num_ones % 2 == 1 else FREQ_VIS_BIT0 yield parity_freq, MSEC_VIS_BIT yield FREQ_SYNC, MSEC_VIS_BIT # stop bit + for freq_tuple in self.gen_image_tuples(): + yield freq_tuple + + def gen_image_tuples(self): + return [] def horizontal_sync(self): yield FREQ_SYNC, self.SYNC