diff options
91 files changed, 4065 insertions, 1792 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 24e77e5ae7..f00bc0b72d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ * Prevent infinite loop when decoding corrupt MP3 files #2417 * Add controller mapping for Native Instruments Traktor Kontrol S2 MK3 #2348 * Add controller mapping for Soundless joyMIDI #2425 +* AutoDJ skip next track when both deck are playing lp:1399974 #2531 ## [2.2.3](https://launchpad.net/mixxx/+milestone/2.2.3) (2019-11-24) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52d1975186..6b9a320981 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,13 +426,16 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/mixer/samplerbank.cpp src/mixxx.cpp src/mixxxapplication.cpp - src/musicbrainz/acoustidclient.cpp src/musicbrainz/chromaprinter.cpp src/musicbrainz/crc.c src/musicbrainz/gzip.cpp - src/musicbrainz/musicbrainzclient.cpp - src/musicbrainz/network.cpp + src/musicbrainz/musicbrainz.cpp + src/musicbrainz/musicbrainzxml.cpp src/musicbrainz/tagfetcher.cpp + src/musicbrainz/web/acoustidlookuptask.cpp + src/musicbrainz/web/musicbrainzrecordingstask.cpp + src/network/jsonwebtask.cpp + src/network/webtask.cpp src/preferences/broadcastprofile.cpp src/preferences/broadcastsettings.cpp src/preferences/broadcastsettings_legacy.cpp @@ -522,6 +525,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/track/replaygain.cpp src/track/serato/markers.cpp src/track/serato/markers2.cpp + src/track/serato/tags.cpp src/track/track.cpp src/track/trackfile.cpp src/track/trackinfo.cpp @@ -934,6 +938,7 @@ add_executable(mixxx-test src/test/coverartcache_test.cpp src/test/coverartutils_test.cpp src/test/cratestorage_test.cpp + src/test/cue_test.cpp src/test/cuecontrol_test.cpp src/test/dbconnectionpool_test.cpp src/test/dbidtest.cpp @@ -981,6 +986,7 @@ add_executable(mixxx-test src/test/searchqueryparsertest.cpp src/test/seratomarkerstest.cpp src/test/seratomarkers2test.cpp + src/test/seratotagstest.cpp src/test/signalpathtest.cpp src/test/skincontext_test.cpp src/test/softtakeover_test.cpp diff --git a/build/depends.py b/build/depends.py index f55ed8b0b9..e13d2df5b3 100644 --- a/build/depends.py +++ b/build/depends.py @@ -998,13 +998,14 @@ class MixxxCore(Feature): "src/widget/wsingletoncontainer.cpp", "src/widget/wmainmenubar.cpp", - "src/musicbrainz/network.cpp", "src/musicbrainz/tagfetcher.cpp", "src/musicbrainz/gzip.cpp", "src/musicbrainz/crc.c", - "src/musicbrainz/acoustidclient.cpp", "src/musicbrainz/chromaprinter.cpp", - "src/musicbrainz/musicbrainzclient.cpp", + "src/musicbrainz/musicbrainz.cpp", + "src/musicbrainz/musicbrainzxml.cpp", + "src/musicbrainz/web/acoustidlookuptask.cpp", + "src/musicbrainz/web/musicbrainzrecordingstask.cpp", "src/widget/wtracktableview.cpp", "src/widget/wtracktableviewheader.cpp", @@ -1130,6 +1131,9 @@ class MixxxCore(Feature): "src/library/trackloader.cpp", + "src/network/jsonwebtask.cpp", + "src/network/webtask.cpp", + "src/widget/wwaveformviewer.cpp", "src/waveform/sharedglcontext.cpp", @@ -1214,6 +1218,7 @@ class MixxxCore(Feature): "src/track/replaygain.cpp", "src/track/serato/markers.cpp", "src/track/serato/markers2.cpp", + "src/track/serato/tags.cpp", "src/track/track.cpp", "src/track/globaltrackcache.cpp", "src/track/trackfile.cpp", diff --git a/build/osx/OSConsX.py b/build/osx/OSConsX.py index 6b1d96d020..1aa7da5f72 100644 --- a/build/osx/OSConsX.py +++ b/build/osx/OSConsX.py @@ -1,5 +1,8 @@ -"""OSConsX.py - scons support for building applications on OS X using SCons. -Functions to build .app bundles and .dmg images, and to use otool(1) to trace out the needed libraries. +""" +OSConsX.py - scons support for building applications on OS X using SCons. + +Functions to build .app bundles and .dmg images, and to use otool(1) to trace +out the needed libraries. usage: @@ -13,92 +16,130 @@ License: 2-clause BSD (XXX put a proper notice here) Please email me with questions/comments/patches! TODO: --add a CheckFramework() call that looks for a framework (and maybe adds to CXXFLAGS||CPPATH||LINKFLAGS if found) -""" - - - -import sys, os, shutil, stat +- add a CheckFramework() call that looks for a framework (and maybe adds to + CXXFLAGS||CPPATH||LINKFLAGS if found) + """ + +import sys +import os +import shutil +import stat import SCons from SCons.Builder import Builder -from SCons.Script import * +from SCons.Script import Copy, Dir, Execute, File, Glob, Mkdir import otool -#Dev info: -#http://doc.trolltech.com/qq/qq09-mac-deployment.html -#http://www.scons.org/wiki/MacOSX (not very featureful, but the tip about resource forks might be important (wait did I say important? I meant out of date. see CpMac(1)) +# Dev info: +# http://doc.trolltech.com/qq/qq09-mac-deployment.html +# http://www.scons.org/wiki/MacOSX +# (not very featureful, but the tip about resource forks might be important +# (wait did I say important? I meant out of date. see CpMac(1)) + +# oooh, you can use warnings! just call "warn()" -#oooh, you can use warnings! just call "warn()" def system(s): - "wrap system() to give us feedback on what it's doing" - "anything using this call should be fixed to use SCons's declarative style (once you figure that out, right nick?)" + """ + Wrap system() to give us feedback on what it's doing. + + Anything using this call should be fixed to use SCons's declarative style + (once you figure that out, right nick?) + """ print(s), - sys.stdout.flush() #ignore line buffering.. + sys.stdout.flush() # ignore line buffering.. result = os.system(s) - print + print() return result - def no_sources(target, source, env): - "an emitter that forces null sources, so that we don't need to have the user explicitly say there are no dependencies (SCons assumes that if you are building 'X.out' then you need 'X.in')" - return target, [] + """ + An emitter that forces null sources. + So that we don't need to have the user explicitly say there are no + dependencies (SCons assumes that if you are building 'X.out' then you need + 'X.in') + """ + return target, [] -def InstallDir(target, source, env): #XXX this belongs not in this module - "copies the given source dir inside of the given target dir" - #XXX could be rewritten better with schemey-recursion as "if source is File: env.Install(), elif source is Dir, scan the dir and recurse" - #SCons doesn't really like using directories as targets. Like, at all. - #Mkdir(os.path.join(str(target), str(source))) - #translate install(a/, b/) to install(a/b/, [files in b]) - contents = Glob(os.path.join(str(source), "*")) #XXX there's probably a cleaner way that SCons has to do this - #print("contents:", contents) +def InstallDir(target, source, env): # XXX this belongs not in this module + """ + Copies the given source dir inside of the given target dir. + """ + # XXX could be rewritten better with schemey-recursion as "if source is + # File: env.Install(), elif source is Dir, scan the dir and recurse" + # SCons doesn't really like using directories as targets. Like, at all. + # Mkdir(os.path.join(str(target), str(source))) + # translate install(a/, b/) to install(a/b/, [files in b]) + contents = Glob( + os.path.join(str(source), "*") + ) # XXX there's probably a cleaner way that SCons has to do this + # print("contents:", contents) files = filter(lambda f: isinstance(f, SCons.Node.FS.File), contents) folders = filter(lambda f: isinstance(f, SCons.Node.FS.Dir), contents) - #print(map(str, folders)) + # print(map(str, folders)) name = os.path.basename(str(source)) - #install the files local to this + # install the files local to this nodes = env.Install(Dir(os.path.join(str(target), name)), files) - #now recursively install the subfolders + # now recursively install the subfolders for f in folders: - nodes+=InstallDir(Dir(os.path.join(str(target), name)), f, env) + nodes += InstallDir(Dir(os.path.join(str(target), name)), f, env) return nodes -#okay, this works. It could be done better (make better use of SCons's declarativity, look at http://frungy.org/~tpot/weblog/2008/05/02#scons-rpm2 for ideas) -#Specifically, this does file copying by itself, instead of telling SCons about it. -#On the other hand, the files it is copying are not really part of the build process, they are tmp files, so maybe it works.... -#BUG: scons doesn't track that it's built the .dmg. It decides it needs to build it every time "because it doesn't exist". Perhaps has to do with the lack s + +# okay, this works. It could be done better (make better use of SCons's +# declarativity, look at http://frungy.org/~tpot/weblog/2008/05/02#scons-rpm2 +# for ideas) Specifically, this does file copying by itself, instead of telling +# SCons about it. +# On the other hand, the files it is copying are not really part of the build +# process, they are tmp files, so maybe it works.... +# BUG: scons doesn't track that it's built the .dmg. It decides it needs to +# build it every time "because it doesn't exist". def build_dmg(target, source, env): - "takes the given source files, makes a temporary directory, copies them all there, and then packages that directory into a .dmg" - #TODO: make emit_dmg emit that we are making the Dmg that we are making + """ + Builds a *.dmg file. + + Takes the given source files, makes a temporary directory, copies them all + there, and then packages that directory into a .dmg. + """ + # TODO: make emit_dmg emit that we are making the Dmg that we are making - #since we are building into a single .dmg, coerce target to point at the actual name + # since we are building into a single .dmg, coerce target to point at the + # actual name assert len(target) == 1 target = target[0] # I'm going to let us overwrite the .dmg for now - Albert - #if os.path.exists(str(target)+".dmg"): #huhh? why do I have to say +.dmg here? I thought scons was supposed to handle that + # huhh? why do I have to say +.dmg here? I thought scons was supposed to + # handle that + # if os.path.exists(str(target)+".dmg"): # raise Exception(".dmg target already exists.") - #if 'DMG_DIR' in env: .... etc fill me in please - dmg = os.tmpnam()+"-"+env['VOLNAME'].strip()+"-dmg" #create a directory to build the .dmg root from + # if 'DMG_DIR' in env: .... etc fill me in please + dmg = ( + os.tmpnam() + "-" + env["VOLNAME"].strip() + "-dmg" + ) # create a directory to build the .dmg root from - #is os.system the best thing for this? Can't we declare that these files need to be moved somehow? - #aah there must be a more SCons-ey (i.e. declarative) way to do all this; the trouble with doing + # is os.system the best thing for this? Can't we declare that these files + # need to be moved somehow? aah there must be a more SCons-ey (i.e. + # declarative) way to do all this; the trouble with doing os.mkdir(dmg) for f in source: print("Copying", f) a, b = str(f), os.path.join(dmg, os.path.basename(str(f.path))) - if isinstance(f, SCons.Node.FS.Dir): #XXX there's a lot of cases that could throw this off, particularly if you try to pass in subdirs + if isinstance(f, SCons.Node.FS.Dir): + # XXX there's a lot of cases that could throw this off, + # particularly if you try to pass in subdirs copier = shutil.copytree elif isinstance(f, SCons.Node.FS.File): copier = shutil.copy else: - raise Exception("%s is neither Dir nor File node? Bailing out." % f) + raise Exception( + "%s is neither Dir nor File node? Bailing out." % f + ) try: copier(a, b) @@ -107,183 +148,251 @@ def build_dmg(target, source, env): raise Exception("Error copying %s: " % (a,), e) # Symlink Applications to /Applications - os.system('ln -s /Applications %s' % os.path.join(dmg, 'Applications')) - - if env['ICON']: - env['ICON'] = File(str(env['ICON'])) #make sure the given file is an icon; scons does this wrapping for us on sources and targets but not on environment vars (obviously, that would be stupid). - #XXX this doesn't seem to work, at least not on MacOS 10.5 - #the MacFUSE people have solved it, though, see "._" in http://www.google.com/codesearch/p?hl=en#OXKFx3-7cSY/tags/macfuse-1.0.0/filesystems-objc/FUSEObjC/FUSEFileSystem.m&q=volumeicon - #appearently it requires making a special volume header file named "._$VOLNAME" with a binary blob in it - #But also the Qt4 dmg has a working icon, and it has no ._$VOLNAME file - shutil.copy(str(env['ICON']), os.path.join(dmg, ".VolumeIcon.icns")) #XXX bug: will crash if not given an icon file - system('SetFile -a C "%s"' % dmg) #is there an sconsey way to declare this? Would be nice so that it could write what - + os.system("ln -s /Applications %s" % os.path.join(dmg, "Applications")) + + if env["ICON"]: + env["ICON"] = File(str(env["ICON"])) + # make sure the given file is an icon; scons does this wrapping for us + # on sources and targets but not on environment vars (obviously, that + # would be stupid). + # XXX this doesn't seem to work, at least not on MacOS 10.5 + # the MacFUSE people have solved it, though, see "._" in + # http://www.google.com/codesearch/p?hl=en#OXKFx3-7cSY/tags/macfuse-1.0.0/filesystems-objc/FUSEObjC/FUSEFileSystem.m&q=volumeicon + # appearently it requires making a special volume header file named + # "._$VOLNAME" with a binary blob in it But also the Qt4 dmg has a + # working icon, and it has no ._$VOLNAME file + + # XXX bug: will crash if not given an icon file + shutil.copy(str(env["ICON"]), os.path.join(dmg, ".VolumeIcon.icns")) + # is there an sconsey way to declare this? Would be nice so that it + # could write what + system('SetFile -a C "%s"' % dmg) # TODO(rryan): hdiutil has a bug where if srcfolder is greater than 100M it # fails to create a DMG with error -5341. The actual size of the resulting # DMG is not affected by the -size parameter -- I think it's just the size # of the "partition" in the DMG. Hard-coding 150M is a band-aid to get the # build working again while we figure out the r |