Organize Lib/Sound

Vocaluxe/Base/CConfig.cs

@@ -25,6 +25,7 @@ using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
 using Vocaluxe.Lib.Sound;
+using Vocaluxe.Lib.Sound.Record;
 using Vocaluxe.Lib.Webcam;
 using VocaluxeLib;
 using VocaluxeLib.Profile;

Vocaluxe/Base/CSound.cs

@@ -19,6 +19,14 @@ using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using Vocaluxe.Lib.Sound;
+using Vocaluxe.Lib.Sound.Playback;
+using Vocaluxe.Lib.Sound.Playback.Gstreamer;
+using Vocaluxe.Lib.Sound.Playback.GstreamerSharp;
+using Vocaluxe.Lib.Sound.Playback.OpenAL;
+using Vocaluxe.Lib.Sound.Playback.PortAudio;
+using Vocaluxe.Lib.Sound.Record;
+using Vocaluxe.Lib.Sound.Record.DirectSound;
+using Vocaluxe.Lib.Sound.Record.PortAudio;
 using VocaluxeLib;
 
 namespace Vocaluxe.Base

Vocaluxe/Lib/Sound/Playback/Decoder/CAudioDecoderFFmpeg.cs

@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Video.Acinerella;
 
-namespace Vocaluxe.Lib.Sound.Decoder
+namespace Vocaluxe.Lib.Sound.Playback.Decoder
 {
     class CAudioDecoderFFmpeg : IAudioDecoder, IDisposable
     {

Vocaluxe/Lib/Sound/Playback/Decoder/IAudioDecoder.cs

@@ -15,7 +15,7 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
-namespace Vocaluxe.Lib.Sound.Decoder
+namespace Vocaluxe.Lib.Sound.Playback.Decoder
 {
     struct SFormatInfo
     {

Vocaluxe/Lib/Sound/Playback/Gstreamer/CGstreamerAudio.cs

@@ -17,9 +17,8 @@
 
 using System;
 using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound.Gstreamer;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback.Gstreamer
 {
     class CGstreamerAudio : IPlayback
     {

Vocaluxe/Lib/Sound/Playback/Gstreamer/CGstreamerAudioWrapper.cs

@@ -17,7 +17,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Vocaluxe.Lib.Sound.Gstreamer
+namespace Vocaluxe.Lib.Sound.Playback.Gstreamer
 {
     public static class CGstreamerAudioWrapper
     {

Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs

@@ -22,9 +22,8 @@ using GLib;
 using System.Runtime.InteropServices;
 using Vocaluxe.Base;
 using VocaluxeLib;
-using Thread = System.Threading.Thread;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
 {
     public class CGstreamerSharpAudio : IPlayback
     {
@@ -322,7 +321,7 @@ namespace Vocaluxe.Lib.Sound
                 {
                     Closed = true;
                     Finished = true;
-                    var t = new Thread(_TerminateStream) {Name = "GSt Terminate"};
+                    var t = new System.Threading.Thread(_TerminateStream) {Name = "GSt Terminate"};
                     t.Start();
                 }
             }
@@ -403,7 +402,7 @@ namespace Vocaluxe.Lib.Sound
                     if (_Duration < 0 && !_QueryingDuration)
                     {
                         _QueryingDuration = true; // Set this to avoid race conditions
-                        var t = new Thread(_UpdateDuration) {Name = "GSt Update Duration"};
+                        var t = new System.Threading.Thread(_UpdateDuration) {Name = "GSt Update Duration"};
                         t.Start();
                     }
                     return _Duration > 0 ? _Duration : -1;

Vocaluxe/Lib/Sound/Playback/IPlayback.cs

@@ -15,7 +15,7 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback
 {
     public enum EStreamAction
     {

Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs

@@ -23,10 +23,10 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound.Decoder;
+using Vocaluxe.Lib.Sound.Playback.Decoder;
 using VocaluxeLib;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback.OpenAL
 {
     class COpenALPlay : IPlayback, IDisposable
     {

Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs

@@ -22,11 +22,11 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound.Decoder;
+using Vocaluxe.Lib.Sound.Playback.Decoder;
 using Vocaluxe.Lib.Sound.PortAudio;
 using VocaluxeLib;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback.PortAudio
 {
     class CPortAudioPlay : IPlayback
     {

Vocaluxe/Lib/Sound/Playback/PortAudio/CPt1.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback.PortAudio
 {
     class CPt1
     {

Vocaluxe/Lib/Sound/Playback/PortAudio/CSyncTimer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback.PortAudio
 {
     class CSyncTimer
     {

Vocaluxe/Lib/Sound/Record/CBuffer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Record
 {
     class CBuffer : IDisposable
     {

Vocaluxe/Lib/Sound/Record/CDelayTest.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using Vocaluxe.Base;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Record
 {
     class CDelayTest
     {

Vocaluxe/Lib/Sound/Record/DirectSound/CDirectSoundRecord.cs

@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.Threading;
 using Vocaluxe.Base;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Record.DirectSound
 {
     class CDirectSoundRecord : IRecord
     {

Vocaluxe/Lib/Sound/Record/IRecord.cs

@@ -18,7 +18,7 @@
 using System;
 using System.Collections.ObjectModel;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Record
 {
     class CRecordDevice
     {

Vocaluxe/Lib/Sound/Record/PortAudio/CPortAudioRecord.cs

@@ -23,7 +23,7 @@ using System.Runtime.InteropServices;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Sound.PortAudio;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Record.PortAudio
 {
     class CPortAudioRecord : IRecord
     {

Vocaluxe/Screens/CScreenOptionsRecord.cs

@@ -20,6 +20,7 @@ using System.Collections.ObjectModel;
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Sound;
+using Vocaluxe.Lib.Sound.Record;
 using VocaluxeLib;
 using VocaluxeLib.Menu;
 

Vocaluxe/Vocaluxe.csproj

@@ -212,14 +212,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Base\CBackgroundMusic.cs" />
-    <Compile Include="Lib\Sound\CBuffer.cs" />
+    <Compile Include="Lib\Sound\Record\CBuffer.cs" />
     <Compile Include="Base\CConfig.cs" />
     <Compile Include="Base\CCover.cs" />
     <Compile Include="Base\CCursor.cs" />
     <Compile Include="Base\CDataBase.cs" />
     <Compile Include="Base\CDraw.cs" />
-    <Compile Include="Lib\Sound\CPt1.cs" />
-    <Compile Include="Lib\Sound\CSyncTimer.cs" />
+    <Compile Include="Lib\Sound\Playback\PortAudio\CPt1.cs" />
+    <Compile Include="Lib\Sound\Playback\PortAudio\CSyncTimer.cs" />
     <Compile Include="Base\Fonts\CFont.cs" />
     <Compile Include="Base\CGame.cs" />
     <Compile Include="Base\CController.cs" />
@@ -252,11 +252,11 @@
     <Compile Include="GameModes\CGameMode.cs" />
     <Compile Include="GameModes\CGameModes.cs" />
     <Compile Include="Lib\Input\CControllerFramework.cs" />
-    <Compile Include="Lib\Sound\CGstreamerSharpAudio.cs" />
+    <Compile Include="Lib\Sound\Playback\GstreamerSharp\CGstreamerSharpAudio.cs" />
     <Compile Include="Lib\Video\Acinerella\CDecoder.cs" />
     <Compile Include="Lib\Video\Acinerella\CDecoderThread.cs" />
     <Compile Include="Lib\Video\Acinerella\CFramebuffer.cs" />
-    <Compile Include="Lib\Sound\CDelayTest.cs" />
+    <Compile Include="Lib\Sound\Record\CDelayTest.cs" />
     <Compile Include="Screens\CPopupScreenServerQR.cs" />
     <Compile Include="Screens\CScreenOptionsVideoAdjustments.cs" />
     <Compile Include="SongQueue\CSongQueue.cs" />
@@ -278,17 +278,17 @@
     <Compile Include="Lib\Input\WiiMote\CWiiMote.cs" />
     <Compile Include="Lib\Input\WiiMote\WiiMoteLib.cs" />
     <Compile Include="Lib\Playlist\CPlaylistFile.cs" />
-    <Compile Include="Lib\Sound\CDirectSoundRecord.cs" />
-    <Compile Include="Lib\Sound\CGstreamerAudio.cs" />
-    <Compile Include="Lib\Sound\COpenALPlay.cs" />
+    <Compile Include="Lib\Sound\Record\DirectSound\CDirectSoundRecord.cs" />
+    <Compile Include="Lib\Sound\Playback\Gstreamer\CGstreamerAudio.cs" />
+    <Compile Include="Lib\Sound\Playback\OpenAL\COpenALPlay.cs" />
     <Compile Include="Base\CSound.cs" />
-    <Compile Include="Lib\Sound\CPortAudioPlay.cs" />
-    <Compile Include="Lib\Sound\CPortAudioRecord.cs" />
-    <Compile Include="Lib\Sound\Decoder\CAudioDecoderFFmpeg.cs" />
-    <Compile Include="Lib\Sound\Decoder\IAudioDecoder.cs" />
-    <Compile Include="Lib\Sound\Gstreamer\CGstreamerAudioWrapper.cs" />
-    <Compile Include="Lib\Sound\IPlayback.cs" />
-    <Compile Include="Lib\Sound\IRecord.cs" />
+    <Compile Include="Lib\Sound\Playback\PortAudio\CPortAudioPlay.cs" />
+    <Compile Include="Lib\Sound\Record\PortAudio\CPortAudioRecord.cs" />
+    <Compile Include="Lib\Sound\Playback\Decoder\CAudioDecoderFFmpeg.cs" />
+    <Compile Include="Lib\Sound\Playback\Decoder\IAudioDecoder.cs" />
+    <Compile Include="Lib\Sound\Playback\Gstreamer\CGstreamerAudioWrapper.cs" />
+    <Compile Include="Lib\Sound\Playback\IPlayback.cs" />
+    <Compile Include="Lib\Sound\Record\IRecord.cs" />
     <Compile Include="Lib\Video\Acinerella\CAcinerella.cs" />
     <Compile Include="Lib\Video\CVideoDecoderFFmpeg.cs" />
     <Compile Include="Lib\Video\CVideoDecoderGstreamer.cs" />