[chronojump: 18/18] Merge branch 'video-capture'

[Xavier de Blas <xaviblas src gnome org>]

commit eb35dac85ef51839a656222f419e5fc169cb0944
Merge: 5a4aded 1cbb511
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Feb 1 18:36:36 2011 +0100

    Merge branch 'video-capture'
    
    Conflicts:
    	CesarPlayer/Gui/CapturerBin.cs
    	src/gui/chronojump.cs

 CesarPlayer/Gui/CapturerBin.cs |   15 ++++++++++++++-
 src/gui/chronojump.cs          |    4 ++++
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --cc CesarPlayer/Gui/CapturerBin.cs
index 1b4f014,e3fcc55..d1916f7
--- a/CesarPlayer/Gui/CapturerBin.cs
+++ b/CesarPlayer/Gui/CapturerBin.cs
@@@ -381,6 -389,11 +389,11 @@@ namespace LongoMatch.Gu
  			if (frame != null && NewSnapshot != null) {
  				NewSnapshot(frame);
  			}
 -			//Pixbuf frameMini = capturer.CurrentMiniatureFrame;
++			
+ 			Pixbuf frameMini = CurrentMiniatureFrame;
+ 			if (frameMini != null && NewSnapshotMini != null) {
+ 				NewSnapshotMini(frameMini);
+ 			}
  		}