Re-pathed all queries and filestreams.

src/core/IndexerTrack.cpp

@@ -42,7 +42,7 @@
 #include <core/db/Connection.h>
 #include <core/db/Statement.h>
 #include <core/library/LibraryBase.h>
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 
 #include <boost/lexical_cast.hpp>
 

src/core/Library/LibraryBase.cpp

@@ -38,7 +38,7 @@
 
 #include <core/Library/LibraryBase.h>
 #include <core/config.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Common.h>
 
 using namespace musik::core;

src/core/Library/LocalLibrary.cpp

@@ -37,7 +37,7 @@
 #include "pch.hpp"
 
 #include <core/Library/LocalLibrary.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Preferences.h>
 
 #include <boost/bind.hpp>

src/core/NonLibraryTrackHelper.cpp

@@ -40,7 +40,7 @@
 #include <boost/bind.hpp>
 #include <core/PluginFactory.h>
 #include <core/sdk/IMetaDataReader.h>
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 
 using namespace musik::core;
 

src/core/PlaybackQueue.cpp

@@ -33,7 +33,7 @@
 #include "pch.hpp"
 #include <core/PlaybackQueue.h>
 #include <core/LibraryFactory.h>
-#include <core/tracklist/MultiLibraryTrackListQuery.h>
+#include <core/library/query/MultiLibraryTrackListQuery.h>
 
 #include <boost/algorithm/string.hpp>
 

src/core/PlaybackQueue.h

@@ -36,8 +36,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <core/audio/Transport.h>
-#include <core/tracklist/TrackListQueryBase.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackListQueryBase.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <sigslot/sigslot.h>
 
 //////////////////////////////////////////////////////////////////////////////

src/core/audio/Stream.h

@@ -34,7 +34,7 @@
 #pragma once
 
 #include <core/config.h>
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 #include <core/audio/Buffer.h>
 #include <core/sdk/IDecoder.h>
 #include <core/sdk/IDSP.h>

src/core/core.vcxproj

@@ -77,7 +77,19 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="datastream\Factory.cpp" />
+    <ClCompile Include="datastream\LocalFileStream.cpp" />
     <ClCompile Include="Library\LocalLibrary.cpp" />
+    <ClCompile Include="Library\query\Factory.cpp" />
+    <ClCompile Include="Library\query\LibraryTrackListQuery.cpp" />
+    <ClCompile Include="Library\query\ListQueryBase.cpp" />
+    <ClCompile Include="Library\query\ListSelectionQuery.cpp" />
+    <ClCompile Include="Library\query\MultiLibraryTrackListQuery.cpp" />
+    <ClCompile Include="Library\query\QueryBase.cpp" />
+    <ClCompile Include="Library\query\SortTracksQuery.cpp" />
+    <ClCompile Include="Library\query\SortTracksWithDataQuery.cpp" />
+    <ClCompile Include="Library\query\TrackListQueryBase.cpp" />
+    <ClCompile Include="Library\query\TrackMetadataQuery.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -91,18 +103,6 @@
     <ClCompile Include="ThreadHelper.cpp" />
     <ClCompile Include="Indexer.cpp" />
     <ClCompile Include="LibraryFactory.cpp" />
-    <ClCompile Include="Query\QueryBase.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="Query\Factory.cpp" />
-    <ClCompile Include="Query\ListQueryBase.cpp" />
-    <ClCompile Include="Query\ListSelectionQuery.cpp" />
-    <ClCompile Include="Query\SortTracksQuery.cpp" />
-    <ClCompile Include="Query\SortTracksWithDataQuery.cpp" />
-    <ClCompile Include="Query\TrackMetadataQuery.cpp" />
     <ClCompile Include="Library\LibraryBase.cpp" />
     <ClCompile Include="db\CachedStatement.cpp" />
     <ClCompile Include="db\Connection.cpp" />
@@ -116,24 +116,26 @@
     <ClCompile Include="audio\Player.cpp" />
     <ClCompile Include="audio\Stream.cpp" />
     <ClCompile Include="audio\Transport.cpp" />
-    <ClCompile Include="filestreams\Factory.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="filestreams\LocalFileStream.cpp" />
     <ClCompile Include="GenericTrack.cpp" />
     <ClCompile Include="IndexerTrack.cpp" />
     <ClCompile Include="LibraryTrack.cpp" />
     <ClCompile Include="Track.cpp" />
     <ClCompile Include="TrackFactory.cpp" />
-    <ClCompile Include="tracklist\TrackListQueryBase.cpp" />
-    <ClCompile Include="tracklist\LibraryTrackListQuery.cpp" />
-    <ClCompile Include="tracklist\MultiLibraryTrackListQuery.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="datastream\Factory.h" />
+    <ClInclude Include="datastream\LocalFileStream.h" />
     <ClInclude Include="Library\LocalLibrary.h" />
