[axis-camera-mpplugin] r531 committed - Replaced the default camera snapshot with a new image. The image will ...

[axis-camer...@googlecode.com]

Revision: 531
Author: mattias....@gmail.com
Date: Tue Feb 3 22:27:45 2015 UTC
Log: Replaced the default camera snapshot with a new image. The image
will in contrast to before never be saved on disk but will be used if the
camera itself doesn't provide its own snapshot.
https://code.google.com/p/axis-camera-mpplugin/source/detail?r=531

Added:
/trunk/Source/AxisCameras/Resources/Original/Background.jpg
/trunk/Source/AxisCameras.Configuration/Resources/DefaultSnapshot.png
Deleted:
/trunk/Source/AxisCameras/Thumbs/AxisCameras/DefaultSnapshot.png
Modified:
/trunk/Source/AxisCameras/AxisCameras.csproj
/trunk/Source/AxisCameras/Player/CameraPlayer.cs
/trunk/Source/AxisCameras.Configuration/AxisCameras.Configuration.csproj
/trunk/Source/AxisCameras.Configuration/Provider/CameraConverter.cs
/trunk/Source/AxisCameras.Configuration/Provider/ICameraConverter.cs

/trunk/Source/AxisCameras.Configuration/Provider/WizardPageViewModelsProvider.cs
/trunk/Source/AxisCameras.Configuration/Service/IIOService.cs
/trunk/Source/AxisCameras.Configuration/Service/IOService.cs
/trunk/Source/AxisCameras.Configuration/View/SetupDialogResources.xaml
/trunk/Source/AxisCameras.Configuration/View/WizardPageResources.xaml
/trunk/Source/AxisCameras.Configuration/View/WizardPageThree.xaml

/trunk/Source/AxisCameras.Configuration/ViewModel/CameraParametersDialogViewModel.cs

/trunk/Source/AxisCameras.Configuration/ViewModel/CameraSnapshotDialogViewModel.cs

/trunk/Source/AxisCameras.Configuration/ViewModel/Data/ConfigurableCamera.cs

/trunk/Source/AxisCameras.Configuration/ViewModel/WizardPageThreeViewModel.cs
/trunk/Source/Setup/AxisCameras.xmp2

=======================================
--- /dev/null
+++ /trunk/Source/AxisCameras/Resources/Original/Background.jpg Tue Feb 3
22:27:45 2015 UTC
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/Source/AxisCameras.Configuration/Resources/DefaultSnapshot.png
Tue Feb 3 22:27:45 2015 UTC
Binary file, no diff available.
=======================================
--- /trunk/Source/AxisCameras/Thumbs/AxisCameras/DefaultSnapshot.png Sat
Mar 19 09:33:36 2011 UTC
+++ /dev/null
Binary file, no diff available.
=======================================
--- /trunk/Source/AxisCameras/AxisCameras.csproj Sun Jan 25 07:20:18 2015
UTC
+++ /trunk/Source/AxisCameras/AxisCameras.csproj Tue Feb 3 22:27:45 2015
UTC
@@ -167,9 +167,6 @@
<None Include="Thumbs\AxisCameras\CameraPortrait.png" />
</ItemGroup>
<ItemGroup>
- <None Include="Thumbs\AxisCameras\DefaultSnapshot.png" />
- </ItemGroup>
- <ItemGroup>
<CodeAnalysisDictionary Include="..\CustomDictionary.xml">
<Link>CustomDictionary.xml</Link>
</CodeAnalysisDictionary>
=======================================
--- /trunk/Source/AxisCameras/Player/CameraPlayer.cs Sun Jan 18 21:12:50
2015 UTC
+++ /trunk/Source/AxisCameras/Player/CameraPlayer.cs Tue Feb 3 22:27:45
2015 UTC
@@ -100,7 +100,7 @@
};

