games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00
Code Issues Releases Activity

- replaced auto_ptr with c++11 unique_ptr

Browse Source
This commit is contained in:
Ivan Savenko 2012-02-17 20:34:34 +00:00
parent a975805ae8
commit d1d21b16dc
2 changed files with 4 additions and 4 deletions

4
client/CMusicHandler.cpp

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

4
client/CMusicHandler.h

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