Skip to content

Commit a8c0b55

Browse files
NeoCoderMatrix86NeoCoderMatrix86
authored
Merge branch 'development' into master
2 parents 9036f64 + 81f8e40 commit a8c0b55

47 files changed

Lines changed: 2335 additions & 1265 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,23 @@
4141
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
4242
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4343
</None>
44+
<None Update="Sample_Inputfile2.txt">
45+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
46+
</None>
4447
<None Update="Sample_Project.ace">
4548
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
4649
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
4750
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4851
</None>
52+
<None Update="Textimport with Cuesheetdata.txt">
53+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
54+
</None>
55+
<None Update="Textimport-Bug-#54.txt">
56+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
57+
</None>
58+
<None Update="Traktor Export.html">
59+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
60+
</None>
4961
</ItemGroup>
5062

5163
</Project>

‎AudioCuesheetEditor.End2EndTests/Pages/IndexTest.cs‎

Lines changed: 69 additions & 0 deletions
Large diffs are not rendered by default.

AudioCuesheetEditor.Tests/Sample_Inputfile2.txt renamed to AudioCuesheetEditor.End2EndTests/Sample_Inputfile2.txt

File renamed without changes.

‎AudioCuesheetEditor.End2EndTests/Textimport with Cuesheetdata.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
DJFreezeT - Rabbit Hole Mix - 0123456789123
2+
Adriatique - X. 00:05:24.250
3+
Third Harmony - Fears And Dreams (Original Mix) 00:10:39
4+
Dele Sosimi Afrobeat Orchestra - Too Much Information (Laolu Remix; Edit) 00:17:06
5+
Edem, Govan - Ankh (Onetwo MX Remix) 00:23:21
6+
Jody Wisternoff - For All Time (feat. Hendrik Burkhard) (Extended Mix) 00:29:02
7+
Einmusik - Bead (Original Mix) 00:34:27
8+
Sebastien Leger - La Danse du Scorpion 00:40:59
9+
Paul Thomas & Solid Stone - La Bombo (Solid Stone Remix) 00:46:19
10+
GusGus - Crossfade (Maceo Plex Mix) 00:52:20
11+
Klangkarussell - Time (Original Mix) 00:56:19
12+
Anysense & Un:said - Missing Path (Original Mix) 01:01:41
13+
Space Food - Bombay 01:06:33
14+
SHDW & Obscure Shape - Wächter der Nacht (Original Mix) 01:11:04
15+
HOSH - Karma 01:15:28
16+
Alexey Union - Olympia (Original Mix) 01:21:08
17+
Paul Taylor - Afterglow 01:25:38
18+
Philter - Stranger 01:31:52
19+
Skizologic - Hypersphere (Original Mix) 01:36:40
20+
Thomas Schumacher, Caitlin - All of You (Remix) 01:42:16
21+
A. Skomoroh - White Horse Conquest (Original Mix) 01:47:04
22+
Patrik Berg - Bright (Original Mix) 01:52:37
23+
Hidden Empire - Bengal 01:58:05
24+
Mario Ochoa - Levitate 02:03:00
25+
Raul Facio - Eyes Wide Shut (Original Mix) 02:08:21
26+
Soolver - Regular (Original Mix) 02:14:31
27+
Weska - EQ64 (Original Mix) 02:18:35
28+
Tempo Giusto - The Fall (Extended Mix) 02:24:12
29+
Vlind & Asteroid & Gary Leroy - Trinity (Extended Mix) 02:29:38
30+
Astral Legacy - Vaveyla (Original Mix) 02:32:52
31+
Gerrox - Chakra (Original Mix) 02:37:00
32+
Charlotte De Witte - Pattern 02:41:55
33+
Space Food - Amabey 02:46:55
34+
ARTBAT - Papilion (Original Mix) 02:51:13
35+
PETER PAHN - Enjoy Infinity (Original Mix) 02:56:08
36+
Solitek - Instinct (Original Mix) 03:00:57
37+
Veerus - Heavy 03:05:19
38+
Secret Cinema & Reinier Zonneveld - Pain Thing (Original Mix) 03:09:38
39+
Amelie Lens - Hypnotized 03:13:13
40+
Nikolay Kirov - Chasing the Sun (Original Mix)

‎AudioCuesheetEditor.End2EndTests/Textimport-Bug-#54.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
2+
Adriatique - X. 00:05:24
3+
Third Harmony - Fears And Dreams (Original Mix) 00:10:39
4+
Dele Sosimi Afrobeat Orchestra - Too Much Information (Laolu Remix; Edit) 00:17:06
5+
Edem, Govan - Ankh (Onetwo MX Remix) 00:23:21
6+
Jody Wisternoff - For All Time (feat. Hendrik Burkhard) (Extended Mix) 00:29:02
7+
Einmusik - Bead (Original Mix) 00:34:27
8+
Sebastien Leger - La Danse du Scorpion 00:40:59
9+
Paul Thomas & Solid Stone - La Bombo (Solid Stone Remix) 00:46:19
10+
GusGus - Crossfade (Maceo Plex Mix) 00:52:20
11+
Klangkarussell - Time (Original Mix) 00:56:19
12+
Anysense & Un:said - Missing Path (Original Mix) 01:01:41
13+
Space Food - Bombay 01:06:33
14+
SHDW & Obscure Shape - Wächter der Nacht (Original Mix) 01:11:04
15+
HOSH - Karma 01:15:28
16+
Alexey Union - Olympia (Original Mix) 01:21:08
17+
Paul Taylor - Afterglow 01:25:38
18+
Philter - Stranger 01:31:52
19+
Skizologic - Hypersphere (Original Mix) 01:36:40
20+
Thomas Schumacher, Caitlin - All of You (Remix) 01:42:16
21+
A. Skomoroh - White Horse Conquest (Original Mix) 01:47:04
22+
Patrik Berg - Bright (Original Mix) 01:52:37
23+
Hidden Empire - Bengal 01:58:05
24+
Mario Ochoa - Levitate 02:03:00
25+
Raul Facio - Eyes Wide Shut (Original Mix) 02:08:21
26+
Soolver - Regular (Original Mix) 02:14:31
27+
Weska - EQ64 (Original Mix) 02:18:35
28+
Tempo Giusto - The Fall (Extended Mix) 02:24:12
29+
Vlind & Asteroid & Gary Leroy - Trinity (Extended Mix) 02:29:38
30+
Astral Legacy - Vaveyla (Original Mix) 02:32:52
31+
Gerrox - Chakra (Original Mix) 02:37:00
32+
Charlotte De Witte - Pattern 02:41:55
33+
Space Food - Amabey 02:46:55
34+
ARTBAT - Papilion (Original Mix) 02:51:13
35+
PETER PAHN - Enjoy Infinity (Original Mix) 02:56:08
36+
Solitek - Instinct (Original Mix) 03:00:57
37+
Veerus - Heavy 03:05:19
38+
Secret Cinema & Reinier Zonneveld - Pain Thing (Original Mix) 03:09:38
39+
Amelie Lens - Hypnotized 03:13:13
40+
Nikolay Kirov - Chasing the Sun (Original Mix)

0 commit comments

Comments
 (0)