mediaPortalPlayer.PlayVideoStreamsInFullScreen(
- playlistItems.ToList(),
+ playlistItems.ToArray(),
Resources.Playlist_DefaultName);
}
}
=======================================
---
/trunk/Source/AxisCameras.Configuration/AxisCameras.Configuration.csproj
Mon Dec 22 16:31:19 2014 UTC
+++
/trunk/Source/AxisCameras.Configuration/AxisCameras.Configuration.csproj
Tue Feb 3 22:27:45 2015 UTC
@@ -288,6 +288,9 @@
<Link>CustomDictionary.xml</Link>
</CodeAnalysisDictionary>
</ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\DefaultSnapshot.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets"
Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports"
BeforeTargets="PrepareForBuild">
=======================================
--- /trunk/Source/AxisCameras.Configuration/Provider/CameraConverter.cs Sun
Jan 18 21:12:50 2015 UTC
+++ /trunk/Source/AxisCameras.Configuration/Provider/CameraConverter.cs Tue
Feb 3 22:27:45 2015 UTC
@@ -28,7 +28,8 @@
namespace AxisCameras.Configuration.Provider
{
/// <summary>
- /// Class describing a converter that converts between a Camera and a
ConfigurableCamera.
+ /// Class describing a converter that converts between a <see
cref="Camera"/> and a
+ /// <see cref="ConfigurableCamera"/>.
/// </summary>
internal class CameraConverter : ICameraConverter
{
@@ -46,9 +47,11 @@
}

/// <summary>
- /// Returns a ConfigurableCamera created from a Camera.
+ /// Returns a <see cref="ConfigurableCamera"/> created from a <see
cref="Camera"/>.
/// </summary>
- /// <param name="camera">The camera to turn into a
ConfigurableCamera.</param>
+ /// <param name="camera">
+ /// The <see cref="Camera"/> to turn into a <see
cref="ConfigurableCamera"/>.
+ /// </param>
public ConfigurableCamera ToConfigurableCamera(Camera camera)
{
Requires.NotNull(camera);
@@ -71,17 +74,22 @@
}

/// <summary>
- /// Returns a Camera created from a ConfigurableCamera.
+ /// Returns a <see cref="Camera"/> created from a <see
cref="ConfigurableCamera"/>.
/// </summary>
- /// <param name="configurableCamera">The configurable camera to
turn into a Camera.</param>
+ /// <param name="configurableCamera">
+ /// The <see cref="ConfigurableCamera"/> to turn into a <see
cref="Camera"/>.
+ /// </param>
public Camera ToCamera(ConfigurableCamera configurableCamera)
{
Requires.NotNull(configurableCamera);

Log.Debug("Convert a ConfigurableCamera to a Camera");

- // Save thumb to disk
- ioService.SaveThumb(configurableCamera.Id,
configurableCamera.Snapshot.ToArray());
+ if (configurableCamera.Snapshot != null)
+ {
+ // Save thumb to disk
+ ioService.SaveThumb(configurableCamera.Id,
configurableCamera.Snapshot.ToArray());
+ }

return new Camera
{
=======================================
--- /trunk/Source/AxisCameras.Configuration/Provider/ICameraConverter.cs
Sun Jan 18 21:12:50 2015 UTC
+++ /trunk/Source/AxisCameras.Configuration/Provider/ICameraConverter.cs
Tue Feb 3 22:27:45 2015 UTC
@@ -24,20 +24,25 @@
namespace AxisCameras.Configuration.Provider
{
/// <summary>
- /// Interface describing a converter that converts between a Camera
and a ConfigurableCamera.
+ /// Interface describing a converter that converts between a <see
cref="Camera"/> and a
+ /// <see cref="ConfigurableCamera"/>.
/// </summary>
public interface ICameraConverter
{
/// <summary>
- /// Returns a ConfigurableCamera created from a Camera.
+ /// Returns a <see cref="ConfigurableCamera"/> created from a <see
cref="Camera"/>.
/// </summary>
- /// <param name="camera">The camera to turn into a
ConfigurableCamera.</param>
+ /// <param name="camera">
+ /// The <see cref="Camera"/> to turn into a <see
cref="ConfigurableCamera"/>.
+ /// </param>
ConfigurableCamera ToConfigurableCamera(Camera camera);

/// <summary>
- /// Returns a Camera created from a ConfigurableCamera.
+ /// Returns a <see cref="Camera"/> created from a <see
cref="ConfigurableCamera"/>.
/// </summary>
- /// <param name="configurableCamera">The configurable camera to
turn into a Camera.</param>
+ /// <param name="configurableCamera">
+ /// The <see cref="ConfigurableCamera"/> camera to turn into a
<see cref="Camera"/>.
+ /// </param>
Camera ToCamera(ConfigurableCamera configurableCamera);
}
}
=======================================
---
/trunk/Source/AxisCameras.Configuration/Provider/WizardPageViewModelsProvider.cs
Sun Jan 18 21:12:50 2015 UTC
+++
/trunk/Source/AxisCameras.Configuration/Provider/WizardPageViewModelsProvider.cs
Tue Feb 3 22:27:45 2015 UTC
@@ -35,7 +35,6 @@
private readonly IWindowService windowService;
private readonly ICameraParametersDialogViewModelProvider
cameraParametersProvider;
private readonly ICameraSnapshotDialogViewModelProvider
cameraSnapshotProvider;
- private readonly IIOService ioService;
private readonly IDispatcherService dispatcherService;

/// <summary>
@@ -48,25 +47,21 @@
/// <param name="cameraSnapshotProvider">
/// The camera snapshot dialog view model provider.
/// </param>
- /// <param name="ioService">The I/O service.</param>
/// <param name="dispatcherService">The dispatcher service.</param>
public WizardPageViewModelsProvider(
IWindowService windowService,
ICameraParametersDialogViewModelProvider
cameraParametersProvider,
ICameraSnapshotDialogViewModelProvider cameraSnapshotProvider,
- IIOService ioService,
IDispatcherService dispatcherService)
{
Requires.NotNull(windowService);
Requires.NotNull(cameraParametersProvider);
Requires.NotNull(cameraSnapshotProvider);
- Requires.NotNull(ioService);
Requires.NotNull(dispatcherService);

this.windowService = windowService;
this.cameraParametersProvider = cameraParametersProvider;
this.cameraSnapshotProvider = cameraSnapshotProvider;
- this.ioService = ioService;
this.dispatcherService = dispatcherService;
}

@@ -84,8 +79,7 @@
IWizardPageViewModel pageThree = new WizardPageThreeViewModel(
windowService,
dispatcherService,
- cameraSnapshotProvider,
- ioService);
+ cameraSnapshotProvider);

Log.Debug("Provide a sequence of IWizardPageViewModels");

=======================================
--- /trunk/Source/AxisCameras.Configuration/Service/IIOService.cs Sun Jan
18 21:12:50 2015 UTC
+++ /trunk/Source/AxisCameras.Configuration/Service/IIOService.cs Tue Feb
3 22:27:45 2015 UTC
@@ -32,33 +32,21 @@
/// </summary>
/// <returns>The file name of the camera icon.</returns>
string CameraIconFileName { get; }
-
- /// <summary>
- /// Gets the file name of the default thumb.
- /// </summary>
- /// <returns>The file name of the default thumb.</returns>
- string DefaultThumbFileName { get; }

/// <summary>
/// Gets the file name of the thumb for specified camera.
/// </summary>
/// <param name="cameraId">The camera id.</param>
/// <returns>
- /// The file name of the thumb if existing on disk, otherwise the
generic thumb.
+ /// The file name of the thumb if existing on disk, otherwise null.
/// </returns>
string GetThumbFileName(Guid cameraId);

- /// <summary>
- /// Gets the default thumb.
- /// </summary>
- /// <returns>The default thumb.</returns>
- byte[] GetDefaultThumb();
-
/// <summary>
/// Gets the thumb for specified camera.
/// </summary>
/// <param name="cameraId">The camera id.</param>
- /// <returns>The thumb if existing; otherwise the default
thumb.</returns>
+ /// <returns>The thumb if existing; otherwise null.</returns>
byte[] GetThumb(Guid cameraId);

/// <summary>
=======================================
--- /trunk/Source/AxisCameras.Configuration/Service/IOService.cs Sun Jan 18
21:12:50 2015 UTC
+++ /trunk/Source/AxisCameras.Configuration/Service/IOService.cs Tue Feb 3
22:27:45 2015 UTC
@@ -33,7 +33,6 @@
{
private const string PluginFolderName = "AxisCameras";
private const string CameraIcon = "CameraPortrait.png";
- private const string DefaultThumb = "DefaultSnapshot.png";

/// <summary>
/// Gets the file name of the camera icon.
@@ -43,22 +42,13 @@
{
get { return Config.GetFile(Config.Dir.Thumbs,
PluginFolderName, CameraIcon); }
}
-
- /// <summary>
- /// Gets the file name of the default thumb.
- /// </summary>
- /// <returns>The file name of the default thumb.</returns>
- public string DefaultThumbFileName
- {
- get { return Config.GetFile(Config.Dir.Thumbs,
PluginFolderName, DefaultThumb); }
- }

/// <summary>
/// Gets the file name of the thumb for specified camera.
/// </summary>
/// <param name="cameraId">The camera id.</param>
/// <returns>
- /// The file name of the thumb if existing on disk, otherwise the
default thumb.
+ /// The file name of the thumb if existing on disk, otherwise null.
/// </returns>
public string GetThumbFileName(Guid cameraId)
{
@@ -74,26 +64,17 @@
}

Log.Warn(
- "Snapshot of camera with ID {0} has been removed from
disk, returning default.",
+ "Snapshot of camera with ID {0} has been removed from
disk.",
cameraId);

- return DefaultThumbFileName;
- }
-
- /// <summary>
- /// Gets the default thumb.
- /// </summary>
- /// <returns>The default thumb.</returns>
- public byte[] GetDefaultThumb()
- {
- return File.ReadAllBytes(DefaultThumbFileName);
+ return null;
}

/// <summary>
/// Gets the thumb for specified camera.
/// </summary>
/// <param name="cameraId">The camera id.</param>
- /// <returns>The thumb if existing; otherwise the default
thumb.</returns>
+ /// <returns>The thumb if existing; otherwise null.</returns>
public byte[] GetThumb(Guid cameraId)
{
Requires.True(cameraId != Guid.Empty, "ID cannot be
Guid.Empty");
@@ -102,7 +83,9 @@

string thumbFileName = GetThumbFileName(cameraId);

- return File.ReadAllBytes(thumbFileName);
+ return thumbFileName != null ?
+ File.ReadAllBytes(thumbFileName) :
+ null;
}

/// <summary>
=======================================
--- /trunk/Source/AxisCameras.Configuration/View/SetupDialogResources.xaml
Tue Dec 23 08:49:39 2014 UTC
+++ /trunk/Source/AxisCameras.Configuration/View/SetupDialogResources.xaml
Tue Feb 3 22:27:45 2015 UTC
@@ -38,6 +38,9 @@
<Setter Property="i:StyleInteraction.Triggers" Value="{StaticResource
CameraTriggers}" />
</Style>

+ <!-- Default snapshot -->
+ <BitmapImage x:Key="DefaultSnapshot"
UriSource="/AxisCameras.Configuration;component/Resources/DefaultSnapshot.png"
/>
+
<!-- A camera template -->
<DataTemplate x:Key="CameraTemplate">
<Grid
@@ -55,7 +58,7 @@
<!-- Snapshot -->
<Image
HorizontalAlignment="Center"
- Source="{Binding Snapshot, Converter={StaticResource
ImageBytesConverter}}"
+ Source="{Binding Snapshot, Converter={StaticResource
ImageBytesConverter}, FallbackValue={StaticResource DefaultSnapshot}}"
ToolTip="{Binding Name}">

