Merge branch 'master' of https://github.com/hexuallyactive/ventriloquist

Upswell · May 23, 2014 · dec3367 · dec3367
2 parents c2e4d42 + 2497ca9
commit dec3367
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/VentriloquistWin/Ventriloquist/Config.cs b/VentriloquistWin/Ventriloquist/Config.cs
@@ -45,7 +45,7 @@ private void CreateDatabase()
                     cmd.CommandText = "CREATE TABLE Config (ConfigId INTEGER PRIMARY KEY AUTOINCREMENT, Setting VARCHAR(20), SettingValue varchar(200))";
                     cmd.CommandType = CommandType.Text;
                     cmd.ExecuteNonQuery();
-                    cmd.CommandText = "INSERT INTO Config(Setting, SettingValue) VALUES('outputdevice', '0')";
+                    cmd.CommandText = "INSERT INTO Config(Setting, SettingValue) VALUES('outputdevice', 'NOPE')";
                     cmd.ExecuteNonQuery();
                     cmd.CommandText = "INSERT INTO Config(Setting, SettingValue) VALUES('localonly', '0')";
                     cmd.ExecuteNonQuery();

diff --git a/VentriloquistWin/Ventriloquist/Program.cs b/VentriloquistWin/Ventriloquist/Program.cs
@@ -103,13 +103,14 @@ public Ventriloquist()
 
             for (int deviceId = 0; deviceId < WaveOut.DeviceCount; deviceId++)
             {
+
                 var capabilities = WaveOut.GetCapabilities(deviceId);
                 //Console.WriteLine(String.Format("Device {0} ({1})", deviceId, capabilities.ProductName));
                 var deviceItem = new MenuItem(capabilities.ProductName, OnDeviceConfig);
                 deviceItem.Tag = deviceId;
-                //if(deviceId == int.Parse(config.OutputDevice)) {
-                //    deviceItem.Checked = true;
-                //}
+                if(config.OutputDevice.Equals("NOPE")) {
+                    config.OutputDevice = capabilities.ProductName;
+                }
                 if(capabilities.ProductName == config.OutputDevice) {
                     deviceItem.Checked = true;
                     OutputDeviceId = deviceId;

diff --git a/VentriloquistWin/Ventriloquist/Ventriloquist.csproj b/VentriloquistWin/Ventriloquist/Ventriloquist.csproj
@@ -12,6 +12,21 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -156,6 +171,23 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.