From 71aa667b3bc07eb5df2d139e4e3a62511795769c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 7 Jun 2020 13:35:16 -0500
Subject: [PATCH] don't put IMovie extensions in separate namespace

---
 src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs    | 2 +-
 src/BizHawk.Client.Common/movie/MovieSession.cs                 | 1 -
 src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs                 | 1 -
 src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs | 1 -
 src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs           | 1 -
 .../Client.Common/Movie/MovieConversionExtensionTests.cs        | 2 +-
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
index 6ec30f56c5..8f88f39f7e 100644
--- a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
+++ b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
@@ -11,7 +11,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem;
 using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
 using BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive;
 
-namespace BizHawk.Client.Common.MovieConversionExtensions
+namespace BizHawk.Client.Common
 {
 	public static class MovieConversionExtensions
 	{
diff --git a/src/BizHawk.Client.Common/movie/MovieSession.cs b/src/BizHawk.Client.Common/movie/MovieSession.cs
index 4a61435f5f..89f2bce039 100644
--- a/src/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/src/BizHawk.Client.Common/movie/MovieSession.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using BizHawk.Client.Common.MovieConversionExtensions;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores;
 using BizHawk.Emulation.Cores.Nintendo.Gameboy;
diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index bedb6d6044..b112988df2 100644
--- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -5,7 +5,6 @@ using System.Linq;
 
 using BizHawk.Emulation.Common;
 using BizHawk.Client.Common;
-using BizHawk.Client.Common.MovieConversionExtensions;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index dcd15ba48a..3f663c2c0e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -5,7 +5,6 @@ using System.Text;
 using System.Windows.Forms;
 
 using BizHawk.Client.Common;
-using BizHawk.Client.Common.MovieConversionExtensions;
 using BizHawk.Client.EmuHawk.ToolExtensions;
 using BizHawk.Emulation.Common;
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 0e26cdc732..50ca7687ca 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Windows.Forms;
 using System.ComponentModel;
 using BizHawk.Client.Common;
-using BizHawk.Client.Common.MovieConversionExtensions;
 using BizHawk.Client.EmuHawk.ToolExtensions;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Nintendo.N64;
diff --git a/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs b/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs
index 96b913567c..fd299aa4df 100644
--- a/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs
+++ b/src/BizHawk.Tests/Client.Common/Movie/MovieConversionExtensionTests.cs
@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using BizHawk.Client.Common.MovieConversionExtensions;
+using BizHawk.Client.Common;
 
 namespace BizHawk.Common.Tests.Client.Common.Movie
 {