<!-- Image effect -->
=======================================
--- /trunk/Source/AxisCameras.Configuration/View/WizardPageResources.xaml
Fri Dec 19 15:11:20 2014 UTC
+++ /trunk/Source/AxisCameras.Configuration/View/WizardPageResources.xaml
Tue Feb 3 22:27:45 2015 UTC
@@ -16,7 +16,10 @@
<TextBlock Text="{Binding}"/>
</DataTemplate>

- <!-- Generic style for TextBox -->
+ <!-- Default snapshot -->
+ <BitmapImage x:Key="DefaultSnapshot"
UriSource="/AxisCameras.Configuration;component/Resources/DefaultSnapshot.png"
/>
+
+ <!-- Generic style for TextBox -->
<Style TargetType="PasswordBox" BasedOn="{StaticResource
PasswordBoxStyle}">
<Setter Property="Width" Value="200"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
=======================================
--- /trunk/Source/AxisCameras.Configuration/View/WizardPageThree.xaml Sat
Dec 20 09:30:47 2014 UTC
+++ /trunk/Source/AxisCameras.Configuration/View/WizardPageThree.xaml Tue
Feb 3 22:27:45 2015 UTC
@@ -52,8 +52,7 @@
<Grid HorizontalAlignment="Center">

<!-- Snapshot image -->
- <Image
- Source="{Binding Snapshot, Converter={StaticResource
ImageBytesConverter}}">
+ <Image Source="{Binding Snapshot, Converter={StaticResource
ImageBytesConverter}, FallbackValue={StaticResource DefaultSnapshot}}">

