diff --git a/README.md b/README.md index eff404e..af9b73b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,10 @@ Browser for Magix Soundpool files Small app to catalogue files from Magix Soundpool DVD's into Genres, Instruments and samples. Plus preview said samples. -Should also allow dragging sample into another app, like Garageband or Logic +Should also allow dragging sample into another app, like Garageband or Logic. +Also liking samples. Provide filtering of Genre / Category / Instrument. + +Supposed to be quick and dirty. ## Usage diff --git a/SoundpoolBrowser/SoundpoolBrowser.xcodeproj/project.pbxproj b/SoundpoolBrowser/SoundpoolBrowser.xcodeproj/project.pbxproj index 56ca53c..671d28c 100644 --- a/SoundpoolBrowser/SoundpoolBrowser.xcodeproj/project.pbxproj +++ b/SoundpoolBrowser/SoundpoolBrowser.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ E2D9A8F828F2118D00519159 /* Brain.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2D9A8F728F2118D00519159 /* Brain.swift */; }; E2D9A8FA28F21B0B00519159 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2D9A8F928F21B0B00519159 /* Category.swift */; }; E2D9A8FD28F2207B00519159 /* Waveform in Frameworks */ = {isa = PBXBuildFile; productRef = E2D9A8FC28F2207B00519159 /* Waveform */; }; + E2D9A8FF28F2242400519159 /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2D9A8FE28F2242400519159 /* Sample.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -35,6 +36,7 @@ E2D9A8F528F2104C00519159 /* FileScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileScanner.swift; sourceTree = ""; }; E2D9A8F728F2118D00519159 /* Brain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Brain.swift; sourceTree = ""; }; E2D9A8F928F21B0B00519159 /* Category.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = ""; }; + E2D9A8FE28F2242400519159 /* Sample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sample.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -97,6 +99,7 @@ E2D9A8F128F20DF500519159 /* Scale.swift */, E2D9A8F728F2118D00519159 /* Brain.swift */, E2D9A8F928F21B0B00519159 /* Category.swift */, + E2D9A8FE28F2242400519159 /* Sample.swift */, ); path = Models; sourceTree = ""; @@ -197,6 +200,7 @@ E2D9A8F828F2118D00519159 /* Brain.swift in Sources */, E2D9A8DD28F20AF200519159 /* ContentView.swift in Sources */, E2D9A8DB28F20AF200519159 /* SoundpoolBrowserApp.swift in Sources */, + E2D9A8FF28F2242400519159 /* Sample.swift in Sources */, E2D9A8FA28F21B0B00519159 /* Category.swift in Sources */, E2D9A8F628F2104C00519159 /* FileScanner.swift in Sources */, E2D9A8F228F20DF500519159 /* Scale.swift in Sources */, diff --git a/SoundpoolBrowser/SoundpoolBrowser/Models/Category.swift b/SoundpoolBrowser/SoundpoolBrowser/Models/Category.swift index 22402cc..b7ef646 100644 --- a/SoundpoolBrowser/SoundpoolBrowser/Models/Category.swift +++ b/SoundpoolBrowser/SoundpoolBrowser/Models/Category.swift @@ -8,6 +8,7 @@ import Foundation struct Category { + var id: UUID var name: String var instruments: [Instrument] } diff --git a/SoundpoolBrowser/SoundpoolBrowser/Models/Genre.swift b/SoundpoolBrowser/SoundpoolBrowser/Models/Genre.swift index de37c14..15cea0a 100644 --- a/SoundpoolBrowser/SoundpoolBrowser/Models/Genre.swift +++ b/SoundpoolBrowser/SoundpoolBrowser/Models/Genre.swift @@ -20,6 +20,8 @@ import Foundation */ struct Genre { + var id: UUID + var name: String var volumeNumber: Int var tempo: Int diff --git a/SoundpoolBrowser/SoundpoolBrowser/Models/Instrument.swift b/SoundpoolBrowser/SoundpoolBrowser/Models/Instrument.swift index 80a4f13..60518a0 100644 --- a/SoundpoolBrowser/SoundpoolBrowser/Models/Instrument.swift +++ b/SoundpoolBrowser/SoundpoolBrowser/Models/Instrument.swift @@ -18,11 +18,11 @@ import Foundation */ struct Instrument { + var id: UUID var name: String - var number: Int + var numberOfSamples: Int + var samples: [Sample] var scale: Scale - var location: String var liked: Bool var dateLiked: Date - var length: Float } diff --git a/SoundpoolBrowser/SoundpoolBrowser/Models/Sample.swift b/SoundpoolBrowser/SoundpoolBrowser/Models/Sample.swift new file mode 100644 index 0000000..db7583d --- /dev/null +++ b/SoundpoolBrowser/SoundpoolBrowser/Models/Sample.swift @@ -0,0 +1,32 @@ +// +// Sample.swift +// SoundpoolBrowser +// +// Created by Robert McGovern on 08/10/2022. +// + +import Foundation + +/* + Sample: + name: string (all text, minus number) + number: number (ties to sample) + scale: Scale of sample + location: string (file path) + liked: bool + date liked: date + length: number (seconds) + + Image(music.note) + */ + +struct Sample { + var id: UUID + var name: String + var number: Int + var scale: Scale + var location: String + var liked: Bool + var dateLiked: Date + var length: Float +} diff --git a/Test Data/BPM.inf b/Test Data/BPM.inf new file mode 100644 index 0000000..6f5acb7 --- /dev/null +++ b/Test Data/BPM.inf @@ -0,0 +1,13 @@ +[Tempo] +BPM=125 + +[HarmonyTable] +Scale=C + +Sample1=C +Sample2=d +Sample3=e +Sample4=F +Sample5=G +Sample6=a +Sample7=B \ No newline at end of file diff --git a/Test Data/Broken-BPM.inf b/Test Data/Broken-BPM.inf new file mode 100644 index 0000000..4860948 --- /dev/null +++ b/Test Data/Broken-BPM.inf @@ -0,0 +1,13 @@ +[Tmpo] +BPM=1250 + +[HamonyTable] +Scale=C + +Sample1=c +Sample2=d +Sample3=e +Sample4=z +Sample5=G +Sample6=a +Sample7=d \ No newline at end of file diff --git a/Test Data/MovieScore Vol. 1/BPM.inf b/Test Data/MovieScore Vol. 1/BPM.inf new file mode 100644 index 0000000..e39b181 --- /dev/null +++ b/Test Data/MovieScore Vol. 1/BPM.inf @@ -0,0 +1,13 @@ +[Tempo] +BPM=80 + +[HarmonyTable] +Scale=a + +Sample1=a +Sample2=B +Sample3=C +Sample4=d +Sample5=e +Sample6=F +Sample7=G \ No newline at end of file diff --git a/Test Data/MovieScore Vol. 1/Bass/Beige Bass 1.wav b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Bass/Beige Bass 2.wav b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Bass/Beige Bass 3.wav b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Bass/Beige Bass 4.wav b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Bass/Beige Bass 5.wav b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Bass/Beige Bass 6.wav b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Bass/Beige Bass 7.wav b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Bass/Beige Bass 7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Bugle 1.wav b/Test Data/MovieScore Vol. 1/Brass/Bugle 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Bugle 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Bugle 2.wav b/Test Data/MovieScore Vol. 1/Brass/Bugle 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Bugle 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Bugle 3.wav b/Test Data/MovieScore Vol. 1/Brass/Bugle 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Bugle 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Bugle 4.wav b/Test Data/MovieScore Vol. 1/Brass/Bugle 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Bugle 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Bugle 5.wav b/Test Data/MovieScore Vol. 1/Brass/Bugle 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Bugle 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Bugle 6.wav b/Test Data/MovieScore Vol. 1/Brass/Bugle 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Bugle 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Bugle 7.wav b/Test Data/MovieScore Vol. 1/Brass/Bugle 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Bugle 7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Umber Horn 1.wav b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Umber Horn 2.wav b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Umber Horn 3.wav b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Umber Horn 4.wav b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Umber Horn 5.wav b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Umber Horn 6.wav b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Brass/Umber Horn 7.wav b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Brass/Umber Horn 7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Kettle 1.wav b/Test Data/MovieScore Vol. 1/Drums/Kettle 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Kettle 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Kettle 2.wav b/Test Data/MovieScore Vol. 1/Drums/Kettle 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Kettle 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Kettle 3.wav b/Test Data/MovieScore Vol. 1/Drums/Kettle 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Kettle 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Kettle 4.wav b/Test Data/MovieScore Vol. 1/Drums/Kettle 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Kettle 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Kettle 5.wav b/Test Data/MovieScore Vol. 1/Drums/Kettle 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Kettle 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Kettle 6.wav b/Test Data/MovieScore Vol. 1/Drums/Kettle 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Kettle 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Kettle 7.wav b/Test Data/MovieScore Vol. 1/Drums/Kettle 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Kettle 7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Snare1.wav b/Test Data/MovieScore Vol. 1/Drums/Snare1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Snare1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Snare2.wav b/Test Data/MovieScore Vol. 1/Drums/Snare2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Snare2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Snare3.wav b/Test Data/MovieScore Vol. 1/Drums/Snare3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Snare3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Snare4.wav b/Test Data/MovieScore Vol. 1/Drums/Snare4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Snare4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Snare5.wav b/Test Data/MovieScore Vol. 1/Drums/Snare5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Snare5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Snare6.wav b/Test Data/MovieScore Vol. 1/Drums/Snare6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Snare6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Triangle 1.wav b/Test Data/MovieScore Vol. 1/Drums/Triangle 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Triangle 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Triangle 2.wav b/Test Data/MovieScore Vol. 1/Drums/Triangle 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Triangle 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Triangle 3.wav b/Test Data/MovieScore Vol. 1/Drums/Triangle 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Triangle 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Triangle 4.wav b/Test Data/MovieScore Vol. 1/Drums/Triangle 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Triangle 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Drums/Triangle 5.wav b/Test Data/MovieScore Vol. 1/Drums/Triangle 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Drums/Triangle 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/k_Electric 1.wav b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/k_Electric 2.wav b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/k_Electric 3.wav b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/k_Electric 4.wav b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/k_Electric 5.wav b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/k_Electric 6.wav b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/k_Electric 7.wav b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/k_Electric 7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/o_Funky 1.wav b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/o_Funky 2.wav b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/o_Funky 3.wav b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/o_Funky 4.wav b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/o_Funky 5.wav b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/o_Funky 6.wav b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/o_Funky 7.wav b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/o_Funky 7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 1.wav b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 2.wav b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 3.wav b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 4.wav b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 5.wav b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 6.wav b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 7.wav b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Guitar/w_ Ukulele 7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolasB1.wav b/Test Data/MovieScore Vol. 1/Strings/ViolasB1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolasB1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolasB2.wav b/Test Data/MovieScore Vol. 1/Strings/ViolasB2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolasB2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolasB3.wav b/Test Data/MovieScore Vol. 1/Strings/ViolasB3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolasB3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolasB4.wav b/Test Data/MovieScore Vol. 1/Strings/ViolasB4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolasB4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolasB5.wav b/Test Data/MovieScore Vol. 1/Strings/ViolasB5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolasB5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolasB6.wav b/Test Data/MovieScore Vol. 1/Strings/ViolasB6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolasB6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolasB7.wav b/Test Data/MovieScore Vol. 1/Strings/ViolasB7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolasB7.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolinsA 1.wav b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 1.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 1.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolinsA 2.wav b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 2.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 2.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolinsA 3.wav b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 3.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 3.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolinsA 4.wav b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 4.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 4.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolinsA 5.wav b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 5.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 5.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolinsA 6.wav b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 6.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 6.wav differ diff --git a/Test Data/MovieScore Vol. 1/Strings/ViolinsA 7.wav b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 7.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/MovieScore Vol. 1/Strings/ViolinsA 7.wav differ diff --git a/Test Data/sample.wav b/Test Data/sample.wav new file mode 100644 index 0000000..df9b84e Binary files /dev/null and b/Test Data/sample.wav differ diff --git a/notes/file structure.txt b/notes/file structure.txt index cb4bbef..da6869e 100644 --- a/notes/file structure.txt +++ b/notes/file structure.txt @@ -39,3 +39,12 @@ Other file examples of files ... 'Beige Bass 6.wav' 'Gamboge Cello 4.wav' 'Limerick ViolinsB 2.wav' 'Orange Basses 7.wav' 'Orchid Violins 5.wav' 'Viridian Violins 3.wav' 'Beige Bass 7.wav' 'Gamboge Cello 5.wav' 'Limerick ViolinsB 3.wav' 'Orange Strings 1.wav' 'Orchid Violins 6.wav' 'Viridian Violins 4.wav' 'Beige StingsB 1.wav' 'Gamboge Cello 6.wav' 'Limerick ViolinsB 4.wav' 'Orange Strings 2.wav' 'Orchid Violins 7.wav' 'Viridian Violins 5.wav' + +... + +So I would see it as + MovieScore + [Vol 1, Vol 2, Vol 3, ...] + Vol 1 [Bass, Brass, Drums, Synth, Wind] + Bass [Beige Bass, Gamboge BassA, Gamboge Cello, Limerick ViolinsA, Orange Basses, Orange Strings, ....] + Beige Bass [ Sample 1, Sample 2, Sample 3, Sample 4, Sample 5, Sample 6, Sample 7] \ No newline at end of file diff --git a/notes/layout.txt b/notes/layout.txt index 64a367c..c13886b 100644 --- a/notes/layout.txt +++ b/notes/layout.txt @@ -28,4 +28,8 @@ Genre Instrument: sample[number: note] date liked: date liked: bool length: number (seconds) date liked: date scale: note enum - date scanned: date \ No newline at end of file + date scanned: date samples: [Sample] + +Category: + name: String + instruments: [Instrument] \ No newline at end of file diff --git a/notes/thoughts.txt b/notes/thoughts.txt index 85deaed..9517563 100644 --- a/notes/thoughts.txt +++ b/notes/thoughts.txt @@ -1,7 +1,8 @@ 1) try and identify what the k_ w_ o_ on some files mean, if can't then simply strip them off 2) scan folder for genres, then spin of threads to scan instruments, then tracks 3) browser should provide filter down by default of genre, optional filter trackname -4) ... +4) be able to drag sample into Garageband / Logic +5) --- @@ -9,3 +10,18 @@ show waveform? https://www.audiokit.io/AudioKitUI/documentation/audiokitui/wavef https://www.audiokit.io/Waveform/documentation/waveform https://github.com/AudioKit/Waveform/ + +--- + +Image names: + music.note.house (for top of tree / genre) + music.note.house.fill + music.note (for sample) + music.note.list (for category) + + I like palette rendering for .house .note .list + +--- + +what happens if there are duplicate file names between say Vol 1 and Vol 12 of one Genre, and Vol 3 of a difference Genre? +Treat each as unique. So add id. \ No newline at end of file