<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>pycatcher/filters/webcam.py</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -13,8 +13,8 @@ config = {
 	# 'filename_prefix' : 'img-',
 
 	# Delay in seconds between each shot
-	# 'delay' : 60
+	# 'delay' : 60,
 
 	# List of filters to apply to the image
-	'filters' : ['text']
+	# 'filters' : []
 }</diff>
      <filename>pycatcher/defaults.py</filename>
    </modified>
    <modified>
      <diff>@@ -20,7 +20,9 @@ config = {
 img_counter = 1
 
 currently_paused = False
-	
+
+filter_instances = {}
+
 	
 def take_image():
 	&quot;&quot;&quot; The magic method - Captures an image and saves it out. &quot;&quot;&quot;
@@ -65,14 +67,7 @@ def take_image():
 	)
 
 	for filter_name in config['filters']:
-		fil = __import__(&quot;filters.&quot; + filter_name)
-		filter_config = fil.__dict__[filter_name].config
-
-		for k in filter_config:
-			if k not in config:
-				config[k] = filter_config[k]
-
-		print config
+		final_screengrab = filter_instances[filter_name].apply_filter(final_screengrab, config)
 
 	print &quot;Saving image ...&quot;
 
@@ -98,6 +93,8 @@ def thread_through():
 	&quot;&quot;&quot; Used for threading the screenshot taking mechanism so we can get input
 	And still be lazy with time.sleep() &quot;&quot;&quot;
 	global currently_paused
+
+	#time.sleep(config['delay'])
 	
 	while True:
 		if currently_paused == False:
@@ -133,6 +130,18 @@ def main():
 	if os.path.exists(config['filename_path']) == False:
 		sys.exit(&quot;Path defined in configuration does not exist.&quot;)
 
+	# load any overriding filter configs
+	for filter_name in config['filters']:
+		fil = __import__(&quot;filters.&quot; + filter_name)
+		filter_instances[filter_name] = fil.__dict__[filter_name].image_filter()
+		
+		filter_config = filter_instances[filter_name].config
+
+		for k in filter_config:
+			if k not in config:
+				config[k] = filter_config[k]
+			
+
 	print &quot;---------------------------&quot;
 	print &quot;PyCatcher -----------------&quot;
 	print &quot;---------------------------&quot;
@@ -153,7 +162,7 @@ def main():
 		get_input = raw_input(&quot;&quot;)
 		currently_paused = True
 		
-		get_command = raw_input(&quot;* Paused...\n* Plase enter commend. (exit to close PyCatcher. Nothing will continue.)\n: &quot;)
+		get_command = raw_input(&quot;* Paused...\n* Please enter a command. (exit to close PyCatcher or nothing to continue.)\n: &quot;)
 
 		if get_command in [&quot;exit&quot;, &quot;quit&quot;, &quot;q&quot;]:
 			break</diff>
      <filename>pycatcher/main.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5144b4d579154228ec305cf84f2ea0926abb7499</id>
    </parent>
  </parents>
  <author>
    <name>Fiona</name>
    <email>fiona@myrmidonprocess.com</email>
  </author>
  <url>http://github.com/Fiona/pycatcher/commit/4ea70e305fab9bd46e7dead0065640c05ccf0093</url>
  <id>4ea70e305fab9bd46e7dead0065640c05ccf0093</id>
  <committed-date>2008-12-03T15:28:02-08:00</committed-date>
  <authored-date>2008-12-03T15:28:02-08:00</authored-date>
  <message>Webcam capturing works!!</message>
  <tree>000878cd8efa0814987bdbb6be7e583d07de1063</tree>
  <committer>
    <name>Fiona</name>
    <email>fiona@myrmidonprocess.com</email>
  </committer>
</commit>
