summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2016-04-26 16:48:17 -0700
committerRJ Ryan <rryan@mixxx.org>2016-04-26 16:48:17 -0700
commit0a9c4a70bf93024da636ba8af951d4e5aa4d406a (patch)
treefc1dea517f6d0ea6dee1beb395820bd4e29aed15 /src
parenta9ba2ad074fd97e7ce4665ca57814ca160c22be5 (diff)
Rename TrackInfoObject to Track.
At long last! Also move trackinfoobject.h/cpp to src/track/track.h/cpp.
Diffstat (limited to 'src')
-rw-r--r--src/analyzer/analyzer.h2
-rw-r--r--src/analyzer/analyzerbeats.cpp2
-rw-r--r--src/analyzer/analyzerebur128.cpp2
-rw-r--r--src/analyzer/analyzergain.cpp2
-rw-r--r--src/analyzer/analyzerkey.h2
-rw-r--r--src/analyzer/analyzerqueue.cpp2
-rw-r--r--src/analyzer/analyzerqueue.h2
-rw-r--r--src/analyzer/analyzerwaveform.cpp2
-rw-r--r--src/encoder/encoderffmpegcore.h2
-rw-r--r--src/encoder/encodermp3.h2
-rw-r--r--src/encoder/encodervorbis.h2
-rw-r--r--src/engine/bpmcontrol.cpp4
-rw-r--r--src/engine/cachingreader.cpp2
-rw-r--r--src/engine/cachingreader.h2
-rw-r--r--src/engine/cachingreaderworker.h2
-rw-r--r--src/engine/clockcontrol.h2
-rw-r--r--src/engine/cuecontrol.h2
-rw-r--r--src/engine/enginebuffer.cpp4
-rw-r--r--src/engine/enginebuffer.h2
-rw-r--r--src/engine/enginecontrol.h2
-rw-r--r--src/engine/loopingcontrol.cpp2
-rw-r--r--src/engine/loopingcontrol.h2
-rw-r--r--src/engine/quantizecontrol.h2
-rw-r--r--src/engine/sidechain/enginerecord.h2
-rw-r--r--src/engine/sidechain/engineshoutcast.cpp2
-rw-r--r--src/engine/sidechain/engineshoutcast.h2
-rw-r--r--src/engine/vinylcontrolcontrol.h2
-rw-r--r--src/library/autodj/autodjprocessor.h2
-rw-r--r--src/library/autodj/dlgautodj.h2
-rw-r--r--src/library/baseexternaltrackmodel.h2
-rw-r--r--src/library/baseplaylistfeature.h2
-rw-r--r--src/library/basetrackcache.h2
-rw-r--r--src/library/browse/browsefeature.cpp2
-rw-r--r--src/library/browse/browsethread.cpp2
-rw-r--r--src/library/coverartcache.h2
-rw-r--r--src/library/coverartutils.cpp4
-rw-r--r--src/library/coverartutils.h4
-rw-r--r--src/library/cratefeature.h2
-rw-r--r--src/library/dao/analysisdao.cpp2
-rw-r--r--src/library/dao/analysisdao.h14
-rw-r--r--src/library/dao/autodjcratesdao.h2
-rw-r--r--src/library/dao/cue.h4
-rw-r--r--src/library/dao/cuedao.cpp4
-rw-r--r--src/library/dao/cuedao.h4
-rw-r--r--src/library/dao/playlistdao.cpp2
-rw-r--r--src/library/dao/trackdao.cpp56
-rw-r--r--src/library/dao/trackdao.h16
-rw-r--r--src/library/dlgtagfetcher.cpp8
-rw-r--r--src/library/dlgtagfetcher.h4
-rw-r--r--src/library/dlgtrackinfo.cpp14
-rw-r--r--src/library/dlgtrackinfo.h6
-rw-r--r--src/library/export/trackexportdlg.h2
-rw-r--r--src/library/export/trackexportwizard.h2
-rw-r--r--src/library/export/trackexportworker.h2
-rw-r--r--src/library/library.h2
-rw-r--r--src/library/libraryfeature.h12
-rw-r--r--src/library/previewbuttondelegate.cpp2
-rw-r--r--src/library/previewbuttondelegate.h2
-rw-r--r--src/library/recording/dlgrecording.h2
-rw-r--r--src/library/recording/recordingfeature.cpp2
-rw-r--r--src/library/scanner/libraryscanner.cpp2
-rw-r--r--src/library/scanner/libraryscanner.h2
-rw-r--r--src/library/scanner/scannertask.h2
-rw-r--r--src/library/searchquery.h2
-rw-r--r--src/library/searchqueryparser.h2
-rw-r--r--src/library/trackcollection.cpp2
-rw-r--r--src/library/trackcollection.h2
-rw-r--r--src/library/trackmodel.h2
-rw-r--r--src/mixer/basetrackplayer.cpp4
-rw-r--r--src/mixer/basetrackplayer.h4
-rw-r--r--src/mixer/playerinfo.h2
-rw-r--r--src/mixer/playermanager.cpp2
-rw-r--r--src/mixer/playermanager.h2
-rw-r--r--src/mixer/samplerbank.cpp2
-rw-r--r--src/mixxx.cpp2
-rw-r--r--src/mixxx.h2
-rw-r--r--src/musicbrainz/acoustidclient.h2
-rw-r--r--src/musicbrainz/chromaprinter.h2
-rw-r--r--src/musicbrainz/tagfetcher.cpp2
-rw-r--r--src/musicbrainz/tagfetcher.h2
-rw-r--r--src/preferences/replaygainsettings.h2
-rw-r--r--src/soundsourceproxy.cpp6
-rw-r--r--src/soundsourceproxy.h6
-rw-r--r--src/test/analyserwaveformtest.cpp4
-rw-r--r--src/test/autodjprocessor_test.cpp4
-rw-r--r--src/test/beatgridtest.cpp10
-rw-r--r--src/test/beatmaptest.cpp2
-rw-r--r--src/test/bpmcontrol_test.cpp4
-rw-r--r--src/test/coverartcache_test.cpp8
-rw-r--r--src/test/coverartutils_test.cpp8
-rw-r--r--src/test/directorydoatest.cpp8
-rw-r--r--src/test/searchqueryparsertest.cpp48
-rw-r--r--src/test/signalpathtest.h2
-rw-r--r--src/test/soundproxy_test.cpp6
-rw-r--r--src/test/trackexport_test.cpp30
-rw-r--r--src/test/trackexport_test.h2
-rw-r--r--src/track/beatfactory.cpp2
-rw-r--r--src/track/beatfactory.h2
-rw-r--r--src/track/beatgrid.cpp2
-rw-r--r--src/track/beatgrid.h4
-rw-r--r--src/track/beatmap.h2
-rw-r--r--src/track/keyfactory.h2
-rw-r--r--src/track/track.cpp (renamed from src/trackinfoobject.cpp)216
-rw-r--r--src/track/track.h (renamed from src/trackinfoobject.h)33
-rw-r--r--src/waveform/renderers/glwaveformrendererfilteredsignal.cpp2
-rw-r--r--src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp2
-rw-r--r--src/waveform/renderers/qtwaveformrenderersimplesignal.cpp2
-rw-r--r--src/waveform/renderers/waveformrenderbeat.cpp4
-rw-r--r--src/waveform/renderers/waveformrendererfilteredsignal.cpp2
-rw-r--r--src/waveform/renderers/waveformrendererhsv.cpp2
-rw-r--r--src/waveform/renderers/waveformrendererrgb.cpp2
-rw-r--r--src/waveform/renderers/waveformrendermark.cpp2
-rw-r--r--src/waveform/renderers/waveformrendermarkrange.cpp2
-rw-r--r--src/waveform/renderers/waveformwidgetrenderer.h4
-rw-r--r--src/waveform/widgets/waveformwidgetabstract.h2
-rw-r--r--src/widget/wcoverart.h2
-rw-r--r--src/widget/wcoverartmenu.h2
-rw-r--r--src/widget/wlibrarytableview.h2
-rw-r--r--src/widget/woverview.cpp2
-rw-r--r--src/widget/woverview.h2
-rw-r--r--src/widget/wspinny.h2
-rw-r--r--src/widget/wstarrating.cpp6
-rw-r--r--src/widget/wstarrating.h4
-rw-r--r--src/widget/wtrackproperty.cpp6
-rw-r--r--src/widget/wtrackproperty.h4
-rw-r--r--src/widget/wtracktableview.cpp2
-rw-r--r--src/widget/wtracktableview.h2
-rw-r--r--src/widget/wtracktext.cpp6
-rw-r--r--src/widget/wtracktext.h4
-rw-r--r--src/widget/wwaveformviewer.cpp2
-rw-r--r--src/widget/wwaveformviewer.h2
131 files changed, 390 insertions, 391 deletions
diff --git a/src/analyzer/analyzer.h b/src/analyzer/analyzer.h
index c351e619fb..4e55e6432c 100644
--- a/src/analyzer/analyzer.h
+++ b/src/analyzer/analyzer.h
@@ -11,7 +11,7 @@
* -- Adam
*/
-#include "trackinfoobject.h"
+#include "track/track.h"
class Analyzer {
public:
diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
index 9258a40d8e..086c9501b7 100644
--- a/src/analyzer/analyzerbeats.cpp
+++ b/src/analyzer/analyzerbeats.cpp
@@ -15,7 +15,7 @@
#include "track/beatfactory.h"
#include "track/beatmap.h"
#include "track/beatutils.h"
-#include "trackinfoobject.h"
+#include "track/track.h"
AnalyzerBeats::AnalyzerBeats(UserSettingsPointer pConfig)
: m_pConfig(pConfig),
diff --git a/src/analyzer/analyzerebur128.cpp b/src/analyzer/analyzerebur128.cpp
index 1b5e408bdc..2899c9ab26 100644
--- a/