Skip to content

Commit

Permalink
WinGui: HandBrake.Interop further API tidyup. Namespace changes. Many…
Browse files Browse the repository at this point in the history
… "model" objects have moved to interfaces.models to avoid confusion. A number of filter/video enums have moved to HandBrakeWPF as they are not part of the API.
  • Loading branch information
sr55 committed Feb 4, 2021
1 parent f52375b commit db589c5
Show file tree
Hide file tree
Showing 80 changed files with 115 additions and 219 deletions.
4 changes: 2 additions & 2 deletions win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ namespace HandBrake.Interop.Interop

using HandBrake.Interop.Interop.HbLib;
using HandBrake.Interop.Interop.Helpers;
using HandBrake.Interop.Interop.Model;
using HandBrake.Interop.Interop.Model.Encoding;
using HandBrake.Interop.Interop.Interfaces.Model;
using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
using HandBrake.Interop.Utilities;

public static class HandBrakeEncoderHelpers
Expand Down
2 changes: 1 addition & 1 deletion win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ namespace HandBrake.Interop.Interop

using HandBrake.Interop.Interop.HbLib;
using HandBrake.Interop.Interop.Helpers;
using HandBrake.Interop.Interop.Interfaces.Model.Filters;
using HandBrake.Interop.Interop.Json.Filters;
using HandBrake.Interop.Interop.Model.Encoding;
using HandBrake.Interop.Json;

/// <summary>
Expand Down
5 changes: 3 additions & 2 deletions win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ namespace HandBrake.Interop.Interop
using HandBrake.Interop.Interop.Helpers;
using HandBrake.Interop.Interop.Interfaces;
using HandBrake.Interop.Interop.Interfaces.Model;
using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
using HandBrake.Interop.Interop.Interfaces.Model.Picture;
using HandBrake.Interop.Interop.Interfaces.Model.Preview;
using HandBrake.Interop.Interop.Json.Encode;
using HandBrake.Interop.Interop.Json.Scan;
using HandBrake.Interop.Interop.Json.State;
using HandBrake.Interop.Interop.Model.Encoding;
using HandBrake.Interop.Interop.Model.Preview;
using HandBrake.Interop.Json;

public class HandBrakeInstance : IHandBrakeInstance, IDisposable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace HandBrake.Interop.Interop

using HandBrake.Interop.Interop.HbLib;
using HandBrake.Interop.Interop.Helpers;
using HandBrake.Interop.Interop.Model;
using HandBrake.Interop.Interop.Interfaces.Model;

/// <summary>
/// Contains utilities for converting language codes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace HandBrake.Interop.Interop
{
using HandBrake.Interop.Interop.HbLib;
using HandBrake.Interop.Interop.Interfaces.Model;
using HandBrake.Interop.Interop.Model.Encoding;
using HandBrake.Interop.Interop.Interfaces.Model.Picture;

public class HandBrakePictureHelpers
{
Expand Down
2 changes: 1 addition & 1 deletion win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ namespace HandBrake.Interop.Interop

using HandBrake.Interop.Interop.HbLib;
using HandBrake.Interop.Interop.Helpers;
using HandBrake.Interop.Interop.Interfaces.Model.Presets;
using HandBrake.Interop.Interop.Json.Presets;
using HandBrake.Interop.Interop.Model;
using HandBrake.Interop.Json;

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ namespace HandBrake.Interop.Interop

using HandBrake.Interop.Interop.HbLib;
using HandBrake.Interop.Interop.Helpers;
using HandBrake.Interop.Interop.Model;
using HandBrake.Interop.Interop.Model.Encoding;
using HandBrake.Interop.Interop.Interfaces.Model;
using HandBrake.Interop.Interop.Interfaces.Model.Encoders;

/// <summary>
/// Converters for various encoding values.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ namespace HandBrake.Interop.Interop.Interfaces

using HandBrake.Interop.Interop.EventArgs;
using HandBrake.Interop.Interop.Interfaces.Model;
using HandBrake.Interop.Interop.Interfaces.Model.Picture;
using HandBrake.Interop.Interop.Interfaces.Model.Preview;
using HandBrake.Interop.Interop.Json.Scan;
using HandBrake.Interop.Interop.Model.Preview;

/// <summary>
/// The Interface for HandBrakeInstance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
{
/// <summary>
/// Represents bitrate limits as a range.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Encoding
namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
{
using HandBrake.Interop.Interop.HbLib;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Encoding
namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
{
/// <summary>
/// The hb mixdown.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Encoding
namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
{
/// <summary>
/// Represents a rate in HandBrake: audio sample rate or video framerate.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Encoding
namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
{
using System.Collections.Generic;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
{
/// <summary>
/// The range limits.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
{
/// <summary>
/// Represents limits on video quality for a particular encoder.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
// <summary>
// An object represetning the key and name of a Filter Preset or Tune option.
// An object representing the key and name of a Filter Preset or Tune option.
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Encoding
namespace HandBrake.Interop.Interop.Interfaces.Model.Filters
{
public class HBPresetTune
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Encoding
namespace HandBrake.Interop.Interop.Interfaces.Model
{
/// <summary>
/// The hb container.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model
namespace HandBrake.Interop.Interop.Interfaces.Model
{
/// <summary>
/// Represents a language.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Encoding
namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
{
using HandBrake.Interop.Attributes;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Interfaces.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
{
public class AnamorphicResult
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
{
/// <summary>
/// The Cropping Model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Interfaces.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
{
using HandBrake.Interop.Interop.Model;
using HandBrake.Interop.Interop.Model.Encoding;

public class PictureSettingsJob
{
public Cropping Crop { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Interfaces.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
{
public class PictureSettingsTitle
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Presets
{
public class PresetVersion
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Interfaces.Model
namespace HandBrake.Interop.Interop.Interfaces.Model.Preview
{
using HandBrake.Interop.Interop.Model;
using HandBrake.Interop.Interop.Model.Encoding;
using HandBrake.Interop.Interop.Interfaces.Model.Picture;

/// <summary>
/// The preview settings.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace HandBrake.Interop.Interop.Model.Preview
namespace HandBrake.Interop.Interop.Interfaces.Model.Preview
{
public class RawPreviewData
{
Expand Down
31 changes: 0 additions & 31 deletions win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs

This file was deleted.

22 changes: 0 additions & 22 deletions win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs

This file was deleted.

22 changes: 0 additions & 22 deletions win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs

This file was deleted.

42 changes: 0 additions & 42 deletions win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ namespace HandBrakeWPF.Converters.Audio
using System.Windows.Data;

using HandBrake.Interop.Interop;
using HandBrake.Interop.Interop.Model.Encoding;
using HandBrake.Interop.Interop.Interfaces.Model.Encoders;

using HandBrakeWPF.Services.Scan.Model;
using HandBrakeWPF.Utilities;

Expand Down
Loading

0 comments on commit db589c5

Please sign in to comment.