mixxx - Contrib clone of mixxx

summary refs log tree commit diff stats

path: root/src

diff options

author	Be <be@mixxx.org>	2020-05-07 09:56:22 -0500
committer	Be <be@mixxx.org>	2020-05-07 09:56:22 -0500
commit	00feedc9c72e1a0bb925355425f2de6596d39fc9 (patch)
tree	5f9c4a536c24c9d9b271737b9b3a7c9ba7af13b4 /src
parent	3970b4e3e940bbf656e9770d67a26aa2c16151cc (diff)
parent	898052f480ddbdefe3a36ce73893b90731f3beb3 (diff)

Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

Diffstat (limited to 'src')

-rw-r--r--

src/analyzer/analyzerbeats.cpp

6

-rw-r--r--

src/analyzer/analyzerkey.cpp

10

-rw-r--r--

src/analyzer/plugins/analyzerkeyfinder.cpp

115

-rw-r--r--

src/analyzer/plugins/analyzerkeyfinder.h

40

-rw-r--r--

src/broadcast/defs_broadcast.h

5

-rw-r--r--

src/controllers/dlgprefcontroller.cpp

25

-rw-r--r--

src/controllers/dlgprefcontroller.h

8

-rw-r--r--

src/controllers/dlgprefcontrollerdlg.ui

2

-rw-r--r--

src/controllers/dlgprefcontrollers.cpp

13

-rw-r--r--

src/controllers/dlgprefcontrollers.h

1

-rw-r--r--

src/controllers/engine/colormapper.cpp

30

-rw-r--r--

src/defs_urls.h

20

-rw-r--r--

src/encoder/encoderwave.cpp

2

-rw-r--r--

src/engine/channels/engineaux.cpp

4

-rw-r--r--

src/engine/channels/enginechannel.cpp

7

-rw-r--r--

src/engine/channels/enginechannel.h

14

-rw-r--r--

src/engine/channels/enginedeck.cpp

13

-rw-r--r--

src/engine/channels/enginedeck.h

9

-rw-r--r--

src/engine/channels/enginemicrophone.cpp

6

-rw-r--r--

src/engine/controls/bpmcontrol.cpp

182

-rw-r--r--

src/engine/controls/bpmcontrol.h

26

-rw-r--r--

src/engine/controls/clockcontrol.cpp

30

-rw-r--r--

src/engine/controls/clockcontrol.h

8

-rw-r--r--

src/engine/controls/cuecontrol.cpp

36

-rw-r--r--

src/engine/controls/cuecontrol.h

2

-rw-r--r--

src/engine/controls/enginecontrol.cpp

4

-rw-r--r--

src/engine/controls/enginecontrol.h

1

-rw-r--r--

src/engine/controls/loopingcontrol.cpp

43

-rw-r--r--

src/engine/controls/loopingcontrol.h

7

-rw-r--r--

src/engine/controls/quantizecontrol.cpp

26

-rw-r--r--

src/engine/controls/quantizecontrol.h

9

-rw-r--r--

src/engine/enginebuffer.cpp

89

-rw-r--r--

src/engine/enginebuffer.h

1

-rw-r--r--

src/engine/enginemaster.cpp

103

-rw-r--r--

src/engine/enginemaster.h

1

-rw-r--r--

src/engine/enginesidechaincompressor.cpp

36

-rw-r--r--

src/engine/enginesidechaincompressor.h

6

-rw-r--r--

src/engine/enginetalkoverducking.cpp

12

-rw-r--r--

src/engine/sidechain/enginesidechain.cpp

16

-rw-r--r--

src/engine/sidechain/enginesidechain.h

3

-rw-r--r--

src/engine/sidechain/shoutconnection.cpp

6

-rw-r--r--

src/engine/sync/basesyncablelistener.cpp

30

-rw-r--r--

src/engine/sync/basesyncablelistener.h

20

-rw-r--r--

src/engine/sync/enginesync.cpp

484

-rw-r--r--

src/engine/sync/enginesync.h

17

-rw-r--r--

src/engine/sync/internalclock.cpp

64

-rw-r--r--

src/engine/sync/internalclock.h

8

-rw-r--r--

src/engine/sync/syncable.h

29

-rw-r--r--

src/engine/sync/synccontrol.cpp

200

-rw-r--r--

src/engine/sync/synccontrol.h

12

-rw-r--r--

src/library/autodj/dlgautodj.cpp

2

-rw-r--r--

src/library/banshee/bansheeplaylistmodel.cpp

2

-rw-r--r--

src/library/basecoverartdelegate.h

2

-rw-r--r--

src/library/basesqltablemodel.cpp

5

-rw-r--r--

src/library/basetrackcache.cpp

34

-rw-r--r--

src/library/basetrackcache.h

6

-rw-r--r--

src/library/basetracktablemodel.cpp

31

-rw-r--r--

src/library/browse/browsethread.cpp

17

-rw-r--r--

src/library/dao/trackdao.cpp

399

-rw-r--r--

