--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Thu Nov 19 18:37:26 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Thu Nov 19 18:05:52 2009 +0100
@@ -33,10 +33,18 @@
         public event EventHandler PlayerStopOrPause;
         public event EventHandler NewGestureRegognized;
 
+        double _Time = 0;
+        double _StartAnnotation = -1;
+        List<Gesture> _Gestures = new List<Gesture>();
+
         public double Time
         {
             get { return gestureControl.time; }
-            set { gestureControl.time = value; }
+            set
+            {
+                gestureControl.time = value;
+                _Time = value;
+            }
         }
 
         #region constructors
@@ -49,6 +57,7 @@
             //Control User Info
             usercontrolInfoUser.LabelSession.Content = "Seance Test";
             usercontrolInfoUser.LabelUser.Content = "User Test";
+            MediaElementVideo.Volume = 0;
         }
 
         #endregion
@@ -195,8 +204,7 @@
                         return;
                 }
                 if (!e.Gesture.Name.Equals("PLAY-PAUSE"))
-                    if (NewGestureRegognized != null)
-                        NewGestureRegognized(this, e);
+                    _Gestures.Add(e.Gesture);
             }
             catch { }
         }
@@ -435,5 +443,27 @@
                 default: break;
             }
         }
+
+        private void AnnotationButton_ContactLeave(object sender, ContactEventArgs e)
+        {
+            try
+            {
+                if (_StartAnnotation == -1)
+                {
+                    _StartAnnotation = _Time;
+                    AnnotationLabel.Content = "Annotation en cours";
+                }
+                else
+                {
+                    if (NewGestureRegognized != null)
+                        NewGestureRegognized(null, new GestureEventArg(_Gestures, _StartAnnotation, _Time));
+                    _Gestures.Clear();
+                    _StartAnnotation = -1;
+                    AnnotationLabel.Content = "";
+                    AnnotationButton.IsChecked = false;
+                }
+            }
+            catch { }
+        }
 	}
 }
\ No newline at end of file