1 files changed, 18 insertions, 25 deletions

diff --git a/src/PlayerControl.cxx b/src/PlayerControl.cxx
index f180874b0..bca3cc937 100644
--- a/src/PlayerControl.cxx
+++ b/src/PlayerControl.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,16 +20,17 @@
 #include "config.h"
 #include "PlayerControl.hxx"
 #include "Idle.hxx"
-#include "Song.hxx"
-#include "DecoderControl.hxx"
+#include "DetachedSong.hxx"
 
-#include <cmath>
+#include <algorithm>
 
 #include <assert.h>
 
-PlayerControl::PlayerControl(unsigned _buffer_chunks,
+PlayerControl::PlayerControl(MultipleOutputs &_outputs,
+			     unsigned _buffer_chunks,
 			     unsigned _buffered_before_play)
-	:buffer_chunks(_buffer_chunks),
+	:outputs(_outputs),
+	 buffer_chunks(_buffer_chunks),
 	 buffered_before_play(_buffered_before_play),
 	 command(PlayerCommand::NONE),
 	 state(PlayerState::STOP),
@@ -43,15 +44,12 @@ PlayerControl::PlayerControl(unsigned _buffer_chunks,
 
 PlayerControl::~PlayerControl()
 {
-	if (next_song != nullptr)
-		next_song->Free();
-
-	if (tagged_song != nullptr)
-		tagged_song->Free();
+	delete next_song;
+	delete tagged_song;
 }
 
 void
-PlayerControl::Play(Song *song)
+PlayerControl::Play(DetachedSong *song)
 {
 	assert(song != nullptr);
 
@@ -196,26 +194,23 @@ PlayerControl::ClearError()
 }
 
 void
-PlayerControl::LockSetTaggedSong(const Song &song)
+PlayerControl::LockSetTaggedSong(const DetachedSong &song)
 {
 	Lock();
-	if (tagged_song != nullptr)
-		tagged_song->Free();
-	tagged_song = song.DupDetached();
+	delete tagged_song;
+	tagged_song = new DetachedSong(song);
 	Unlock();
 }
 
 void
 PlayerControl::ClearTaggedSong()
 {
-	if (tagged_song != nullptr) {
-		tagged_song->Free();
-		tagged_song = nullptr;
-	}
+	delete tagged_song;
+	tagged_song = nullptr;
 }
 
 void
-PlayerControl::EnqueueSong(Song *song)
+PlayerControl::EnqueueSong(DetachedSong *song)
 {
 	assert(song != nullptr);
 
@@ -225,15 +220,13 @@ PlayerControl::EnqueueSong(Song *song)
 }
 
 bool
-PlayerControl::Seek(Song *song, float seek_time)
+PlayerControl::Seek(DetachedSong *song, float seek_time)
 {
 	assert(song != nullptr);
 
 	Lock();
 
-	if (next_song != nullptr)
-		next_song->Free();
-
+	delete next_song;
 	next_song = song;
 	seek_where = seek_time;
 	SynchronousCommand(PlayerCommand::SEEK);