AudioSource v2 API

build/depends.py

@@ -815,6 +815,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",
@@ -1072,6 +1074,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",
@@ -1137,8 +1142,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",
@@ -1147,6 +1151,7 @@ def sources(self, build):
                    "util/widgethider.cpp",
                    "util/autohidpi.cpp",
                    "util/screensaver.cpp",
+                   "util/indexrange.cpp",
 
                    '#res/mixxx.qrc'
                    ]

build/features.py

@@ -12,16 +12,16 @@ def description(self):
 
     def enabled(self, build):
         build.flags['opengles'] = util.get_flags(build.env, 'opengles', 0)
-	return int(build.flags['opengles'])
+        return int(build.flags['opengles'])
 
     def add_options(self, build, vars):
         vars.Add('opengles', 'Set to 1 to enable OpenGL-ES >= 2.0 support [Experimental]', 0)
 
     def configure(self, build, conf):
         if not self.enabled(build):
             return
-	if build.flags['opengles']:
-	    build.env.Append(CPPDEFINES='__OPENGLES__')
+        if build.flags['opengles']:
+            build.env.Append(CPPDEFINES='__OPENGLES__')
 
     def sources(self, build):
         return []
@@ -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']
 
 

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",