Organize Folders

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "Screna"]
-	path = Screna
+	path = src/Screna
 	url = https://github.com/MathewSachin/Screna

appveyor.yml

@@ -29,7 +29,7 @@ cache:
 before_build:
   # Retrieve version from AssemblyInfo.cs
   - ps: >-
-      $content = Get-Content "src\Properties\AssemblyInfo.cs";
+      $content = Get-Content "src\Captura\Properties\AssemblyInfo.cs";
       $match = [regex]::Match($content, 'AssemblyVersion\(\"(.+?)\"\)');
 
       if ($match.Success)
@@ -55,11 +55,11 @@ after_build:
   - ps: >-
       if ($env:configuration -eq 'Release')
       {
-        Get-ChildItem -Path 'src/bin/Release/*' -Include *.exe*, *.dll | Copy-Item -Destination 'Output/'
+        Get-ChildItem -Path 'src/Captura/bin/Release/*' -Include *.exe*, *.dll | Copy-Item -Destination 'Output/'
       }
       elseif ($env:configuration -eq 'Debug')
       {
-        Get-ChildItem -Path 'src/bin/Debug/*' -Include *.exe*, *.dll, *.pdb, *.xml | Copy-Item -Destination 'Output/'
+        Get-ChildItem -Path 'src/Captura/bin/Debug/*' -Include *.exe*, *.dll, *.pdb, *.xml | Copy-Item -Destination 'Output/'
       }
 
   # Download BASS and BassMix

Captura.Core/Captura.Core.csproj → src/Captura.Core/Captura.Core.csproj

@@ -28,19 +28,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Gma.System.MouseKeyHook, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\src\packages\MouseKeyHook.5.4.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath>
+      <HintPath>..\packages\MouseKeyHook.5.4.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath>
     </Reference>
     <Reference Include="ManagedBass, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\src\packages\ManagedBass.1.0.2\lib\net45\ManagedBass.dll</HintPath>
+      <HintPath>..\packages\ManagedBass.1.0.2\lib\net45\ManagedBass.dll</HintPath>
     </Reference>
     <Reference Include="ManagedBass.Mix, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\src\packages\ManagedBass.Mix.1.0.1\lib\portable-net45+MonoAndroid+uap\ManagedBass.Mix.dll</HintPath>
+      <HintPath>..\packages\ManagedBass.Mix.1.0.1\lib\portable-net45+MonoAndroid+uap\ManagedBass.Mix.dll</HintPath>
     </Reference>
     <Reference Include="NAudio, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\src\packages\NAudio.1.8.0\lib\net35\NAudio.dll</HintPath>
+      <HintPath>..\packages\NAudio.1.8.0\lib\net35\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="SharpAvi, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\src\packages\SharpAvi.2.1.0\lib\net45\SharpAvi.dll</HintPath>
+      <HintPath>..\packages\SharpAvi.2.1.0\lib\net45\SharpAvi.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />

src/Captura.sln

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26403.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Captura", "Captura.csproj", "{0B496E01-F328-4969-832C-C75977B4F4E6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Captura", "Captura\Captura.csproj", "{0B496E01-F328-4969-832C-C75977B4F4E6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Screna", "..\Screna\src\Screna.csproj", "{23CB9ADB-BA9F-4618-BD0C-589A00A532E5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Screna", "Screna\src\Screna.csproj", "{23CB9ADB-BA9F-4618-BD0C-589A00A532E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Captura.Core", "..\Captura.Core\Captura.Core.csproj", "{F8568B22-8AC6-49C5-92DF-E1C359FF1FAB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Captura.Core", "Captura.Core\Captura.Core.csproj", "{F8568B22-8AC6-49C5-92DF-E1C359FF1FAB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Views/AudioEditor.xaml.cs → src/Captura/Views/AudioEditor.xaml.cs

@@ -39,12 +39,11 @@ public TimeSpan Current
             {
                 _current = value;
 
-                if (_current > End)
-                    _current = End;
-
-                if (_current < Begin)
+                if (_current > End || _current < Begin)
                     _current = Begin;
 
+                _player.Position = _current;
+
                 OnPropertyChanged();
             }
         }
@@ -63,20 +62,23 @@ public TimeSpan Duration
         public void Load(string FileName)
         {
             _player = new MediaPlayer();
-
+            
             _player.Open(new Uri(FileName));
 
             Begin = Current = TimeSpan.Zero;
-            End = Duration = _player.NaturalDuration.TimeSpan;
-
-            var c = _player.Clock;
-
-            c.CurrentTimeInvalidated += (s, e) => Current = c.CurrentTime.Value;
+            End = Duration = _player.NaturalDuration.TimeSpan;            
         }
 
         public void Save() { }
 
-        public void Reset() { }
+        public void Reset()
+        {
+            _player.Stop();
+
+            _player.Position = _begin = TimeSpan.Zero;
+
+            _end = _duration;
+        }
     }
 
     public partial class AudioEditor