Use unique_ptr.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 3a098c38e..5de089ba9 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -134,12 +134,6 @@ Player::construct ()
 }
 
 
-Player::~Player ()
-{
-	delete _shuffler;
-}
-
-
 void
 Player::setup_pieces ()
 {
@@ -170,8 +164,7 @@ Player::setup_pieces_unlocked ()
 	auto old_pieces = _pieces;
 	_pieces.clear ();
 
-	delete _shuffler;
-	_shuffler = new Shuffler();
+	_shuffler.reset (new Shuffler());
 	_shuffler->Video.connect(bind(&Player::video, this, _1, _2));
 
 	for (auto i: playlist()->content()) {
@@ -226,7 +219,7 @@ Player::setup_pieces_unlocked ()
 		if (decoder->video) {
 			if (i->video->frame_type() == VideoFrameType::THREE_D_LEFT || i->video->frame_type() == VideoFrameType::THREE_D_RIGHT) {
 				/* We need a Shuffler to cope with 3D L/R video data arriving out of sequence */
-				decoder->video->Data.connect (bind(&Shuffler::video, _shuffler, weak_ptr<Piece>(piece), _1));
+				decoder->video->Data.connect (bind(&Shuffler::video, _shuffler.get(), weak_ptr<Piece>(piece), _1));
 			} else {
 				decoder->video->Data.connect (bind(&Player::video, this, weak_ptr<Piece>(piece), _1));
 			}