Renamed SIL.Media to SIL.Windows.Forms.Media

CHANGELOG.md

@@ -20,6 +20,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - [SIL.Core] Added macOS support for `GlobalMutex`
 
+### Changed
+
+- [SIL.Windows.Forms.Media] Renamed SIL.Media to SIL.Windows.Forms.Media
+
 ### Fixed
 
 - [SIL.Window.Forms] When choosing a file in the ImageToolbox.AcquireImageControl, a FileOk handler is simulated that verifies the selected file passes the given filter.  Users can defeat the filter mechanism by pasting or typing the file name.  While the returned filename does not pass the filter, the dialog is reopened until the user either chooses a proper filename or cancels the dialog.  The native FileOk handler can prevent the dialog from closing: we can't achieve that.  (See BL-13552.)

Palaso.sln

@@ -14,9 +14,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AddSortKey", "AddSortKey\Ad
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.Windows.Forms.Tests", "SIL.Windows.Forms.Tests\SIL.Windows.Forms.Tests.csproj", "{6E16866F-FF8D-4136-AD67-36AFE3626432}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.Media", "SIL.Media\SIL.Media.csproj", "{66B3504A-3B4E-45CB-903A-A9A75B22EF68}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.Windows.Forms.Media", "SIL.Windows.Forms.Media\SIL.Windows.Forms.Media.csproj", "{66B3504A-3B4E-45CB-903A-A9A75B22EF68}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.Media.Tests", "SIL.Media.Tests\SIL.Media.Tests.csproj", "{CD4AF11C-C214-4D90-8F12-6DA97836B800}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.Windows.Forms.Media.Tests", "SIL.Windows.Forms.Media.Tests\SIL.Windows.Forms.Media.Tests.csproj", "{CD4AF11C-C214-4D90-8F12-6DA97836B800}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.TestUtilities", "SIL.TestUtilities\SIL.TestUtilities.csproj", "{D74CE910-D44A-44F5-8C0F-F5E50B26F85D}"
 EndProject

SIL.Core/Acknowledgements/AcknowledgementAttribute.cs

@@ -121,9 +121,9 @@ private FileVersionInfo ExtractExecutableVersionInfo()
 		/// This is useful for making Linux copyright files. It can be a list (comma-separated).
 		/// Items may be relative to the client solution (e.g., something dependent on GeckoFx would specify
 		/// "packages/{filenames}", since that’s where Nuget will always put those files)
-		/// or relative to the DLL that has the acknowledgement attributes (e.g., SIL.Media.dll would specify
+		/// or relative to the DLL that has the acknowledgement attributes (e.g., SIL.Windows.Forms.Media.dll would specify
 		/// "./IrrKlang.dll, ./ikpFlac.dll, ./ikpMP3.dll", since we expect these DLLs to be downloaded somehow
-		/// to the same place in the project source tree as SIL.Media.dll itself).
+		/// to the same place in the project source tree as SIL.Windows.Forms.Media.dll itself).
 		/// If Name and/or Copyright are not specified, the code will use this Location field to find suitable substitutes
 		/// in the FileVersionInfo.
 		/// This is an optional field.

SIL.Media.Tests/AudioFactoryTests.cs → SIL.Windows.Forms.Media.Tests/AudioFactoryTests.cs

@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using SIL.IO;
 
