From 7b0d99537ba33574d38715ed48b2b66c0dd29a31 Mon Sep 17 00:00:00 2001
From: Gary Sharp <discoict@outlook.com>
Date: Tue, 30 Apr 2013 12:48:04 +1000
Subject: [PATCH] Fix: Silverlight Attachment Upload Information

---
 Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml    | 2 +-
 Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml.vb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml b/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml
index 0a7dd5ea..ce710259 100644
--- a/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml
+++ b/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml
@@ -19,7 +19,7 @@
                 <Rectangle x:Name="WebCamHost" OpacityMask="White" />
             </Border>
             <StackPanel HorizontalAlignment="Center" VerticalAlignment="Bottom" Grid.Row="1" Margin="0, 10, 0, 0">
-                <Button x:Name="ButtonCapture" Content="CAPTURE IMAGE (Michael)" HorizontalAlignment="Center" Padding="14, 8" />
+                <Button x:Name="ButtonCapture" Content="CAPTURE IMAGE" HorizontalAlignment="Center" Padding="14, 8" />
                 <TextBlock x:Name="TextBlockWebCamFormat" HorizontalAlignment="Center" Margin="0, 6, 0, 0"></TextBlock>
             </StackPanel>
         </Grid>
diff --git a/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml.vb b/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml.vb
index 1bd7ef86..12320ca7 100644
--- a/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml.vb
+++ b/Disco.Silverlight.AttachmentUpload/Views/WebCam.xaml.vb
@@ -24,7 +24,7 @@ Partial Public Class WebCam
             Dim format = (From f In _CaptureSource.VideoCaptureDevice.SupportedFormats Where f.PixelHeight <= 720 And f.Stride = 0
                           Order By (f.PixelHeight * f.PixelWidth) Descending Order By f.FramesPerSecond).FirstOrDefault()
 
-            TextBlockWebCamFormat.Text = String.Format("{0}x{1} at {2}fps", format.PixelWidth, format.PixelHeight, format.FramesPerSecond)
+            TextBlockWebCamFormat.Text = String.Format("{0} - {1}x{2} at {3}fps", _CaptureSource.VideoCaptureDevice.FriendlyName, format.PixelWidth, format.PixelHeight, format.FramesPerSecond)
 
             _CaptureSource.VideoCaptureDevice.DesiredFormat = format