diff --git a/CHANGELOG.md b/CHANGELOG.md index c714305d7..be96dfd40 100644 --- a/CHANGELOG.md +++ b/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.) diff --git a/Design/audio icons.svg b/Design/audio icons.svg index a1cd8c11c..74ce32af2 100644 --- a/Design/audio icons.svg +++ b/Design/audio icons.svg @@ -285,7 +285,7 @@ d="m -406.39995,184.79101 c -3.31866,0 -6.04811,2.83136 -5.99261,5.38232 0.028,1.27849 0.22062,2.28748 0.44123,3.07533 0.0165,0.0844 0.034,0.16875 0.0627,0.25369 l 0.42748,1.2647 c 0.31337,0.92506 1.24404,1.49248 2.08641,1.27205 0.84241,-0.22045 1.26835,-1.14293 0.95497,-2.06801 l -0.42748,-1.2647 c -0.30417,-0.89793 -1.18979,-1.45255 -2.0119,-1.28308 -0.0508,-0.64347 -0.051,-1.13234 -0.051,-1.13234 0,-2.23297 2.01471,-4.05879 4.51015,-4.0588 2.49544,0 4.51779,1.80763 4.51014,4.11762 -0.006,0.40168 -0.0215,0.73901 -0.0529,1.05697 -0.78766,-0.0966 -1.60442,0.44408 -1.89429,1.29963 l -0.42748,1.2647 c -0.31338,0.92508 0.11261,1.84756 0.95497,2.06801 0.84241,0.22043 1.77109,-0.34699 2.08451,-1.27205 l 0.005,-0.009 0.87652,0.29783 -0.0315,1.64704 c -0.005,0.50075 -0.13641,0.81666 -0.31372,1 -0.17731,0.18331 -0.40348,0.2647 -0.7216,0.2647 h -3.81405 c -0.0524,-0.008 -0.1,-0.0294 -0.15491,-0.0294 h -1.94524 c -0.5475,0 -0.98833,0.4132 -0.98833,0.92646 0,0.51326 0.44083,0.92647 0.98833,0.92647 h 1.94524 c 0.53084,0 0.95273,-0.39095 0.97853,-0.88235 h 2.99043 c 0.54974,0 1.09703,-0.19785 1.47461,-0.58823 0.37758,-0.39037 0.55819,-0.94966 0.56474,-1.61763 l 0.0315,-1.97058 v -0.32352 l -0.31377,-0.11766 -1.26085,-0.43565 0.11961,-0.35294 c 0.008,-0.0227 0.009,-0.0453 0.0155,-0.0681 0.22892,-0.75417 0.43529,-1.77255 0.43529,-3.17278 0,-2.66332 -2.73666,-5.47055 -6.05531,-5.47055 z" id="Headset" inkscape:connector-curvature="0" - inkscape:export-filename="X:\dev\libpalaso\SIL.Media\Resources\Headset.png" + inkscape:export-filename="X:\dev\libpalaso\SIL.Windows.Forms.Media\Resources\Headset.png" inkscape:export-xdpi="89.999886" inkscape:export-ydpi="89.999886" inkscape:label="#path10296" /> @@ -950,7 +950,7 @@ AElFTkSuQmCC y="-31.142786" style="font-family:sans-serif" />These can be re-exported in Inkscape, by selecting them all and then using the PNG Export command with the "Batch export" option ticked. That will use the ID of each object as a file name. Each of these icons has an ID that matches the file name expected by SIL.Media.Resources, and is already sized to by 16 px high.These can be re-exported in Inkscape, by selecting them all and then using the PNG Export command with the "Batch export" option ticked. That will use the ID of each object as a file name. Each of these icons has an ID that matches the file name expected by SIL.Windows.Forms.Media.Resources, and is already sized to by 16 px high. - /// 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 diff --git a/SIL.Media.Tests/AudioRecorderTests.cs b/SIL.Windows.Forms.Media.Tests/AudioRecorderTests.cs similarity index 98% rename from SIL.Media.Tests/AudioRecorderTests.cs rename to SIL.Windows.Forms.Media.Tests/AudioRecorderTests.cs index b6cf4f997..0d419c503 100644 --- a/SIL.Media.Tests/AudioRecorderTests.cs +++ b/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. diff --git a/SIL.Media.Tests/AudioSessionTests.cs b/SIL.Windows.Forms.Media.Tests/AudioSessionTests.cs similarity index 99% rename from SIL.Media.Tests/AudioSessionTests.cs rename to SIL.Windows.Forms.Media.Tests/AudioSessionTests.cs index ea557bbff..2f14688ae 100644 --- a/SIL.Media.Tests/AudioSessionTests.cs +++ b/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. diff --git a/SIL.Media.Tests/FFmpegRunnerTests.cs b/SIL.Windows.Forms.Media.Tests/FFmpegRunnerTests.cs similarity index 95% rename from SIL.Media.Tests/FFmpegRunnerTests.cs rename to SIL.Windows.Forms.Media.Tests/FFmpegRunnerTests.cs index 1430daf64..07cd4c74b 100644 --- a/SIL.Media.Tests/FFmpegRunnerTests.cs +++ b/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 { /// - /// 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 diff --git a/SIL.Media.Tests/MediaInfoTests.cs b/SIL.Windows.Forms.Media.Tests/MediaInfoTests.cs similarity index 96% rename from SIL.Media.Tests/MediaInfoTests.cs rename to SIL.Windows.Forms.Media.Tests/MediaInfoTests.cs index a9f8a608b..d3ee22384 100644 --- a/SIL.Media.Tests/MediaInfoTests.cs +++ b/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 { /// - /// 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 diff --git a/SIL.Media.Tests/Properties/Resources.Designer.cs b/SIL.Windows.Forms.Media.Tests/Properties/Resources.Designer.cs similarity index 96% rename from SIL.Media.Tests/Properties/Resources.Designer.cs rename to SIL.Windows.Forms.Media.Tests/Properties/Resources.Designer.cs index fa20ad690..0e4952aa6 100644 --- a/SIL.Media.Tests/Properties/Resources.Designer.cs +++ b/SIL.Windows.Forms.Media.Tests/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace SIL.Media.Tests.Properties { +namespace SIL.Windows.Forms.Media.Tests.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.Media.Tests.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.Windows.Forms.Media.Tests.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/SIL.Media.Tests/Properties/Resources.resx b/SIL.Windows.Forms.Media.Tests/Properties/Resources.resx similarity index 100% rename from SIL.Media.Tests/Properties/Resources.resx rename to SIL.Windows.Forms.Media.Tests/Properties/Resources.resx diff --git a/SIL.Media.Tests/Resources/24bitH4NSample.wav b/SIL.Windows.Forms.Media.Tests/Resources/24bitH4NSample.wav similarity index 100% rename from SIL.Media.Tests/Resources/24bitH4NSample.wav rename to SIL.Windows.Forms.Media.Tests/Resources/24bitH4NSample.wav diff --git a/SIL.Media.Tests/Resources/2Channel.wav b/SIL.Windows.Forms.Media.Tests/Resources/2Channel.wav similarity index 100% rename from SIL.Media.Tests/Resources/2Channel.wav rename to SIL.Windows.Forms.Media.Tests/Resources/2Channel.wav diff --git a/SIL.Media.Tests/Resources/Image1.bmp b/SIL.Windows.Forms.Media.Tests/Resources/Image1.bmp similarity index 100% rename from SIL.Media.Tests/Resources/Image1.bmp rename to SIL.Windows.Forms.Media.Tests/Resources/Image1.bmp diff --git a/SIL.Media.Tests/Resources/MP3 PLAYER.png b/SIL.Windows.Forms.Media.Tests/Resources/MP3 PLAYER.png similarity index 100% rename from SIL.Media.Tests/Resources/MP3 PLAYER.png rename to SIL.Windows.Forms.Media.Tests/Resources/MP3 PLAYER.png diff --git a/SIL.Media.Tests/Resources/finished.wav b/SIL.Windows.Forms.Media.Tests/Resources/finished.wav similarity index 100% rename from SIL.Media.Tests/Resources/finished.wav rename to SIL.Windows.Forms.Media.Tests/Resources/finished.wav diff --git a/SIL.Media.Tests/Resources/short.mp3 b/SIL.Windows.Forms.Media.Tests/Resources/short.mp3 similarity index 100% rename from SIL.Media.Tests/Resources/short.mp3 rename to SIL.Windows.Forms.Media.Tests/Resources/short.mp3 diff --git a/SIL.Media.Tests/Resources/tiny.mov b/SIL.Windows.Forms.Media.Tests/Resources/tiny.mov similarity index 100% rename from SIL.Media.Tests/Resources/tiny.mov rename to SIL.Windows.Forms.Media.Tests/Resources/tiny.mov diff --git a/SIL.Media.Tests/SIL.Media.Tests.csproj b/SIL.Windows.Forms.Media.Tests/SIL.Windows.Forms.Media.Tests.csproj similarity index 80% rename from SIL.Media.Tests/SIL.Media.Tests.csproj rename to SIL.Windows.Forms.Media.Tests/SIL.Windows.Forms.Media.Tests.csproj index 4d405e5b8..cc32e7450 100644 --- a/SIL.Media.Tests/SIL.Media.Tests.csproj +++ b/SIL.Windows.Forms.Media.Tests/SIL.Windows.Forms.Media.Tests.csproj @@ -1,9 +1,9 @@ - SIL.Media.Tests - SIL.Media.Tests - Unit tests for SIL.Media + SIL.Windows.Forms.Media.Tests + SIL.Windows.Forms.Media.Tests + Unit tests for SIL.Windows.Forms.Media false false true @@ -23,7 +23,7 @@ - + diff --git a/SIL.Media.Tests/SampleForm.Designer.cs b/SIL.Windows.Forms.Media.Tests/SampleForm.Designer.cs similarity index 96% rename from SIL.Media.Tests/SampleForm.Designer.cs rename to SIL.Windows.Forms.Media.Tests/SampleForm.Designer.cs index d408d9dd9..cd745adc6 100644 --- a/SIL.Media.Tests/SampleForm.Designer.cs +++ b/SIL.Windows.Forms.Media.Tests/SampleForm.Designer.cs @@ -1,6 +1,6 @@ using SIL.Windows.Forms.Widgets; -namespace SIL.Media.Tests +namespace SIL.Windows.Forms.Media.Tests { partial class Form1 { @@ -84,7 +84,7 @@ private void InitializeComponent() this.bitmapButton1.ImageFocused = null; this.bitmapButton1.ImageInactive = null; this.bitmapButton1.ImageMouseOver = null; - this.bitmapButton1.ImageNormal = global::SIL.Media.Tests.Properties.Resources.MP3_PLAYER; + this.bitmapButton1.ImageNormal = global::SIL.Windows.Forms.Media.Tests.Properties.Resources.MP3_PLAYER; this.bitmapButton1.ImagePressed = null; this.bitmapButton1.InnerBorderColor = System.Drawing.Color.Transparent; this.bitmapButton1.InnerBorderColor_Focus = System.Drawing.Color.LightBlue; @@ -110,7 +110,7 @@ private void InitializeComponent() this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Form1"; - this.Text = "SIL.Media Sample App"; + this.Text = "SIL.Windows.Forms.Media Sample App"; this.ResumeLayout(false); } diff --git a/SIL.Media.Tests/SampleForm.cs b/SIL.Windows.Forms.Media.Tests/SampleForm.cs similarity index 98% rename from SIL.Media.Tests/SampleForm.cs rename to SIL.Windows.Forms.Media.Tests/SampleForm.cs index e95106b75..bd0760c07 100644 --- a/SIL.Media.Tests/SampleForm.cs +++ b/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 { diff --git a/SIL.Media.Tests/SampleForm.resx b/SIL.Windows.Forms.Media.Tests/SampleForm.resx similarity index 100% rename from SIL.Media.Tests/SampleForm.resx rename to SIL.Windows.Forms.Media.Tests/SampleForm.resx diff --git a/SIL.Media.Tests/app.config b/SIL.Windows.Forms.Media.Tests/app.config similarity index 100% rename from SIL.Media.Tests/app.config rename to SIL.Windows.Forms.Media.Tests/app.config diff --git a/SIL.Media/AlsaAudio/AlsaAudioDevice.cs b/SIL.Windows.Forms.Media/AlsaAudio/AlsaAudioDevice.cs similarity index 98% rename from SIL.Media/AlsaAudio/AlsaAudioDevice.cs rename to SIL.Windows.Forms.Media/AlsaAudio/AlsaAudioDevice.cs index 93901dfe2..c2602ae69 100644 --- a/SIL.Media/AlsaAudio/AlsaAudioDevice.cs +++ b/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 { /// /// Simplified wrapper around the standard Linux Alsa audio library. This wrapper defaults @@ -239,7 +239,7 @@ internal struct SF_INFO #region Construction and Destruction /// - /// Initialize a new instance of the class. + /// Initialize a new instance of the class. /// public AlsaAudioDevice() { @@ -797,7 +797,7 @@ public class WaveFileWriter BinaryWriter _writer; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public WaveFileWriter(string filename) { diff --git a/SIL.Media/AlsaAudio/AudioAlsaSession.cs b/SIL.Windows.Forms.Media/AlsaAudio/AudioAlsaSession.cs similarity index 99% rename from SIL.Media/AlsaAudio/AudioAlsaSession.cs rename to SIL.Windows.Forms.Media/AlsaAudio/AudioAlsaSession.cs index 6e0e71c2c..f1bcb5fda 100644 --- a/SIL.Media/AlsaAudio/AudioAlsaSession.cs +++ b/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 { /// /// Implementation of ISimpleAudioSession that uses the standard ALSA sound diff --git a/SIL.Media/AlsaAudio/AudioRecorder.cs b/SIL.Windows.Forms.Media/AlsaAudio/AudioRecorder.cs similarity index 97% rename from SIL.Media/AlsaAudio/AudioRecorder.cs rename to SIL.Windows.Forms.Media/AlsaAudio/AudioRecorder.cs index 0d60cedb3..2a41b154d 100644 --- a/SIL.Media/AlsaAudio/AudioRecorder.cs +++ b/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 { /// /// AudioRecorder rewritten to work on Linux using AlsaAudio instead of Naudio. The things I can't @@ -14,7 +14,7 @@ namespace SIL.Media.AlsaAudio /// 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; diff --git a/SIL.Media/AlsaAudio/RecordingDevice.cs b/SIL.Windows.Forms.Media/AlsaAudio/RecordingDevice.cs similarity index 99% rename from SIL.Media/AlsaAudio/RecordingDevice.cs rename to SIL.Windows.Forms.Media/AlsaAudio/RecordingDevice.cs index d12a7b98c..d2ce64755 100644 --- a/SIL.Media/AlsaAudio/RecordingDevice.cs +++ b/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 { /// /// 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. /// public class RecordingDevice: IRecordingDevice { diff --git a/SIL.Media/AudioFactory.cs b/SIL.Windows.Forms.Media/AudioFactory.cs similarity index 96% rename from SIL.Media/AudioFactory.cs rename to SIL.Windows.Forms.Media/AudioFactory.cs index 177e036d8..e19d1b213 100644 --- a/SIL.Media/AudioFactory.cs +++ b/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 { diff --git a/SIL.Media/AudioNullSession.cs b/SIL.Windows.Forms.Media/AudioNullSession.cs similarity index 97% rename from SIL.Media/AudioNullSession.cs rename to SIL.Windows.Forms.Media/AudioNullSession.cs index 7d21fc9dd..46c577ea8 100644 --- a/SIL.Media/AudioNullSession.cs +++ b/SIL.Windows.Forms.Media/AudioNullSession.cs @@ -1,6 +1,6 @@ using System; -namespace SIL.Media +namespace SIL.Windows.Forms.Media { public class AudioNullSession : ISimpleAudioSession { diff --git a/SIL.Media/FFmpegRunner.cs b/SIL.Windows.Forms.Media/FFmpegRunner.cs similarity index 99% rename from SIL.Media/FFmpegRunner.cs rename to SIL.Windows.Forms.Media/FFmpegRunner.cs index f29b25c38..db9d1c392 100644 --- a/SIL.Media/FFmpegRunner.cs +++ b/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 { /// /// FFmpeg is an open source media processing commandline library. Note that there is diff --git a/SIL.Media/IAudioPlayer.cs b/SIL.Windows.Forms.Media/IAudioPlayer.cs similarity index 93% rename from SIL.Media/IAudioPlayer.cs rename to SIL.Windows.Forms.Media/IAudioPlayer.cs index e5db5e853..c309c9116 100644 --- a/SIL.Media/IAudioPlayer.cs +++ b/SIL.Windows.Forms.Media/IAudioPlayer.cs @@ -1,6 +1,6 @@ using System; -namespace SIL.Media +namespace SIL.Windows.Forms.Media { public class PlaybackProgressEventArgs : EventArgs { diff --git a/SIL.Media/IAudioRecorder.cs b/SIL.Windows.Forms.Media/IAudioRecorder.cs similarity index 96% rename from SIL.Media/IAudioRecorder.cs rename to SIL.Windows.Forms.Media/IAudioRecorder.cs index d8ebe375a..d0842a4a0 100644 --- a/SIL.Media/IAudioRecorder.cs +++ b/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 { diff --git a/SIL.Media/IRecordingDevice.cs b/SIL.Windows.Forms.Media/IRecordingDevice.cs similarity index 91% rename from SIL.Media/IRecordingDevice.cs rename to SIL.Windows.Forms.Media/IRecordingDevice.cs index c768d8200..df69d1fd3 100644 --- a/SIL.Media/IRecordingDevice.cs +++ b/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 { diff --git a/SIL.Media/ISimpleAudioSession.cs b/SIL.Windows.Forms.Media/ISimpleAudioSession.cs similarity index 93% rename from SIL.Media/ISimpleAudioSession.cs rename to SIL.Windows.Forms.Media/ISimpleAudioSession.cs index 8b515c410..a64a37b08 100644 --- a/SIL.Media/ISimpleAudioSession.cs +++ b/SIL.Windows.Forms.Media/ISimpleAudioSession.cs @@ -1,6 +1,6 @@ using System; -namespace SIL.Media +namespace SIL.Windows.Forms.Media { public interface ISimpleAudioSession : IDisposable { diff --git a/SIL.Media/MediaInfo.cs b/SIL.Windows.Forms.Media/MediaInfo.cs similarity index 99% rename from SIL.Media/MediaInfo.cs rename to SIL.Windows.Forms.Media/MediaInfo.cs index 59e2fa7f1..6de5db288 100644 --- a/SIL.Media/MediaInfo.cs +++ b/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 { /// /// This class uses FFprobe (via FFMpegCore) to gather information about media streams. diff --git a/SIL.Media/Naudio/AudioPlayer.cs b/SIL.Windows.Forms.Media/Naudio/AudioPlayer.cs similarity index 98% rename from SIL.Media/Naudio/AudioPlayer.cs rename to SIL.Windows.Forms.Media/Naudio/AudioPlayer.cs index 46cdf41c1..20d73a654 100644 --- a/SIL.Media/Naudio/AudioPlayer.cs +++ b/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 { diff --git a/SIL.Media/Naudio/AudioRecorder.cs b/SIL.Windows.Forms.Media/Naudio/AudioRecorder.cs similarity index 99% rename from SIL.Media/Naudio/AudioRecorder.cs rename to SIL.Windows.Forms.Media/Naudio/AudioRecorder.cs index 63a79b428..373723f97 100644 --- a/SIL.Media/Naudio/AudioRecorder.cs +++ b/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() /// Called when in an invalid state. It is /// only valid to call this method when the is /// or - /// . In other words, this + /// . In other words, this /// should be called (either directly or as a side-effect of setting the /// or calling only /// once to create and initialize a new WaveIn device. For example, if merely setting /// for an 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 state. + /// into a state. /// also begins monitoring, so if that is called /// directly, this method should not be called. /// If true, any unhandled exception diff --git a/SIL.Media/Naudio/FileWriterThread.cs b/SIL.Windows.Forms.Media/Naudio/FileWriterThread.cs similarity index 98% rename from SIL.Media/Naudio/FileWriterThread.cs rename to SIL.Windows.Forms.Media/Naudio/FileWriterThread.cs index 5f7334e51..e89e21e1a 100644 --- a/SIL.Media/Naudio/FileWriterThread.cs +++ b/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 { diff --git a/SIL.Media/Naudio/RecordingDevice.cs b/SIL.Windows.Forms.Media/Naudio/RecordingDevice.cs similarity index 98% rename from SIL.Media/Naudio/RecordingDevice.cs rename to SIL.Windows.Forms.Media/Naudio/RecordingDevice.cs index 03e5efb7f..57c7d209e 100644 --- a/SIL.Media/Naudio/RecordingDevice.cs +++ b/SIL.Windows.Forms.Media/Naudio/RecordingDevice.cs @@ -4,7 +4,7 @@ using NAudio.CoreAudioApi; using NAudio.Wave; -namespace SIL.Media.Naudio +namespace SIL.Windows.Forms.Media.Naudio { /// /// A RecordingDevice is used to select and get information about the diff --git a/SIL.Media/Naudio/SampleAggregator.cs b/SIL.Windows.Forms.Media/Naudio/SampleAggregator.cs similarity index 96% rename from SIL.Media/Naudio/SampleAggregator.cs rename to SIL.Windows.Forms.Media/Naudio/SampleAggregator.cs index 4d548852a..0ab89113a 100644 --- a/SIL.Media/Naudio/SampleAggregator.cs +++ b/SIL.Windows.Forms.Media/Naudio/SampleAggregator.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; -namespace SIL.Media.Naudio +namespace SIL.Windows.Forms.Media.Naudio { public class SampleAggregator { diff --git a/SIL.Media/Naudio/TrimWaveStream.cs b/SIL.Windows.Forms.Media/Naudio/TrimWaveStream.cs similarity index 97% rename from SIL.Media/Naudio/TrimWaveStream.cs rename to SIL.Windows.Forms.Media/Naudio/TrimWaveStream.cs index dab22c7b1..3688c07c3 100644 --- a/SIL.Media/Naudio/TrimWaveStream.cs +++ b/SIL.Windows.Forms.Media/Naudio/TrimWaveStream.cs @@ -1,7 +1,7 @@ using System; using NAudio.Wave; -namespace SIL.Media.Naudio +namespace SIL.Windows.Forms.Media.Naudio { public class TrimWaveStream : WaveStream { diff --git a/SIL.Media/Naudio/UI/AudioDeviceIcons.Designer.cs b/SIL.Windows.Forms.Media/Naudio/UI/AudioDeviceIcons.Designer.cs similarity index 96% rename from SIL.Media/Naudio/UI/AudioDeviceIcons.Designer.cs rename to SIL.Windows.Forms.Media/Naudio/UI/AudioDeviceIcons.Designer.cs index 08c471f92..72e9b49d0 100644 --- a/SIL.Media/Naudio/UI/AudioDeviceIcons.Designer.cs +++ b/SIL.Windows.Forms.Media/Naudio/UI/AudioDeviceIcons.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace SIL.Media.Naudio.UI { +namespace SIL.Windows.Forms.Media.Naudio.UI { using System; @@ -39,7 +39,7 @@ internal AudioDeviceIcons() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.Media.Naudio.UI.AudioDeviceIcons", typeof(AudioDeviceIcons).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.Windows.Forms.Media.Naudio.UI.AudioDeviceIcons", typeof(AudioDeviceIcons).Assembly); resourceMan = temp; } return resourceMan; diff --git a/SIL.Media/Naudio/UI/AudioDeviceIcons.resx b/SIL.Windows.Forms.Media/Naudio/UI/AudioDeviceIcons.resx similarity index 100% rename from SIL.Media/Naudio/UI/AudioDeviceIcons.resx rename to SIL.Windows.Forms.Media/Naudio/UI/AudioDeviceIcons.resx diff --git a/SIL.Media/Naudio/UI/PeakMeterCtrl.cs b/SIL.Windows.Forms.Media/Naudio/UI/PeakMeterCtrl.cs similarity index 99% rename from SIL.Media/Naudio/UI/PeakMeterCtrl.cs rename to SIL.Windows.Forms.Media/Naudio/UI/PeakMeterCtrl.cs index 1e3b6a46b..e636917e8 100644 --- a/SIL.Media/Naudio/UI/PeakMeterCtrl.cs +++ b/SIL.Windows.Forms.Media/Naudio/UI/PeakMeterCtrl.cs @@ -33,7 +33,7 @@ using System.Threading; using System.Windows.Forms; -namespace SIL.Media.Naudio.UI +namespace SIL.Windows.Forms.Media.Naudio.UI { public enum PeakMeterStyle { diff --git a/SIL.Media/Naudio/UI/PeakMeterCtrl.designer.cs b/SIL.Windows.Forms.Media/Naudio/UI/PeakMeterCtrl.designer.cs similarity index 95% rename from SIL.Media/Naudio/UI/PeakMeterCtrl.designer.cs rename to SIL.Windows.Forms.Media/Naudio/UI/PeakMeterCtrl.designer.cs index 1a597c40c..4ce1944b0 100644 --- a/SIL.Media/Naudio/UI/PeakMeterCtrl.designer.cs +++ b/SIL.Windows.Forms.Media/Naudio/UI/PeakMeterCtrl.designer.cs @@ -1,4 +1,4 @@ -namespace SIL.Media.Naudio.UI +namespace SIL.Windows.Forms.Media.Naudio.UI { partial class PeakMeterCtrl { diff --git a/SIL.Media/Naudio/UI/RecordingDeviceIndicator.cs b/SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.cs similarity index 99% rename from SIL.Media/Naudio/UI/RecordingDeviceIndicator.cs rename to SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.cs index dcc6e7413..9ef481208 100644 --- a/SIL.Media/Naudio/UI/RecordingDeviceIndicator.cs +++ b/SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.cs @@ -4,7 +4,7 @@ using System.Drawing; using System.Windows.Forms; -namespace SIL.Media.Naudio.UI +namespace SIL.Windows.Forms.Media.Naudio.UI { /// /// This control displays an icon and tooltip to indicate which recording device is currently in use. diff --git a/SIL.Media/Naudio/UI/RecordingDeviceIndicator.designer.cs b/SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.designer.cs similarity index 98% rename from SIL.Media/Naudio/UI/RecordingDeviceIndicator.designer.cs rename to SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.designer.cs index 5f5626382..30cd5e5d4 100644 --- a/SIL.Media/Naudio/UI/RecordingDeviceIndicator.designer.cs +++ b/SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.designer.cs @@ -1,4 +1,4 @@ -namespace SIL.Media.Naudio.UI +namespace SIL.Windows.Forms.Media.Naudio.UI { partial class RecordingDeviceIndicator { diff --git a/SIL.Media/Naudio/UI/RecordingDeviceIndicator.resx b/SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.resx similarity index 100% rename from SIL.Media/Naudio/UI/RecordingDeviceIndicator.resx rename to SIL.Windows.Forms.Media/Naudio/UI/RecordingDeviceIndicator.resx diff --git a/SIL.Media/Properties/AssemblyInfo.cs b/SIL.Windows.Forms.Media/Properties/AssemblyInfo.cs similarity index 100% rename from SIL.Media/Properties/AssemblyInfo.cs rename to SIL.Windows.Forms.Media/Properties/AssemblyInfo.cs diff --git a/SIL.Media/Properties/Resources.Designer.cs b/SIL.Windows.Forms.Media/Properties/Resources.Designer.cs similarity index 96% rename from SIL.Media/Properties/Resources.Designer.cs rename to SIL.Windows.Forms.Media/Properties/Resources.Designer.cs index 020db9938..364d42781 100644 --- a/SIL.Media/Properties/Resources.Designer.cs +++ b/SIL.Windows.Forms.Media/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace SIL.Media.Properties { +namespace SIL.Windows.Forms.Media.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.Media.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.Windows.Forms.Media.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/SIL.Media/Properties/Resources.resx b/SIL.Windows.Forms.Media/Properties/Resources.resx similarity index 100% rename from SIL.Media/Properties/Resources.resx rename to SIL.Windows.Forms.Media/Properties/Resources.resx diff --git a/SIL.Media/RecordingState.cs b/SIL.Windows.Forms.Media/RecordingState.cs similarity index 76% rename from SIL.Media/RecordingState.cs rename to SIL.Windows.Forms.Media/RecordingState.cs index f3a6ceb9d..18eed7fab 100644 --- a/SIL.Media/RecordingState.cs +++ b/SIL.Windows.Forms.Media/RecordingState.cs @@ -1,4 +1,4 @@ -namespace SIL.Media +namespace SIL.Windows.Forms.Media { public enum RecordingState { diff --git a/SIL.Media/Resources/Computer.png b/SIL.Windows.Forms.Media/Resources/Computer.png similarity index 100% rename from SIL.Media/Resources/Computer.png rename to SIL.Windows.Forms.Media/Resources/Computer.png diff --git a/SIL.Media/Resources/DeleteHS.png b/SIL.Windows.Forms.Media/Resources/DeleteHS.png similarity index 100% rename from SIL.Media/Resources/DeleteHS.png rename to SIL.Windows.Forms.Media/Resources/DeleteHS.png diff --git a/SIL.Media/Resources/Headset.png b/SIL.Windows.Forms.Media/Resources/Headset.png similarity index 100% rename from SIL.Media/Resources/Headset.png rename to SIL.Windows.Forms.Media/Resources/Headset.png diff --git a/SIL.Media/Resources/Line.png b/SIL.Windows.Forms.Media/Resources/Line.png similarity index 100% rename from SIL.Media/Resources/Line.png rename to SIL.Windows.Forms.Media/Resources/Line.png diff --git a/SIL.Media/Resources/Microphone.png b/SIL.Windows.Forms.Media/Resources/Microphone.png similarity index 100% rename from SIL.Media/Resources/Microphone.png rename to SIL.Windows.Forms.Media/Resources/Microphone.png diff --git a/SIL.Media/Resources/NoAudioDevice.png b/SIL.Windows.Forms.Media/Resources/NoAudioDevice.png similarity index 100% rename from SIL.Media/Resources/NoAudioDevice.png rename to SIL.Windows.Forms.Media/Resources/NoAudioDevice.png diff --git a/SIL.Media/Resources/Recorder.png b/SIL.Windows.Forms.Media/Resources/Recorder.png similarity index 100% rename from SIL.Media/Resources/Recorder.png rename to SIL.Windows.Forms.Media/Resources/Recorder.png diff --git a/SIL.Media/Resources/Webcam.png b/SIL.Windows.Forms.Media/Resources/Webcam.png similarity index 100% rename from SIL.Media/Resources/Webcam.png rename to SIL.Windows.Forms.Media/Resources/Webcam.png diff --git a/SIL.Media/SIL.Media.csproj b/SIL.Windows.Forms.Media/SIL.Windows.Forms.Media.csproj similarity index 87% rename from SIL.Media/SIL.Media.csproj rename to SIL.Windows.Forms.Media/SIL.Windows.Forms.Media.csproj index 7e3df89cb..5c3e19469 100644 --- a/SIL.Media/SIL.Media.csproj +++ b/SIL.Windows.Forms.Media/SIL.Windows.Forms.Media.csproj @@ -1,8 +1,8 @@  - SIL.Media - SIL.Media - SIL.Media contains Windows Forms UI elements and classes for processing audio on Windows and Linux. + SIL.Windows.Forms.Media + SIL.Windows.Forms.Media + SIL.Windows.Forms.Media contains Windows Forms UI elements and classes for processing audio on Windows and Linux. @@ -43,7 +43,7 @@ true build/lib/win-x86 - + true build diff --git a/SIL.Media/SIL.Media.targets b/SIL.Windows.Forms.Media/SIL.Windows.Forms.Media.targets similarity index 100% rename from SIL.Media/SIL.Media.targets rename to SIL.Windows.Forms.Media/SIL.Windows.Forms.Media.targets diff --git a/SIL.Media/ShortSoundFieldControl.Designer.cs b/SIL.Windows.Forms.Media/ShortSoundFieldControl.Designer.cs similarity index 95% rename from SIL.Media/ShortSoundFieldControl.Designer.cs rename to SIL.Windows.Forms.Media/ShortSoundFieldControl.Designer.cs index 9919614bb..1ef8d52ff 100644 --- a/SIL.Media/ShortSoundFieldControl.Designer.cs +++ b/SIL.Windows.Forms.Media/ShortSoundFieldControl.Designer.cs @@ -1,4 +1,4 @@ -namespace SIL.Media +namespace SIL.Windows.Forms.Media { partial class ShortSoundFieldControl { @@ -44,7 +44,7 @@ private void InitializeComponent() this._playButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this._playButton.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this._playButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this._playButton.Image = global::SIL.Media.Properties.Resources.play14x16; + this._playButton.Image = global::SIL.Windows.Forms.Media.Properties.Resources.play14x16; this._playButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this._playButton.Location = new System.Drawing.Point(0, 0); this._playButton.Name = "_playButton"; @@ -64,7 +64,7 @@ private void InitializeComponent() this._deleteButton.Enabled = false; this._deleteButton.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this._deleteButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this._deleteButton.Image = global::SIL.Media.Properties.Resources.Delete; + this._deleteButton.Image = global::SIL.Windows.Forms.Media.Properties.Resources.Delete; this._deleteButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; // part of display bug fix WS-67 this._deleteButton.Location = new System.Drawing.Point(204, 0); this._deleteButton.Name = "_deleteButton"; @@ -81,7 +81,7 @@ private void InitializeComponent() this._recordButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this._recordButton.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this._recordButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this._recordButton.Image = global::SIL.Media.Properties.Resources.record16x16; + this._recordButton.Image = global::SIL.Windows.Forms.Media.Properties.Resources.record16x16; this._recordButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this._recordButton.Location = new System.Drawing.Point(41, 0); this._recordButton.Name = "_recordButton"; diff --git a/SIL.Media/ShortSoundFieldControl.cs b/SIL.Windows.Forms.Media/ShortSoundFieldControl.cs similarity index 99% rename from SIL.Media/ShortSoundFieldControl.cs rename to SIL.Windows.Forms.Media/ShortSoundFieldControl.cs index 764d9c7c4..fba5b7566 100644 --- a/SIL.Media/ShortSoundFieldControl.cs +++ b/SIL.Windows.Forms.Media/ShortSoundFieldControl.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using SIL.Reporting; -namespace SIL.Media +namespace SIL.Windows.Forms.Media { public partial class ShortSoundFieldControl : UserControl { diff --git a/SIL.Media/ShortSoundFieldControl.resx b/SIL.Windows.Forms.Media/ShortSoundFieldControl.resx similarity index 100% rename from SIL.Media/ShortSoundFieldControl.resx rename to SIL.Windows.Forms.Media/ShortSoundFieldControl.resx diff --git a/SIL.Media/SoundFieldControl.Designer.cs b/SIL.Windows.Forms.Media/SoundFieldControl.Designer.cs similarity index 91% rename from SIL.Media/SoundFieldControl.Designer.cs rename to SIL.Windows.Forms.Media/SoundFieldControl.Designer.cs index ca93331a1..b446d25dc 100644 --- a/SIL.Media/SoundFieldControl.Designer.cs +++ b/SIL.Windows.Forms.Media/SoundFieldControl.Designer.cs @@ -1,4 +1,4 @@ -namespace SIL.Media +namespace SIL.Windows.Forms.Media { partial class SoundFieldControl { @@ -38,7 +38,7 @@ private void InitializeComponent() // _stopButton // this._stopButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this._stopButton.Image = global::SIL.Media.Properties.Resources.stop15x16; + this._stopButton.Image = global::SIL.Windows.Forms.Media.Properties.Resources.stop15x16; this._stopButton.Location = new System.Drawing.Point(82, 0); this._stopButton.Name = "_stopButton"; this._stopButton.Size = new System.Drawing.Size(38, 31); @@ -51,7 +51,7 @@ private void InitializeComponent() // _playButton // this._playButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this._playButton.Image = global::SIL.Media.Properties.Resources.play14x16; + this._playButton.Image = global::SIL.Windows.Forms.Media.Properties.Resources.play14x16; this._playButton.Location = new System.Drawing.Point(0, 0); this._playButton.Name = "_playButton"; this._playButton.Size = new System.Drawing.Size(38, 31); @@ -63,7 +63,7 @@ private void InitializeComponent() // _recordButton // this._recordButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this._recordButton.Image = global::SIL.Media.Properties.Resources.record16x16; + this._recordButton.Image = global::SIL.Windows.Forms.Media.Properties.Resources.record16x16; this._recordButton.Location = new System.Drawing.Point(41, 0); this._recordButton.Name = "_recordButton"; this._recordButton.Size = new System.Drawing.Size(38, 31); diff --git a/SIL.Media/SoundFieldControl.cs b/SIL.Windows.Forms.Media/SoundFieldControl.cs similarity index 97% rename from SIL.Media/SoundFieldControl.cs rename to SIL.Windows.Forms.Media/SoundFieldControl.cs index 6064f5ea7..feb639f61 100644 --- a/SIL.Media/SoundFieldControl.cs +++ b/SIL.Windows.Forms.Media/SoundFieldControl.cs @@ -2,7 +2,7 @@ using System.IO; using System.Windows.Forms; -namespace SIL.Media +namespace SIL.Windows.Forms.Media { public partial class SoundFieldControl : UserControl { diff --git a/SIL.Media/SoundFieldControl.resx b/SIL.Windows.Forms.Media/SoundFieldControl.resx similarity index 100% rename from SIL.Media/SoundFieldControl.resx rename to SIL.Windows.Forms.Media/SoundFieldControl.resx diff --git a/SIL.Media/WindowsAudioSession.cs b/SIL.Windows.Forms.Media/WindowsAudioSession.cs similarity index 99% rename from SIL.Media/WindowsAudioSession.cs rename to SIL.Windows.Forms.Media/WindowsAudioSession.cs index c941097ef..a5c98ed03 100644 --- a/SIL.Media/WindowsAudioSession.cs +++ b/SIL.Windows.Forms.Media/WindowsAudioSession.cs @@ -8,7 +8,7 @@ using NAudio.Wave; using SIL.Code; -namespace SIL.Media +namespace SIL.Windows.Forms.Media { /// /// A Windows implementation of an ISimpleAudioSession. diff --git a/SIL.Media/app.config b/SIL.Windows.Forms.Media/app.config similarity index 100% rename from SIL.Media/app.config rename to SIL.Windows.Forms.Media/app.config diff --git a/SIL.Media/artwork/play.svg b/SIL.Windows.Forms.Media/artwork/play.svg similarity index 100% rename from SIL.Media/artwork/play.svg rename to SIL.Windows.Forms.Media/artwork/play.svg diff --git a/SIL.Media/artwork/play14x16.png b/SIL.Windows.Forms.Media/artwork/play14x16.png similarity index 100% rename from SIL.Media/artwork/play14x16.png rename to SIL.Windows.Forms.Media/artwork/play14x16.png diff --git a/SIL.Media/artwork/playDisabled.svg b/SIL.Windows.Forms.Media/artwork/playDisabled.svg similarity index 100% rename from SIL.Media/artwork/playDisabled.svg rename to SIL.Windows.Forms.Media/artwork/playDisabled.svg diff --git a/SIL.Media/artwork/playDisabled14x16.png b/SIL.Windows.Forms.Media/artwork/playDisabled14x16.png similarity index 100% rename from SIL.Media/artwork/playDisabled14x16.png rename to SIL.Windows.Forms.Media/artwork/playDisabled14x16.png diff --git a/SIL.Media/artwork/record.svg b/SIL.Windows.Forms.Media/artwork/record.svg similarity index 100% rename from SIL.Media/artwork/record.svg rename to SIL.Windows.Forms.Media/artwork/record.svg diff --git a/SIL.Media/artwork/record16x16.png b/SIL.Windows.Forms.Media/artwork/record16x16.png similarity index 100% rename from SIL.Media/artwork/record16x16.png rename to SIL.Windows.Forms.Media/artwork/record16x16.png diff --git a/SIL.Media/artwork/recordDisabled.svg b/SIL.Windows.Forms.Media/artwork/recordDisabled.svg similarity index 100% rename from SIL.Media/artwork/recordDisabled.svg rename to SIL.Windows.Forms.Media/artwork/recordDisabled.svg diff --git a/SIL.Media/artwork/recordDisabled16x16.png b/SIL.Windows.Forms.Media/artwork/recordDisabled16x16.png similarity index 100% rename from SIL.Media/artwork/recordDisabled16x16.png rename to SIL.Windows.Forms.Media/artwork/recordDisabled16x16.png diff --git a/SIL.Media/artwork/stop.svg b/SIL.Windows.Forms.Media/artwork/stop.svg similarity index 100% rename from SIL.Media/artwork/stop.svg rename to SIL.Windows.Forms.Media/artwork/stop.svg diff --git a/SIL.Media/artwork/stop15x16.png b/SIL.Windows.Forms.Media/artwork/stop15x16.png similarity index 100% rename from SIL.Media/artwork/stop15x16.png rename to SIL.Windows.Forms.Media/artwork/stop15x16.png diff --git a/SIL.Media/lib/win-x64/ikpFlac.dll b/SIL.Windows.Forms.Media/lib/win-x64/ikpFlac.dll similarity index 100% rename from SIL.Media/lib/win-x64/ikpFlac.dll rename to SIL.Windows.Forms.Media/lib/win-x64/ikpFlac.dll diff --git a/SIL.Media/lib/win-x64/ikpMP3.dll b/SIL.Windows.Forms.Media/lib/win-x64/ikpMP3.dll similarity index 100% rename from SIL.Media/lib/win-x64/ikpMP3.dll rename to SIL.Windows.Forms.Media/lib/win-x64/ikpMP3.dll diff --git a/SIL.Media/lib/win-x64/irrKlang.NET4.dll b/SIL.Windows.Forms.Media/lib/win-x64/irrKlang.NET4.dll similarity index 100% rename from SIL.Media/lib/win-x64/irrKlang.NET4.dll rename to SIL.Windows.Forms.Media/lib/win-x64/irrKlang.NET4.dll diff --git a/SIL.Media/lib/win-x86/ikpFlac.dll b/SIL.Windows.Forms.Media/lib/win-x86/ikpFlac.dll similarity index 100% rename from SIL.Media/lib/win-x86/ikpFlac.dll rename to SIL.Windows.Forms.Media/lib/win-x86/ikpFlac.dll diff --git a/SIL.Media/lib/win-x86/ikpMP3.dll b/SIL.Windows.Forms.Media/lib/win-x86/ikpMP3.dll similarity index 100% rename from SIL.Media/lib/win-x86/ikpMP3.dll rename to SIL.Windows.Forms.Media/lib/win-x86/ikpMP3.dll diff --git a/SIL.Media/lib/win-x86/irrKlang.NET4.dll b/SIL.Windows.Forms.Media/lib/win-x86/irrKlang.NET4.dll similarity index 100% rename from SIL.Media/lib/win-x86/irrKlang.NET4.dll rename to SIL.Windows.Forms.Media/lib/win-x86/irrKlang.NET4.dll diff --git a/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj b/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj index 302f0679d..8a8fd5086 100644 --- a/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj +++ b/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj @@ -6,7 +6,7 @@ SIL.Windows.Forms.TestApp SIL.Windows.Forms.TestApp test app ../../output/$(Configuration) - false false @@ -30,7 +30,7 @@ - + diff --git a/TestApps/SIL.Windows.Forms.TestApp/TestAppForm.cs b/TestApps/SIL.Windows.Forms.TestApp/TestAppForm.cs index 978db2993..f24daae3f 100644 --- a/TestApps/SIL.Windows.Forms.TestApp/TestAppForm.cs +++ b/TestApps/SIL.Windows.Forms.TestApp/TestAppForm.cs @@ -25,7 +25,7 @@ using SIL.Windows.Forms.SettingProtection; using SIL.Windows.Forms.WritingSystems; using SIL.WritingSystems; -using SIL.Media; +using SIL.Windows.Forms.Media; using SIL.Windows.Forms.Extensions; using SIL.Windows.Forms.FileSystem; using SIL.Windows.Forms.LocalizationIncompleteDlg;