Merge pull request #411 from uklotzde/NewSoundSourceAPI

New SoundSource/AudioSource API

build/depends.py

@@ -126,7 +126,7 @@ def configure(self, build, conf):
                     'Did not find libvorbisenc.a, libvorbisenc.lib, or the libvorbisenc development headers.')
 
     def sources(self, build):
-        return ['soundsourceoggvorbis.cpp']
+        return ['sources/soundsourceoggvorbis.cpp']
 
 class SndFile(Dependence):
 
@@ -139,7 +139,7 @@ def configure(self, build, conf):
         build.env.Append(CPPDEFINES='__SNDFILE__')
 
     def sources(self, build):
-        return ['soundsourcesndfile.cpp']
+        return ['sources/soundsourcesndfile.cpp']
 
 
 class FLAC(Dependence):
@@ -154,7 +154,7 @@ def configure(self, build, conf):
             build.env.Append(CPPDEFINES='FLAC__NO_DLL')
 
     def sources(self, build):
-        return ['soundsourceflac.cpp', ]
+        return ['sources/soundsourceflac.cpp',]
 
 
 class Qt(Dependence):
@@ -646,8 +646,13 @@ def sources(self, build):
                    "errordialoghandler.cpp",
                    "upgrade.cpp",
 
-                   "soundsource.cpp",
-                   "soundsourcetaglib.cpp",
+                   "sources/soundsourceplugin.cpp",
+                   "sources/soundsource.cpp",
+                   "sources/audiosource.cpp",
+
+                   "metadata/trackmetadata.cpp",
+                   "metadata/trackmetadatataglib.cpp",
+                   "metadata/audiotagger.cpp",
 
                    "sharedglcontext.cpp",
                    "widget/controlwidgetconnection.cpp",
@@ -790,7 +795,6 @@ def sources(self, build):
                    "library/bpmdelegate.cpp",
                    "library/previewbuttondelegate.cpp",
                    "library/coverartdelegate.cpp",
-                   "audiotagger.cpp",
 
                    "library/treeitemmodel.cpp",
                    "library/treeitem.cpp",
@@ -863,6 +867,10 @@ def sources(self, build):
                    "skin/pixmapsource.cpp",
 
                    "sampleutil.cpp",
+                   "samplebuffer.cpp",
+                   "singularsamplebuffer.cpp",
+                   "circularsamplebuffer.cpp",
+
                    "trackinfoobject.cpp",
                    "track/beatgrid.cpp",
                    "track/beatmap.cpp",

build/features.py

@@ -179,7 +179,7 @@ def configure(self, build, conf):
         build.env.Append(CPPDEFINES='__MAD__')
 
     def sources(self, build):
-        return ['soundsourcemp3.cpp']
+        return ['sources/soundsourcemp3.cpp']
 
 
 class CoreAudio(Feature):
@@ -214,7 +214,7 @@ def configure(self, build, conf):
         build.env.Append(CPPDEFINES='__COREAUDIO__')
 
     def sources(self, build):
-        return ['soundsourcecoreaudio.cpp',
+        return ['sources/soundsourcecoreaudio.cpp',
                 '#lib/apple/CAStreamBasicDescription.cpp']
 
 
@@ -429,7 +429,7 @@ def configure(self, build, conf):
 
     def sources(self, build):
         depends.Qt.uic(build)('dlgprefmodplugdlg.ui')
-        return ['soundsourcemodplug.cpp', 'dlgprefmodplug.cpp']
+        return ['sources/soundsourcemodplug.cpp', 'dlgprefmodplug.cpp']
 
 
 class FAAD(Feature):
@@ -820,7 +820,7 @@ def configure(self, build, conf):
             build.env.ParseConfig('pkg-config opusfile opus --silence-errors --cflags --libs')
 
     def sources(self, build):
-        return ['soundsourceopus.cpp']
+        return ['sources/soundsourceopus.cpp']
 
 
 class FFMPEG(Feature):
@@ -948,7 +948,7 @@ def configure(self, build, conf):
                                                   'include', 'ffmpeg'))
 
     def sources(self, build):
-        return ['soundsourceffmpeg.cpp',
+        return ['sources/soundsourceffmpeg.cpp',
                 'encoder/encoderffmpegresample.cpp',
                 'encoder/encoderffmpegcore.cpp',
                 'encoder/encoderffmpegmp3.cpp',

plugins/soundsourcem4a/SConscript

@@ -11,10 +11,15 @@ Import('build')
 # On Posix default SCons.LIBPREFIX = 'lib', on Windows default SCons.LIBPREFIX = ''
 
 m4a_sources = [
-    "soundsourcem4a.cpp",  # MP4/M4A Support through FAAD/libmp4v2
-    "soundsourcetaglib.cpp", # TagLib dependencies
-    "soundsource.cpp", # required to subclass SoundSource
-    "sampleutil.cpp", # utility functions
+    "soundsourcem4a.cpp",
+    "sources/soundsource.cpp",
+    "sources/soundsourceplugin.cpp",
+    "sources/audiosource.cpp",
+    "samplebuffer.cpp",
+    "singularsamplebuffer.cpp",
+    "sampleutil.cpp",
+    "metadata/trackmetadata.cpp",
+    "metadata/trackmetadatataglib.cpp"
 ]
 
 #Tell SCons to build the SoundSourceM4A plugin