+    <ClInclude Include="Library\query\Factory.h" />
+    <ClInclude Include="Library\query\LibraryTrackListQuery.h" />
+    <ClInclude Include="Library\query\ListQueryBase.h" />
+    <ClInclude Include="Library\query\ListSelectionQuery.h" />
+    <ClInclude Include="Library\query\MultiLibraryTrackListQuery.h" />
+    <ClInclude Include="Library\query\QueryBase.h" />
+    <ClInclude Include="Library\query\SortTracksQuery.h" />
+    <ClInclude Include="Library\query\SortTracksWithDataQuery.h" />
+    <ClInclude Include="Library\query\TrackListQueryBase.h" />
+    <ClInclude Include="Library\query\TrackMetadataQuery.h" />
     <ClInclude Include="pch.hpp" />
     <ClInclude Include="PlaybackQueue.h" />
     <ClInclude Include="Common.h" />
@@ -155,18 +157,8 @@
     <ClInclude Include="sdk\IPlugin.h" />
     <ClInclude Include="sdk\ITrack.h" />
     <ClInclude Include="ThreadHelper.h" />
-    <ClInclude Include="tracklist\TrackListQueryBase.h" />
-    <ClInclude Include="tracklist\LibraryTrackListQuery.h" />
-    <ClInclude Include="tracklist\MultiLibraryTrackListQuery.h" />
     <ClInclude Include="Indexer.h" />
     <ClInclude Include="LibraryFactory.h" />
-    <ClInclude Include="Query\QueryBase.h" />
-    <ClInclude Include="Query\Factory.h" />
-    <ClInclude Include="Query\ListQueryBase.h" />
-    <ClInclude Include="Query\ListSelectionQuery.h" />
-    <ClInclude Include="Query\SortTracksQuery.h" />
-    <ClInclude Include="Query\SortTracksWithDataQuery.h" />
-    <ClInclude Include="Query\TrackMetadataQuery.h" />
     <ClInclude Include="Library\LibraryBase.h" />
     <ClInclude Include="db\CachedStatement.h" />
     <ClInclude Include="db\Connection.h" />
@@ -181,8 +173,6 @@
     <ClInclude Include="audio\Player.h" />
     <ClInclude Include="audio\Stream.h" />
     <ClInclude Include="audio\Transport.h" />
-    <ClInclude Include="filestreams\Factory.h" />
-    <ClInclude Include="filestreams\LocalFileStream.h" />
     <ClInclude Include="GenericTrack.h" />
     <ClInclude Include="IndexerTrack.h" />
     <ClInclude Include="LibraryTrack.h" />

src/core/datastream/Factory.cpp

@@ -36,10 +36,10 @@
 
 #include "pch.hpp"
 
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 #include <core/config.h>
 #include <core/PluginFactory.h>
-#include <core/filestreams/LocalFileStream.h>
+#include <core/datastream/LocalFileStream.h>
 
 using namespace musik::core::io;
 

src/core/datastream/LocalFileStream.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/filestreams/LocalFileStream.h>
+#include <core/datastream/LocalFileStream.h>
 #include <core/config.h>
 #include <core/Common.h>
 #include <core/config.h>

src/core/library/query/Factory.cpp

@@ -36,12 +36,12 @@
 
 #include "pch.hpp"
 
-#include <core/Query/Factory.h>
+#include <core/library/query/Factory.h>
 
-#include <core/Query/ListSelectionQuery.h>
-#include <core/Query/SortTracksQuery.h>
-#include <core/Query/SortTracksWithDataQuery.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/ListSelectionQuery.h>
+#include <core/library/query/SortTracksQuery.h>
+#include <core/library/query/SortTracksWithDataQuery.h>
+#include <core/library/query/TrackMetadataQuery.h>
 
 using namespace musik::core::query;
 

src/core/library/query/Factory.h

@@ -36,7 +36,7 @@
 #pragma once
 
 #include <core/config.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 
 #include <map>
 

src/core/library/query/LibraryTrackListQuery.cpp

@@ -36,9 +36,9 @@
 
 #include "pch.hpp"
 
-#include <core/tracklist/LibraryTrackListQuery.h>
+#include <core/library/query/LibraryTrackListQuery.h>
 #include <core/LibraryTrack.h>
-#include <core/Query/SortTracksQuery.h>
+#include <core/library/query/SortTracksQuery.h>
 
 //////////////////////////////////////////////////////////////////////////////
 using namespace musik::core::tracklist;

src/core/library/query/LibraryTrackListQuery.h

@@ -38,9 +38,9 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <core/tracklist/TrackListQueryBase.h>
-#include <core/Query/ListQueryBase.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <core/library/LibraryBase.h>
 
 #include <set>

src/core/library/query/ListQueryBase.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/ListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
 #include <core/library/LibraryBase.h>
 #include <core/Common.h>
 #include <core/LibraryTrack.h>

src/core/library/query/ListQueryBase.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/MetadataValue.h>
 #include <core/LibraryTrack.h>
 

src/core/library/query/ListSelectionQuery.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/ListSelectionQuery.h>
+#include <core/library/query/ListSelectionQuery.h>
 #include <core/library/LibraryBase.h>
 
 #include <boost/format.hpp>

src/core/library/query/ListSelectionQuery.h

@@ -50,7 +50,7 @@
 #include <string>
 
 #include <core/config.h>
-#include <core/Query/ListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
 
 //////////////////////////////////////////////////////////////
 

