Permalink
Browse files

merged bitbucket down

  • Loading branch information...
2 parents ea93b78 + cf61b64 commit b445002bdc701e3bb93757e671d69cdc549c8a0c @dougrathbone committed Jun 5, 2012
@@ -35,7 +35,7 @@ public partial class SurfaceWindow1 : SurfaceWindow
public string BackgroundImagePath { get { return (string)GetValue(_backgroundImagePath); } set { SetValue(_backgroundImagePath, value); } }
public static readonly DependencyProperty _backgroundImagePath = DependencyProperty.Register("BackgroundImagePath", typeof(string), typeof(SurfaceWindow1), new FrameworkPropertyMetadata(AppSettings.BackgroundPath));
- private List<VideoPlayer> videoPlayers;
+ private List<VideoPlayer> _videoPlayers;
public SurfaceWindow1()
{
@@ -62,7 +62,7 @@ void FireClickEvent()
void SurfaceWindow1_Loaded(object sender, RoutedEventArgs e)
{
_timeLastTouched = DateTime.Now;
- videoPlayers = new List<VideoPlayer>();
+ _videoPlayers = new List<VideoPlayer>();
InitialiseTouchTimer();
@@ -73,7 +73,7 @@ void SurfaceWindow1_Loaded(object sender, RoutedEventArgs e)
private void InitialiseScatterItems()
{
- videoPlayers.ForEach(x=>x.StopVideo());
+ _videoPlayers.ForEach(x=>x.StopVideo());
ScatterContainer.Items.Clear();
var images =
@@ -109,17 +109,17 @@ private void InitialiseScatterItems()
videoControl.OnVideoPlayerStopped += videoControl_VideoStopped;
ScatterContainer.Items.Add(scatterView);
- videoPlayers.Add(videoControl);
+ _videoPlayers.Add(videoControl);
}
}
void videoControl_OnVideoPlayerPlayed(object sender, EventArgs e)
{
- var videoPlayersPlaying = videoPlayers.Count(x => x.VideoIsPlaying);
+ var videoPlayersPlaying = _videoPlayers.Count(x => x.VideoIsPlaying);
if (videoPlayersPlaying > AppSettings.MaximumVideosPlayingAtOnce)
{
- var singleOrDefault = videoPlayers.Where(x => x.VideoIsPlaying).OrderBy(x => x.PlayStarted).Take(1).SingleOrDefault();
+ var singleOrDefault = _videoPlayers.Where(x => x.VideoIsPlaying).OrderBy(x => x.PlayStarted).Take(1).SingleOrDefault();
if (singleOrDefault != null)
singleOrDefault.StopVideo();
Debug.WriteLine("Too many videos playing, stopping one");
@@ -131,7 +131,7 @@ void videoControl_OnVideoPlayerPlayed(object sender, EventArgs e)
void videoControl_VideoStopped(object sender, EventArgs e)
{
Debug.WriteLine("Video player stopped");
- Debug.WriteLine("{0} videos currently playing", videoPlayers.Count(x => x.VideoIsPlaying));
+ Debug.WriteLine("{0} videos currently playing", _videoPlayers.Count(x => x.VideoIsPlaying));
}
private bool _throbObjects = false;
@@ -13,7 +13,7 @@
<ImageBrush ImageSource="/OpenAttractor;component/Resources/video_frame.png" />
</Grid.Background>
<MediaElement Margin="3" x:Name="videoPlayer" ScrubbingEnabled="True" Source="{Binding Path=Source}" Loaded="videoPlayer_Loaded" LoadedBehavior="Manual" UnloadedBehavior="Stop" Stretch="UniformToFill" />
- <Image Source="/OpenAttractor;component/Resources/video_overlay.png" x:Name="Overlay">
+ <Image Source="/OpenAttractor;component/Resources/video_overlay.png" Stretch="Fill" x:Name="Overlay">
<Image.Style>
<Style TargetType="{x:Type Image}">
<Style.Triggers>
@@ -27,7 +27,11 @@
</Style>
</Image.Style>
</Image>
+<<<<<<< HEAD
<s:SurfaceButton x:Name="PlayButton" Click="PlayButton_Click" Background="Transparent" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
+=======
+ <s:SurfaceButton Background="Transparent" x:Name="PlayButton" Click="PlayButton_Click" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
+>>>>>>> cf61b64d2acf29c252aa8b8b24955e20f0a492cd
<s:SurfaceButton.Content>
<Image Source="/OpenAttractor;component/Resources/video_playbutton_large.png">
<!--<Image.Style>
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered

0 comments on commit b445002

Please sign in to comment.