-namespace SIL.Media.Tests
+namespace SIL.Windows.Forms.Media.Tests
 {
 	// These will not work if a speaker is not available.
 	[TestFixture]

SIL.Media.Tests/AudioPlayerTests.cs → SIL.Windows.Forms.Media.Tests/AudioPlayerTests.cs

@@ -3,14 +3,14 @@
 using System.Threading;
 using NUnit.Framework;
 using SIL.IO;
-using SIL.Media.Tests.Properties;
-using SIL.Media.Naudio;
+using SIL.Windows.Forms.Media.Tests.Properties;
+using SIL.Windows.Forms.Media.Naudio;
 using NAudio.Wave;
 
-namespace SIL.Media.Tests
+namespace SIL.Windows.Forms.Media.Tests
 {
 	/// <summary>
-	/// All these tests are skipped on TeamCity (even if you remove this category) because SIL.Media.Tests compiles to an exe,
+	/// All these tests are skipped on TeamCity (even if you remove this category) because SIL.Windows.Forms.Media.Tests compiles to an exe,
 	/// and the project that builds libpalaso on TeamCity (build/Palaso.proj, task Test) invokes RunNUnitTC which
 	/// selects the test assemblies using Include="$(RootDir)/output/$(Configuration)/*.Tests.dll" which excludes exes.
 	/// I have not tried to verify that all of these tests would actually have problems on TeamCity, but it seemed

SIL.Media.Tests/AudioRecorderTests.cs → SIL.Windows.Forms.Media.Tests/AudioRecorderTests.cs

@@ -4,9 +4,9 @@
 using System.Windows.Forms;
 using NUnit.Framework;
 using SIL.IO;
-using SIL.Media.Naudio;
+using SIL.Windows.Forms.Media.Naudio;
 
-namespace SIL.Media.Tests
+namespace SIL.Windows.Forms.Media.Tests
 {
 	// Some of these tests require a speaker. Others require a microphone.
 	// None of them will work if neither a speaker nor a microphone is available.

SIL.Media.Tests/AudioSessionTests.cs → SIL.Windows.Forms.Media.Tests/AudioSessionTests.cs

@@ -7,10 +7,10 @@
 using System.Windows.Forms;
 using NUnit.Framework;
 using SIL.IO;
-using SIL.Media.Tests.Properties;
+using SIL.Windows.Forms.Media.Tests.Properties;
 using SIL.TestUtilities;
 
-namespace SIL.Media.Tests
+namespace SIL.Windows.Forms.Media.Tests
 {
 	// Some of these tests require a speaker. Others require a microphone.
 	// None of them will work if neither a speaker nor a microphone is available.

SIL.Media.Tests/FFmpegRunnerTests.cs → SIL.Windows.Forms.Media.Tests/FFmpegRunnerTests.cs

@@ -1,13 +1,13 @@
 using System.IO;
 using NUnit.Framework;
 using SIL.IO;
-using SIL.Media.Tests.Properties;
+using SIL.Windows.Forms.Media.Tests.Properties;
 using SIL.Progress;
 
-namespace SIL.Media.Tests
+namespace SIL.Windows.Forms.Media.Tests
 {
 	/// <summary>
-	/// All these tests are skipped on TeamCity (even if you remove this category) because SIL.Media.Tests compiles to an exe,
+	/// All these tests are skipped on TeamCity (even if you remove this category) because SIL.Windows.Forms.Media.Tests compiles to an exe,
 	/// and the project that builds libpalaso on TeamCity (build/Palaso.proj, task Test) invokes RunNUnitTC which
 	/// selects the test assemblies using Include="$(RootDir)/output/$(Configuration)/*.Tests.dll" which excludes exes.
 	/// I have not tried to verify that all of these tests would actually have problems on TeamCity, but it seemed

SIL.Media.Tests/MediaInfoTests.cs → SIL.Windows.Forms.Media.Tests/MediaInfoTests.cs

@@ -1,11 +1,11 @@
 using NUnit.Framework;
 using SIL.IO;
-using SIL.Media.Tests.Properties;
+using SIL.Windows.Forms.Media.Tests.Properties;
 
-namespace SIL.Media.Tests
+namespace SIL.Windows.Forms.Media.Tests
 {
 	/// <summary>
-	/// All these tests are skipped on TeamCity (even if you remove this category) because SIL.Media.Tests compiles to an exe,
+	/// All these tests are skipped on TeamCity (even if you remove this category) because SIL.Windows.Forms.Media.Tests compiles to an exe,
 	/// and the project that builds libpalaso on TeamCity (build/Palaso.proj, task Test) invokes RunNUnitTC which
 	/// selects the test assemblies using Include="$(RootDir)/output/$(Configuration)/*.Tests.dll" which excludes exes.
 	/// I have not tried to verify that all of these tests would actually have problems on TeamCity, but it seemed

SIL.Media.Tests/SIL.Media.Tests.csproj → SIL.Windows.Forms.Media.Tests/SIL.Windows.Forms.Media.Tests.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <RootNamespace>SIL.Media.Tests</RootNamespace>
-    <AssemblyName>SIL.Media.Tests</AssemblyName>
-    <Description>Unit tests for SIL.Media</Description>
+    <RootNamespace>SIL.Windows.Forms.Media.Tests</RootNamespace>
+    <AssemblyName>SIL.Windows.Forms.Media.Tests</AssemblyName>
+    <Description>Unit tests for SIL.Windows.Forms.Media</Description>
     <SignAssembly>false</SignAssembly>
     <IsPackable>false</IsPackable>
     <UseWindowsForms>true</UseWindowsForms>
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\SIL.Core\SIL.Core.csproj" />
-    <ProjectReference Include="..\SIL.Media\SIL.Media.csproj" />
+    <ProjectReference Include="..\SIL.Windows.Forms.Media\SIL.Windows.Forms.Media.csproj" />
     <ProjectReference Include="..\SIL.TestUtilities\SIL.TestUtilities.csproj" />
     <ProjectReference Include="..\SIL.Windows.Forms\SIL.Windows.Forms.csproj" />
   </ItemGroup>

SIL.Media.Tests/SampleForm.cs → SIL.Windows.Forms.Media.Tests/SampleForm.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Windows.Forms;
 
-namespace SIL.Media.Tests
+namespace SIL.Windows.Forms.Media.Tests
 {
 	public partial class Form1 : Form
 	{

SIL.Media/AlsaAudio/AlsaAudioDevice.cs → SIL.Windows.Forms.Media/AlsaAudio/AlsaAudioDevice.cs

@@ -4,7 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace SIL.Media.AlsaAudio
+namespace SIL.Windows.Forms.Media.AlsaAudio
 {
 	/// <summary>
 	/// Simplified wrapper around the standard Linux Alsa audio library.  This wrapper defaults
@@ -239,7 +239,7 @@ internal struct SF_INFO
 		#region Construction and Destruction
 
 		/// <summary>
-		/// Initialize a new instance of the <see cref="SIL.Media.AlsaAudio.AlsaAudioDevice"/> class.
+		/// Initialize a new instance of the <see cref="SIL.Windows.Forms.Media.AlsaAudio.AlsaAudioDevice"/> class.
 		/// </summary>
 		public AlsaAudioDevice()
 		{
@@ -797,7 +797,7 @@ public class WaveFileWriter
 			BinaryWriter _writer;
 
 			/// <summary>
-			/// Initializes a new instance of the <see cref="SIL.Media.AlsaAudio.AlsaAudioDevice.WaveFileWriter"/> class.
+			/// Initializes a new instance of the <see cref="SIL.Windows.Forms.Media.AlsaAudio.AlsaAudioDevice.WaveFileWriter"/> class.
 			/// </summary>
 			public WaveFileWriter(string filename)
 			{

SIL.Media/AlsaAudio/AudioAlsaSession.cs → SIL.Windows.Forms.Media/AlsaAudio/AudioAlsaSession.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace SIL.Media.AlsaAudio
+namespace SIL.Windows.Forms.Media.AlsaAudio
 {
 	/// <summary>
 	/// Implementation of ISimpleAudioSession that uses the standard ALSA sound

SIL.Media/AlsaAudio/AudioRecorder.cs → SIL.Windows.Forms.Media/AlsaAudio/AudioRecorder.cs

@@ -5,7 +5,7 @@
 using System.IO;
 using NAudio.Wave;
 
-namespace SIL.Media.AlsaAudio
+namespace SIL.Windows.Forms.Media.AlsaAudio
 {
 	/// <summary>
 	/// AudioRecorder rewritten to work on Linux using AlsaAudio instead of Naudio.  The things I can't
@@ -14,7 +14,7 @@ namespace SIL.Media.AlsaAudio
 	/// </summary>
 	public class AudioRecorder : IAudioRecorder, IDisposable
 	{
-		// variables copied from SIL.Media.Naudio implementation.
+		// variables copied from SIL.Windows.Forms.Media.Naudio implementation.
 		protected readonly int _maxMinutes;
 		protected RecordingState _recordingState = RecordingState.NotYetStarted;
 		//private DateTime _recordingStartTime;

SIL.Media/AlsaAudio/RecordingDevice.cs → SIL.Windows.Forms.Media/AlsaAudio/RecordingDevice.cs

@@ -6,11 +6,11 @@
 using System.Runtime.InteropServices;
 using NAudio.Wave;
 
-namespace SIL.Media.AlsaAudio
+namespace SIL.Windows.Forms.Media.AlsaAudio
 {
 	/// <summary>
 	/// This class implements the methods and properties used by Bloom.  It reimplements a class in
-	/// SIL.Media/NAudio, but for Linux.
+	/// SIL.Windows.Forms.Media/NAudio, but for Linux.
 	/// </summary>
 	public class RecordingDevice: IRecordingDevice
 	{

SIL.Media/AudioFactory.cs → SIL.Windows.Forms.Media/AudioFactory.cs

@@ -2,10 +2,10 @@
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-using SIL.Media.AlsaAudio;
+using SIL.Windows.Forms.Media.AlsaAudio;
 using SIL.PlatformUtilities;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	public class AudioFactory
 	{

SIL.Media/AudioNullSession.cs → SIL.Windows.Forms.Media/AudioNullSession.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	public class AudioNullSession : ISimpleAudioSession
 	{

SIL.Media/FFmpegRunner.cs → SIL.Windows.Forms.Media/FFmpegRunner.cs

@@ -9,7 +9,7 @@
 using SIL.Progress;
 using static System.String;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	///<summary>
 	/// FFmpeg is an open source media processing commandline library. Note that there is

SIL.Media/IAudioPlayer.cs → SIL.Windows.Forms.Media/IAudioPlayer.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	public class PlaybackProgressEventArgs : EventArgs
 	{

SIL.Media/IAudioRecorder.cs → SIL.Windows.Forms.Media/IAudioRecorder.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using NAudio.Wave;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	public class PeakLevelEventArgs : EventArgs
 	{

SIL.Media/IRecordingDevice.cs → SIL.Windows.Forms.Media/IRecordingDevice.cs

@@ -2,7 +2,7 @@
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 using NAudio.Wave;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	public interface IRecordingDevice
 	{

SIL.Media/ISimpleAudioSession.cs → SIL.Windows.Forms.Media/ISimpleAudioSession.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	public interface ISimpleAudioSession : IDisposable
 	{

SIL.Media/MediaInfo.cs → SIL.Windows.Forms.Media/MediaInfo.cs

@@ -9,7 +9,7 @@
 using static System.String;
 using static SIL.IO.FileLocationUtilities;
 
-namespace SIL.Media
+namespace SIL.Windows.Forms.Media
 {
 	/// <summary>
 	/// This class uses FFprobe (via FFMpegCore) to gather information about media streams.

SIL.Media/Naudio/AudioPlayer.cs → SIL.Windows.Forms.Media/Naudio/AudioPlayer.cs

@@ -2,7 +2,7 @@
 using System.Timers;
 using NAudio.Wave;
 
-namespace SIL.Media.Naudio
+namespace SIL.Windows.Forms.Media.Naudio
 {
 	public class AudioPlayer : IAudioPlayer
 	{

SIL.Media/Naudio/AudioRecorder.cs → SIL.Windows.Forms.Media/Naudio/AudioRecorder.cs

@@ -9,7 +9,7 @@
 using NAudio.Wave;
 using SIL.Reporting;
 
-namespace SIL.Media.Naudio
+namespace SIL.Windows.Forms.Media.Naudio
 {
 	public class AudioRecorder : IAudioRecorder, IDisposable
 	{
@@ -189,14 +189,14 @@ public virtual void BeginMonitoring()
 		/// <exception cref="InvalidOperationException">Called when in an invalid state. It is
 		/// only valid to call this method when the <see cref="RecordingState"/> is
 		/// <see cref="Media.RecordingState.NotYetStarted"/> or
-		/// <see cref="SIL.Media.RecordingState.Stopped"/>. In other words, this
+		/// <see cref="SIL.Windows.Forms.Media.RecordingState.Stopped"/>. In other words, this
 		/// should be called (either directly or as a side-effect of setting the
 		/// <see cref="SelectedDevice"/> or calling <see cref="BeginRecording(string)"/> only
 		/// once to create and initialize a new WaveIn device. For example, if merely setting
 		/// <see cref="SelectedDevice"/> for an <see cref="AudioRecorder"/> that is already
 		/// monitoring, do not call this method again. Likewise, when completing a recording
 		/// normally or aborting it (at the caller's request), this will automatically go back
-		/// into a <see cref="SIL.Media.RecordingState.Monitoring"/> state.
+		/// into a <see cref="SIL.Windows.Forms.Media.RecordingState.Monitoring"/> state.
 		/// <see cref="BeginRecording(string)"/> also begins monitoring, so if that is called
 		/// directly, this method should not be called.</exception>
 		/// <param name="catchAndReportExceptions"> If true, any unhandled exception

SIL.Media/Naudio/FileWriterThread.cs → SIL.Windows.Forms.Media/Naudio/FileWriterThread.cs

@@ -3,7 +3,7 @@
 using System.Threading;
 using NAudio.Wave;
 
-namespace SIL.Media.Naudio
+namespace SIL.Windows.Forms.Media.Naudio
 {
 	internal class FileWriterThread
 	{