src/core/library/query/MultiLibraryTrackListQuery.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/tracklist/MultiLibraryTrackListQuery.h>
+#include <core/library/query/MultiLibraryTrackListQuery.h>
 #include <core/LibraryTrack.h>
 #include <core/LibraryFactory.h>
 #include <core/NonLibraryTrackHelper.h>

src/core/library/query/MultiLibraryTrackListQuery.h

@@ -38,11 +38,11 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <core/tracklist/TrackListQueryBase.h>
-#include <core/Query/ListQueryBase.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <core/library/LibraryBase.h>
-#include <core/Query/SortTracksWithDataQuery.h>
+#include <core/library/query/SortTracksWithDataQuery.h>
 
 #include <boost/thread/mutex.hpp>
 #include <boost/algorithm/string.hpp>

src/core/library/query/PlaylistLoad.cpp

@@ -40,7 +40,7 @@
 #include <core/pch.hpp>
 #endif
 
-#include <core/Query/PlaylistLoad.h>
+#include <core/library/query/PlaylistLoad.h>
 #include <core/Library/Base.h>
 
 using namespace musik::core;

src/core/library/query/PlaylistLoad.h

@@ -44,7 +44,7 @@
 #include <string>
 
 #include <core/config.h>
-#include <core/Query/ListBase.h>
+#include <core/library/query/ListBase.h>
 
 //////////////////////////////////////////////////////////////
 // Forward declarations

src/core/library/query/PlaylistSave.cpp

@@ -35,7 +35,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "../pch.hpp"
-#include <core/Query/PlaylistSave.h>
+#include <core/library/query/PlaylistSave.h>
 #include <core/Library/Base.h>
 #include <core/LibraryTrack.h>
 

src/core/library/query/PlaylistSave.h

@@ -43,8 +43,8 @@
 #include <sigslot/sigslot.h>
 
 #include <core/config.h>
-#include <core/Query/Base.h>
-#include <core/tracklist/LibraryList.h>
+#include <core/library/query/Base.h>
+#include <core/library/query/LibraryList.h>
 
 //////////////////////////////////////////////////////////////
 // Forward declarations

src/core/library/query/Playlists.cpp

@@ -35,9 +35,9 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "../pch.hpp"
-#include <core/Query/Playlists.h>
+#include <core/library/query/Playlists.h>
 #include <core/Library/Base.h>
-#include <core/tracklist/Playlist.h>
+#include <core/library/query/Playlist.h>
 
 using namespace musik::core;
 

src/core/library/query/Playlists.h

@@ -48,8 +48,8 @@ namespace musik{ namespace core{
 //////////////////////////////////////////////////////////////
 
 #include <core/config.h>
-#include <core/Query/Base.h>
-#include <core/tracklist/LibraryList.h>
+#include <core/library/query/Base.h>
+#include <core/library/query/LibraryList.h>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>

src/core/library/query/QueryBase.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Library/LibraryBase.h>
 
 using namespace musik::core;

src/core/library/query/SortTracksQuery.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/SortTracksQuery.h>
+#include <core/library/query/SortTracksQuery.h>
 #include <core/library/LibraryBase.h>
 #include <core/config.h>
 #include <boost/algorithm/string.hpp>

src/core/library/query/SortTracksQuery.h

@@ -43,8 +43,8 @@
 #include <string>
 
 #include <core/config.h>
-#include <core/Query/ListQueryBase.h>
-#include <core/tracklist/LibraryTrackListQuery.h>
+#include <core/library/query/ListQueryBase.h>
+#include <core/library/query/LibraryTrackListQuery.h>
 
 namespace musik { namespace core { namespace query {
 

src/core/library/query/SortTracksWithDataQuery.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/SortTracksWithDataQuery.h>
+#include <core/library/query/SortTracksWithDataQuery.h>
 #include <core/library/LibraryBase.h>
 #include <core/config.h>
 #include <boost/algorithm/string.hpp>

src/core/library/query/SortTracksWithDataQuery.h

@@ -37,7 +37,7 @@
 #pragma once
 
 #include <core/config.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Track.h>
 
 #include <boost/shared_ptr.hpp>

src/core/library/query/TrackListQueryBase.cpp

@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/tracklist/TrackListQueryBase.h>
+#include <core/library/query/TrackListQueryBase.h>
 
 //////////////////////////////////////////////////////////////////////////////
 

src/core/library/query/TrackListQueryBase.h

@@ -41,7 +41,7 @@
 #include <core/config.h>
 #include <core/Track.h>
 #include <core/library/LibraryBase.h>
-#include <core/Query/ListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
 
 //////////////////////////////////////////////////////////////////////////////
 

src/core/library/query/TrackMetadataQuery.cpp

@@ -37,7 +37,7 @@
 #include "pch.hpp"
 
 #include <core/Common.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <core/library/LibraryBase.h>
 #include <core/LibraryTrack.h>
 #include <boost/algorithm/string.hpp>

src/core/library/query/TrackMetadataQuery.h

@@ -42,7 +42,7 @@
 #include <boost/function.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/config.h>
 #include <core/Track.h>