Merge branch 'master' into features_effects

Conflicts:
	src/basetrackplayer.cpp
	src/engine/enginemaster.cpp
	src/mixxx.cpp
	src/mixxx.h

1 files changed, 10 insertions, 2 deletions

diff --git a/src/basetrackplayer.cpp b/src/basetrackplayer.cpp
index 652a8b09e1..20feb4225a 100644
--- a/src/basetrackplayer.cpp
+++ b/src/basetrackplayer.cpp
@@ -14,6 +14,7 @@
 #include "track/beatgrid.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "analyserqueue.h"
+#include "util/sandbox.h"
 #include "effects/effectsmanager.h"
 
 BaseTrackPlayer::BaseTrackPlayer(QObject* pParent,
@@ -102,6 +103,12 @@ BaseTrackPlayer::~BaseTrackPlayer()
 }
 
 void BaseTrackPlayer::slotLoadTrack(TrackPointer track, bool bPlay) {
+    // Before loading the track, ensure we have access. This uses lazy
+    // evaluation to make sure track isn't NULL before we dereference it.
+    if (!track.isNull() && !Sandbox::askForAccess(track->getCanonicalLocation())) {
+        // We don't have access.
+        return;
+    }
 
     //Disconnect the old track's signals.
     if (m_pLoadedTrack) {
@@ -200,8 +207,9 @@ void BaseTrackPlayer::slotUnloadTrack(TrackPointer) {
 void BaseTrackPlayer::slotFinishLoading(TrackPointer pTrackInfoObject)
 {
     // Read the tags if required
-    if(!m_pLoadedTrack->getHeaderParsed())
-        SoundSourceProxy::ParseHeader(m_pLoadedTrack.data());
+    if (!m_pLoadedTrack->getHeaderParsed()) {
+        m_pLoadedTrack->parse();
+    }
 
     // m_pLoadedTrack->setPlayedAndUpdatePlaycount(true); // Actually the song is loaded but not played