<!-- Image effect -->
<Image.Effect>
=======================================
---
/trunk/Source/AxisCameras.Configuration/ViewModel/CameraParametersDialogViewModel.cs
Sun Jan 18 21:12:50 2015 UTC
+++
/trunk/Source/AxisCameras.Configuration/ViewModel/CameraParametersDialogViewModel.cs
Tue Feb 3 22:27:45 2015 UTC
@@ -23,6 +23,7 @@
using AxisCameras.Core;
using AxisCameras.Core.Contracts;
using AxisCameras.Data;
+using AxisCameras.Mvvm;
using AxisCameras.Mvvm.Behaviors;

namespace AxisCameras.Configuration.ViewModel
@@ -95,8 +96,8 @@
/// </summary>
/// <remarks>
/// Make sure view binds <see
cref="WindowLifetimeBehaviors.LoadedProperty" /> or
- /// <see cref="LifetimeBehaviors.LoadedProperty" /> to <see
cref="LoadedCommand" />
- /// in order for this method to be called.
+ /// <see cref="LifetimeBehaviors.LoadedProperty" /> to
+ /// <see cref="ViewModelBase.LoadedCommand" /> in order for this
method to be called.
/// </remarks>
protected override void OnLoaded()
{
=======================================
---
/trunk/Source/AxisCameras.Configuration/ViewModel/CameraSnapshotDialogViewModel.cs
Sun Jan 18 21:12:50 2015 UTC
+++
/trunk/Source/AxisCameras.Configuration/ViewModel/CameraSnapshotDialogViewModel.cs
Tue Feb 3 22:27:45 2015 UTC
@@ -22,6 +22,7 @@
using AxisCameras.Configuration.Service;
using AxisCameras.Core;
using AxisCameras.Core.Contracts;
+using AxisCameras.Mvvm;
using AxisCameras.Mvvm.Behaviors;

namespace AxisCameras.Configuration.ViewModel
@@ -71,8 +72,8 @@
/// </summary>
/// <remarks>
/// Make sure view binds <see
cref="WindowLifetimeBehaviors.LoadedProperty" /> or
- /// <see cref="LifetimeBehaviors.LoadedProperty" /> to <see
cref="LoadedCommand" />
- /// in order for this method to be called.
+ /// <see cref="LifetimeBehaviors.LoadedProperty" /> to
+ /// <see cref="ViewModelBase.LoadedCommand" /> in order for this
method to be called.
/// </remarks>
protected override void OnLoaded()
{
=======================================
---
/trunk/Source/AxisCameras.Configuration/ViewModel/Data/ConfigurableCamera.cs
Sun Jan 18 21:12:50 2015 UTC
+++
/trunk/Source/AxisCameras.Configuration/ViewModel/Data/ConfigurableCamera.cs
Tue Feb 3 22:27:45 2015 UTC
@@ -107,6 +107,10 @@
/// </returns>
public ConfigurableCamera Clone()
{
+ byte[] snapshot = Snapshot != null ?
+ Snapshot.ToArray() :
+ null;
+
return new ConfigurableCamera(Id)
{
Name = Name,
@@ -118,10 +122,7 @@
UserName = UserName,
Password = Password,
FirmwareVersion = FirmwareVersion,
- // Use ToList() to evaluate the Linq expression now,
rather than when it is used for the
- // first time. One expects the clone method to clone the
data when the method is executed,
- // not anytime later.
- Snapshot = Snapshot.Select(data => data).ToList()
+ Snapshot = snapshot
};
}
}
=======================================
---
/trunk/Source/AxisCameras.Configuration/ViewModel/WizardPageThreeViewModel.cs
Sun Jan 18 21:12:50 2015 UTC
+++
/trunk/Source/AxisCameras.Configuration/ViewModel/WizardPageThreeViewModel.cs
Tue Feb 3 22:27:45 2015 UTC
@@ -44,12 +44,10 @@
private readonly IWindowService windowService;
private readonly IDispatcherService dispatcherService;
private readonly ICameraSnapshotDialogViewModelProvider
cameraSnapshotProvider;
- private readonly IIOService ioService;
private readonly ICommand refreshCommand;

private NetworkEndpoint cameraEndpoint;
private int videoSource;
- private byte[] defaultSnapshot;

/// <summary>
/// Initializes a new instance of the <see
cref="WizardPageThreeViewModel"/> class.
@@ -59,22 +57,18 @@
/// <param name="cameraSnapshotProvider">
/// The camera snapshot dialog view model provider.
/// </param>
- /// <param name="ioService">The I/O service.</param>
public WizardPageThreeViewModel(
IWindowService windowService,
IDispatcherService dispatcherService,
- ICameraSnapshotDialogViewModelProvider cameraSnapshotProvider,
- IIOService ioService)
+ ICameraSnapshotDialogViewModelProvider cameraSnapshotProvider)
{
Requires.NotNull(windowService);
Requires.NotNull(dispatcherService);
Requires.NotNull(cameraSnapshotProvider);
- Requires.NotNull(ioService);

this.windowService = windowService;
this.dispatcherService = dispatcherService;
this.cameraSnapshotProvider = cameraSnapshotProvider;
- this.ioService = ioService;

refreshCommand = new RelayCommand(Refresh);

@@ -159,8 +153,8 @@
/// </summary>
/// <remarks>
/// Make sure view binds <see
cref="WindowLifetimeBehaviors.LoadedProperty" /> or
- /// <see cref="LifetimeBehaviors.LoadedProperty" /> to <see
cref="LoadedCommand" />
- /// in order for this method to be called.
+ /// <see cref="LifetimeBehaviors.LoadedProperty" /> to
+ /// <see cref="ViewModelBase.LoadedCommand" /> in order for this
method to be called.
/// </remarks>
protected override void OnLoaded()
{
@@ -179,9 +173,6 @@
{
if (Snapshot == null)
{
- // Set default snapshot while getting snapshot
from camera
- Snapshot = DefaultSnapshot;
-
Log.Debug("Start getting snapshot from
camera.");
RefreshCommand.Execute(null);
}
@@ -210,8 +201,6 @@
}
else
{
- Snapshot = DefaultSnapshot;
-
windowService.ShowMessageBox(
this,
Resources.CameraCommunicationError,
@@ -220,22 +209,6 @@
}
}
}
-
- /// <summary>
- /// Gets the default snapshot.
- /// </summary>
- private IEnumerable<byte> DefaultSnapshot
- {
- get
- {
- if (defaultSnapshot == null)
- {
- defaultSnapshot = ioService.GetDefaultThumb();
- }
-
- return defaultSnapshot;
- }
- }

/// <summary>
/// Adds the validators.
=======================================
--- /trunk/Source/Setup/AxisCameras.xmp2 Thu Jan 22 18:44:49 2015 UTC
+++ /trunk/Source/Setup/AxisCameras.xmp2 Tue Feb 3 22:27:45 2015 UTC
@@ -90,13 +90,6 @@

<ZipFileName>Installer{CopyFile}\{63d869a0-63e2-4bd6-be9b-130d4dbd80d5}-CameraPortrait.png</ZipFileName>

<DestinationFilename>%Thumbs%\AxisCameras\CameraPortrait.png</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false"
Modified="false">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
-
<LocalFileName>..\AxisCameras\Thumbs\AxisCameras\DefaultSnapshot.png</LocalFileName>
-
<ZipFileName>Installer{CopyFile}\{7d06173f-a64f-4eac-8115-bb1bffcd8e8a}-DefaultSnapshot.png</ZipFileName>
-
<DestinationFilename>%Thumbs%\AxisCameras\DefaultSnapshot.png</DestinationFilename>
- </FileItem>
</Items>
</Files>
</GroupItem>
@@ -853,13 +846,6 @@

<ZipFileName>Installer{CopyFile}\{63d869a0-63e2-4bd6-be9b-130d4dbd80d5}-CameraPortrait.png</ZipFileName>

<DestinationFilename>%Thumbs%\AxisCameras\CameraPortrait.png</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
-
<LocalFileName>..\AxisCameras\Thumbs\AxisCameras\DefaultSnapshot.png</LocalFileName>
-
<ZipFileName>Installer{CopyFile}\{7d06173f-a64f-4eac-8115-bb1bffcd8e8a}-DefaultSnapshot.png</ZipFileName>
-
<DestinationFilename>%Thumbs%\AxisCameras\DefaultSnapshot.png</DestinationFilename>
- </FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>