Merge pull request #1317 from uklotzde/audiosourcev2

AudioSource v2 API
mixxxdj · Nov 25, 2017 · 80f3ea5 · 80f3ea5
2 parents d2513a6 + d6765cf
commit 80f3ea5
Show file tree

Hide file tree

Showing 120 changed files with 7,103 additions and 4,830 deletions.
diff --git a/build/depends.py b/build/depends.py
@@ -825,6 +825,8 @@ def sources(self, build):
                    "errordialoghandler.cpp",
 
                    "sources/audiosource.cpp",
+                   "sources/audiosourcestereoproxy.cpp",
+                   "sources/metadatasourcetaglib.cpp",
                    "sources/soundsource.cpp",
                    "sources/soundsourceplugin.cpp",
                    "sources/soundsourcepluginlibrary.cpp",
@@ -1082,6 +1084,9 @@ def sources(self, build):
                    "track/trackmetadata.cpp",
                    "track/trackmetadatataglib.cpp",
                    "track/tracknumbers.cpp",
+                   "track/albuminfo.cpp",
+                   "track/trackinfo.cpp",
+                   "track/trackrecord.cpp",
 
                    "mixer/auxiliary.cpp",
                    "mixer/baseplayer.cpp",
@@ -1147,8 +1152,7 @@ def sources(self, build):
                    "util/db/sqltransaction.cpp",
                    "util/sample.cpp",
                    "util/samplebuffer.cpp",
-                   "util/singularsamplebuffer.cpp",
-                   "util/circularsamplebuffer.cpp",
+                   "util/readaheadsamplebuffer.cpp",
                    "util/rotary.cpp",
                    "util/logger.cpp",
                    "util/logging.cpp",
@@ -1157,6 +1161,7 @@ def sources(self, build):
                    "util/widgethider.cpp",
                    "util/autohidpi.cpp",
                    "util/screensaver.cpp",
+                   "util/indexrange.cpp",
 
                    '#res/mixxx.qrc'
                    ]

diff --git a/build/features.py b/build/features.py
@@ -246,6 +246,7 @@ def configure(self, build, conf):
 
     def sources(self, build):
         return ['sources/soundsourcecoreaudio.cpp',
+                'sources/v1/legacyaudiosourceadapter.cpp',
                 '#lib/apple/CAStreamBasicDescription.cpp']
 
 

diff --git a/plugins/soundsourcem4a/SConscript b/plugins/soundsourcem4a/SConscript
@@ -12,14 +12,16 @@ Import('build')
 
 m4a_sources = [
     "soundsourcem4a.cpp",
+    "sources/audiosource.cpp",
+    "sources/metadatasourcetaglib.cpp",
     "sources/soundsource.cpp",
     "sources/soundsourceplugin.cpp",
-    "sources/audiosource.cpp",
     "util/audiosignal.cpp",
     "util/samplebuffer.cpp",
-    "util/singularsamplebuffer.cpp",
+    "util/readaheadsamplebuffer.cpp",
     "util/sample.cpp",
     "util/logger.cpp",
+    "util/indexrange.cpp",
     "track/trackmetadata.cpp",
     "track/trackmetadatataglib.cpp",
     "track/tracknumbers.cpp",