src/library/dao/trackdao.h

26

-rw-r--r--

src/library/dlganalysis.cpp

2

-rw-r--r--

src/library/dlghidden.cpp

2

-rw-r--r--

src/library/dlgmissing.cpp

2

-rw-r--r--

src/library/dlgtrackinfo.cpp

23

-rw-r--r--

src/library/dlgtrackinfo.h

2

-rw-r--r--

src/library/dlgtrackinfo.ui

285

-rw-r--r--

src/library/externaltrackcollection.h

2

-rw-r--r--

src/library/library.cpp

7

-rw-r--r--

src/library/librarycontrol.cpp

74

-rw-r--r--

src/library/librarycontrol.h

7

-rw-r--r--

src/library/recording/dlgrecording.cpp

2

-rw-r--r--

src/library/rekordbox/rekordbox_anlz.cpp

27

-rw-r--r--

src/library/rekordbox/rekordbox_anlz.h

29

-rw-r--r--

src/library/rekordbox/rekordbox_anlz.ksy

509

-rw-r--r--

src/library/rekordbox/rekordbox_pdb.ksy

975

-rw-r--r--

src/library/rekordbox/rekordboxfeature.cpp

8

-rw-r--r--

src/library/relocatedtrack.h

11

-rw-r--r--

src/library/scanner/libraryscanner.cpp

3

-rw-r--r--

src/library/serato/seratofeature.cpp

2

-rw-r--r--

src/library/trackcollection.cpp

22

-rw-r--r--

src/library/trackcollection.h

3

-rw-r--r--

src/library/trackcollectionmanager.cpp

16

-rw-r--r--

src/mixer/basetrackplayer.cpp

84

-rw-r--r--

src/mixer/basetrackplayer.h

19

-rw-r--r--

src/mixer/deck.cpp

17

-rw-r--r--

src/mixer/playermanager.cpp

16

-rw-r--r--

src/mixer/previewdeck.cpp

17

-rw-r--r--

src/mixer/sampler.cpp

17

-rw-r--r--

13

-rw-r--r--

2

-rw-r--r--

src/network/webtask.cpp

2

-rw-r--r--

src/network/webtask.h

2

-rw-r--r--

src/preferences/broadcastprofile.cpp

5

-rw-r--r--

src/preferences/broadcastsettings_legacy.cpp

13

-rw-r--r--

src/preferences/dialog/dlgprefbeats.cpp

5

-rw-r--r--

src/preferences/dialog/dlgprefbeats.h

2

-rw-r--r--

src/preferences/dialog/dlgprefbroadcast.cpp

11

-rw-r--r--

src/preferences/dialog/dlgprefbroadcast.h

2

-rw-r--r--

src/preferences/dialog/dlgprefcolors.cpp

2

-rw-r--r--

src/preferences/dialog/dlgprefeq.cpp

20

-rw-r--r--

src/preferences/dialog/dlgprefeq.h

2

-rw-r--r--

src/preferences/dialog/dlgpreferences.cpp

58

-rw-r--r--

src/preferences/dialog/dlgpreferences.h

1

-rw-r--r--

src/preferences/dialog/dlgpreferencesdlg.ui

2

-rw-r--r--

src/preferences/dialog/dlgprefkey.cpp

5

-rw-r--r--

src/preferences/dialog/dlgprefkey.h

7

-rw-r--r--

src/preferences/dialog/dlgpreflibrary.cpp

4

-rw-r--r--

src/preferences/dialog/dlgpreflibrary.h

9

-rw-r--r--

src/preferences/dialog/dlgpreflibrarydlg.ui

38

-rw-r--r--

src/preferences/dialog/dlgprefsound.cpp

4

-rw-r--r--

src/preferences/dialog/dlgprefsound.h

9

-rw-r--r--

src/preferences/dialog/dlgprefvinyl.cpp

4

-rw-r--r--

src/preferences/dialog/dlgprefvinyl.h

2

-rw-r--r--

src/preferences/dialog/dlgprefwaveform.cpp

8

-rw-r--r--

src/preferences/dlgpreferencepage.cpp

6

-rw-r--r--

src/preferences/dlgpreferencepage.h

12

-rw-r--r--

src/skin/launchimage.h

2

-rw-r--r--

src/skin/legacyskinparser.cpp

8

-rw-r--r--

src/skin/skincontext.h

2

-rw-r--r--

src/skin/tooltips.cpp

31

-rw-r--r--

src/sources/audiosource.cpp

49

-rw-r--r--

src/sources/audiosource.h

63

-rw-r--r--

src/sources/metadatasource.h

2

-rw-r--r--

src/sources/metadatasourcetaglib.cpp

105

-rw-r--r--

src/sources/metadatasourcetaglib.h

4

-rw-r--r--

src/sources/soundsource.cpp

2

-rw-r--r--

src/sources/soundsource.h

2

-rw-r--r--

src/sources/soundsourcem4a.h

8

-rw-r--r--

src/sources/soundsourceproxy.cpp

128