From 426c628fdf35587e54740e4e1a941e1d0b79fc82 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 3 Nov 2013 12:28:33 +0000 Subject: [PATCH] Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk --- .../About.Designer.cs | 2 +- .../About.cs | 2 +- .../About.resx | 0 .../AudioExtractor.cs | 38 ++-- .../BizHawk.Client.DiscoHawk.csproj | 0 .../DiscoHawk.cs | 2 +- .../DiscoHawkDialog.Designer.cs | 2 +- .../DiscoHawkDialog.cs | 2 +- .../DiscoHawkDialog.resx | 0 .../MainDiscoForm.Designer.cs | 2 +- .../MainDiscoForm.cs | 2 +- .../MainDiscoForm.resx | 0 .../ProgressDialog.Designer.cs | 2 +- .../ProgressDialog.cs | 2 +- .../ProgressDialog.resx | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/svnrev_template | 0 .../discohawk.ico | Bin BizHawk.sln | 30 ++-- DiscoHawk/DiscoHawk_4.5.csproj | 166 ------------------ 20 files changed, 42 insertions(+), 210 deletions(-) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/About.Designer.cs (95%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/About.cs (89%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/About.resx (100%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/AudioExtractor.cs (56%) rename DiscoHawk/DiscoHawk.csproj => BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj (100%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/DiscoHawk.cs (96%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/DiscoHawkDialog.Designer.cs (97%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/DiscoHawkDialog.cs (95%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/DiscoHawkDialog.resx (100%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/MainDiscoForm.Designer.cs (96%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/MainDiscoForm.cs (95%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/MainDiscoForm.resx (100%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/ProgressDialog.Designer.cs (95%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/ProgressDialog.cs (91%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/ProgressDialog.resx (100%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/Properties/AssemblyInfo.cs (100%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/Properties/svnrev_template (100%) rename {DiscoHawk => BizHawk.Client.DiscoHawk}/discohawk.ico (100%) delete mode 100644 DiscoHawk/DiscoHawk_4.5.csproj diff --git a/DiscoHawk/About.Designer.cs b/BizHawk.Client.DiscoHawk/About.Designer.cs similarity index 95% rename from DiscoHawk/About.Designer.cs rename to BizHawk.Client.DiscoHawk/About.Designer.cs index 6f045e31b5..3702480822 100644 --- a/DiscoHawk/About.Designer.cs +++ b/BizHawk.Client.DiscoHawk/About.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { partial class About { diff --git a/DiscoHawk/About.cs b/BizHawk.Client.DiscoHawk/About.cs similarity index 89% rename from DiscoHawk/About.cs rename to BizHawk.Client.DiscoHawk/About.cs index f72c7375f8..db2d924051 100644 --- a/DiscoHawk/About.cs +++ b/BizHawk.Client.DiscoHawk/About.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { public partial class About : Form { diff --git a/DiscoHawk/About.resx b/BizHawk.Client.DiscoHawk/About.resx similarity index 100% rename from DiscoHawk/About.resx rename to BizHawk.Client.DiscoHawk/About.resx diff --git a/DiscoHawk/AudioExtractor.cs b/BizHawk.Client.DiscoHawk/AudioExtractor.cs similarity index 56% rename from DiscoHawk/AudioExtractor.cs rename to BizHawk.Client.DiscoHawk/AudioExtractor.cs index 409b86b730..20a5ebf561 100644 --- a/DiscoHawk/AudioExtractor.cs +++ b/BizHawk.Client.DiscoHawk/AudioExtractor.cs @@ -7,28 +7,28 @@ using BizHawk.DiscSystem; using System.IO; using System.Diagnostics; -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { - class AudioExtractor - { - public static string FFmpegPath; + class AudioExtractor + { + public static string FFmpegPath; - public static void Extract(Disc disc, string path, string filebase) - { + public static void Extract(Disc disc, string path, string filebase) + { bool confirmed = false; - var tracks = disc.TOC.Sessions[0].Tracks; - foreach (var track in tracks) - { - if (track.TrackType != ETrackType.Audio) - continue; + var tracks = disc.TOC.Sessions[0].Tracks; + foreach (var track in tracks) + { + if (track.TrackType != ETrackType.Audio) + continue; - var waveData = new byte[track.length_aba * 2352]; - int startLba = track.Indexes[1].LBA; - for (int sector = 0; sector < track.length_aba; sector++) - disc.ReadLBA_2352(startLba + sector, waveData, sector * 2352); + var waveData = new byte[track.length_aba * 2352]; + int startLba = track.Indexes[1].LBA; + for (int sector = 0; sector < track.length_aba; sector++) + disc.ReadLBA_2352(startLba + sector, waveData, sector * 2352); string mp3Path = string.Format("{0} - Track {1:D2}.mp3", Path.Combine(path, filebase), track.num); - if(File.Exists(mp3Path)) + if (File.Exists(mp3Path)) { if (!confirmed) { @@ -51,7 +51,7 @@ namespace BizHawk { File.Delete(tempfile); } - } - } - } + } + } + } } diff --git a/DiscoHawk/DiscoHawk.csproj b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj similarity index 100% rename from DiscoHawk/DiscoHawk.csproj rename to BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj diff --git a/DiscoHawk/DiscoHawk.cs b/BizHawk.Client.DiscoHawk/DiscoHawk.cs similarity index 96% rename from DiscoHawk/DiscoHawk.cs rename to BizHawk.Client.DiscoHawk/DiscoHawk.cs index 89259d781c..c89541d4c7 100644 --- a/DiscoHawk/DiscoHawk.cs +++ b/BizHawk.Client.DiscoHawk/DiscoHawk.cs @@ -13,7 +13,7 @@ using System.IO; //it can handle binpercue //it seems not to be able to handle binpertrack, or maybe i am doing something wrong (still havent ruled it out) -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { static class Program { diff --git a/DiscoHawk/DiscoHawkDialog.Designer.cs b/BizHawk.Client.DiscoHawk/DiscoHawkDialog.Designer.cs similarity index 97% rename from DiscoHawk/DiscoHawkDialog.Designer.cs rename to BizHawk.Client.DiscoHawk/DiscoHawkDialog.Designer.cs index d9eec3d5b9..3f3550a176 100644 --- a/DiscoHawk/DiscoHawkDialog.Designer.cs +++ b/BizHawk.Client.DiscoHawk/DiscoHawkDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { partial class DiscoHawkDialog { diff --git a/DiscoHawk/DiscoHawkDialog.cs b/BizHawk.Client.DiscoHawk/DiscoHawkDialog.cs similarity index 95% rename from DiscoHawk/DiscoHawkDialog.cs rename to BizHawk.Client.DiscoHawk/DiscoHawkDialog.cs index 2e90690487..dc3b885e81 100644 --- a/DiscoHawk/DiscoHawkDialog.cs +++ b/BizHawk.Client.DiscoHawk/DiscoHawkDialog.cs @@ -10,7 +10,7 @@ using System.IO; using System.Windows.Forms; using BizHawk.DiscSystem; -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { public partial class DiscoHawkDialog : Form { diff --git a/DiscoHawk/DiscoHawkDialog.resx b/BizHawk.Client.DiscoHawk/DiscoHawkDialog.resx similarity index 100% rename from DiscoHawk/DiscoHawkDialog.resx rename to BizHawk.Client.DiscoHawk/DiscoHawkDialog.resx diff --git a/DiscoHawk/MainDiscoForm.Designer.cs b/BizHawk.Client.DiscoHawk/MainDiscoForm.Designer.cs similarity index 96% rename from DiscoHawk/MainDiscoForm.Designer.cs rename to BizHawk.Client.DiscoHawk/MainDiscoForm.Designer.cs index cbab79ec51..ffdb538428 100644 --- a/DiscoHawk/MainDiscoForm.Designer.cs +++ b/BizHawk.Client.DiscoHawk/MainDiscoForm.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { partial class MainDiscoForm { diff --git a/DiscoHawk/MainDiscoForm.cs b/BizHawk.Client.DiscoHawk/MainDiscoForm.cs similarity index 95% rename from DiscoHawk/MainDiscoForm.cs rename to BizHawk.Client.DiscoHawk/MainDiscoForm.cs index 1fa522f156..563d87bff1 100644 --- a/DiscoHawk/MainDiscoForm.cs +++ b/BizHawk.Client.DiscoHawk/MainDiscoForm.cs @@ -11,7 +11,7 @@ using System.Threading; using BizHawk.DiscSystem; -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { public partial class MainDiscoForm : Form { diff --git a/DiscoHawk/MainDiscoForm.resx b/BizHawk.Client.DiscoHawk/MainDiscoForm.resx similarity index 100% rename from DiscoHawk/MainDiscoForm.resx rename to BizHawk.Client.DiscoHawk/MainDiscoForm.resx diff --git a/DiscoHawk/ProgressDialog.Designer.cs b/BizHawk.Client.DiscoHawk/ProgressDialog.Designer.cs similarity index 95% rename from DiscoHawk/ProgressDialog.Designer.cs rename to BizHawk.Client.DiscoHawk/ProgressDialog.Designer.cs index 9256b5a530..32d453e23c 100644 --- a/DiscoHawk/ProgressDialog.Designer.cs +++ b/BizHawk.Client.DiscoHawk/ProgressDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { partial class ProgressDialog { diff --git a/DiscoHawk/ProgressDialog.cs b/BizHawk.Client.DiscoHawk/ProgressDialog.cs similarity index 91% rename from DiscoHawk/ProgressDialog.cs rename to BizHawk.Client.DiscoHawk/ProgressDialog.cs index 13b81f4244..631f61fa54 100644 --- a/DiscoHawk/ProgressDialog.cs +++ b/BizHawk.Client.DiscoHawk/ProgressDialog.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk +namespace BizHawk.Client.DiscoHawk { public partial class ProgressDialog : Form { diff --git a/DiscoHawk/ProgressDialog.resx b/BizHawk.Client.DiscoHawk/ProgressDialog.resx similarity index 100% rename from DiscoHawk/ProgressDialog.resx rename to BizHawk.Client.DiscoHawk/ProgressDialog.resx diff --git a/DiscoHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs similarity index 100% rename from DiscoHawk/Properties/AssemblyInfo.cs rename to BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs diff --git a/DiscoHawk/Properties/svnrev_template b/BizHawk.Client.DiscoHawk/Properties/svnrev_template similarity index 100% rename from DiscoHawk/Properties/svnrev_template rename to BizHawk.Client.DiscoHawk/Properties/svnrev_template diff --git a/DiscoHawk/discohawk.ico b/BizHawk.Client.DiscoHawk/discohawk.ico similarity index 100% rename from DiscoHawk/discohawk.ico rename to BizHawk.Client.DiscoHawk/discohawk.ico diff --git a/BizHawk.sln b/BizHawk.sln index 88b95f0814..3680a0b6cb 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -3,14 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation", "BizHawk.Emulation\BizHawk.Emulation.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.EmuHawk", "BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.DiscoHawk", "BizHawk.Client.DiscoHawk\BizHawk.Client.DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,20 +37,6 @@ Global {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.Build.0 = Release|Any CPU {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Win32.ActiveCfg = Debug|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Win32.Build.0 = Debug|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|x86.ActiveCfg = Debug|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.Build.0 = Release|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.ActiveCfg = Release|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.Build.0 = Release|Any CPU - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x86.ActiveCfg = Release|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -87,6 +73,18 @@ Global {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.Build.0 = Release|Any CPU {DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.ActiveCfg = Release|Any CPU {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x86.ActiveCfg = Release|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Win32.ActiveCfg = Debug|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.Build.0 = Release|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.ActiveCfg = Release|Any CPU + {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DiscoHawk/DiscoHawk_4.5.csproj b/DiscoHawk/DiscoHawk_4.5.csproj deleted file mode 100644 index cfa968d157..0000000000 --- a/DiscoHawk/DiscoHawk_4.5.csproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {C4366030-6D03-424B-AE53-F4F43BB217C3} - WinExe - Properties - DiscoHawk - DiscoHawk - v4.5 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - true - full - false - ..\BizHawk.MultiClient\output\ - TRACE;DEBUG;WINDOWS - prompt - 4 - false - AllRules.ruleset - x86 - false - - - pdbonly - true - ..\BizHawk.MultiClient\output\ - TRACE;WINDOWS - prompt - 4 - false - x86 - AllRules.ruleset - false - - - true - - - - - - discohawk.ico - - - - - - VersionInfo.cs - - - Form - - - About.cs - - - - - Form - - - DiscoHawkDialog.cs - - - Form - - - MainDiscoForm.cs - - - Form - - - ProgressDialog.cs - - - - - - - - 3.5 - - - - - - - - - - About.cs - - - DiscoHawkDialog.cs - - - MainDiscoForm.cs - - - ProgressDialog.cs - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} - BizHawk.Emulation - - - - - - - "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" - "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" - - \ No newline at end of file