cheese r715 - in branches/cheese-vala: . src

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Sun May 11 19:46:15 2008
New Revision: 715
URL: http://svn.gnome.org/viewvc/cheese?rev=715&view=rev

Log:
effect stuff

Modified:
   branches/cheese-vala/   (props changed)
   branches/cheese-vala/src/cheese-webcam.vala
   branches/cheese-vala/src/cheese-window.vala

Modified: branches/cheese-vala/src/cheese-webcam.vala
==============================================================================
--- branches/cheese-vala/src/cheese-webcam.vala	(original)
+++ branches/cheese-vala/src/cheese-webcam.vala	Sun May 11 19:46:15 2008
@@ -75,9 +75,9 @@
 	}
 	
 	struct EffectToPipeline {
-		Effect effect;
-		string pipeline_desc;
-		ColorSpace colorspace; /* The color space the effect works in */
+		public Effect effect;
+		public string pipeline_desc;
+		public ColorSpace colorspace; /* The color space the effect works in */
 	} 
 
 	const EffectToPipeline[] EFFECT_TO_PIPELINE = {
@@ -234,7 +234,20 @@
 	}
 	
 	public void set_effect (Effect effect) {
+		string rgb_effects, yuv_effects;
 		
+		for (int i = 0; i < EFFECT_TO_PIPELINE.length; i++) {
+			if ((effect & EFFECT_TO_PIPELINE[i].effect) != 0) {
+				if (EFFECT_TO_PIPELINE[i].colorspace == ColorSpace.RGB) {
+					rgb_effects += EFFECT_TO_PIPELINE[i].pipeline_desc + " ! ";
+				} else { /* colorspace == YUV */
+					yuv_effects += EFFECT_TO_PIPELINE[i].pipeline_desc + " ! ";
+				}
+			}
+		}		
+		var effects = "ffmpegcolorspace ! " + rgb_effects + "ffmpegcolorspace ! " + yuv_effects;		
+		var effect_filter = parse_bin_from_description (effects, true);		
+		set_effect_filter (effect_filter);		
 	}
 	
 	

Modified: branches/cheese-vala/src/cheese-window.vala
==============================================================================
--- branches/cheese-vala/src/cheese-window.vala	(original)
+++ branches/cheese-vala/src/cheese-window.vala	Sun May 11 19:46:15 2008
@@ -109,7 +109,6 @@
   	int audio_play_counter = 0;
   	Rand rand = new Rand();
 
-
 	const ActionEntry[] action_entries_main = {
   		{"Cheese", null, N_("_Cheese")},
 		{"Edit", null, N_("_Edit")},