diff --git a/SLAM/Form1.Designer.vb b/SLAM/Form1.Designer.vb
index c8c8c67..40fde2f 100644
--- a/SLAM/Form1.Designer.vb
+++ b/SLAM/Form1.Designer.vb
@@ -28,6 +28,7 @@ Partial Class Form1
Me.Label1 = New System.Windows.Forms.Label()
Me.ImportButton = New System.Windows.Forms.Button()
Me.TrackList = New System.Windows.Forms.ListView()
+ Me.TrackIndexCol = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.LoadedCol = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.TrackCol = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.HotKeyCol = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
@@ -100,7 +101,7 @@ Partial Class Form1
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.TrackList.AutoArrange = False
- Me.TrackList.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.LoadedCol, Me.TrackCol, Me.HotKeyCol, Me.VolumeCol, Me.Trimmed, Me.TagsCol})
+ Me.TrackList.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.TrackIndexCol, Me.LoadedCol, Me.TrackCol, Me.HotKeyCol, Me.VolumeCol, Me.Trimmed, Me.TagsCol})
Me.TrackList.FullRowSelect = True
Me.TrackList.HideSelection = False
Me.TrackList.ImeMode = System.Windows.Forms.ImeMode.Off
@@ -111,6 +112,10 @@ Partial Class Form1
Me.TrackList.UseCompatibleStateImageBehavior = False
Me.TrackList.View = System.Windows.Forms.View.Details
'
+ 'TrackIndexCol
+ '
+ Me.TrackIndexCol.Text = "Index"
+ '
'LoadedCol
'
Me.LoadedCol.Text = "Loaded"
@@ -371,4 +376,5 @@ Partial Class Form1
Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
Friend WithEvents SystemTrayMenu_Exit As ToolStripMenuItem
Friend WithEvents YTButton As Button
+ Friend WithEvents TrackIndexCol As ColumnHeader
End Class
diff --git a/SLAM/Form1.vb b/SLAM/Form1.vb
index 5e7cba4..a222ba2 100644
--- a/SLAM/Form1.vb
+++ b/SLAM/Form1.vb
@@ -316,16 +316,18 @@ Public Class Form1
trimmed = "Yes"
End If
- TrackList.Items.Add(New ListViewItem({"False", Track.name, Track.hotkey, Track.volume & "%", trimmed, """" & String.Join(""", """, Track.tags) & """"}))
+ Dim index As String = Game.tracks.IndexOf(Track) + 1 'for TrackIndexCol
+ TrackList.Items.Add(New ListViewItem({index, "False", Track.name, Track.hotkey, Track.volume & "%", trimmed, """" & String.Join(""", """, Track.tags) & """"}))
Next
TrackList.AutoResizeColumn(0, ColumnHeaderAutoResizeStyle.HeaderSize)
- TrackList.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent)
- TrackList.AutoResizeColumn(2, ColumnHeaderAutoResizeStyle.HeaderSize)
+ TrackList.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.HeaderSize)
+ TrackList.AutoResizeColumn(2, ColumnHeaderAutoResizeStyle.ColumnContent)
TrackList.AutoResizeColumn(3, ColumnHeaderAutoResizeStyle.HeaderSize)
TrackList.AutoResizeColumn(4, ColumnHeaderAutoResizeStyle.HeaderSize)
- TrackList.AutoResizeColumn(5, ColumnHeaderAutoResizeStyle.ColumnContent)
+ TrackList.AutoResizeColumn(5, ColumnHeaderAutoResizeStyle.HeaderSize)
+ TrackList.AutoResizeColumn(6, ColumnHeaderAutoResizeStyle.ColumnContent)
End Sub
Private Sub StartButton_Click(sender As Object, e As EventArgs) Handles StartButton.Click
@@ -486,13 +488,13 @@ Public Class Form1
Dim GameCfgFolder As String = Path.Combine(SteamAppsPath, Game.directory, Game.ToCfg)
Using slam_curtrack As StreamWriter = New StreamWriter(GameCfgFolder & "slam_curtrack.cfg")
- slam_curtrack.WriteLine("echo ""[SLAM] Track name: {0}""", Track.name)
+ slam_curtrack.WriteLine("echo ""Track name: {0}""", Track.name)
End Using
Using slam_saycurtrack As StreamWriter = New StreamWriter(GameCfgFolder & "slam_saycurtrack.cfg")
- slam_saycurtrack.WriteLine("say ""[SLAM] Track name: {0}""", Track.name)
+ slam_saycurtrack.WriteLine("say ""Track name: {0}""", Track.name)
End Using
Using slam_sayteamcurtrack As StreamWriter = New StreamWriter(GameCfgFolder & "slam_sayteamcurtrack.cfg")
- slam_sayteamcurtrack.WriteLine("say_team ""[SLAM] Track name: {0}""", Track.name)
+ slam_sayteamcurtrack.WriteLine("say_team ""Track name: {0}""", Track.name)
End Using
@@ -693,16 +695,12 @@ Public Class Form1
Dim index As Integer
For Each Track In Game.tracks
- Dim Words As List(Of String) = Track.name.Split({" "c, "."c, "-"c, "_"c}).ToList
+ Dim Words As List(Of String) = Track.name.Split({" "c, "."c, "-"c, "_"c, "("c, ")"c, "!"c, "@"c, "#"c, "$"c, "^"c, "&"c, "*"c, "["c, "]"c}).ToList
For Each Word In Words
- If Not IsNumeric(Word) And Not Game.blacklist.Contains(Word.ToLower) And Word.Length < 32 Then
- If NameWords.ContainsKey(Word) Then
- NameWords.Remove(Word)
- Else
- NameWords.Add(Word, index)
- End If
+ If Not IsNumeric(Word) And Not Game.blacklist.Contains(Word.ToLower) And Word.Length < 32 And Not NameWords.ContainsKey(Word.ToLower) Then
+ NameWords.Add(Word.ToLower, index)
End If
Next
@@ -728,9 +726,9 @@ Public Class Form1
Private Sub DisplayLoaded(ByVal track As Integer)
For i As Integer = 0 To TrackList.Items.Count - 1
- TrackList.Items(i).SubItems(0).Text = "False"
+ TrackList.Items(i).SubItems(1).Text = "False"
Next
- TrackList.Items(track).SubItems(0).Text = "True"
+ TrackList.Items(track).SubItems(1).Text = "True"
End Sub
Private Sub LoadTrackKeys(ByVal Game As SourceGame)
@@ -825,10 +823,10 @@ Public Class Form1
End Sub
Private Sub TrackList_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles TrackList.MouseDoubleClick
- Const TRACK = 1
- Const BIND = 2
- Const VOLUME = 3
- Const TRIMMED = 4
+ Const TRACK = 2
+ Const BIND = 3
+ Const VOLUME = 4
+ Const TRIMMED = 5
If TrackList.FocusedItem.Bounds.Contains(e.Location) Then
@@ -868,7 +866,7 @@ Public Class Form1
Dim SelectedNames As New List(Of String)
For Each item In TrackList.SelectedItems
- SelectedNames.Add(item.SubItems(1).Text)
+ SelectedNames.Add(item.SubItems(2).Text)
Next
If MessageBox.Show(String.Format("Are you sure you want to delete {0}?", String.Join(", ", SelectedNames)), "Delete Track?", MessageBoxButtons.YesNo) = Windows.Forms.DialogResult.Yes Then
diff --git a/SLAM/SLAM.vbproj b/SLAM/SLAM.vbproj
index a4c4695..d5c4a1b 100644
--- a/SLAM/SLAM.vbproj
+++ b/SLAM/SLAM.vbproj
@@ -78,20 +78,23 @@
false
- true
+ false
LocalIntranet
-
- lib\libvideo.dll
+
+ ..\packages\VideoLibrary.3.0.2\lib\netstandard1.1\libvideo.dll
+
+
+ ..\packages\VideoLibrary.Compat.3.0.2\lib\netstandard1.1\libvideo.compat.dll
lib\NAudio.dll
-
- lib\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
lib\NReco.VideoConverter.dll
diff --git a/SLAM/SourceGame.vb b/SLAM/SourceGame.vb
index 33a9fa4..4cb5b81 100644
--- a/SLAM/SourceGame.vb
+++ b/SLAM/SourceGame.vb
@@ -15,7 +15,7 @@
Public PollInterval As Integer = 100
Public tracks As New List(Of Track)
- Public blacklist As New List(Of String) From {"slam", "slam_listtracks", "list", "tracks", "la", "slam_play", "slam_play_on", "slam_play_off", "slam_updatecfg", "slam_curtrack", "slam_saycurtrack", "slam_sayteamcurtrack"}
+ Public blacklist As New List(Of String) From {"slam", "slam_listtracks", "list", "tracks", "la", "slam_play", "slam_play_on", "slam_play_off", "slam_updatecfg", "slam_curtrack", "slam_saycurtrack", "slam_sayteamcurtrack", "say"}
Public Class track
Public name As String
diff --git a/SLAM/YTImport.vb b/SLAM/YTImport.vb
index 0a74b8e..9b15279 100644
--- a/SLAM/YTImport.vb
+++ b/SLAM/YTImport.vb
@@ -54,7 +54,13 @@ Public Class YTImport
Catch ex As Exception
Form1.LogError(ex)
- e.Result = ex
+ If ex.Message = "Sequence contains no elements" Then
+ Dim localEx = New Exception("Video possibly age restriced.")
+ e.Result = localEx
+ Else
+ e.Result = ex
+ End If
+
End Try
End Sub
diff --git a/SLAM/packages.config b/SLAM/packages.config
index decce6a..8a1f26f 100644
--- a/SLAM/packages.config
+++ b/SLAM/packages.config
@@ -1,7 +1,8 @@
-
-
+
+
+
@@ -12,25 +13,25 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
\ No newline at end of file