MusicManager: change parents to raw pointers to avoid circular references

Author: fuzzie

src/MusicManager.cpp

@@ -379,7 +379,7 @@ MusicEffect::MusicEffect(MNGEffectDecNode *n) {
 	}
 }
 
-std::vector<FloatAudioBuffer> MusicEffect::applyEffect(shared_ptr<class MusicTrack> t, std::vector<FloatAudioBuffer> src, float beatlength) {
+std::vector<FloatAudioBuffer> MusicEffect::applyEffect(class MusicTrack *t, std::vector<FloatAudioBuffer> src, float beatlength) {
 	std::vector<FloatAudioBuffer> buffers;
 
 	for (std::vector<shared_ptr<MusicStage> >::iterator i = stages.begin(); i != stages.end(); i++) {
@@ -394,7 +394,7 @@ std::vector<FloatAudioBuffer> MusicEffect::applyEffect(shared_ptr<class MusicTra
 
 MusicVoice::MusicVoice(shared_ptr<MusicLayer> p, MNGVoiceNode *n) {
 	node = n;
-	parent = p;
+	parent = p.get();
 
 	interval = 0.0f;
 	interval_expression = NULL;
@@ -461,7 +461,7 @@ bool MusicVoice::shouldPlay() {
 }
 
 MusicLayer::MusicLayer(shared_ptr<MusicTrack> p) {
-	parent = p;
+	parent = p.get();
 
 	updaterate = 1.0f;
 	volume = 1.0f;

src/MusicManager.h

@@ -97,14 +97,14 @@ class MusicEffect {
 
 public:
 	MusicEffect(MNGEffectDecNode *n);
-	std::vector<FloatAudioBuffer> applyEffect(shared_ptr<class MusicTrack> t, std::vector<FloatAudioBuffer> src, float beatlength);
+	std::vector<FloatAudioBuffer> applyEffect(class MusicTrack *t, std::vector<FloatAudioBuffer> src, float beatlength);
 };
 
 class MusicVoice {
 protected:
 	MNGVoiceNode *node;
 	MNGUpdateNode *updatenode;
-	shared_ptr<class MusicLayer> parent;
+	class MusicLayer *parent;
 	shared_ptr<MusicWave> wave;
 	shared_ptr<MusicEffect> effect;
 
@@ -121,14 +121,14 @@ class MusicVoice {
 	shared_ptr<MusicEffect> getEffect() { return effect; }
 	bool shouldPlay();
 	void runUpdateBlock();
-	shared_ptr<MusicLayer> getParent() { return parent; }
+	MusicLayer *getParent() { return parent; }
 };
 
 class MusicLayer : public boost::enable_shared_from_this<class MusicLayer> {
 protected:
 	MNGUpdateNode *updatenode;
 
-	shared_ptr<MusicTrack> parent;
+	MusicTrack *parent;
 	unsigned int next_offset;
 
 	std::map<std::string, float> variables;
@@ -138,7 +138,7 @@ class MusicLayer : public boost::enable_shared_from_this<class MusicLayer> {
 	void runUpdateBlock();
 
 public:
-	shared_ptr<MusicTrack> getParent() { return parent; }
+	MusicTrack *getParent() { return parent; }
 	float &getVariable(std::string name) { return variables[name]; }
 	virtual void update(unsigned int latency) = 0;
 	float getVolume() { return volume; }