Browse Source

- replaced auto_ptr with c++11 unique_ptr

Ivan Savenko 13 years ago
parent
commit
d1d21b16dc
2 changed files with 4 additions and 4 deletions
  1. 2 2
      client/CMusicHandler.cpp
  2. 2 2
      client/CMusicHandler.h

+ 2 - 2
client/CMusicHandler.cpp

@@ -421,7 +421,7 @@ void CMusicHandler::queueNext(MusicEntry *queued)
 	}
 	else
 	{
-		current = next;
+		current.reset(next.release());
 		current->play();
 	}
 }
@@ -465,7 +465,7 @@ void CMusicHandler::musicFinishedCallback(void)
 
 	if (current.get() == NULL && next.get() != NULL)
 	{
-		current = next;
+		current.reset(next.release());
 		current->play();
 	}
 }

+ 2 - 2
client/CMusicHandler.h

@@ -145,8 +145,8 @@ private:
 	SettingsListener listener;
 	void onVolumeChange(const JsonNode &volumeNode);
 
-	std::auto_ptr<MusicEntry> current;
-	std::auto_ptr<MusicEntry> next;
+	std::unique_ptr<MusicEntry> current;
+	std::unique_ptr<MusicEntry> next;
 
 	void queueNext(MusicEntry *queued);
 public: