From 47fffa7f7381dbff4cc0c446c98ea31bff1b3a3b Mon Sep 17 00:00:00 2001
From: casey <casey@GREENPOINT>
Date: Sat, 14 May 2016 01:16:50 -0700
Subject: [PATCH] boost::shared_ptr -> std::shared_ptr, boost::weak_ptr ->
 std::weak_ptr

---
 src/contrib/cddadecoder/CddaDataStreamFactory.cpp |  2 +-
 src/contrib/waveout/WaveOut.h                     |  2 +-
 src/core/audio/Buffer.h                           |  2 +-
 src/core/audio/Player.h                           |  4 ++--
 src/core/audio/Stream.h                           |  8 ++++----
 src/core/io/DataStreamFactory.h                   |  4 ++--
 src/core/library/ILibrary.h                       |  2 +-
 src/core/library/IQuery.h                         |  2 +-
 src/core/library/Indexer.cpp                      |  2 +-
 src/core/library/Indexer.h                        |  4 ++--
 src/core/library/LibraryFactory.cpp               |  2 +-
 src/core/library/metadata/MetadataValue.h         |  2 +-
 src/core/library/track/InMemoryTrack.h            |  2 +-
 src/core/library/track/Track.h                    |  2 +-
 src/core/playback/NonLibraryTrackHelper.cpp       |  2 +-
 src/core/playback/NonLibraryTrackHelper.h         |  2 +-
 src/core/plugin/PluginFactory.h                   |  6 +++---
 src/core/support/Preferences.h                    |  4 ++--
 src/musikbox/CategoryListQuery.h                  |  2 +-
 src/musikbox/CategoryListView.h                   |  4 ++--
 src/musikbox/CommandWindow.cpp                    |  2 +-
 src/musikbox/IScrollAdapter.h                     |  2 +-
 src/musikbox/LogWindow.cpp                        |  2 +-
 src/musikbox/MainLayout.h                         | 10 +++++-----
 src/musikbox/SimpleScrollAdapter.cpp              |  2 +-
 25 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/contrib/cddadecoder/CddaDataStreamFactory.cpp b/src/contrib/cddadecoder/CddaDataStreamFactory.cpp
index 69c94c102..68e41f812 100755
--- a/src/contrib/cddadecoder/CddaDataStreamFactory.cpp
+++ b/src/contrib/cddadecoder/CddaDataStreamFactory.cpp
@@ -34,7 +34,7 @@
 #include "shlwapi.h"
 #include <string>
 #include "CddaDataStreamFactory.h"
-#include "CddaDataStream.h";
+#include "CddaDataStream.h"
 
 CddaDataStreamFactory::CddaDataStreamFactory() {
 
diff --git a/src/contrib/waveout/WaveOut.h b/src/contrib/waveout/WaveOut.h
index 5e1fff09d..e311bcf6b 100644
--- a/src/contrib/waveout/WaveOut.h
+++ b/src/contrib/waveout/WaveOut.h
@@ -56,7 +56,7 @@ class WaveOut : public IOutput {
         virtual bool Play(IBuffer *buffer, IBufferProvider *provider);
 
     public: 
-        typedef boost::shared_ptr<WaveOutBuffer> WaveOutBufferPtr;
+        typedef std::shared_ptr<WaveOutBuffer> WaveOutBufferPtr;
         static DWORD WINAPI WaveCallbackThreadProc(LPVOID params);
 
         void OnBufferWrittenToOutput(WaveOutBuffer *buffer);
diff --git a/src/core/audio/Buffer.h b/src/core/audio/Buffer.h
index b79959760..8b786353a 100644
--- a/src/core/audio/Buffer.h
+++ b/src/core/audio/Buffer.h
@@ -42,7 +42,7 @@ namespace musik { namespace core { namespace audio {
 
 class  Buffer;
 class  Stream;
-typedef boost::shared_ptr<Buffer> BufferPtr;
+typedef std::shared_ptr<Buffer> BufferPtr;
 
 //////////////////////////////////////////
 ///\brief
diff --git a/src/core/audio/Player.h b/src/core/audio/Player.h
index f118bc550..35f0ffb3b 100644
--- a/src/core/audio/Player.h
+++ b/src/core/audio/Player.h
@@ -48,11 +48,11 @@ namespace musik { namespace core { namespace audio {
 
     class  Player;
     class  Transport;
-    typedef boost::shared_ptr<Player> PlayerPtr;
+    typedef std::shared_ptr<Player> PlayerPtr;
 
     class Player : public IBufferProvider {
         public:
-            typedef boost::shared_ptr<IOutput> OutputPtr;
+            typedef std::shared_ptr<IOutput> OutputPtr;
 
             static PlayerPtr Create(std::string &url,OutputPtr *output=&OutputPtr());
     
diff --git a/src/core/audio/Stream.h b/src/core/audio/Stream.h
index bbf581d38..e14b49149 100644
--- a/src/core/audio/Stream.h
+++ b/src/core/audio/Stream.h
@@ -47,7 +47,7 @@ namespace musik { namespace core { namespace audio {
 
     class  Stream;
     class  Player;
-    typedef boost::shared_ptr<Stream> StreamPtr;
+    typedef std::shared_ptr<Stream> StreamPtr;
 
     class  Stream {
         public:
@@ -77,10 +77,10 @@ namespace musik { namespace core { namespace audio {
 
         private:        
             typedef std::list<BufferPtr> BufferList;
-            typedef boost::shared_ptr<IDecoderFactory> DecoderFactoryPtr;
+            typedef std::shared_ptr<IDecoderFactory> DecoderFactoryPtr;
             typedef std::vector<DecoderFactoryPtr> DecoderFactoryList;
-            typedef boost::shared_ptr<IDecoder> DecoderPtr;
-            typedef boost::shared_ptr<IDSP> DspPtr;
+            typedef std::shared_ptr<IDecoder> DecoderPtr;
+            typedef std::shared_ptr<IDSP> DspPtr;
             typedef std::vector<DspPtr> Dsps;
 
             long preferedBufferSampleSize;
diff --git a/src/core/io/DataStreamFactory.h b/src/core/io/DataStreamFactory.h
index 8ce91c528..6729d94ba 100644
--- a/src/core/io/DataStreamFactory.h
+++ b/src/core/io/DataStreamFactory.h
@@ -44,14 +44,14 @@ namespace musik { namespace core { namespace io {
 
     class DataStreamFactory {
         public:
-            typedef boost::shared_ptr<IDataStream> DataStreamPtr;
+            typedef std::shared_ptr<IDataStream> DataStreamPtr;
 
         private:
             static DataStreamFactory sInstance;
             DataStreamFactory();
 
         private:
-            typedef std::vector<boost::shared_ptr<IDataStreamFactory>> DataStreamFactoryVector;
+            typedef std::vector<std::shared_ptr<IDataStreamFactory>> DataStreamFactoryVector;
             DataStreamFactoryVector dataStreamFactories;
 
         public:
diff --git a/src/core/library/ILibrary.h b/src/core/library/ILibrary.h
index 6f44e504f..07ff6b3db 100755
--- a/src/core/library/ILibrary.h
+++ b/src/core/library/ILibrary.h
@@ -10,7 +10,7 @@
 namespace musik { namespace core {
     
     class ILibrary;
-    typedef boost::shared_ptr<ILibrary> LibraryPtr;
+    typedef std::shared_ptr<ILibrary> LibraryPtr;
 
     class ILibrary {
         public:
diff --git a/src/core/library/IQuery.h b/src/core/library/IQuery.h
index b015e0ef3..68de1ef52 100755
--- a/src/core/library/IQuery.h
+++ b/src/core/library/IQuery.h
@@ -11,7 +11,7 @@
 namespace musik { namespace core {
     
     class IQuery;
-    typedef boost::shared_ptr<IQuery> QueryPtr;
+    typedef std::shared_ptr<IQuery> QueryPtr;
 
     class IQuery {
         public:
diff --git a/src/core/library/Indexer.cpp b/src/core/library/Indexer.cpp
index 450f8aa43..045746237 100644
--- a/src/core/library/Indexer.cpp
+++ b/src/core/library/Indexer.cpp
@@ -753,7 +753,7 @@ void Indexer::ProcessAddRemoveQueue() {
 void Indexer::RunAnalyzers() {
     typedef audio::IAnalyzer PluginType;
     typedef PluginFactory::DestroyDeleter<PluginType> Deleter;
-    typedef boost::shared_ptr<PluginType> PluginPtr;
+    typedef std::shared_ptr<PluginType> PluginPtr;
     typedef std::vector<PluginPtr> PluginVector;
 
     /* short circuit if there aren't any analyzers */
diff --git a/src/core/library/Indexer.h b/src/core/library/Indexer.h
index 99d4c80fb..d712908a1 100644
--- a/src/core/library/Indexer.h
+++ b/src/core/library/Indexer.h
@@ -111,13 +111,13 @@ namespace musik { namespace core {
                     std::string path;
             };
 
-            typedef std::vector<boost::shared_ptr<metadata::IMetadataReader>> MetadataReaderList;
+            typedef std::vector<std::shared_ptr<metadata::IMetadataReader>> MetadataReaderList;
 
             std::deque<AddRemoveContext> addRemoveQueue;
 
             MetadataReaderList metadataReaders;
     };
 
-    typedef boost::shared_ptr<Indexer> IndexerPtr;
+    typedef std::shared_ptr<Indexer> IndexerPtr;
 
 } } 
\ No newline at end of file
diff --git a/src/core/library/LibraryFactory.cpp b/src/core/library/LibraryFactory.cpp
index 980650561..244a7e67d 100644
--- a/src/core/library/LibraryFactory.cpp
+++ b/src/core/library/LibraryFactory.cpp
@@ -44,7 +44,7 @@
 using namespace musik::core;
 
 LibraryFactory& LibraryFactory::Instance() { 
-    typedef boost::shared_ptr<LibraryFactory> InstanceType;
+    typedef std::shared_ptr<LibraryFactory> InstanceType;
     static InstanceType sInstance(new LibraryFactory());
     return *sInstance; 
 };
diff --git a/src/core/library/metadata/MetadataValue.h b/src/core/library/metadata/MetadataValue.h
index 0030c4e9a..2bdcb3d34 100644
--- a/src/core/library/metadata/MetadataValue.h
+++ b/src/core/library/metadata/MetadataValue.h
@@ -55,7 +55,7 @@ namespace musik { namespace core {
             std::string value;
     };
 
-    typedef boost::shared_ptr<MetadataValue> MetadataValuePtr;
+    typedef std::shared_ptr<MetadataValue> MetadataValuePtr;
     typedef std::vector<MetadataValuePtr> MetadataValueVector;
 
 } }
diff --git a/src/core/library/track/InMemoryTrack.h b/src/core/library/track/InMemoryTrack.h
index 672d868e9..bf2b4934a 100644
--- a/src/core/library/track/InMemoryTrack.h
+++ b/src/core/library/track/InMemoryTrack.h
@@ -71,7 +71,7 @@ namespace musik { namespace core {
             virtual TrackPtr Copy();
 
         private:
-            typedef boost::weak_ptr<Track> SelfWeakPtr;
+            typedef std::weak_ptr<Track> SelfWeakPtr;
             SelfWeakPtr selfPtr;
             Track::MetadataMap metadata;
             std::string uri;
diff --git a/src/core/library/track/Track.h b/src/core/library/track/Track.h
index 24c59b24f..00791b2dd 100644
--- a/src/core/library/track/Track.h
+++ b/src/core/library/track/Track.h
@@ -45,7 +45,7 @@
 namespace musik { namespace core {
 
     class Track;
-    typedef boost::shared_ptr<Track> TrackPtr;
+    typedef std::shared_ptr<Track> TrackPtr;
     typedef std::vector<TrackPtr> TrackVector;
 
     //////////////////////////////////////////
diff --git a/src/core/playback/NonLibraryTrackHelper.cpp b/src/core/playback/NonLibraryTrackHelper.cpp
index 00814b200..8d293425d 100644
--- a/src/core/playback/NonLibraryTrackHelper.cpp
+++ b/src/core/playback/NonLibraryTrackHelper.cpp
@@ -80,7 +80,7 @@ void NonLibraryTrackHelper::ThreadLoop() {
     /* load all IMetadataReader plugins */
     typedef metadata::IMetadataReader PluginType;
     typedef PluginFactory::DestroyDeleter<PluginType> Deleter;
-    typedef std::vector<boost::shared_ptr<metadata::IMetadataReader>> MetadataReaderList;
+    typedef std::vector<std::shared_ptr<metadata::IMetadataReader>> MetadataReaderList;
 
     MetadataReaderList metadataReaders = 
         PluginFactory::Instance() .QueryInterface<PluginType, Deleter>("GetMetadataReader");
diff --git a/src/core/playback/NonLibraryTrackHelper.h b/src/core/playback/NonLibraryTrackHelper.h
index 76f2191eb..da274e040 100644
--- a/src/core/playback/NonLibraryTrackHelper.h
+++ b/src/core/playback/NonLibraryTrackHelper.h
@@ -72,7 +72,7 @@ class NonLibraryTrackHelper{
         boost::mutex mutex;
         bool threadIsRunning;
 
-        typedef boost::weak_ptr<musik::core::Track> TrackWeakPtr;
+        typedef std::weak_ptr<musik::core::Track> TrackWeakPtr;
         std::list<TrackWeakPtr> tracksToRead;
 
         typedef boost::scoped_ptr<boost::thread> ThreadPtr;
diff --git a/src/core/plugin/PluginFactory.h b/src/core/plugin/PluginFactory.h
index b135de278..a2e776375 100644
--- a/src/core/plugin/PluginFactory.h
+++ b/src/core/plugin/PluginFactory.h
@@ -95,12 +95,12 @@ namespace musik{ namespace core{
                 }
             };
 
-            template <class T, class D> std::vector<boost::shared_ptr<T>> QueryInterface(const char* functionName) {
+            template <class T, class D> std::vector<std::shared_ptr<T>> QueryInterface(const char* functionName) {
                 boost::mutex::scoped_lock lock(this->mutex);
 
                 typedef T* STDCALL(PluginInterfaceCall);
 
-                std::vector<boost::shared_ptr<T>> plugins;
+                std::vector<std::shared_ptr<T>> plugins;
                 HandleList& allDlls = PluginFactory::sInstance.loadedDlls;
 
                 typedef HandleList::iterator Iterator;
@@ -116,7 +116,7 @@ namespace musik{ namespace core{
                         T* result = funcPtr();
 
                         if (result) {
-                            plugins.push_back(boost::shared_ptr<T>(result, D()));
+                            plugins.push_back(std::shared_ptr<T>(result, D()));
                         }
                     }
 
diff --git a/src/core/support/Preferences.h b/src/core/support/Preferences.h
index c7ba9f511..66ccedfb5 100644
--- a/src/core/support/Preferences.h
+++ b/src/core/support/Preferences.h
@@ -102,10 +102,10 @@ class  Preferences{
                 ~IO(void);
 
                 typedef std::map<std::string,Setting> SettingMap;
-                typedef boost::shared_ptr<SettingMap> SettingMapPtr;
+                typedef std::shared_ptr<SettingMap> SettingMapPtr;
                 typedef std::map<std::string,SettingMapPtr> NamespaceMap;
                 typedef std::map<int,NamespaceMap> LibNamespaceMap;
-                typedef boost::shared_ptr<IO> Ptr;
+                typedef std::shared_ptr<IO> Ptr;
 
                 SettingMapPtr GetNamespace(const char* nameSpace,const char* library,int &libraryId);
 
diff --git a/src/musikbox/CategoryListQuery.h b/src/musikbox/CategoryListQuery.h
index 2be4de044..529f82c61 100755
--- a/src/musikbox/CategoryListQuery.h
+++ b/src/musikbox/CategoryListQuery.h
@@ -8,7 +8,7 @@ using musik::core::db::Connection;
 
 class CategoryListQuery : public QueryBase {
     public:
-        typedef boost::shared_ptr<std::vector<std::string>> Result;
+        typedef std::shared_ptr<std::vector<std::string>> Result;
 
         CategoryListQuery();
         ~CategoryListQuery();
diff --git a/src/musikbox/CategoryListView.h b/src/musikbox/CategoryListView.h
index 7a8dc9d14..09b3a7f46 100755
--- a/src/musikbox/CategoryListView.h
+++ b/src/musikbox/CategoryListView.h
@@ -38,6 +38,6 @@ class CategoryListView : public ListWindow, public sigslot::has_slots<> {
         LibraryPtr library;
         Adapter *adapter;
 
-        boost::shared_ptr<CategoryListQuery> activeQuery;
-        boost::shared_ptr<std::vector<std::string>> metadata;
+        std::shared_ptr<CategoryListQuery> activeQuery;
+        std::shared_ptr<std::vector<std::string>> metadata;
 };
\ No newline at end of file
diff --git a/src/musikbox/CommandWindow.cpp b/src/musikbox/CommandWindow.cpp
index 8da22f8d3..874491781 100755
--- a/src/musikbox/CommandWindow.cpp
+++ b/src/musikbox/CommandWindow.cpp
@@ -239,7 +239,7 @@ void CommandWindow::ListPlugins() const {
     using musik::core::IPlugin;
     using musik::core::PluginFactory;
 
-    typedef std::vector<boost::shared_ptr<IPlugin>> PluginList;
+    typedef std::vector<std::shared_ptr<IPlugin>> PluginList;
     typedef PluginFactory::NullDeleter<IPlugin> Deleter;
 
     PluginList plugins = PluginFactory::Instance()
diff --git a/src/musikbox/IScrollAdapter.h b/src/musikbox/IScrollAdapter.h
index 10aa3ec65..666d990ce 100755
--- a/src/musikbox/IScrollAdapter.h
+++ b/src/musikbox/IScrollAdapter.h
@@ -31,7 +31,7 @@ class IScrollAdapter {
             virtual int64 GetAttrs() = 0;
         };
 
-        typedef boost::shared_ptr<IEntry> EntryPtr;
+        typedef std::shared_ptr<IEntry> EntryPtr;
 
         virtual void SetDisplaySize(size_t width, size_t height) = 0;
         virtual size_t GetEntryCount() = 0;
diff --git a/src/musikbox/LogWindow.cpp b/src/musikbox/LogWindow.cpp
index 416df3e68..aa67f9a15 100755
--- a/src/musikbox/LogWindow.cpp
+++ b/src/musikbox/LogWindow.cpp
@@ -56,7 +56,7 @@ void LogWindow::Update() {
         std::string s = boost::str(boost::format(
             "[%1%] %2%") % entry->tag % entry->message);
 
-        this->adapter->AddEntry(boost::shared_ptr<IEntry>(new MultiLineEntry(s, attrs)));
+        this->adapter->AddEntry(std::shared_ptr<IEntry>(new MultiLineEntry(s, attrs)));
 
         delete entry;
     }
diff --git a/src/musikbox/MainLayout.h b/src/musikbox/MainLayout.h
index 5c03e2b72..eea5710e5 100755
--- a/src/musikbox/MainLayout.h
+++ b/src/musikbox/MainLayout.h
@@ -26,11 +26,11 @@ class MainLayout : public LayoutBase {
         virtual void OnIdle();
 
     private:
-        boost::shared_ptr<LogWindow> logs;
-        boost::shared_ptr<CommandWindow> commands;
-        boost::shared_ptr<OutputWindow> output;
-        boost::shared_ptr<TransportWindow> transport;
-        boost::shared_ptr<ResourcesWindow> resources;
+        std::shared_ptr<LogWindow> logs;
+        std::shared_ptr<CommandWindow> commands;
+        std::shared_ptr<OutputWindow> output;
+        std::shared_ptr<TransportWindow> transport;
+        std::shared_ptr<ResourcesWindow> resources;
         
         std::vector<IWindow*> focusOrder;
         int focusIndex;
diff --git a/src/musikbox/SimpleScrollAdapter.cpp b/src/musikbox/SimpleScrollAdapter.cpp
index 983b183ee..92850df0f 100755
--- a/src/musikbox/SimpleScrollAdapter.cpp
+++ b/src/musikbox/SimpleScrollAdapter.cpp
@@ -34,7 +34,7 @@ EntryPtr SimpleScrollAdapter::GetEntry(size_t index) {
     return this->entries.at(index);
 }
 
-void SimpleScrollAdapter::AddEntry(boost::shared_ptr<IEntry> entry) {
+void SimpleScrollAdapter::AddEntry(std::shared_ptr<IEntry> entry) {
     entry->SetWidth(this->GetWidth());
     entries.push_back(entry);