Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SLAM
# SLAM (UPDATED)

[Source Live Audio Mixer home page](http://slam.flankers.net/)

Expand Down
22 changes: 11 additions & 11 deletions SLAM/Form1.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 41 additions & 6 deletions SLAM/Form1.vb
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ Public Class Form1
End Sub

Private Sub YTButton_Click(sender As Object, e As EventArgs) Handles YTButton.Click
If File.Exists("NAudio.dll") AndAlso File.Exists("Newtonsoft.Json.dll") AndAlso File.Exists("NReco.VideoConverter.dll") AndAlso File.Exists("YoutubeExtractor.dll") Then
'If File.Exists("NAudio.dll") AndAlso File.Exists("Newtonsoft.Json.dll") AndAlso File.Exists("NReco.VideoConverter.dll") AndAlso File.Exists("YoutubeExtractor.dll") Then
If File.Exists("NAudio.dll") AndAlso File.Exists("Newtonsoft.Json.dll") AndAlso File.Exists("NReco.VideoConverter.dll") AndAlso File.Exists("libvideo.dll") Then
DisableInterface()
Dim YTImporter As New YTImport
If YTImporter.ShowDialog() = DialogResult.OK Then
Expand All @@ -210,7 +211,7 @@ Public Class Form1
End If

Else
MessageBox.Show("You are missing either NAudio.dll, Newtonsoft.Json.dll, NReco.VideoConverter.dll, or YoutubeExtractor.dll! Cannot import from YouTube without them!", "Missing File(s)", MessageBoxButtons.OK, MessageBoxIcon.Error)
MessageBox.Show("You are missing either NAudio.dll, Newtonsoft.Json.dll, NReco.VideoConverter.dll, or libvideo.dll! Cannot import from YouTube without them!", "Missing File(s)", MessageBoxButtons.OK, MessageBoxIcon.Error)
End If
End Sub

Expand Down Expand Up @@ -824,9 +825,36 @@ Public Class Form1
End Sub

Private Sub TrackList_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles TrackList.MouseDoubleClick
If TrackList.FocusedItem.Bounds.Contains(e.Location) AndAlso status = WORKING Then
LoadTrack(GetCurrentGame, TrackList.SelectedItems(0).Index)
DisplayLoaded(TrackList.SelectedItems(0).Index)
Const TRACK = 1
Const BIND = 2
Const VOLUME = 3
Const TRIMMED = 4

If TrackList.FocusedItem.Bounds.Contains(e.Location) Then

Dim HitTestInfo As ListViewHitTestInfo = TrackList.HitTest(e.Location)
Dim SelectedSubItem As Integer = HitTestInfo.Item.SubItems.IndexOf(HitTestInfo.SubItem)

If status = WORKING Then
Select Case SelectedSubItem
Case VOLUME
SetVolumeToolStripMenuItem_Click(sender, Nothing)
Case Else
LoadTrack(GetCurrentGame, TrackList.SelectedItems(0).Index)
DisplayLoaded(TrackList.SelectedItems(0).Index)
End Select
Else
Select Case SelectedSubItem
Case TRACK
RenameToolStripMenuItem_Click(sender, Nothing)
Case BIND
ContextHotKey_Click(sender, Nothing)
Case VOLUME
SetVolumeToolStripMenuItem_Click(sender, Nothing)
Case TRIMMED
TrimToolStripMenuItem_Click(sender, Nothing)
End Select
End If
End If
End Sub

Expand Down Expand Up @@ -916,6 +944,13 @@ Public Class Form1

Private Sub SetVolumeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SetVolumeToolStripMenuItem.Click
Dim SetVolumeDialog As New SetVolume
Const STANDARD_VOLUME = 100

If TrackList.SelectedItems.Count > 1 Then
SetVolumeDialog.Volume = STANDARD_VOLUME
Else
SetVolumeDialog.Volume = GetCurrentGame.tracks(TrackList.SelectedIndices(0)).volume
End If

If SetVolumeDialog.ShowDialog = Windows.Forms.DialogResult.OK Then

Expand Down Expand Up @@ -1040,7 +1075,7 @@ Public Class Form1
End If
End Sub

Private Sub ChangeDirButton_Click(sender As Object, e As EventArgs) Handles ChangeDirButton.Click
Private Sub SettingsButton_Click(sender As Object, e As EventArgs) Handles SettingsButton.Click
SettingsForm.ShowDialog()
End Sub

Expand Down
16 changes: 9 additions & 7 deletions SLAM/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Imports System
Imports System.Resources
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices

Expand All @@ -8,12 +9,12 @@ Imports System.Runtime.InteropServices

' Review the values of the assembly attributes

<Assembly: AssemblyTitle("SLAM")>
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyTitle("SLAM")>
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("SLAM")>
<Assembly: AssemblyCopyright("Copyright © 2017")>
<Assembly: AssemblyTrademark("")>
<Assembly: AssemblyTrademark("")>

<Assembly: ComVisible(False)>

Expand All @@ -31,5 +32,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.5.4.0")>
<Assembly: AssemblyFileVersion("1.5.4.0")>
<Assembly: AssemblyVersion("1.6.1.0")>
<Assembly: AssemblyFileVersion("1.6.1.0")>
<Assembly: NeutralResourcesLanguage("en-150")>
10 changes: 10 additions & 0 deletions SLAM/My Project/Resources.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions SLAM/My Project/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="loader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\generated-image.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
16 changes: 6 additions & 10 deletions SLAM/My Project/app.manifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
Expand All @@ -18,29 +18,26 @@
-->
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
</requestedPrivileges>
<applicationRequestMinimum>
<defaultAssemblyRequest permissionSetReference="Custom" />
<PermissionSet ID="Custom" SameSite="site" Unrestricted="true" />
</applicationRequestMinimum>
</security>
</trustInfo>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of all Windows versions that this application is designed to work with.
Windows will automatically select the most compatible environment.-->

<!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>-->

<!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->

<!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->

<!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>-->

</application>
</compatibility>

<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<!-- <dependency>
<dependentAssembly>
Expand All @@ -54,5 +51,4 @@
/>
</dependentAssembly>
</dependency>-->

</asmv1:assembly>
</asmv1:assembly>
2 changes: 2 additions & 0 deletions SLAM/RenameForm.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions SLAM/RenameForm.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@
End If
End Sub

Private Sub RenameForm_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
Select Case e.KeyCode
Case Keys.Enter
DoneButton_Click(sender, Nothing)
Case Keys.Escape
DialogResult = Windows.Forms.DialogResult.Cancel
End Select
End Sub

Private Sub RenameForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
NameBox.Text = filename
KeyPreview = True
End Sub
End Class
Binary file added SLAM/Resources/generated-image.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added SLAM/Resources/loader.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 40 additions & 9 deletions SLAM/SLAM.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<ApplicationVersion>1.7.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -67,31 +68,58 @@
<PropertyGroup>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>85D160D187C4B057694701055638D5A076F2B4D1</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>SLAM_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>false</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<TargetZone>Internet</TargetZone>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="libvideo, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VideoLibrary.3.0.6\lib\netstandard1.1\libvideo.dll</HintPath>
</Reference>
<Reference Include="libvideo.compat, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VideoLibrary.Compat.3.0.6\lib\netstandard1.1\libvideo.compat.dll</HintPath>
</Reference>
<Reference Include="NAudio">
<HintPath>lib\NAudio.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>lib\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NReco.VideoConverter">
<HintPath>lib\NReco.VideoConverter.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Management" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="YoutubeExtractor">
<HintPath>lib\YoutubeExtractor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
Expand Down Expand Up @@ -214,8 +242,13 @@
<SubType>Designer</SubType>
</None>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="SLAM_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\loader.gif" />
<None Include="Resources\lg.-text-entering-comment-loader.gif" />
<None Include="Resources\generated-image.gif" />
<Content Include="SlamSliders.ico" />
</ItemGroup>
<ItemGroup>
Expand All @@ -235,9 +268,7 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.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.
Expand Down
Loading