WinGui: Correcting namespaces.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6687 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
index 8748ddbc625b2a64cd4f178fdc1a91c667e36485..d5c62794dc8c607205adb8083e2a7cf67b79c867 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
@@ -15,13 +15,13 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model
 \r
     using Caliburn.Micro;\r
 \r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
     using HandBrake.Interop.Model.Encoding.x265;\r
 \r
-    using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;\r
+    using OutputFormat = HandBrake.ApplicationServices.Services.Encode.Model.Models.OutputFormat;\r
 \r
     /// <summary>\r
     /// An Encode Task\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
index 36c4febabe170005545de9e997afac3029e84e72..7c973328c3273838646263a9d2141db2df1d52f7 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
index 992d15a8a10720ce86833a121e7ed3bfcbb13ac6..91c9c3564e466df4b005a6fe23944f37a05cd327 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System;\r
     using System.ComponentModel;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs
index 1a20379f4383f02ca90954dd249f35d45a76a4a7..7f20ac6daaecff78b5bbf28befe42c07e140cfc5 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs
index a411d19aef93417d68beaa3ebe5183065b03100d..1b83f0d401b9e1b1956e999fbb32ed311466a560 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System.ComponentModel.DataAnnotations;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs
index 2fd13cfca66c4868071a6337c1ba034c2cff7b93..745039a3511d63382b52a50caea78fa02af9beb4 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System.ComponentModel.DataAnnotations;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs
index 6392578a613b42efbd9f42514b685ea2ae99747b..542fb6b4edc3a6214317be46a127dc290d4c4f29 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     /// <summary>\r
     /// The Mode of Video Encoding. CFR, VFR, PFR\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs
index 828746f17666106f3a1e8fb10a5854f0329eb752..d36071b738dc92086cd95d3091243d1e0b705dfb 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System.ComponentModel;\r
     using System.ComponentModel.DataAnnotations;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs
index df0bc437c81c50dc2a63c03d417cb5f509217378..17d2316cb16fa0252457d091964397f0cdf82312 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System.ComponentModel.DataAnnotations;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs
index 7be5dd3b96446a198159e44abe103638b7999844..e37bf26c5b54f820e6f5cd7c7bff2422adaf5356 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs
index a249060b5637e905e3b547ce54ceb7f87cb611ce..1262220e07073215b512bd4c40a4f03cc8a7a8a2 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model.Models\r
 {\r
     using System.ComponentModel;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index 45851c76fe2d3faa5ff90cd5345c98199a90f202..972924a505fe87e134af019ed3029fa3431ff969 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -31,7 +31,7 @@ namespace HandBrake.ApplicationServices.Services.Scan
     using ScanProgressEventArgs = HandBrake.Interop.EventArgs.ScanProgressEventArgs;\r
     using Size = System.Drawing.Size;\r
     using Subtitle = HandBrake.ApplicationServices.Services.Scan.Model.Subtitle;\r
-    using SubtitleType = HandBrake.ApplicationServices.Model.Encoding.SubtitleType;\r
+    using SubtitleType = HandBrake.ApplicationServices.Services.Encode.Model.Models.SubtitleType;\r
     using Title = HandBrake.ApplicationServices.Services.Scan.Model.Title;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs
index 3da9e4a2e74bf81d2d285f0445bea8594cc79270..187ac682a526fd9ed9c0e1507241d9777501d2c0 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Services.Scan.Model
     using System;\r
     using System.Xml.Serialization;\r
 \r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index 9b9027f7a7b5bfe985401d4243f9d70f1562d42d..9c78d7d7be8c351d18e2d2bbf9808f4ebb520d93 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Utilities
     using System;\r
     using System.Text.RegularExpressions;\r
 \r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
     using HandBrake.Interop.Model.Encoding.x265;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index c8db8750f81b3e6d440b172f063df538b9708db0..d7b018145a410e097fcd71cfa560136a010c8862 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -14,8 +14,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Linq;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index e9bd849745825198642146b29ca6cb71cb7b629f..fd9ad3b4ceba0e222dcaab67b283725990bc062a 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -16,8 +16,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.IO;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
     using HandBrake.Interop.Model.Encoding.x265;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index b781beb4148eee1ac5da3a4cdedb15bc1bbb5c28..c8c79116fe44c3de41ae1469dfd6c7cd6555936f 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -16,8 +16,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Text.RegularExpressions;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
index bd7aeffca7e6bd252caa958d38f628acae14ad7b..6048a302660246a2ff3fb8adc2e96de2790ef9c8 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
@@ -14,7 +14,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Windows.Data;\r
     using System.Collections.Generic;\r
     using System.Linq;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 2857559b6ed47bf94b4b5dac377b1abae65c9e30..25515bfdb28a569c0df18f7be97cd39c6efc8957 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Windows.Data;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
index c729fac822311546423a864449f01e4fc62d1682..ed9ab9b9f46552f2935dc32518506dda1b1de2fb 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Threading.Tasks;\r
     using System.Windows.Data;\r
 \r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index f746e07c3d2b63616042bd9162093fea959a024e..b488470e28d5617a4e5b6d4d227e2f3b280774c5 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters
     using System;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r

diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index 52e280722f7d5fc846d69967a70c764929dbe930..34569f7d5e12ea610f876e70cf88c519222f77f4 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Filters
     using System.Linq;\r
     using System.Windows.Data;\r
 \r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
index 3e5f5d11339c76e8e11c8991a96a9b589908733d..d3e66d6bcbe83f624d6c1eee823ae293d31758df 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Subtitles
     using System.Text;\r
     using System.Windows.Data;\r
 \r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
 \r
     /// <summary>\r
     /// Subtitle Queue Display Converter\r

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 063f616cfdabb70cddc9506d5cbec64c066e6009..b30d525fb171d917e9d7a311b2514e29371eab9d 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Converters.Video
     using System.Windows.Data;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 49f958e555ae5b43c6a1f1af67e0aa8b11dfff69..6ea4ca28d5fe229c5e725c2402096bc2f96c7151 100644 (file)
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Helpers
     using Caliburn.Micro;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
     using HandBrakeWPF.Extensions;\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
index 7508d30616f80515e0aa71795e581aed5eae672d..5cd4db14884852ba5a068fd6d9b1c0352397fc5b 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
@@ -13,8 +13,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using System.Xml;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
index 96fe6fb132fb7813f195c6e789d22d5be45d6456..7a6e336e8275ba7c2bea10d322c429466254468b 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
@@ -16,8 +16,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using System.Linq;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 82d3b22be76a9f5183085880ca569fb490b9745c..2528679b648f55ff94f71351f70a9e3a71cdff87 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -21,7 +21,7 @@ namespace HandBrakeWPF.Services.Presets
     using System.Xml.Serialization;\r
 \r
     using HandBrake.ApplicationServices.Exceptions;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
     using HandBrakeWPF.Services.Presets.Interfaces;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index e05df3be489138891d54d36e5ea6ba6b46ad221d..aa9c24d41538d3762fffb5149d5934015bdbfa35 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -17,8 +17,8 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index 29509101113a3ff9fca04b3a3f0047115341cbce..a965440df12a9ae972cee90edb4448c123a71077 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -18,8 +18,8 @@ namespace HandBrakeWPF.ViewModels
 \r
     using HandBrake.ApplicationServices.Exceptions;\r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
 \r
     using HandBrakeWPF.Services.Interfaces;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index e71dbea24e6e34c2920b780f2e7222691a0536dd..0a983348edc1b23433520e2920217b104cc98f5f 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -14,8 +14,8 @@ namespace HandBrakeWPF.ViewModels
 \r
     using Caliburn.Micro;\r
 \r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 362089ed4e63855c42b8c568e0e29c7c976ae603..7280bc09110b7bd2540a74c3163dcdb53d0e51f1 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -22,10 +22,10 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Scan.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Scan.Interfaces;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index bf6322b10aea5106cf0bc7da8119ba2e5aa27792..693d7a459ef778db932cef384638b47c39f8e93d 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -18,10 +18,10 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
 \r
     using HandBrakeWPF.Factories;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 74d2c0d643787cb8ddf440d6e48516048736eeb8..7d0b16cdba2ea353a7770aa1e8c91e90abc6b1e3 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -15,8 +15,8 @@ namespace HandBrakeWPF.ViewModels
     using System.Linq;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 6b38c5209e1d70e7ebfb186034186f764c91cef4..36276b2f22f5fa082d2fca022a33b0438780312b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -19,8 +19,8 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model.Models;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop;\r