From f0206c05e8d2f76d09705caeb77af738d68ffab7 Mon Sep 17 00:00:00 2001 From: Casey Langen Date: Mon, 12 Oct 2020 19:23:17 -0700 Subject: [PATCH] Move "core" directory to "musikcore". Windows build probably needs some tweaks. --- .gitignore | 2 +- CMakeLists.txt | 8 +-- README.md | 2 +- src/core_c_demo/main.c | 2 +- src/{core => musikcore}/CMakeLists.txt | 0 src/{core => musikcore}/audio/Buffer.cpp | 2 +- src/{core => musikcore}/audio/Buffer.h | 4 +- .../audio/CrossfadeTransport.cpp | 8 +-- .../audio/CrossfadeTransport.h | 14 ++-- src/{core => musikcore}/audio/Crossfader.cpp | 4 +- src/{core => musikcore}/audio/Crossfader.h | 12 ++-- .../audio/GaplessTransport.cpp | 8 +-- .../audio/GaplessTransport.h | 10 +-- src/{core => musikcore}/audio/IStream.h | 10 +-- src/{core => musikcore}/audio/ITransport.h | 6 +- .../audio/MasterTransport.cpp | 8 +-- .../audio/MasterTransport.h | 6 +- src/{core => musikcore}/audio/Outputs.cpp | 6 +- src/{core => musikcore}/audio/Outputs.h | 4 +- .../audio/PlaybackService.cpp | 20 +++--- .../audio/PlaybackService.h | 16 ++--- src/{core => musikcore}/audio/Player.cpp | 12 ++-- src/{core => musikcore}/audio/Player.h | 10 +-- src/{core => musikcore}/audio/Stream.cpp | 2 +- src/{core => musikcore}/audio/Stream.h | 14 ++-- src/{core => musikcore}/audio/Streams.cpp | 8 +-- src/{core => musikcore}/audio/Streams.h | 12 ++-- src/{core => musikcore}/audio/Visualizer.cpp | 2 +- src/{core => musikcore}/audio/Visualizer.h | 6 +- src/{core => musikcore}/c_context.cpp | 22 +++--- src/{core => musikcore}/c_context.h | 12 ++-- .../c_interface_wrappers.cpp | 68 +++++++++--------- src/{core => musikcore}/config.h | 0 src/{core => musikcore}/core.sln | 0 src/{core => musikcore}/core.vcproj | 0 src/{core => musikcore}/core.vcxproj | 0 src/{core => musikcore}/core.vcxproj.filters | 0 src/{core => musikcore}/db/Connection.cpp | 2 +- src/{core => musikcore}/db/Connection.h | 6 +- .../db/ScopedTransaction.cpp | 4 +- .../db/ScopedTransaction.h | 2 +- src/{core => musikcore}/db/Statement.cpp | 4 +- src/{core => musikcore}/db/Statement.h | 2 +- src/{core => musikcore}/debug.cpp | 4 +- src/{core => musikcore}/debug.h | 0 src/{core => musikcore}/i18n/Locale.cpp | 4 +- src/{core => musikcore}/i18n/Locale.h | 4 +- .../io/DataStreamFactory.cpp | 8 +-- .../io/DataStreamFactory.h | 6 +- .../io/LocalFileStream.cpp | 10 +-- src/{core => musikcore}/io/LocalFileStream.h | 4 +- src/{core => musikcore}/library/IIndexer.h | 0 src/{core => musikcore}/library/ILibrary.h | 8 +-- src/{core => musikcore}/library/IQuery.h | 4 +- src/{core => musikcore}/library/Indexer.cpp | 36 +++++----- src/{core => musikcore}/library/Indexer.h | 14 ++-- .../library/LibraryFactory.cpp | 14 ++-- .../library/LibraryFactory.h | 8 +-- .../library/LocalLibrary.cpp | 16 ++--- .../library/LocalLibrary.h | 12 ++-- .../library/LocalLibraryConstants.h | 0 .../library/LocalMetadataProxy.cpp | 40 +++++------ .../library/LocalMetadataProxy.h | 4 +- .../library/MasterLibrary.cpp | 4 +- .../library/MasterLibrary.h | 12 ++-- src/{core => musikcore}/library/QueryBase.h | 6 +- .../library/QueryRegistry.cpp | 34 ++++----- .../library/QueryRegistry.h | 4 +- .../library/RemoteLibrary.cpp | 22 +++--- .../library/RemoteLibrary.h | 12 ++-- .../library/metadata/MetadataMap.cpp | 10 +-- .../library/metadata/MetadataMap.h | 2 +- .../library/metadata/MetadataMapList.cpp | 0 .../library/metadata/MetadataMapList.h | 2 +- .../library/query/AlbumListQuery.cpp | 6 +- .../library/query/AlbumListQuery.h | 8 +-- .../library/query/AllCategoriesQuery.cpp | 4 +- .../library/query/AllCategoriesQuery.h | 6 +- .../library/query/AppendPlaylistQuery.cpp | 14 ++-- .../library/query/AppendPlaylistQuery.h | 4 +- .../library/query/CategoryListQuery.cpp | 10 +-- .../library/query/CategoryListQuery.h | 14 ++-- .../library/query/CategoryTrackListQuery.cpp | 6 +- .../library/query/CategoryTrackListQuery.h | 12 ++-- .../library/query/DeletePlaylistQuery.cpp | 8 +-- .../library/query/DeletePlaylistQuery.h | 6 +- .../library/query/DirectoryTrackListQuery.cpp | 6 +- .../library/query/DirectoryTrackListQuery.h | 2 +- .../library/query/GetPlaylistQuery.cpp | 8 +-- .../library/query/GetPlaylistQuery.h | 6 +- .../library/query/LyricsQuery.cpp | 0 .../library/query/LyricsQuery.h | 2 +- .../library/query/MarkTrackPlayedQuery.cpp | 0 .../library/query/MarkTrackPlayedQuery.h | 2 +- .../query/NowPlayingTrackListQuery.cpp | 6 +- .../library/query/NowPlayingTrackListQuery.h | 4 +- .../library/query/PersistedPlayQueueQuery.cpp | 6 +- .../library/query/PersistedPlayQueueQuery.h | 4 +- .../library/query/SavePlaylistQuery.cpp | 18 ++--- .../library/query/SavePlaylistQuery.h | 8 +-- .../library/query/SearchTrackListQuery.cpp | 10 +-- .../library/query/SearchTrackListQuery.h | 2 +- .../library/query/SetTrackRatingQuery.cpp | 0 .../library/query/SetTrackRatingQuery.h | 2 +- .../library/query/TrackListQueryBase.h | 10 +-- .../library/query/TrackMetadataBatchQuery.cpp | 10 +-- .../library/query/TrackMetadataBatchQuery.h | 6 +- .../library/query/TrackMetadataQuery.cpp | 10 +-- .../library/query/TrackMetadataQuery.h | 6 +- .../library/query/util/CategoryQueryUtil.cpp | 0 .../library/query/util/CategoryQueryUtil.h | 6 +- .../library/query/util/SdkWrappers.h | 8 +-- .../library/query/util/Serialization.cpp | 2 +- .../library/query/util/Serialization.h | 10 +-- .../library/query/util/TrackQueryFragments.h | 12 ++-- .../library/query/util/TrackSort.h | 0 .../library/track/IndexerTrack.cpp | 16 ++--- .../library/track/IndexerTrack.h | 6 +- .../library/track/LibraryTrack.cpp | 4 +- .../library/track/LibraryTrack.h | 8 +-- .../library/track/Track.cpp | 4 +- src/{core => musikcore}/library/track/Track.h | 6 +- .../library/track/TrackList.cpp | 18 ++--- .../library/track/TrackList.h | 8 +-- src/{core => musikcore}/musikcore_c.h | 0 .../net/WebSocketClient.cpp | 2 +- src/{core => musikcore}/net/WebSocketClient.h | 4 +- src/{core => musikcore}/pch.cpp | 0 src/{core => musikcore}/pch.hpp | 8 +-- .../plugin/PluginFactory.cpp | 14 ++-- .../plugin/PluginFactory.h | 6 +- src/{core => musikcore}/plugin/Plugins.cpp | 30 ++++---- src/{core => musikcore}/plugin/Plugins.h | 8 +-- src/{core => musikcore}/runtime/IMessage.h | 2 +- .../runtime/IMessageQueue.h | 0 .../runtime/IMessageTarget.h | 0 src/{core => musikcore}/runtime/Message.cpp | 0 src/{core => musikcore}/runtime/Message.h | 0 .../runtime/MessageQueue.cpp | 0 .../runtime/MessageQueue.h | 0 src/{core => musikcore}/sdk/DataBuffer.h | 2 +- src/{core => musikcore}/sdk/Filesystem.h | 0 src/{core => musikcore}/sdk/HttpClient.h | 0 src/{core => musikcore}/sdk/IAllocator.h | 0 src/{core => musikcore}/sdk/IAnalyzer.h | 0 .../sdk/IBlockingEncoder.h | 0 src/{core => musikcore}/sdk/IBuffer.h | 0 src/{core => musikcore}/sdk/IBufferProvider.h | 0 src/{core => musikcore}/sdk/IDSP.h | 0 src/{core => musikcore}/sdk/IDataStream.h | 0 .../sdk/IDataStreamFactory.h | 0 src/{core => musikcore}/sdk/IDebug.h | 0 src/{core => musikcore}/sdk/IDecoder.h | 0 src/{core => musikcore}/sdk/IDecoderFactory.h | 0 src/{core => musikcore}/sdk/IDevice.h | 0 src/{core => musikcore}/sdk/IEncoder.h | 0 src/{core => musikcore}/sdk/IEncoderFactory.h | 0 src/{core => musikcore}/sdk/IEnvironment.h | 0 .../sdk/IIndexerNotifier.h | 0 src/{core => musikcore}/sdk/IIndexerSource.h | 0 src/{core => musikcore}/sdk/IIndexerWriter.h | 0 src/{core => musikcore}/sdk/IMap.h | 0 src/{core => musikcore}/sdk/IMapList.h | 0 src/{core => musikcore}/sdk/IMetadataProxy.h | 0 src/{core => musikcore}/sdk/IOutput.h | 0 src/{core => musikcore}/sdk/IPcmVisualizer.h | 0 src/{core => musikcore}/sdk/IPlaybackRemote.h | 0 .../sdk/IPlaybackService.h | 0 src/{core => musikcore}/sdk/IPlugin.h | 0 src/{core => musikcore}/sdk/IPreferences.h | 0 src/{core => musikcore}/sdk/IResource.h | 0 src/{core => musikcore}/sdk/ISchema.h | 0 .../sdk/ISpectrumVisualizer.h | 0 .../sdk/IStreamingEncoder.h | 0 src/{core => musikcore}/sdk/ITagReader.h | 0 src/{core => musikcore}/sdk/ITagStore.h | 0 src/{core => musikcore}/sdk/ITrack.h | 0 src/{core => musikcore}/sdk/ITrackList.h | 0 .../sdk/ITrackListEditor.h | 0 src/{core => musikcore}/sdk/IValue.h | 0 src/{core => musikcore}/sdk/IValueList.h | 0 src/{core => musikcore}/sdk/IVisualizer.h | 0 src/{core => musikcore}/sdk/ReplayGain.h | 0 src/{core => musikcore}/sdk/String.h | 0 src/{core => musikcore}/sdk/constants.h | 0 src/{core => musikcore}/support/Auddio.cpp | 6 +- src/{core => musikcore}/support/Auddio.h | 2 +- src/{core => musikcore}/support/Common.cpp | 4 +- src/{core => musikcore}/support/Common.h | 2 +- src/{core => musikcore}/support/Duration.cpp | 0 src/{core => musikcore}/support/Duration.h | 0 src/{core => musikcore}/support/LastFm.cpp | 6 +- src/{core => musikcore}/support/LastFm.h | 2 +- src/{core => musikcore}/support/Messages.h | 0 src/{core => musikcore}/support/Playback.cpp | 6 +- src/{core => musikcore}/support/Playback.h | 4 +- .../support/PreferenceKeys.cpp | 0 .../support/PreferenceKeys.h | 0 .../support/Preferences.cpp | 6 +- src/{core => musikcore}/support/Preferences.h | 6 +- src/{core => musikcore}/utfutil.h | 0 src/musikcube/Main.cpp | 20 +++--- src/musikcube/app/layout/BrowseLayout.cpp | 14 ++-- src/musikcube/app/layout/BrowseLayout.h | 6 +- .../app/layout/CategorySearchLayout.cpp | 4 +- .../app/layout/CategorySearchLayout.h | 8 +-- src/musikcube/app/layout/ConsoleLayout.cpp | 2 +- src/musikcube/app/layout/DirectoryLayout.cpp | 6 +- src/musikcube/app/layout/DirectoryLayout.h | 4 +- src/musikcube/app/layout/HotkeysLayout.cpp | 2 +- src/musikcube/app/layout/LibraryLayout.cpp | 10 +-- src/musikcube/app/layout/LibraryLayout.h | 6 +- .../app/layout/LibraryNotConnectedLayout.cpp | 4 +- .../app/layout/LibraryNotConnectedLayout.h | 2 +- .../app/layout/LocalLibrarySettingsLayout.cpp | 10 +-- .../app/layout/LocalLibrarySettingsLayout.h | 2 +- src/musikcube/app/layout/LyricsLayout.cpp | 8 +-- src/musikcube/app/layout/LyricsLayout.h | 4 +- src/musikcube/app/layout/MainLayout.cpp | 6 +- src/musikcube/app/layout/MainLayout.h | 8 +-- src/musikcube/app/layout/NowPlayingLayout.cpp | 12 ++-- src/musikcube/app/layout/NowPlayingLayout.h | 6 +- .../layout/RemoteLibrarySettingsLayout.cpp | 4 +- .../app/layout/RemoteLibrarySettingsLayout.h | 4 +- src/musikcube/app/layout/SettingsLayout.cpp | 12 ++-- src/musikcube/app/layout/SettingsLayout.h | 8 +-- .../app/layout/TrackSearchLayout.cpp | 6 +- src/musikcube/app/layout/TrackSearchLayout.h | 6 +- src/musikcube/app/model/DirectoryAdapter.cpp | 2 +- src/musikcube/app/overlay/BrowseOverlays.cpp | 4 +- src/musikcube/app/overlay/BrowseOverlays.h | 2 +- .../app/overlay/ColorThemeOverlay.cpp | 6 +- .../app/overlay/EqualizerOverlay.cpp | 4 +- src/musikcube/app/overlay/EqualizerOverlay.h | 4 +- src/musikcube/app/overlay/LastFmOverlay.cpp | 4 +- .../app/overlay/PlayQueueOverlays.cpp | 24 +++---- src/musikcube/app/overlay/PlayQueueOverlays.h | 6 +- .../app/overlay/PlaybackOverlays.cpp | 6 +- src/musikcube/app/overlay/PlaybackOverlays.h | 4 +- src/musikcube/app/overlay/PluginOverlay.cpp | 10 +-- src/musikcube/app/overlay/PreampOverlay.cpp | 6 +- src/musikcube/app/overlay/PreampOverlay.h | 6 +- src/musikcube/app/overlay/ServerOverlay.cpp | 4 +- src/musikcube/app/overlay/ServerOverlay.h | 4 +- .../app/overlay/SettingsOverlays.cpp | 8 +-- src/musikcube/app/overlay/TrackOverlays.cpp | 4 +- src/musikcube/app/overlay/TrackOverlays.h | 6 +- .../app/overlay/VisualizerOverlay.cpp | 2 +- src/musikcube/app/util/ConsoleLogger.cpp | 2 +- src/musikcube/app/util/ConsoleLogger.h | 4 +- src/musikcube/app/util/GlobalHotkeys.cpp | 4 +- src/musikcube/app/util/GlobalHotkeys.h | 4 +- src/musikcube/app/util/Hotkeys.cpp | 2 +- src/musikcube/app/util/Messages.h | 2 +- src/musikcube/app/util/Playback.cpp | 2 +- src/musikcube/app/util/Playback.h | 6 +- src/musikcube/app/util/Rating.cpp | 6 +- src/musikcube/app/util/TrackRowRenderers.cpp | 6 +- src/musikcube/app/util/TrackRowRenderers.h | 2 +- src/musikcube/app/util/UpdateCheck.cpp | 4 +- src/musikcube/app/util/UpdateCheck.h | 2 +- src/musikcube/app/window/CategoryListView.cpp | 4 +- src/musikcube/app/window/CategoryListView.h | 10 +-- src/musikcube/app/window/TrackListView.cpp | 10 +-- src/musikcube/app/window/TrackListView.h | 8 +-- src/musikcube/app/window/TransportWindow.cpp | 12 ++-- src/musikcube/app/window/TransportWindow.h | 8 +-- src/musikcube/cursespp/Colors.cpp | 2 +- src/musikcube/cursespp/InputOverlay.cpp | 2 +- src/musikcube/cursespp/SchemaOverlay.cpp | 4 +- src/musikcube/cursespp/Window.cpp | 4 +- src/musikcube/cursespp/cursespp/IWindow.h | 4 +- .../cursespp/cursespp/NumberValidator.h | 2 +- .../cursespp/cursespp/SchemaOverlay.h | 4 +- src/musikcube/cursespp/cursespp/Window.h | 2 +- src/musikcube/stdafx.h | 20 +++--- src/musikcubed/main.cpp | 18 ++--- src/musikwin/Main.cpp | 8 +-- .../app/controller/MainController.cpp | 10 +-- src/musikwin/app/controller/MainController.h | 8 +-- src/musikwin/app/view/MainWindow.cpp | 4 +- src/musikwin/app/view/MainWindow.h | 2 +- src/plugins/alsaout/AlsaOut.cpp | 4 +- src/plugins/alsaout/AlsaOut.h | 4 +- src/plugins/alsaout/alsaout_plugin.cpp | 6 +- src/plugins/alsaout/pch.h | 2 +- src/plugins/cddadecoder/CddaDataStream.h | 2 +- .../cddadecoder/CddaDataStreamFactory.h | 4 +- src/plugins/cddadecoder/CddaDecoder.h | 2 +- src/plugins/cddadecoder/CddaDecoderFactory.h | 2 +- src/plugins/cddadecoder/CddaIndexerSource.cpp | 2 +- src/plugins/cddadecoder/CddaIndexerSource.h | 2 +- .../cddadecoder/cddadecoder_plugin.cpp | 4 +- src/plugins/coreaudioout/CoreAudioOut.cpp | 4 +- src/plugins/coreaudioout/CoreAudioOut.h | 4 +- .../coreaudioout/coreaudioout_plugin.cpp | 6 +- src/plugins/directsoundout/DirectSoundOut.cpp | 8 +-- src/plugins/directsoundout/DirectSoundOut.h | 4 +- .../directsoundout/directsoundout_plugin.cpp | 4 +- src/plugins/dsp_example_echo/DSPEcho.h | 38 +++++----- .../dsp_example_echo/dsp_echo_plugin.cpp | 6 +- src/plugins/dsp_example_echo/pch.h | 4 +- src/plugins/ffmpegdecoder/FfmpegDecoder.cpp | 2 +- src/plugins/ffmpegdecoder/FfmpegDecoder.h | 6 +- src/plugins/ffmpegdecoder/plugin.cpp | 6 +- src/plugins/flacdecoder/FlacDecoder.h | 6 +- src/plugins/flacdecoder/FlacDecoderFactory.h | 2 +- .../flacdecoder/flacdecoder_plugin.cpp | 4 +- src/plugins/gmedecoder/Constants.h | 4 +- src/plugins/gmedecoder/GmeDataStream.cpp | 4 +- src/plugins/gmedecoder/GmeDataStream.h | 2 +- src/plugins/gmedecoder/GmeDecoder.cpp | 4 +- src/plugins/gmedecoder/GmeDecoder.h | 6 +- src/plugins/gmedecoder/GmeIndexerSource.cpp | 8 +-- src/plugins/gmedecoder/GmeIndexerSource.h | 2 +- src/plugins/gmedecoder/gme/pwm.c | 72 +++++++++---------- src/plugins/gmedecoder/plugin.cpp | 16 ++--- src/plugins/httpdatastream/HttpDataStream.cpp | 2 +- src/plugins/httpdatastream/HttpDataStream.h | 2 +- .../httpdatastream/HttpDataStreamFactory.h | 2 +- .../httpdatastream/httpdatastream_plugin.cpp | 4 +- .../libopenmptdecoder/OpenMptDataStream.cpp | 6 +- .../libopenmptdecoder/OpenMptDataStream.h | 2 +- .../libopenmptdecoder/OpenMptDecoder.cpp | 2 +- .../libopenmptdecoder/OpenMptDecoder.h | 6 +- .../OpenMptIndexerSource.cpp | 6 +- .../libopenmptdecoder/OpenMptIndexerSource.h | 2 +- src/plugins/libopenmptdecoder/Utility.cpp | 4 +- src/plugins/libopenmptdecoder/Utility.h | 2 +- src/plugins/libopenmptdecoder/plugin.cpp | 18 ++--- src/plugins/m4adecoder/M4aDecoder.h | 2 +- src/plugins/m4adecoder/M4aDecoderFactory.h | 2 +- src/plugins/m4adecoder/m4adecoder.vcproj | 4 +- src/plugins/m4adecoder/m4adecoder_plugin.cpp | 4 +- src/plugins/macosmediakeys/plugin.mm | 8 +-- src/plugins/mpg123decoder/Mpg123Decoder.h | 4 +- .../mpg123decoder/Mpg123DecoderFactory.h | 2 +- .../mpg123decoder/mpg123decoder_plugin.cpp | 2 +- src/plugins/mpg123decoder/stdafx.h | 2 +- src/plugins/mpris/mpris.cpp | 2 +- src/plugins/mpris/mpris.h | 4 +- src/plugins/nomaddecoder/NomadDecoder.h | 4 +- .../nomaddecoder/NomadDecoderFactory.h | 2 +- .../nomaddecoder/nomaddecoder_plugin.cpp | 4 +- src/plugins/nullout/NullOut.cpp | 6 +- src/plugins/nullout/NullOut.h | 2 +- src/plugins/nullout/nullout_plugin.cpp | 6 +- src/plugins/oggdecoder/OggDecoder.h | 2 +- src/plugins/oggdecoder/OggDecoderFactory.h | 2 +- src/plugins/oggdecoder/oggdecoder_plugin.cpp | 4 +- src/plugins/pulseout/PulseOut.cpp | 4 +- src/plugins/pulseout/PulseOut.h | 4 +- src/plugins/pulseout/pch.h | 2 +- src/plugins/pulseout/pulseout_plugin.cpp | 6 +- src/plugins/server/BlockingTranscoder.h | 6 +- src/plugins/server/Context.h | 8 +-- src/plugins/server/HttpServer.cpp | 2 +- src/plugins/server/Snapshots.h | 2 +- src/plugins/server/Transcoder.cpp | 2 +- src/plugins/server/Transcoder.h | 8 +-- .../server/TranscodingAudioDataStream.h | 6 +- src/plugins/server/Util.h | 4 +- src/plugins/server/WebSocketServer.cpp | 2 +- src/plugins/server/WebSocketServer.h | 4 +- src/plugins/server/main.cpp | 4 +- src/plugins/sndioout/SndioOut.cpp | 4 +- src/plugins/sndioout/SndioOut.h | 2 +- src/plugins/sndioout/plugin.cpp | 4 +- src/plugins/stockencoders/FfmpegEncoder.h | 4 +- src/plugins/stockencoders/LameEncoder.h | 4 +- src/plugins/stockencoders/main.cpp | 6 +- src/plugins/stockencoders/shared.h | 2 +- src/plugins/supereqdsp/SuperEqDsp.cpp | 6 +- src/plugins/supereqdsp/SuperEqDsp.h | 2 +- src/plugins/supereqdsp/supereqdsp_plugin.cpp | 8 +-- .../taglib_plugin/TaglibMetadataReader.h | 2 +- src/plugins/taglib_plugin/taglib_plugin.cpp | 4 +- src/plugins/wasapiout/WasapiOut.cpp | 6 +- src/plugins/wasapiout/WasapiOut.h | 4 +- src/plugins/wasapiout/wasapiout_plugin.cpp | 8 +-- src/plugins/waveout/WaveOut.cpp | 4 +- src/plugins/waveout/WaveOut.h | 4 +- src/plugins/waveout/WaveOutBuffer.h | 4 +- src/plugins/waveout/waveout_plugin.cpp | 4 +- src/plugins/win32gdivis/GdiVis.cpp | 6 +- .../win32globalhotkeys_plugin.cpp | 6 +- 386 files changed, 1065 insertions(+), 1065 deletions(-) rename src/{core => musikcore}/CMakeLists.txt (100%) rename src/{core => musikcore}/audio/Buffer.cpp (99%) rename src/{core => musikcore}/audio/Buffer.h (97%) rename src/{core => musikcore}/audio/CrossfadeTransport.cpp (98%) rename src/{core => musikcore}/audio/CrossfadeTransport.h (95%) rename src/{core => musikcore}/audio/Crossfader.cpp (99%) rename src/{core => musikcore}/audio/Crossfader.h (94%) rename src/{core => musikcore}/audio/GaplessTransport.cpp (98%) rename src/{core => musikcore}/audio/GaplessTransport.h (95%) rename src/{core => musikcore}/audio/IStream.h (93%) rename src/{core => musikcore}/audio/ITransport.h (96%) rename src/{core => musikcore}/audio/MasterTransport.cpp (96%) rename src/{core => musikcore}/audio/MasterTransport.h (96%) rename src/{core => musikcore}/audio/Outputs.cpp (98%) rename src/{core => musikcore}/audio/Outputs.h (97%) rename src/{core => musikcore}/audio/PlaybackService.cpp (98%) rename src/{core => musikcore}/audio/PlaybackService.h (96%) rename src/{core => musikcore}/audio/Player.cpp (98%) rename src/{core => musikcore}/audio/Player.h (96%) rename src/{core => musikcore}/audio/Stream.cpp (99%) rename src/{core => musikcore}/audio/Stream.h (94%) rename src/{core => musikcore}/audio/Streams.cpp (97%) rename src/{core => musikcore}/audio/Streams.h (91%) rename src/{core => musikcore}/audio/Visualizer.cpp (99%) rename src/{core => musikcore}/audio/Visualizer.h (95%) rename src/{core => musikcore}/c_context.cpp (94%) rename src/{core => musikcore}/c_context.h (92%) rename src/{core => musikcore}/c_interface_wrappers.cpp (97%) rename src/{core => musikcore}/config.h (100%) rename src/{core => musikcore}/core.sln (100%) rename src/{core => musikcore}/core.vcproj (100%) rename src/{core => musikcore}/core.vcxproj (100%) rename src/{core => musikcore}/core.vcxproj.filters (100%) rename src/{core => musikcore}/db/Connection.cpp (99%) rename src/{core => musikcore}/db/Connection.h (96%) rename src/{core => musikcore}/db/ScopedTransaction.cpp (97%) rename src/{core => musikcore}/db/ScopedTransaction.h (98%) rename src/{core => musikcore}/db/Statement.cpp (98%) rename src/{core => musikcore}/db/Statement.h (99%) rename src/{core => musikcore}/debug.cpp (99%) rename src/{core => musikcore}/debug.h (100%) rename src/{core => musikcore}/i18n/Locale.cpp (98%) rename src/{core => musikcore}/i18n/Locale.h (97%) rename src/{core => musikcore}/io/DataStreamFactory.cpp (95%) rename src/{core => musikcore}/io/DataStreamFactory.h (95%) rename src/{core => musikcore}/io/LocalFileStream.cpp (97%) rename src/{core => musikcore}/io/LocalFileStream.h (97%) rename src/{core => musikcore}/library/IIndexer.h (100%) rename src/{core => musikcore}/library/ILibrary.h (95%) rename src/{core => musikcore}/library/IQuery.h (97%) rename src/{core => musikcore}/library/Indexer.cpp (97%) rename src/{core => musikcore}/library/Indexer.h (95%) rename src/{core => musikcore}/library/LibraryFactory.cpp (94%) rename src/{core => musikcore}/library/LibraryFactory.h (94%) rename src/{core => musikcore}/library/LocalLibrary.cpp (98%) rename src/{core => musikcore}/library/LocalLibrary.h (95%) rename src/{core => musikcore}/library/LocalLibraryConstants.h (100%) rename src/{core => musikcore}/library/LocalMetadataProxy.cpp (96%) rename src/{core => musikcore}/library/LocalMetadataProxy.h (98%) rename src/{core => musikcore}/library/MasterLibrary.cpp (98%) rename src/{core => musikcore}/library/MasterLibrary.h (93%) rename src/{core => musikcore}/library/QueryBase.h (97%) rename src/{core => musikcore}/library/QueryRegistry.cpp (83%) rename src/{core => musikcore}/library/QueryRegistry.h (96%) rename src/{core => musikcore}/library/RemoteLibrary.cpp (96%) rename src/{core => musikcore}/library/RemoteLibrary.h (96%) rename src/{core => musikcore}/library/metadata/MetadataMap.cpp (96%) rename src/{core => musikcore}/library/metadata/MetadataMap.h (99%) rename src/{core => musikcore}/library/metadata/MetadataMapList.cpp (100%) rename src/{core => musikcore}/library/metadata/MetadataMapList.h (98%) rename src/{core => musikcore}/library/query/AlbumListQuery.cpp (97%) rename src/{core => musikcore}/library/query/AlbumListQuery.h (94%) rename src/{core => musikcore}/library/query/AllCategoriesQuery.cpp (97%) rename src/{core => musikcore}/library/query/AllCategoriesQuery.h (95%) rename src/{core => musikcore}/library/query/AppendPlaylistQuery.cpp (95%) rename src/{core => musikcore}/library/query/AppendPlaylistQuery.h (97%) rename src/{core => musikcore}/library/query/CategoryListQuery.cpp (97%) rename src/{core => musikcore}/library/query/CategoryListQuery.h (92%) rename src/{core => musikcore}/library/query/CategoryTrackListQuery.cpp (98%) rename src/{core => musikcore}/library/query/CategoryTrackListQuery.h (94%) rename src/{core => musikcore}/library/query/DeletePlaylistQuery.cpp (96%) rename src/{core => musikcore}/library/query/DeletePlaylistQuery.h (96%) rename src/{core => musikcore}/library/query/DirectoryTrackListQuery.cpp (97%) rename src/{core => musikcore}/library/query/DirectoryTrackListQuery.h (98%) rename src/{core => musikcore}/library/query/GetPlaylistQuery.cpp (95%) rename src/{core => musikcore}/library/query/GetPlaylistQuery.h (96%) rename src/{core => musikcore}/library/query/LyricsQuery.cpp (100%) rename src/{core => musikcore}/library/query/LyricsQuery.h (98%) rename src/{core => musikcore}/library/query/MarkTrackPlayedQuery.cpp (100%) rename src/{core => musikcore}/library/query/MarkTrackPlayedQuery.h (98%) rename src/{core => musikcore}/library/query/NowPlayingTrackListQuery.cpp (95%) rename src/{core => musikcore}/library/query/NowPlayingTrackListQuery.h (96%) rename src/{core => musikcore}/library/query/PersistedPlayQueueQuery.cpp (96%) rename src/{core => musikcore}/library/query/PersistedPlayQueueQuery.h (97%) rename src/{core => musikcore}/library/query/SavePlaylistQuery.cpp (97%) rename src/{core => musikcore}/library/query/SavePlaylistQuery.h (97%) rename src/{core => musikcore}/library/query/SearchTrackListQuery.cpp (96%) rename src/{core => musikcore}/library/query/SearchTrackListQuery.h (98%) rename src/{core => musikcore}/library/query/SetTrackRatingQuery.cpp (100%) rename src/{core => musikcore}/library/query/SetTrackRatingQuery.h (98%) rename src/{core => musikcore}/library/query/TrackListQueryBase.h (96%) rename src/{core => musikcore}/library/query/TrackMetadataBatchQuery.cpp (94%) rename src/{core => musikcore}/library/query/TrackMetadataBatchQuery.h (95%) rename src/{core => musikcore}/library/query/TrackMetadataQuery.cpp (94%) rename src/{core => musikcore}/library/query/TrackMetadataQuery.h (95%) rename src/{core => musikcore}/library/query/util/CategoryQueryUtil.cpp (100%) rename src/{core => musikcore}/library/query/util/CategoryQueryUtil.h (98%) rename src/{core => musikcore}/library/query/util/SdkWrappers.h (97%) rename src/{core => musikcore}/library/query/util/Serialization.cpp (99%) rename src/{core => musikcore}/library/query/util/Serialization.h (93%) rename src/{core => musikcore}/library/query/util/TrackQueryFragments.h (96%) rename src/{core => musikcore}/library/query/util/TrackSort.h (100%) rename src/{core => musikcore}/library/track/IndexerTrack.cpp (98%) rename src/{core => musikcore}/library/track/IndexerTrack.h (98%) rename src/{core => musikcore}/library/track/LibraryTrack.cpp (98%) rename src/{core => musikcore}/library/track/LibraryTrack.h (96%) rename src/{core => musikcore}/library/track/Track.cpp (98%) rename src/{core => musikcore}/library/track/Track.h (97%) rename src/{core => musikcore}/library/track/TrackList.cpp (95%) rename src/{core => musikcore}/library/track/TrackList.h (97%) rename src/{core => musikcore}/musikcore_c.h (100%) rename src/{core => musikcore}/net/WebSocketClient.cpp (99%) rename src/{core => musikcore}/net/WebSocketClient.h (98%) rename src/{core => musikcore}/pch.cpp (100%) rename src/{core => musikcore}/pch.hpp (93%) rename src/{core => musikcore}/plugin/PluginFactory.cpp (96%) rename src/{core => musikcore}/plugin/PluginFactory.h (98%) rename src/{core => musikcore}/plugin/Plugins.cpp (96%) rename src/{core => musikcore}/plugin/Plugins.h (92%) rename src/{core => musikcore}/runtime/IMessage.h (98%) rename src/{core => musikcore}/runtime/IMessageQueue.h (100%) rename src/{core => musikcore}/runtime/IMessageTarget.h (100%) rename src/{core => musikcore}/runtime/Message.cpp (100%) rename src/{core => musikcore}/runtime/Message.h (100%) rename src/{core => musikcore}/runtime/MessageQueue.cpp (100%) rename src/{core => musikcore}/runtime/MessageQueue.h (100%) rename src/{core => musikcore}/sdk/DataBuffer.h (99%) rename src/{core => musikcore}/sdk/Filesystem.h (100%) rename src/{core => musikcore}/sdk/HttpClient.h (100%) rename src/{core => musikcore}/sdk/IAllocator.h (100%) rename src/{core => musikcore}/sdk/IAnalyzer.h (100%) rename src/{core => musikcore}/sdk/IBlockingEncoder.h (100%) rename src/{core => musikcore}/sdk/IBuffer.h (100%) rename src/{core => musikcore}/sdk/IBufferProvider.h (100%) rename src/{core => musikcore}/sdk/IDSP.h (100%) rename src/{core => musikcore}/sdk/IDataStream.h (100%) rename src/{core => musikcore}/sdk/IDataStreamFactory.h (100%) rename src/{core => musikcore}/sdk/IDebug.h (100%) rename src/{core => musikcore}/sdk/IDecoder.h (100%) rename src/{core => musikcore}/sdk/IDecoderFactory.h (100%) rename src/{core => musikcore}/sdk/IDevice.h (100%) rename src/{core => musikcore}/sdk/IEncoder.h (100%) rename src/{core => musikcore}/sdk/IEncoderFactory.h (100%) rename src/{core => musikcore}/sdk/IEnvironment.h (100%) rename src/{core => musikcore}/sdk/IIndexerNotifier.h (100%) rename src/{core => musikcore}/sdk/IIndexerSource.h (100%) rename src/{core => musikcore}/sdk/IIndexerWriter.h (100%) rename src/{core => musikcore}/sdk/IMap.h (100%) rename src/{core => musikcore}/sdk/IMapList.h (100%) rename src/{core => musikcore}/sdk/IMetadataProxy.h (100%) rename src/{core => musikcore}/sdk/IOutput.h (100%) rename src/{core => musikcore}/sdk/IPcmVisualizer.h (100%) rename src/{core => musikcore}/sdk/IPlaybackRemote.h (100%) rename src/{core => musikcore}/sdk/IPlaybackService.h (100%) rename src/{core => musikcore}/sdk/IPlugin.h (100%) rename src/{core => musikcore}/sdk/IPreferences.h (100%) rename src/{core => musikcore}/sdk/IResource.h (100%) rename src/{core => musikcore}/sdk/ISchema.h (100%) rename src/{core => musikcore}/sdk/ISpectrumVisualizer.h (100%) rename src/{core => musikcore}/sdk/IStreamingEncoder.h (100%) rename src/{core => musikcore}/sdk/ITagReader.h (100%) rename src/{core => musikcore}/sdk/ITagStore.h (100%) rename src/{core => musikcore}/sdk/ITrack.h (100%) rename src/{core => musikcore}/sdk/ITrackList.h (100%) rename src/{core => musikcore}/sdk/ITrackListEditor.h (100%) rename src/{core => musikcore}/sdk/IValue.h (100%) rename src/{core => musikcore}/sdk/IValueList.h (100%) rename src/{core => musikcore}/sdk/IVisualizer.h (100%) rename src/{core => musikcore}/sdk/ReplayGain.h (100%) rename src/{core => musikcore}/sdk/String.h (100%) rename src/{core => musikcore}/sdk/constants.h (100%) rename src/{core => musikcore}/support/Auddio.cpp (97%) rename src/{core => musikcore}/support/Auddio.h (97%) rename src/{core => musikcore}/support/Common.cpp (99%) rename src/{core => musikcore}/support/Common.h (98%) rename src/{core => musikcore}/support/Duration.cpp (100%) rename src/{core => musikcore}/support/Duration.h (100%) rename src/{core => musikcore}/support/LastFm.cpp (98%) rename src/{core => musikcore}/support/LastFm.h (98%) rename src/{core => musikcore}/support/Messages.h (100%) rename src/{core => musikcore}/support/Playback.cpp (97%) rename src/{core => musikcore}/support/Playback.h (96%) rename src/{core => musikcore}/support/PreferenceKeys.cpp (100%) rename src/{core => musikcore}/support/PreferenceKeys.h (100%) rename src/{core => musikcore}/support/Preferences.cpp (98%) rename src/{core => musikcore}/support/Preferences.h (97%) rename src/{core => musikcore}/utfutil.h (100%) diff --git a/.gitignore b/.gitignore index 55511deb1..9a9c87b38 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ musikcube.core src/3rdparty/bin src/3rdparty/obj src/contrib -src/core/obj +src/musikcore/obj src/plugins/oggdecoder/obj src/plugins/server/libmicrohttpd-prefix src/plugins/server/microhttpd diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c0fc11e8..97456ee0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ message(STATUS "[build] link libraries are: ${musikcube_LINK_LIBS}") include_directories ( "${musikcube_SOURCE_DIR}/src" - "${musikcube_SOURCE_DIR}/src/core" + "${musikcube_SOURCE_DIR}/src/musikcore" "${musikcube_SOURCE_DIR}/src/musikcube" "${musikcube_SOURCE_DIR}/src/musikcube/cursespp" "${musikcube_SOURCE_DIR}/src/3rdparty/include") @@ -97,7 +97,7 @@ endif() # important bugfixes. set(USE_BUNDLED_TAGLIB "true") -add_subdirectory(src/core) +add_subdirectory(src/musikcore) add_subdirectory(src/core_c_demo) add_subdirectory(src/musikcube) add_subdirectory(src/musikcubed) @@ -193,8 +193,8 @@ else () install(FILES ${plugins} DESTINATION share/musikcube/plugins) endif () -file(GLOB sdk_headers "src/core/sdk/*.h") -install(FILES ${sdk_headers} DESTINATION include/musikcube/core/sdk) +file(GLOB sdk_headers "src/musikcore/sdk/*.h") +install(FILES ${sdk_headers} DESTINATION include/musikcube/musikcore/sdk) file(GLOB themes "src/musikcube/data/themes/*.json") file(COPY ${themes} DESTINATION bin/themes) diff --git a/README.md b/README.md index 63c2cee67..5788f98a0 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ if you're interested in writing your own frontend, [api documentation is availab # sdk -the musikcube sdk is a set of small, pure-virtual c++ classes and a handful of enums and constants. they're still in the process of being slimmed down. you can see what they currently look like here: https://github.com/clangen/musikcube/tree/master/src/core/sdk +the musikcube sdk is a set of small, pure-virtual c++ classes and a handful of enums and constants. they're still in the process of being slimmed down. you can see what they currently look like here: https://github.com/clangen/musikcube/tree/master/src/musikcore/sdk # dependencies diff --git a/src/core_c_demo/main.c b/src/core_c_demo/main.c index dafbe9338..1697ea859 100644 --- a/src/core_c_demo/main.c +++ b/src/core_c_demo/main.c @@ -5,7 +5,7 @@ #endif #include -#include +#include #define ENCODER_TYPE ".opus" diff --git a/src/core/CMakeLists.txt b/src/musikcore/CMakeLists.txt similarity index 100% rename from src/core/CMakeLists.txt rename to src/musikcore/CMakeLists.txt diff --git a/src/core/audio/Buffer.cpp b/src/musikcore/audio/Buffer.cpp similarity index 99% rename from src/core/audio/Buffer.cpp rename to src/musikcore/audio/Buffer.cpp index bbff5143a..778550787 100644 --- a/src/core/audio/Buffer.cpp +++ b/src/musikcore/audio/Buffer.cpp @@ -34,7 +34,7 @@ #include "pch.hpp" -#include +#include #define DEBUG 0 diff --git a/src/core/audio/Buffer.h b/src/musikcore/audio/Buffer.h similarity index 97% rename from src/core/audio/Buffer.h rename to src/musikcore/audio/Buffer.h index 3d073c6c1..4e41e7a96 100644 --- a/src/core/audio/Buffer.h +++ b/src/musikcore/audio/Buffer.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include namespace musik { namespace core { namespace audio { diff --git a/src/core/audio/CrossfadeTransport.cpp b/src/musikcore/audio/CrossfadeTransport.cpp similarity index 98% rename from src/core/audio/CrossfadeTransport.cpp rename to src/musikcore/audio/CrossfadeTransport.cpp index 2f7ce883e..e6e2a483e 100644 --- a/src/core/audio/CrossfadeTransport.cpp +++ b/src/musikcore/audio/CrossfadeTransport.cpp @@ -34,10 +34,10 @@ #include "pch.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include #define CROSSFADE_DURATION_MS 1500 diff --git a/src/core/audio/CrossfadeTransport.h b/src/musikcore/audio/CrossfadeTransport.h similarity index 95% rename from src/core/audio/CrossfadeTransport.h rename to src/musikcore/audio/CrossfadeTransport.h index 852600f51..02573dbb7 100644 --- a/src/core/audio/CrossfadeTransport.h +++ b/src/musikcore/audio/CrossfadeTransport.h @@ -34,13 +34,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/audio/Crossfader.cpp b/src/musikcore/audio/Crossfader.cpp similarity index 99% rename from src/core/audio/Crossfader.cpp rename to src/musikcore/audio/Crossfader.cpp index 1e9d0ee2a..1e04d339e 100644 --- a/src/core/audio/Crossfader.cpp +++ b/src/musikcore/audio/Crossfader.cpp @@ -34,8 +34,8 @@ #include "pch.hpp" -#include -#include +#include +#include #include #include diff --git a/src/core/audio/Crossfader.h b/src/musikcore/audio/Crossfader.h similarity index 94% rename from src/core/audio/Crossfader.h rename to src/musikcore/audio/Crossfader.h index 5483fd9e7..7b807f61e 100644 --- a/src/core/audio/Crossfader.h +++ b/src/musikcore/audio/Crossfader.h @@ -34,12 +34,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/audio/GaplessTransport.cpp b/src/musikcore/audio/GaplessTransport.cpp similarity index 98% rename from src/core/audio/GaplessTransport.cpp rename to src/musikcore/audio/GaplessTransport.cpp index 0cf1b4224..a32b05806 100644 --- a/src/core/audio/GaplessTransport.cpp +++ b/src/musikcore/audio/GaplessTransport.cpp @@ -34,10 +34,10 @@ #include "pch.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace musik::core::audio; diff --git a/src/core/audio/GaplessTransport.h b/src/musikcore/audio/GaplessTransport.h similarity index 95% rename from src/core/audio/GaplessTransport.h rename to src/musikcore/audio/GaplessTransport.h index 19d797045..cd7a16a17 100644 --- a/src/core/audio/GaplessTransport.h +++ b/src/musikcore/audio/GaplessTransport.h @@ -34,11 +34,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/audio/IStream.h b/src/musikcore/audio/IStream.h similarity index 93% rename from src/core/audio/IStream.h rename to src/musikcore/audio/IStream.h index 19ba35a9d..2c171e4ff 100644 --- a/src/core/audio/IStream.h +++ b/src/musikcore/audio/IStream.h @@ -34,11 +34,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/core/audio/ITransport.h b/src/musikcore/audio/ITransport.h similarity index 96% rename from src/core/audio/ITransport.h rename to src/musikcore/audio/ITransport.h index 601531da6..d632b5863 100755 --- a/src/core/audio/ITransport.h +++ b/src/musikcore/audio/ITransport.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace musik { namespace core { namespace audio { diff --git a/src/core/audio/MasterTransport.cpp b/src/musikcore/audio/MasterTransport.cpp similarity index 96% rename from src/core/audio/MasterTransport.cpp rename to src/musikcore/audio/MasterTransport.cpp index c927822ca..40d2e2f10 100644 --- a/src/core/audio/MasterTransport.cpp +++ b/src/musikcore/audio/MasterTransport.cpp @@ -36,10 +36,10 @@ #include "MasterTransport.h" -#include -#include -#include -#include +#include +#include +#include +#include using namespace musik::core::audio; using namespace musik::core; diff --git a/src/core/audio/MasterTransport.h b/src/musikcore/audio/MasterTransport.h similarity index 96% rename from src/core/audio/MasterTransport.h rename to src/musikcore/audio/MasterTransport.h index 69ebfa230..b00168207 100644 --- a/src/core/audio/MasterTransport.h +++ b/src/musikcore/audio/MasterTransport.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace musik { namespace core { namespace audio { class MasterTransport : diff --git a/src/core/audio/Outputs.cpp b/src/musikcore/audio/Outputs.cpp similarity index 98% rename from src/core/audio/Outputs.cpp rename to src/musikcore/audio/Outputs.cpp index 6870c2f61..6980f191f 100644 --- a/src/core/audio/Outputs.cpp +++ b/src/musikcore/audio/Outputs.cpp @@ -34,9 +34,9 @@ #include "pch.hpp" #include "Outputs.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/core/audio/Outputs.h b/src/musikcore/audio/Outputs.h similarity index 97% rename from src/core/audio/Outputs.h rename to src/musikcore/audio/Outputs.h index 8a613c0cd..1a1eef908 100644 --- a/src/core/audio/Outputs.h +++ b/src/musikcore/audio/Outputs.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include namespace musik { namespace core { namespace audio { namespace outputs { diff --git a/src/core/audio/PlaybackService.cpp b/src/musikcore/audio/PlaybackService.cpp similarity index 98% rename from src/core/audio/PlaybackService.cpp rename to src/musikcore/audio/PlaybackService.cpp index 728390be2..3152f8198 100755 --- a/src/core/audio/PlaybackService.cpp +++ b/src/musikcore/audio/PlaybackService.cpp @@ -36,16 +36,16 @@ #include "PlaybackService.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace musik::core::library; using namespace musik::core; diff --git a/src/core/audio/PlaybackService.h b/src/musikcore/audio/PlaybackService.h similarity index 96% rename from src/core/audio/PlaybackService.h rename to src/musikcore/audio/PlaybackService.h index 1ef5445f4..ac9b58141 100755 --- a/src/core/audio/PlaybackService.h +++ b/src/musikcore/audio/PlaybackService.h @@ -36,14 +36,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/core/audio/Player.cpp b/src/musikcore/audio/Player.cpp similarity index 98% rename from src/core/audio/Player.cpp rename to src/musikcore/audio/Player.cpp index e600bbcef..a7d1b01f7 100644 --- a/src/core/audio/Player.cpp +++ b/src/musikcore/audio/Player.cpp @@ -35,12 +35,12 @@ #include "pch.hpp" #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/audio/Player.h b/src/musikcore/audio/Player.h similarity index 96% rename from src/core/audio/Player.h rename to src/musikcore/audio/Player.h index 14c070c5f..ee1a2771b 100644 --- a/src/core/audio/Player.h +++ b/src/musikcore/audio/Player.h @@ -34,11 +34,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/core/audio/Stream.cpp b/src/musikcore/audio/Stream.cpp similarity index 99% rename from src/core/audio/Stream.cpp rename to src/musikcore/audio/Stream.cpp index 58c52ccdc..8fe1caad6 100644 --- a/src/core/audio/Stream.cpp +++ b/src/musikcore/audio/Stream.cpp @@ -36,7 +36,7 @@ #include "Stream.h" #include "Streams.h" -#include +#include using namespace musik::core::audio; using namespace musik::core::sdk; diff --git a/src/core/audio/Stream.h b/src/musikcore/audio/Stream.h similarity index 94% rename from src/core/audio/Stream.h rename to src/musikcore/audio/Stream.h index de58a013e..93c40eba8 100644 --- a/src/core/audio/Stream.h +++ b/src/musikcore/audio/Stream.h @@ -34,13 +34,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/audio/Streams.cpp b/src/musikcore/audio/Streams.cpp similarity index 97% rename from src/core/audio/Streams.cpp rename to src/musikcore/audio/Streams.cpp index 124d018dd..43f78996c 100644 --- a/src/core/audio/Streams.cpp +++ b/src/musikcore/audio/Streams.cpp @@ -35,10 +35,10 @@ #include "pch.hpp" #include "Streams.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #define TAG "Streams" diff --git a/src/core/audio/Streams.h b/src/musikcore/audio/Streams.h similarity index 91% rename from src/core/audio/Streams.h rename to src/musikcore/audio/Streams.h index 793966cf7..c1fda1222 100644 --- a/src/core/audio/Streams.h +++ b/src/musikcore/audio/Streams.h @@ -34,12 +34,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/audio/Visualizer.cpp b/src/musikcore/audio/Visualizer.cpp similarity index 99% rename from src/core/audio/Visualizer.cpp rename to src/musikcore/audio/Visualizer.cpp index df4675ee1..dc3b247f6 100644 --- a/src/core/audio/Visualizer.cpp +++ b/src/musikcore/audio/Visualizer.cpp @@ -34,7 +34,7 @@ #include "pch.hpp" #include "Visualizer.h" -#include +#include #include #include diff --git a/src/core/audio/Visualizer.h b/src/musikcore/audio/Visualizer.h similarity index 95% rename from src/core/audio/Visualizer.h rename to src/musikcore/audio/Visualizer.h index aed58dc52..944446f94 100644 --- a/src/core/audio/Visualizer.h +++ b/src/musikcore/audio/Visualizer.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace musik { namespace core { namespace audio { namespace vis { diff --git a/src/core/c_context.cpp b/src/musikcore/c_context.cpp similarity index 94% rename from src/core/c_context.cpp rename to src/musikcore/c_context.cpp index bf2150b17..68dfcf41b 100644 --- a/src/core/c_context.cpp +++ b/src/musikcore/c_context.cpp @@ -34,17 +34,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/c_context.h b/src/musikcore/c_context.h similarity index 92% rename from src/core/c_context.h rename to src/musikcore/c_context.h index 24e827f88..428ffd30b 100644 --- a/src/core/c_context.h +++ b/src/musikcore/c_context.h @@ -32,12 +32,12 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/c_interface_wrappers.cpp b/src/musikcore/c_interface_wrappers.cpp similarity index 97% rename from src/core/c_interface_wrappers.cpp rename to src/musikcore/c_interface_wrappers.cpp index 107456c59..a13e640bc 100644 --- a/src/core/c_interface_wrappers.cpp +++ b/src/musikcore/c_interface_wrappers.cpp @@ -34,41 +34,41 @@ #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/core/config.h b/src/musikcore/config.h similarity index 100% rename from src/core/config.h rename to src/musikcore/config.h diff --git a/src/core/core.sln b/src/musikcore/core.sln similarity index 100% rename from src/core/core.sln rename to src/musikcore/core.sln diff --git a/src/core/core.vcproj b/src/musikcore/core.vcproj similarity index 100% rename from src/core/core.vcproj rename to src/musikcore/core.vcproj diff --git a/src/core/core.vcxproj b/src/musikcore/core.vcxproj similarity index 100% rename from src/core/core.vcxproj rename to src/musikcore/core.vcxproj diff --git a/src/core/core.vcxproj.filters b/src/musikcore/core.vcxproj.filters similarity index 100% rename from src/core/core.vcxproj.filters rename to src/musikcore/core.vcxproj.filters diff --git a/src/core/db/Connection.cpp b/src/musikcore/db/Connection.cpp similarity index 99% rename from src/core/db/Connection.cpp rename to src/musikcore/db/Connection.cpp index eff76153d..5120025fc 100644 --- a/src/core/db/Connection.cpp +++ b/src/musikcore/db/Connection.cpp @@ -34,7 +34,7 @@ #include "pch.hpp" -#include +#include #include static std::mutex globalMutex; diff --git a/src/core/db/Connection.h b/src/musikcore/db/Connection.h similarity index 96% rename from src/core/db/Connection.h rename to src/musikcore/db/Connection.h index fa2b6545e..71a61f4cd 100644 --- a/src/core/db/Connection.h +++ b/src/musikcore/db/Connection.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/core/db/ScopedTransaction.cpp b/src/musikcore/db/ScopedTransaction.cpp similarity index 97% rename from src/core/db/ScopedTransaction.cpp rename to src/musikcore/db/ScopedTransaction.cpp index a3f687939..74d40c1a8 100644 --- a/src/core/db/ScopedTransaction.cpp +++ b/src/musikcore/db/ScopedTransaction.cpp @@ -34,8 +34,8 @@ #include "pch.hpp" -#include -#include +#include +#include using namespace musik::core::db; diff --git a/src/core/db/ScopedTransaction.h b/src/musikcore/db/ScopedTransaction.h similarity index 98% rename from src/core/db/ScopedTransaction.h rename to src/musikcore/db/ScopedTransaction.h index c9d5799f2..e3f92d924 100644 --- a/src/core/db/ScopedTransaction.h +++ b/src/musikcore/db/ScopedTransaction.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include namespace musik { namespace core { namespace db { diff --git a/src/core/db/Statement.cpp b/src/musikcore/db/Statement.cpp similarity index 98% rename from src/core/db/Statement.cpp rename to src/musikcore/db/Statement.cpp index 8587f40ff..0ddc6e894 100644 --- a/src/core/db/Statement.cpp +++ b/src/musikcore/db/Statement.cpp @@ -34,8 +34,8 @@ #include "pch.hpp" -#include -#include +#include +#include #include using namespace musik::core::db; diff --git a/src/core/db/Statement.h b/src/musikcore/db/Statement.h similarity index 99% rename from src/core/db/Statement.h rename to src/musikcore/db/Statement.h index 918c82f3c..fd1dedea1 100644 --- a/src/core/db/Statement.h +++ b/src/musikcore/db/Statement.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include struct sqlite3_stmt; diff --git a/src/core/debug.cpp b/src/musikcore/debug.cpp similarity index 99% rename from src/core/debug.cpp rename to src/musikcore/debug.cpp index c1c16ab7b..71ce4a888 100755 --- a/src/core/debug.cpp +++ b/src/musikcore/debug.cpp @@ -33,8 +33,8 @@ ////////////////////////////////////////////////////////////////////////////// #include -#include -#include +#include +#include #include #include #include diff --git a/src/core/debug.h b/src/musikcore/debug.h similarity index 100% rename from src/core/debug.h rename to src/musikcore/debug.h diff --git a/src/core/i18n/Locale.cpp b/src/musikcore/i18n/Locale.cpp similarity index 98% rename from src/core/i18n/Locale.cpp rename to src/musikcore/i18n/Locale.cpp index 8f29458b1..78a21c46c 100644 --- a/src/core/i18n/Locale.cpp +++ b/src/musikcore/i18n/Locale.cpp @@ -35,8 +35,8 @@ #include "pch.hpp" #include -#include -#include +#include +#include #include "Locale.h" diff --git a/src/core/i18n/Locale.h b/src/musikcore/i18n/Locale.h similarity index 97% rename from src/core/i18n/Locale.h rename to src/musikcore/i18n/Locale.h index 9dd0fc074..b810f5f49 100644 --- a/src/core/i18n/Locale.h +++ b/src/musikcore/i18n/Locale.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/src/core/io/DataStreamFactory.cpp b/src/musikcore/io/DataStreamFactory.cpp similarity index 95% rename from src/core/io/DataStreamFactory.cpp rename to src/musikcore/io/DataStreamFactory.cpp index 8beba57fd..726b57a16 100644 --- a/src/core/io/DataStreamFactory.cpp +++ b/src/musikcore/io/DataStreamFactory.cpp @@ -34,10 +34,10 @@ #include "pch.hpp" -#include -#include -#include -#include +#include +#include +#include +#include using namespace musik::core::io; using namespace musik::core::sdk; diff --git a/src/core/io/DataStreamFactory.h b/src/musikcore/io/DataStreamFactory.h similarity index 95% rename from src/core/io/DataStreamFactory.h rename to src/musikcore/io/DataStreamFactory.h index dacba4297..df4a231c1 100644 --- a/src/core/io/DataStreamFactory.h +++ b/src/musikcore/io/DataStreamFactory.h @@ -33,9 +33,9 @@ ////////////////////////////////////////////////////////////////////////////// #pragma once -#include -#include -#include +#include +#include +#include #include namespace musik { namespace core { namespace io { diff --git a/src/core/io/LocalFileStream.cpp b/src/musikcore/io/LocalFileStream.cpp similarity index 97% rename from src/core/io/LocalFileStream.cpp rename to src/musikcore/io/LocalFileStream.cpp index 53c9b0a48..ba88be872 100644 --- a/src/core/io/LocalFileStream.cpp +++ b/src/musikcore/io/LocalFileStream.cpp @@ -34,11 +34,11 @@ #include "pch.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/io/LocalFileStream.h b/src/musikcore/io/LocalFileStream.h similarity index 97% rename from src/core/io/LocalFileStream.h rename to src/musikcore/io/LocalFileStream.h index 8d84f2029..33a0d5e93 100644 --- a/src/core/io/LocalFileStream.h +++ b/src/musikcore/io/LocalFileStream.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include namespace musik { namespace core { namespace io { diff --git a/src/core/library/IIndexer.h b/src/musikcore/library/IIndexer.h similarity index 100% rename from src/core/library/IIndexer.h rename to src/musikcore/library/IIndexer.h diff --git a/src/core/library/ILibrary.h b/src/musikcore/library/ILibrary.h similarity index 95% rename from src/core/library/ILibrary.h rename to src/musikcore/library/ILibrary.h index c3baecd2c..c9ee5253a 100755 --- a/src/core/library/ILibrary.h +++ b/src/musikcore/library/ILibrary.h @@ -38,10 +38,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace musik { namespace core { diff --git a/src/core/library/IQuery.h b/src/musikcore/library/IQuery.h similarity index 97% rename from src/core/library/IQuery.h rename to src/musikcore/library/IQuery.h index ed9aceaca..99d5a98c4 100755 --- a/src/core/library/IQuery.h +++ b/src/musikcore/library/IQuery.h @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include namespace musik { namespace core { namespace db { diff --git a/src/core/library/Indexer.cpp b/src/musikcore/library/Indexer.cpp similarity index 97% rename from src/core/library/Indexer.cpp rename to src/musikcore/library/Indexer.cpp index 8590d4eff..afdd04aaf 100644 --- a/src/core/library/Indexer.cpp +++ b/src/musikcore/library/Indexer.cpp @@ -34,25 +34,25 @@ #include "pch.hpp" -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/core/library/Indexer.h b/src/musikcore/library/Indexer.h similarity index 95% rename from src/core/library/Indexer.h rename to src/musikcore/library/Indexer.h index c839e428b..ab1616857 100644 --- a/src/core/library/Indexer.h +++ b/src/musikcore/library/Indexer.h @@ -34,13 +34,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/core/library/LibraryFactory.cpp b/src/musikcore/library/LibraryFactory.cpp similarity index 94% rename from src/core/library/LibraryFactory.cpp rename to src/musikcore/library/LibraryFactory.cpp index 98403abde..0e231cf71 100644 --- a/src/core/library/LibraryFactory.cpp +++ b/src/musikcore/library/LibraryFactory.cpp @@ -33,13 +33,13 @@ ////////////////////////////////////////////////////////////////////////////// #include "pch.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include using namespace musik::core; diff --git a/src/core/library/LibraryFactory.h b/src/musikcore/library/LibraryFactory.h similarity index 94% rename from src/core/library/LibraryFactory.h rename to src/musikcore/library/LibraryFactory.h index 68ddd67e2..be1ac2287 100644 --- a/src/core/library/LibraryFactory.h +++ b/src/musikcore/library/LibraryFactory.h @@ -34,10 +34,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/core/library/LocalLibrary.cpp b/src/musikcore/library/LocalLibrary.cpp similarity index 98% rename from src/core/library/LocalLibrary.cpp rename to src/musikcore/library/LocalLibrary.cpp index 28c7d4fa5..6c1c7ca0a 100644 --- a/src/core/library/LocalLibrary.cpp +++ b/src/musikcore/library/LocalLibrary.cpp @@ -34,14 +34,14 @@ #include "pch.hpp" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include static const std::string TAG = "LocalLibrary"; static bool scheduleSyncDueToDbUpgrade = false; diff --git a/src/core/library/LocalLibrary.h b/src/musikcore/library/LocalLibrary.h similarity index 95% rename from src/core/library/LocalLibrary.h rename to src/musikcore/library/LocalLibrary.h index 39b2b3cc0..15df3621c 100644 --- a/src/core/library/LocalLibrary.h +++ b/src/musikcore/library/LocalLibrary.h @@ -34,13 +34,13 @@ #pragma once -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/core/library/LocalLibraryConstants.h b/src/musikcore/library/LocalLibraryConstants.h similarity index 100% rename from src/core/library/LocalLibraryConstants.h rename to src/musikcore/library/LocalLibraryConstants.h diff --git a/src/core/library/LocalMetadataProxy.cpp b/src/musikcore/library/LocalMetadataProxy.cpp similarity index 96% rename from src/core/library/LocalMetadataProxy.cpp rename to src/musikcore/library/LocalMetadataProxy.cpp index 1ef124ae5..b7fd90333 100644 --- a/src/core/library/LocalMetadataProxy.cpp +++ b/src/musikcore/library/LocalMetadataProxy.cpp @@ -35,26 +35,26 @@ #include "pch.hpp" #include "LocalMetadataProxy.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/core/library/LocalMetadataProxy.h b/src/musikcore/library/LocalMetadataProxy.h similarity index 98% rename from src/core/library/LocalMetadataProxy.h rename to src/musikcore/library/LocalMetadataProxy.h index 39f6b18b2..3e74da532 100644 --- a/src/core/library/LocalMetadataProxy.h +++ b/src/musikcore/library/LocalMetadataProxy.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/MasterLibrary.cpp b/src/musikcore/library/MasterLibrary.cpp similarity index 98% rename from src/core/library/MasterLibrary.cpp rename to src/musikcore/library/MasterLibrary.cpp index 0b87595e1..e96407782 100644 --- a/src/core/library/MasterLibrary.cpp +++ b/src/musikcore/library/MasterLibrary.cpp @@ -36,8 +36,8 @@ #include "MasterLibrary.h" #include "LibraryFactory.h" -#include -#include +#include +#include using namespace musik::core; using namespace musik::core::library; diff --git a/src/core/library/MasterLibrary.h b/src/musikcore/library/MasterLibrary.h similarity index 93% rename from src/core/library/MasterLibrary.h rename to src/musikcore/library/MasterLibrary.h index 6528aae45..41770d714 100644 --- a/src/core/library/MasterLibrary.h +++ b/src/musikcore/library/MasterLibrary.h @@ -34,13 +34,13 @@ #pragma once -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/core/library/QueryBase.h b/src/musikcore/library/QueryBase.h similarity index 97% rename from src/core/library/QueryBase.h rename to src/musikcore/library/QueryBase.h index a24f3b0b3..46177911b 100644 --- a/src/core/library/QueryBase.h +++ b/src/musikcore/library/QueryBase.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/src/core/library/QueryRegistry.cpp b/src/musikcore/library/QueryRegistry.cpp similarity index 83% rename from src/core/library/QueryRegistry.cpp rename to src/musikcore/library/QueryRegistry.cpp index ce39ac249..13bfb0f99 100644 --- a/src/core/library/QueryRegistry.cpp +++ b/src/musikcore/library/QueryRegistry.cpp @@ -35,23 +35,23 @@ #include "pch.hpp" #include "QueryRegistry.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace musik::core; using namespace musik::core::db; diff --git a/src/core/library/QueryRegistry.h b/src/musikcore/library/QueryRegistry.h similarity index 96% rename from src/core/library/QueryRegistry.h rename to src/musikcore/library/QueryRegistry.h index 518ce42ff..616b5fad2 100644 --- a/src/core/library/QueryRegistry.h +++ b/src/musikcore/library/QueryRegistry.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/src/core/library/RemoteLibrary.cpp b/src/musikcore/library/RemoteLibrary.cpp similarity index 96% rename from src/core/library/RemoteLibrary.cpp rename to src/musikcore/library/RemoteLibrary.cpp index d16bf09f6..cefbff5a1 100644 --- a/src/core/library/RemoteLibrary.cpp +++ b/src/musikcore/library/RemoteLibrary.cpp @@ -34,17 +34,17 @@ #include "pch.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static const std::string TAG = "RemoteLibrary"; diff --git a/src/core/library/RemoteLibrary.h b/src/musikcore/library/RemoteLibrary.h similarity index 96% rename from src/core/library/RemoteLibrary.h rename to src/musikcore/library/RemoteLibrary.h index a9db3f96a..915e0770e 100644 --- a/src/core/library/RemoteLibrary.h +++ b/src/musikcore/library/RemoteLibrary.h @@ -34,13 +34,13 @@ #pragma once -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/core/library/metadata/MetadataMap.cpp b/src/musikcore/library/metadata/MetadataMap.cpp similarity index 96% rename from src/core/library/metadata/MetadataMap.cpp rename to src/musikcore/library/metadata/MetadataMap.cpp index 3828ea8a2..68ae21282 100644 --- a/src/core/library/metadata/MetadataMap.cpp +++ b/src/musikcore/library/metadata/MetadataMap.cpp @@ -35,11 +35,11 @@ #include "pch.hpp" #include "MetadataMap.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace musik::core; using namespace musik::core::db; diff --git a/src/core/library/metadata/MetadataMap.h b/src/musikcore/library/metadata/MetadataMap.h similarity index 99% rename from src/core/library/metadata/MetadataMap.h rename to src/musikcore/library/metadata/MetadataMap.h index 92c558026..0a2d27850 100644 --- a/src/core/library/metadata/MetadataMap.h +++ b/src/musikcore/library/metadata/MetadataMap.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/core/library/metadata/MetadataMapList.cpp b/src/musikcore/library/metadata/MetadataMapList.cpp similarity index 100% rename from src/core/library/metadata/MetadataMapList.cpp rename to src/musikcore/library/metadata/MetadataMapList.cpp diff --git a/src/core/library/metadata/MetadataMapList.h b/src/musikcore/library/metadata/MetadataMapList.h similarity index 98% rename from src/core/library/metadata/MetadataMapList.h rename to src/musikcore/library/metadata/MetadataMapList.h index c859c8ba4..d0be17a03 100644 --- a/src/core/library/metadata/MetadataMapList.h +++ b/src/musikcore/library/metadata/MetadataMapList.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include "MetadataMap.h" #include #include diff --git a/src/core/library/query/AlbumListQuery.cpp b/src/musikcore/library/query/AlbumListQuery.cpp similarity index 97% rename from src/core/library/query/AlbumListQuery.cpp rename to src/musikcore/library/query/AlbumListQuery.cpp index 81b629482..2a513ac89 100644 --- a/src/core/library/query/AlbumListQuery.cpp +++ b/src/musikcore/library/query/AlbumListQuery.cpp @@ -35,9 +35,9 @@ #include "pch.hpp" #include "AlbumListQuery.h" -#include -#include -#include +#include +#include +#include #include using namespace musik::core; diff --git a/src/core/library/query/AlbumListQuery.h b/src/musikcore/library/query/AlbumListQuery.h similarity index 94% rename from src/core/library/query/AlbumListQuery.h rename to src/musikcore/library/query/AlbumListQuery.h index 35c3424b7..d24ddb6fd 100644 --- a/src/core/library/query/AlbumListQuery.h +++ b/src/musikcore/library/query/AlbumListQuery.h @@ -34,10 +34,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/AllCategoriesQuery.cpp b/src/musikcore/library/query/AllCategoriesQuery.cpp similarity index 97% rename from src/core/library/query/AllCategoriesQuery.cpp rename to src/musikcore/library/query/AllCategoriesQuery.cpp index 11ee030e8..73280f186 100644 --- a/src/core/library/query/AllCategoriesQuery.cpp +++ b/src/musikcore/library/query/AllCategoriesQuery.cpp @@ -34,8 +34,8 @@ #include "pch.hpp" #include "AllCategoriesQuery.h" -#include -#include +#include +#include #include using musik::core::db::Statement; diff --git a/src/core/library/query/AllCategoriesQuery.h b/src/musikcore/library/query/AllCategoriesQuery.h similarity index 95% rename from src/core/library/query/AllCategoriesQuery.h rename to src/musikcore/library/query/AllCategoriesQuery.h index 288b10afd..2f01b05aa 100644 --- a/src/core/library/query/AllCategoriesQuery.h +++ b/src/musikcore/library/query/AllCategoriesQuery.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/AppendPlaylistQuery.cpp b/src/musikcore/library/query/AppendPlaylistQuery.cpp similarity index 95% rename from src/core/library/query/AppendPlaylistQuery.cpp rename to src/musikcore/library/query/AppendPlaylistQuery.cpp index 433ef04ea..abf34abe6 100644 --- a/src/core/library/query/AppendPlaylistQuery.cpp +++ b/src/musikcore/library/query/AppendPlaylistQuery.cpp @@ -34,13 +34,13 @@ #include "pch.hpp" #include "AppendPlaylistQuery.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include using musik::core::db::Statement; diff --git a/src/core/library/query/AppendPlaylistQuery.h b/src/musikcore/library/query/AppendPlaylistQuery.h similarity index 97% rename from src/core/library/query/AppendPlaylistQuery.h rename to src/musikcore/library/query/AppendPlaylistQuery.h index 6ed6bfdca..22c7880be 100644 --- a/src/core/library/query/AppendPlaylistQuery.h +++ b/src/musikcore/library/query/AppendPlaylistQuery.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/src/core/library/query/CategoryListQuery.cpp b/src/musikcore/library/query/CategoryListQuery.cpp similarity index 97% rename from src/core/library/query/CategoryListQuery.cpp rename to src/musikcore/library/query/CategoryListQuery.cpp index 63bf695dc..b95e69562 100755 --- a/src/core/library/query/CategoryListQuery.cpp +++ b/src/musikcore/library/query/CategoryListQuery.cpp @@ -34,11 +34,11 @@ #include "pch.hpp" #include "CategoryListQuery.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using musik::core::db::Statement; using musik::core::db::Row; diff --git a/src/core/library/query/CategoryListQuery.h b/src/musikcore/library/query/CategoryListQuery.h similarity index 92% rename from src/core/library/query/CategoryListQuery.h rename to src/musikcore/library/query/CategoryListQuery.h index a4d5acffa..f2be06857 100755 --- a/src/core/library/query/CategoryListQuery.h +++ b/src/musikcore/library/query/CategoryListQuery.h @@ -34,13 +34,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/CategoryTrackListQuery.cpp b/src/musikcore/library/query/CategoryTrackListQuery.cpp similarity index 98% rename from src/core/library/query/CategoryTrackListQuery.cpp rename to src/musikcore/library/query/CategoryTrackListQuery.cpp index 817492d09..4526a37bd 100755 --- a/src/core/library/query/CategoryTrackListQuery.cpp +++ b/src/musikcore/library/query/CategoryTrackListQuery.cpp @@ -37,9 +37,9 @@ #include "CategoryTrackListQuery.h" #include "GetPlaylistQuery.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/core/library/query/CategoryTrackListQuery.h b/src/musikcore/library/query/CategoryTrackListQuery.h similarity index 94% rename from src/core/library/query/CategoryTrackListQuery.h rename to src/musikcore/library/query/CategoryTrackListQuery.h index 2b29888ee..f04e024de 100755 --- a/src/core/library/query/CategoryTrackListQuery.h +++ b/src/musikcore/library/query/CategoryTrackListQuery.h @@ -34,12 +34,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "TrackListQueryBase.h" diff --git a/src/core/library/query/DeletePlaylistQuery.cpp b/src/musikcore/library/query/DeletePlaylistQuery.cpp similarity index 96% rename from src/core/library/query/DeletePlaylistQuery.cpp rename to src/musikcore/library/query/DeletePlaylistQuery.cpp index b2cb00c14..fb1d78973 100644 --- a/src/core/library/query/DeletePlaylistQuery.cpp +++ b/src/musikcore/library/query/DeletePlaylistQuery.cpp @@ -35,10 +35,10 @@ #include "pch.hpp" #include "DeletePlaylistQuery.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/core/library/query/DeletePlaylistQuery.h b/src/musikcore/library/query/DeletePlaylistQuery.h similarity index 96% rename from src/core/library/query/DeletePlaylistQuery.h rename to src/musikcore/library/query/DeletePlaylistQuery.h index fefb0ee05..89251989a 100644 --- a/src/core/library/query/DeletePlaylistQuery.h +++ b/src/musikcore/library/query/DeletePlaylistQuery.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/DirectoryTrackListQuery.cpp b/src/musikcore/library/query/DirectoryTrackListQuery.cpp similarity index 97% rename from src/core/library/query/DirectoryTrackListQuery.cpp rename to src/musikcore/library/query/DirectoryTrackListQuery.cpp index ad44d1ef3..aa1298412 100644 --- a/src/core/library/query/DirectoryTrackListQuery.cpp +++ b/src/musikcore/library/query/DirectoryTrackListQuery.cpp @@ -33,9 +33,9 @@ ////////////////////////////////////////////////////////////////////////////// #include "pch.hpp" -#include -#include -#include +#include +#include +#include #include "DirectoryTrackListQuery.h" #include "CategoryTrackListQuery.h" diff --git a/src/core/library/query/DirectoryTrackListQuery.h b/src/musikcore/library/query/DirectoryTrackListQuery.h similarity index 98% rename from src/core/library/query/DirectoryTrackListQuery.h rename to src/musikcore/library/query/DirectoryTrackListQuery.h index 0635a1d10..35d42473f 100644 --- a/src/core/library/query/DirectoryTrackListQuery.h +++ b/src/musikcore/library/query/DirectoryTrackListQuery.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include "TrackListQueryBase.h" namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/GetPlaylistQuery.cpp b/src/musikcore/library/query/GetPlaylistQuery.cpp similarity index 95% rename from src/core/library/query/GetPlaylistQuery.cpp rename to src/musikcore/library/query/GetPlaylistQuery.cpp index 6b8d5332d..ad027cd72 100644 --- a/src/core/library/query/GetPlaylistQuery.cpp +++ b/src/musikcore/library/query/GetPlaylistQuery.cpp @@ -35,10 +35,10 @@ #include "pch.hpp" #include "GetPlaylistQuery.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/core/library/query/GetPlaylistQuery.h b/src/musikcore/library/query/GetPlaylistQuery.h similarity index 96% rename from src/core/library/query/GetPlaylistQuery.h rename to src/musikcore/library/query/GetPlaylistQuery.h index 2bb1aea02..5d37be00b 100644 --- a/src/core/library/query/GetPlaylistQuery.h +++ b/src/musikcore/library/query/GetPlaylistQuery.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "TrackListQueryBase.h" diff --git a/src/core/library/query/LyricsQuery.cpp b/src/musikcore/library/query/LyricsQuery.cpp similarity index 100% rename from src/core/library/query/LyricsQuery.cpp rename to src/musikcore/library/query/LyricsQuery.cpp diff --git a/src/core/library/query/LyricsQuery.h b/src/musikcore/library/query/LyricsQuery.h similarity index 98% rename from src/core/library/query/LyricsQuery.h rename to src/musikcore/library/query/LyricsQuery.h index 4c0b78488..62e187683 100644 --- a/src/core/library/query/LyricsQuery.h +++ b/src/musikcore/library/query/LyricsQuery.h @@ -34,7 +34,7 @@ #pragma once -#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/MarkTrackPlayedQuery.cpp b/src/musikcore/library/query/MarkTrackPlayedQuery.cpp similarity index 100% rename from src/core/library/query/MarkTrackPlayedQuery.cpp rename to src/musikcore/library/query/MarkTrackPlayedQuery.cpp diff --git a/src/core/library/query/MarkTrackPlayedQuery.h b/src/musikcore/library/query/MarkTrackPlayedQuery.h similarity index 98% rename from src/core/library/query/MarkTrackPlayedQuery.h rename to src/musikcore/library/query/MarkTrackPlayedQuery.h index 48e08b630..4708ec100 100644 --- a/src/core/library/query/MarkTrackPlayedQuery.h +++ b/src/musikcore/library/query/MarkTrackPlayedQuery.h @@ -34,7 +34,7 @@ #pragma once -#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/NowPlayingTrackListQuery.cpp b/src/musikcore/library/query/NowPlayingTrackListQuery.cpp similarity index 95% rename from src/core/library/query/NowPlayingTrackListQuery.cpp rename to src/musikcore/library/query/NowPlayingTrackListQuery.cpp index b06a51fab..53c9629bb 100755 --- a/src/core/library/query/NowPlayingTrackListQuery.cpp +++ b/src/musikcore/library/query/NowPlayingTrackListQuery.cpp @@ -35,9 +35,9 @@ #include "pch.hpp" #include "NowPlayingTrackListQuery.h" -#include -#include -#include +#include +#include +#include using musik::core::db::Statement; using musik::core::db::Row; diff --git a/src/core/library/query/NowPlayingTrackListQuery.h b/src/musikcore/library/query/NowPlayingTrackListQuery.h similarity index 96% rename from src/core/library/query/NowPlayingTrackListQuery.h rename to src/musikcore/library/query/NowPlayingTrackListQuery.h index 39acc00ab..f766e4493 100755 --- a/src/core/library/query/NowPlayingTrackListQuery.h +++ b/src/musikcore/library/query/NowPlayingTrackListQuery.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include "TrackListQueryBase.h" diff --git a/src/core/library/query/PersistedPlayQueueQuery.cpp b/src/musikcore/library/query/PersistedPlayQueueQuery.cpp similarity index 96% rename from src/core/library/query/PersistedPlayQueueQuery.cpp rename to src/musikcore/library/query/PersistedPlayQueueQuery.cpp index e6cb82987..b483a7914 100644 --- a/src/core/library/query/PersistedPlayQueueQuery.cpp +++ b/src/musikcore/library/query/PersistedPlayQueueQuery.cpp @@ -34,9 +34,9 @@ #include "pch.hpp" #include "PersistedPlayQueueQuery.h" -#include -#include -#include +#include +#include +#include using namespace musik::core; using namespace musik::core::db; diff --git a/src/core/library/query/PersistedPlayQueueQuery.h b/src/musikcore/library/query/PersistedPlayQueueQuery.h similarity index 97% rename from src/core/library/query/PersistedPlayQueueQuery.h rename to src/musikcore/library/query/PersistedPlayQueueQuery.h index 21beaabc5..cb3568352 100644 --- a/src/core/library/query/PersistedPlayQueueQuery.h +++ b/src/musikcore/library/query/PersistedPlayQueueQuery.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/SavePlaylistQuery.cpp b/src/musikcore/library/query/SavePlaylistQuery.cpp similarity index 97% rename from src/core/library/query/SavePlaylistQuery.cpp rename to src/musikcore/library/query/SavePlaylistQuery.cpp index c5018acee..6ca3c5431 100644 --- a/src/core/library/query/SavePlaylistQuery.cpp +++ b/src/musikcore/library/query/SavePlaylistQuery.cpp @@ -36,14 +36,14 @@ #include "SavePlaylistQuery.h" #include "CategoryTrackListQuery.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace musik::core; using namespace musik::core::sdk; @@ -419,7 +419,7 @@ void SavePlaylistQuery::SendPlaylistMutationBroadcast() { break; case Operation::Append: this->library->GetMessageQueue().Broadcast( - Message::Create(nullptr, message::PlaylistModified, playlistId)); + Message::Create(nullptr, message::PlaylistModified, playlistId)); break; } } diff --git a/src/core/library/query/SavePlaylistQuery.h b/src/musikcore/library/query/SavePlaylistQuery.h similarity index 97% rename from src/core/library/query/SavePlaylistQuery.h rename to src/musikcore/library/query/SavePlaylistQuery.h index 98accf115..54c10c096 100644 --- a/src/core/library/query/SavePlaylistQuery.h +++ b/src/musikcore/library/query/SavePlaylistQuery.h @@ -34,10 +34,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/SearchTrackListQuery.cpp b/src/musikcore/library/query/SearchTrackListQuery.cpp similarity index 96% rename from src/core/library/query/SearchTrackListQuery.cpp rename to src/musikcore/library/query/SearchTrackListQuery.cpp index 2d8068ba5..469f0c05f 100755 --- a/src/core/library/query/SearchTrackListQuery.cpp +++ b/src/musikcore/library/query/SearchTrackListQuery.cpp @@ -35,11 +35,11 @@ #include "pch.hpp" #include "SearchTrackListQuery.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/library/query/SearchTrackListQuery.h b/src/musikcore/library/query/SearchTrackListQuery.h similarity index 98% rename from src/core/library/query/SearchTrackListQuery.h rename to src/musikcore/library/query/SearchTrackListQuery.h index 5f140c7f2..819aa1636 100755 --- a/src/core/library/query/SearchTrackListQuery.h +++ b/src/musikcore/library/query/SearchTrackListQuery.h @@ -35,7 +35,7 @@ #pragma once #include "TrackListQueryBase.h" -#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/SetTrackRatingQuery.cpp b/src/musikcore/library/query/SetTrackRatingQuery.cpp similarity index 100% rename from src/core/library/query/SetTrackRatingQuery.cpp rename to src/musikcore/library/query/SetTrackRatingQuery.cpp diff --git a/src/core/library/query/SetTrackRatingQuery.h b/src/musikcore/library/query/SetTrackRatingQuery.h similarity index 98% rename from src/core/library/query/SetTrackRatingQuery.h rename to src/musikcore/library/query/SetTrackRatingQuery.h index bf0584c48..f8494cca5 100644 --- a/src/core/library/query/SetTrackRatingQuery.h +++ b/src/musikcore/library/query/SetTrackRatingQuery.h @@ -34,7 +34,7 @@ #pragma once -#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/TrackListQueryBase.h b/src/musikcore/library/query/TrackListQueryBase.h similarity index 96% rename from src/core/library/query/TrackListQueryBase.h rename to src/musikcore/library/query/TrackListQueryBase.h index 5fb92d4c5..a6e0bea07 100755 --- a/src/core/library/query/TrackListQueryBase.h +++ b/src/musikcore/library/query/TrackListQueryBase.h @@ -34,11 +34,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/core/library/query/TrackMetadataBatchQuery.cpp b/src/musikcore/library/query/TrackMetadataBatchQuery.cpp similarity index 94% rename from src/core/library/query/TrackMetadataBatchQuery.cpp rename to src/musikcore/library/query/TrackMetadataBatchQuery.cpp index f0ccf9afe..ecfac7662 100644 --- a/src/core/library/query/TrackMetadataBatchQuery.cpp +++ b/src/musikcore/library/query/TrackMetadataBatchQuery.cpp @@ -34,11 +34,11 @@ #include "pch.hpp" #include "TrackMetadataBatchQuery.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using namespace musik::core; diff --git a/src/core/library/query/TrackMetadataBatchQuery.h b/src/musikcore/library/query/TrackMetadataBatchQuery.h similarity index 95% rename from src/core/library/query/TrackMetadataBatchQuery.h rename to src/musikcore/library/query/TrackMetadataBatchQuery.h index 64ab1bb27..c7be8794b 100644 --- a/src/core/library/query/TrackMetadataBatchQuery.h +++ b/src/musikcore/library/query/TrackMetadataBatchQuery.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/core/library/query/TrackMetadataQuery.cpp b/src/musikcore/library/query/TrackMetadataQuery.cpp similarity index 94% rename from src/core/library/query/TrackMetadataQuery.cpp rename to src/musikcore/library/query/TrackMetadataQuery.cpp index 34b3f0fdc..59b8f8613 100644 --- a/src/core/library/query/TrackMetadataQuery.cpp +++ b/src/musikcore/library/query/TrackMetadataQuery.cpp @@ -34,11 +34,11 @@ #include "pch.hpp" #include "TrackMetadataQuery.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using namespace musik::core; diff --git a/src/core/library/query/TrackMetadataQuery.h b/src/musikcore/library/query/TrackMetadataQuery.h similarity index 95% rename from src/core/library/query/TrackMetadataQuery.h rename to src/musikcore/library/query/TrackMetadataQuery.h index 33d25e4dd..20cc51a7c 100644 --- a/src/core/library/query/TrackMetadataQuery.h +++ b/src/musikcore/library/query/TrackMetadataQuery.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/util/CategoryQueryUtil.cpp b/src/musikcore/library/query/util/CategoryQueryUtil.cpp similarity index 100% rename from src/core/library/query/util/CategoryQueryUtil.cpp rename to src/musikcore/library/query/util/CategoryQueryUtil.cpp diff --git a/src/core/library/query/util/CategoryQueryUtil.h b/src/musikcore/library/query/util/CategoryQueryUtil.h similarity index 98% rename from src/core/library/query/util/CategoryQueryUtil.h rename to src/musikcore/library/query/util/CategoryQueryUtil.h index c435126a1..10230fe49 100644 --- a/src/core/library/query/util/CategoryQueryUtil.h +++ b/src/musikcore/library/query/util/CategoryQueryUtil.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/util/SdkWrappers.h b/src/musikcore/library/query/util/SdkWrappers.h similarity index 97% rename from src/core/library/query/util/SdkWrappers.h rename to src/musikcore/library/query/util/SdkWrappers.h index d7b0dcff9..369a2b4b6 100644 --- a/src/core/library/query/util/SdkWrappers.h +++ b/src/musikcore/library/query/util/SdkWrappers.h @@ -34,10 +34,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/core/library/query/util/Serialization.cpp b/src/musikcore/library/query/util/Serialization.cpp similarity index 99% rename from src/core/library/query/util/Serialization.cpp rename to src/musikcore/library/query/util/Serialization.cpp index d848d2607..361db4895 100644 --- a/src/core/library/query/util/Serialization.cpp +++ b/src/musikcore/library/query/util/Serialization.cpp @@ -34,7 +34,7 @@ #include "pch.hpp" #include "Serialization.h" -#include +#include using namespace musik::core; using namespace musik::core::library::query; diff --git a/src/core/library/query/util/Serialization.h b/src/musikcore/library/query/util/Serialization.h similarity index 93% rename from src/core/library/query/util/Serialization.h rename to src/musikcore/library/query/util/Serialization.h index f74a56165..b3e1242cf 100644 --- a/src/core/library/query/util/Serialization.h +++ b/src/musikcore/library/query/util/Serialization.h @@ -36,11 +36,11 @@ #include #include "CategoryQueryUtil.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace musik { namespace core { namespace library { namespace query { diff --git a/src/core/library/query/util/TrackQueryFragments.h b/src/musikcore/library/query/util/TrackQueryFragments.h similarity index 96% rename from src/core/library/query/util/TrackQueryFragments.h rename to src/musikcore/library/query/util/TrackQueryFragments.h index b1612f6cb..ffebf2d4a 100644 --- a/src/core/library/query/util/TrackQueryFragments.h +++ b/src/musikcore/library/query/util/TrackQueryFragments.h @@ -34,11 +34,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace musik { namespace core { namespace library { namespace query { @@ -75,7 +75,7 @@ namespace musik { namespace core { namespace library { namespace query { static inline void ParseFullTrackMetadata( musik::core::TrackPtr result, - musik::core::db::Statement& trackQuery) + musik::core::db::Statement& trackQuery) { result->SetValue(constants::Track::TRACK_NUM, trackQuery.ColumnText(1)); result->SetValue(constants::Track::DISC_NUM, trackQuery.ColumnText(2)); diff --git a/src/core/library/query/util/TrackSort.h b/src/musikcore/library/query/util/TrackSort.h similarity index 100% rename from src/core/library/query/util/TrackSort.h rename to src/musikcore/library/query/util/TrackSort.h diff --git a/src/core/library/track/IndexerTrack.cpp b/src/musikcore/library/track/IndexerTrack.cpp similarity index 98% rename from src/core/library/track/IndexerTrack.cpp rename to src/musikcore/library/track/IndexerTrack.cpp index febd9798e..ce1598fc2 100644 --- a/src/core/library/track/IndexerTrack.cpp +++ b/src/musikcore/library/track/IndexerTrack.cpp @@ -34,15 +34,15 @@ #include "pch.hpp" -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/core/library/track/IndexerTrack.h b/src/musikcore/library/track/IndexerTrack.h similarity index 98% rename from src/core/library/track/IndexerTrack.h rename to src/musikcore/library/track/IndexerTrack.h index b5e0f4ead..4e44f1bda 100644 --- a/src/core/library/track/IndexerTrack.h +++ b/src/musikcore/library/track/IndexerTrack.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace musik { namespace core { diff --git a/src/core/library/track/LibraryTrack.cpp b/src/musikcore/library/track/LibraryTrack.cpp similarity index 98% rename from src/core/library/track/LibraryTrack.cpp rename to src/musikcore/library/track/LibraryTrack.cpp index 1a79e6480..eefbd4405 100644 --- a/src/core/library/track/LibraryTrack.cpp +++ b/src/musikcore/library/track/LibraryTrack.cpp @@ -34,8 +34,8 @@ #include "pch.hpp" -#include -#include +#include +#include using namespace musik::core; using namespace musik::core::sdk; diff --git a/src/core/library/track/LibraryTrack.h b/src/musikcore/library/track/LibraryTrack.h similarity index 96% rename from src/core/library/track/LibraryTrack.h rename to src/musikcore/library/track/LibraryTrack.h index 7f766c58e..13c1fbf23 100644 --- a/src/core/library/track/LibraryTrack.h +++ b/src/musikcore/library/track/LibraryTrack.h @@ -34,10 +34,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/core/library/track/Track.cpp b/src/musikcore/library/track/Track.cpp similarity index 98% rename from src/core/library/track/Track.cpp rename to src/musikcore/library/track/Track.cpp index 25f49bcaa..a34aaec7a 100644 --- a/src/core/library/track/Track.cpp +++ b/src/musikcore/library/track/Track.cpp @@ -34,8 +34,8 @@ #include "pch.hpp" -#include -#include +#include +#include using namespace musik::core; using namespace musik::core::sdk; diff --git a/src/core/library/track/Track.h b/src/musikcore/library/track/Track.h similarity index 97% rename from src/core/library/track/Track.h rename to src/musikcore/library/track/Track.h index 08a5f43cd..0c66cdd2a 100644 --- a/src/core/library/track/Track.h +++ b/src/musikcore/library/track/Track.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/core/library/track/TrackList.cpp b/src/musikcore/library/track/TrackList.cpp similarity index 95% rename from src/core/library/track/TrackList.cpp rename to src/musikcore/library/track/TrackList.cpp index 96db14af7..a6ee79b39 100755 --- a/src/core/library/track/TrackList.cpp +++ b/src/musikcore/library/track/TrackList.cpp @@ -35,15 +35,15 @@ #include "pch.hpp" #include "TrackList.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/library/track/TrackList.h b/src/musikcore/library/track/TrackList.h similarity index 97% rename from src/core/library/track/TrackList.h rename to src/musikcore/library/track/TrackList.h index 59f549e65..5f8a497a2 100755 --- a/src/core/library/track/TrackList.h +++ b/src/musikcore/library/track/TrackList.h @@ -34,11 +34,11 @@ #pragma once -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/src/core/musikcore_c.h b/src/musikcore/musikcore_c.h similarity index 100% rename from src/core/musikcore_c.h rename to src/musikcore/musikcore_c.h diff --git a/src/core/net/WebSocketClient.cpp b/src/musikcore/net/WebSocketClient.cpp similarity index 99% rename from src/core/net/WebSocketClient.cpp rename to src/musikcore/net/WebSocketClient.cpp index c77f05ea2..24eb55ba5 100644 --- a/src/core/net/WebSocketClient.cpp +++ b/src/musikcore/net/WebSocketClient.cpp @@ -34,7 +34,7 @@ #include "pch.hpp" -#include +#include #include using namespace musik::core; diff --git a/src/core/net/WebSocketClient.h b/src/musikcore/net/WebSocketClient.h similarity index 98% rename from src/core/net/WebSocketClient.h rename to src/musikcore/net/WebSocketClient.h index 66929960e..2e0d976a7 100644 --- a/src/core/net/WebSocketClient.h +++ b/src/musikcore/net/WebSocketClient.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/src/core/pch.cpp b/src/musikcore/pch.cpp similarity index 100% rename from src/core/pch.cpp rename to src/musikcore/pch.cpp diff --git a/src/core/pch.hpp b/src/musikcore/pch.hpp similarity index 93% rename from src/core/pch.hpp rename to src/musikcore/pch.hpp index 9c84d8de2..1cd4d0541 100644 --- a/src/core/pch.hpp +++ b/src/musikcore/pch.hpp @@ -33,10 +33,10 @@ ////////////////////////////////////////////////////////////////////////////// #ifdef WIN32 - #include + #include #include - #include - #include + #include + #include #endif #include @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/src/core/plugin/PluginFactory.cpp b/src/musikcore/plugin/PluginFactory.cpp similarity index 96% rename from src/core/plugin/PluginFactory.cpp rename to src/musikcore/plugin/PluginFactory.cpp index ca95cd604..73b306dc3 100644 --- a/src/core/plugin/PluginFactory.cpp +++ b/src/musikcore/plugin/PluginFactory.cpp @@ -34,13 +34,13 @@ #include "pch.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include static const std::string TAG = "PluginFactory"; diff --git a/src/core/plugin/PluginFactory.h b/src/musikcore/plugin/PluginFactory.h similarity index 98% rename from src/core/plugin/PluginFactory.h rename to src/musikcore/plugin/PluginFactory.h index ad5a46852..e6da6eddc 100644 --- a/src/core/plugin/PluginFactory.h +++ b/src/musikcore/plugin/PluginFactory.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/core/plugin/Plugins.cpp b/src/musikcore/plugin/Plugins.cpp similarity index 96% rename from src/core/plugin/Plugins.cpp rename to src/musikcore/plugin/Plugins.cpp index 05306ba58..72cb9369f 100644 --- a/src/core/plugin/Plugins.cpp +++ b/src/musikcore/plugin/Plugins.cpp @@ -36,23 +36,23 @@ #include "Plugins.h" #include "PluginFactory.h" -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include using namespace musik::core; using namespace musik::core::audio; diff --git a/src/core/plugin/Plugins.h b/src/musikcore/plugin/Plugins.h similarity index 92% rename from src/core/plugin/Plugins.h rename to src/musikcore/plugin/Plugins.h index 9b5f0738e..995bb494f 100644 --- a/src/core/plugin/Plugins.h +++ b/src/musikcore/plugin/Plugins.h @@ -34,10 +34,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace musik { namespace core { namespace plugin { diff --git a/src/core/runtime/IMessage.h b/src/musikcore/runtime/IMessage.h similarity index 98% rename from src/core/runtime/IMessage.h rename to src/musikcore/runtime/IMessage.h index 86ba2bc60..bd0c36710 100755 --- a/src/core/runtime/IMessage.h +++ b/src/musikcore/runtime/IMessage.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include namespace musik { namespace core { namespace runtime { diff --git a/src/core/runtime/IMessageQueue.h b/src/musikcore/runtime/IMessageQueue.h similarity index 100% rename from src/core/runtime/IMessageQueue.h rename to src/musikcore/runtime/IMessageQueue.h diff --git a/src/core/runtime/IMessageTarget.h b/src/musikcore/runtime/IMessageTarget.h similarity index 100% rename from src/core/runtime/IMessageTarget.h rename to src/musikcore/runtime/IMessageTarget.h diff --git a/src/core/runtime/Message.cpp b/src/musikcore/runtime/Message.cpp similarity index 100% rename from src/core/runtime/Message.cpp rename to src/musikcore/runtime/Message.cpp diff --git a/src/core/runtime/Message.h b/src/musikcore/runtime/Message.h similarity index 100% rename from src/core/runtime/Message.h rename to src/musikcore/runtime/Message.h diff --git a/src/core/runtime/MessageQueue.cpp b/src/musikcore/runtime/MessageQueue.cpp similarity index 100% rename from src/core/runtime/MessageQueue.cpp rename to src/musikcore/runtime/MessageQueue.cpp diff --git a/src/core/runtime/MessageQueue.h b/src/musikcore/runtime/MessageQueue.h similarity index 100% rename from src/core/runtime/MessageQueue.h rename to src/musikcore/runtime/MessageQueue.h diff --git a/src/core/sdk/DataBuffer.h b/src/musikcore/sdk/DataBuffer.h similarity index 99% rename from src/core/sdk/DataBuffer.h rename to src/musikcore/sdk/DataBuffer.h index 5cb977f9a..4489fb87b 100644 --- a/src/core/sdk/DataBuffer.h +++ b/src/musikcore/sdk/DataBuffer.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include template diff --git a/src/core/sdk/Filesystem.h b/src/musikcore/sdk/Filesystem.h similarity index 100% rename from src/core/sdk/Filesystem.h rename to src/musikcore/sdk/Filesystem.h diff --git a/src/core/sdk/HttpClient.h b/src/musikcore/sdk/HttpClient.h similarity index 100% rename from src/core/sdk/HttpClient.h rename to src/musikcore/sdk/HttpClient.h diff --git a/src/core/sdk/IAllocator.h b/src/musikcore/sdk/IAllocator.h similarity index 100% rename from src/core/sdk/IAllocator.h rename to src/musikcore/sdk/IAllocator.h diff --git a/src/core/sdk/IAnalyzer.h b/src/musikcore/sdk/IAnalyzer.h similarity index 100% rename from src/core/sdk/IAnalyzer.h rename to src/musikcore/sdk/IAnalyzer.h diff --git a/src/core/sdk/IBlockingEncoder.h b/src/musikcore/sdk/IBlockingEncoder.h similarity index 100% rename from src/core/sdk/IBlockingEncoder.h rename to src/musikcore/sdk/IBlockingEncoder.h diff --git a/src/core/sdk/IBuffer.h b/src/musikcore/sdk/IBuffer.h similarity index 100% rename from src/core/sdk/IBuffer.h rename to src/musikcore/sdk/IBuffer.h diff --git a/src/core/sdk/IBufferProvider.h b/src/musikcore/sdk/IBufferProvider.h similarity index 100% rename from src/core/sdk/IBufferProvider.h rename to src/musikcore/sdk/IBufferProvider.h diff --git a/src/core/sdk/IDSP.h b/src/musikcore/sdk/IDSP.h similarity index 100% rename from src/core/sdk/IDSP.h rename to src/musikcore/sdk/IDSP.h diff --git a/src/core/sdk/IDataStream.h b/src/musikcore/sdk/IDataStream.h similarity index 100% rename from src/core/sdk/IDataStream.h rename to src/musikcore/sdk/IDataStream.h diff --git a/src/core/sdk/IDataStreamFactory.h b/src/musikcore/sdk/IDataStreamFactory.h similarity index 100% rename from src/core/sdk/IDataStreamFactory.h rename to src/musikcore/sdk/IDataStreamFactory.h diff --git a/src/core/sdk/IDebug.h b/src/musikcore/sdk/IDebug.h similarity index 100% rename from src/core/sdk/IDebug.h rename to src/musikcore/sdk/IDebug.h diff --git a/src/core/sdk/IDecoder.h b/src/musikcore/sdk/IDecoder.h similarity index 100% rename from src/core/sdk/IDecoder.h rename to src/musikcore/sdk/IDecoder.h diff --git a/src/core/sdk/IDecoderFactory.h b/src/musikcore/sdk/IDecoderFactory.h similarity index 100% rename from src/core/sdk/IDecoderFactory.h rename to src/musikcore/sdk/IDecoderFactory.h diff --git a/src/core/sdk/IDevice.h b/src/musikcore/sdk/IDevice.h similarity index 100% rename from src/core/sdk/IDevice.h rename to src/musikcore/sdk/IDevice.h diff --git a/src/core/sdk/IEncoder.h b/src/musikcore/sdk/IEncoder.h similarity index 100% rename from src/core/sdk/IEncoder.h rename to src/musikcore/sdk/IEncoder.h diff --git a/src/core/sdk/IEncoderFactory.h b/src/musikcore/sdk/IEncoderFactory.h similarity index 100% rename from src/core/sdk/IEncoderFactory.h rename to src/musikcore/sdk/IEncoderFactory.h diff --git a/src/core/sdk/IEnvironment.h b/src/musikcore/sdk/IEnvironment.h similarity index 100% rename from src/core/sdk/IEnvironment.h rename to src/musikcore/sdk/IEnvironment.h diff --git a/src/core/sdk/IIndexerNotifier.h b/src/musikcore/sdk/IIndexerNotifier.h similarity index 100% rename from src/core/sdk/IIndexerNotifier.h rename to src/musikcore/sdk/IIndexerNotifier.h diff --git a/src/core/sdk/IIndexerSource.h b/src/musikcore/sdk/IIndexerSource.h similarity index 100% rename from src/core/sdk/IIndexerSource.h rename to src/musikcore/sdk/IIndexerSource.h diff --git a/src/core/sdk/IIndexerWriter.h b/src/musikcore/sdk/IIndexerWriter.h similarity index 100% rename from src/core/sdk/IIndexerWriter.h rename to src/musikcore/sdk/IIndexerWriter.h diff --git a/src/core/sdk/IMap.h b/src/musikcore/sdk/IMap.h similarity index 100% rename from src/core/sdk/IMap.h rename to src/musikcore/sdk/IMap.h diff --git a/src/core/sdk/IMapList.h b/src/musikcore/sdk/IMapList.h similarity index 100% rename from src/core/sdk/IMapList.h rename to src/musikcore/sdk/IMapList.h diff --git a/src/core/sdk/IMetadataProxy.h b/src/musikcore/sdk/IMetadataProxy.h similarity index 100% rename from src/core/sdk/IMetadataProxy.h rename to src/musikcore/sdk/IMetadataProxy.h diff --git a/src/core/sdk/IOutput.h b/src/musikcore/sdk/IOutput.h similarity index 100% rename from src/core/sdk/IOutput.h rename to src/musikcore/sdk/IOutput.h diff --git a/src/core/sdk/IPcmVisualizer.h b/src/musikcore/sdk/IPcmVisualizer.h similarity index 100% rename from src/core/sdk/IPcmVisualizer.h rename to src/musikcore/sdk/IPcmVisualizer.h diff --git a/src/core/sdk/IPlaybackRemote.h b/src/musikcore/sdk/IPlaybackRemote.h similarity index 100% rename from src/core/sdk/IPlaybackRemote.h rename to src/musikcore/sdk/IPlaybackRemote.h diff --git a/src/core/sdk/IPlaybackService.h b/src/musikcore/sdk/IPlaybackService.h similarity index 100% rename from src/core/sdk/IPlaybackService.h rename to src/musikcore/sdk/IPlaybackService.h diff --git a/src/core/sdk/IPlugin.h b/src/musikcore/sdk/IPlugin.h similarity index 100% rename from src/core/sdk/IPlugin.h rename to src/musikcore/sdk/IPlugin.h diff --git a/src/core/sdk/IPreferences.h b/src/musikcore/sdk/IPreferences.h similarity index 100% rename from src/core/sdk/IPreferences.h rename to src/musikcore/sdk/IPreferences.h diff --git a/src/core/sdk/IResource.h b/src/musikcore/sdk/IResource.h similarity index 100% rename from src/core/sdk/IResource.h rename to src/musikcore/sdk/IResource.h diff --git a/src/core/sdk/ISchema.h b/src/musikcore/sdk/ISchema.h similarity index 100% rename from src/core/sdk/ISchema.h rename to src/musikcore/sdk/ISchema.h diff --git a/src/core/sdk/ISpectrumVisualizer.h b/src/musikcore/sdk/ISpectrumVisualizer.h similarity index 100% rename from src/core/sdk/ISpectrumVisualizer.h rename to src/musikcore/sdk/ISpectrumVisualizer.h diff --git a/src/core/sdk/IStreamingEncoder.h b/src/musikcore/sdk/IStreamingEncoder.h similarity index 100% rename from src/core/sdk/IStreamingEncoder.h rename to src/musikcore/sdk/IStreamingEncoder.h diff --git a/src/core/sdk/ITagReader.h b/src/musikcore/sdk/ITagReader.h similarity index 100% rename from src/core/sdk/ITagReader.h rename to src/musikcore/sdk/ITagReader.h diff --git a/src/core/sdk/ITagStore.h b/src/musikcore/sdk/ITagStore.h similarity index 100% rename from src/core/sdk/ITagStore.h rename to src/musikcore/sdk/ITagStore.h diff --git a/src/core/sdk/ITrack.h b/src/musikcore/sdk/ITrack.h similarity index 100% rename from src/core/sdk/ITrack.h rename to src/musikcore/sdk/ITrack.h diff --git a/src/core/sdk/ITrackList.h b/src/musikcore/sdk/ITrackList.h similarity index 100% rename from src/core/sdk/ITrackList.h rename to src/musikcore/sdk/ITrackList.h diff --git a/src/core/sdk/ITrackListEditor.h b/src/musikcore/sdk/ITrackListEditor.h similarity index 100% rename from src/core/sdk/ITrackListEditor.h rename to src/musikcore/sdk/ITrackListEditor.h diff --git a/src/core/sdk/IValue.h b/src/musikcore/sdk/IValue.h similarity index 100% rename from src/core/sdk/IValue.h rename to src/musikcore/sdk/IValue.h diff --git a/src/core/sdk/IValueList.h b/src/musikcore/sdk/IValueList.h similarity index 100% rename from src/core/sdk/IValueList.h rename to src/musikcore/sdk/IValueList.h diff --git a/src/core/sdk/IVisualizer.h b/src/musikcore/sdk/IVisualizer.h similarity index 100% rename from src/core/sdk/IVisualizer.h rename to src/musikcore/sdk/IVisualizer.h diff --git a/src/core/sdk/ReplayGain.h b/src/musikcore/sdk/ReplayGain.h similarity index 100% rename from src/core/sdk/ReplayGain.h rename to src/musikcore/sdk/ReplayGain.h diff --git a/src/core/sdk/String.h b/src/musikcore/sdk/String.h similarity index 100% rename from src/core/sdk/String.h rename to src/musikcore/sdk/String.h diff --git a/src/core/sdk/constants.h b/src/musikcore/sdk/constants.h similarity index 100% rename from src/core/sdk/constants.h rename to src/musikcore/sdk/constants.h diff --git a/src/core/support/Auddio.cpp b/src/musikcore/support/Auddio.cpp similarity index 97% rename from src/core/support/Auddio.cpp rename to src/musikcore/support/Auddio.cpp index 605385c4b..89296015f 100644 --- a/src/core/support/Auddio.cpp +++ b/src/musikcore/support/Auddio.cpp @@ -35,9 +35,9 @@ #include "pch.hpp" #include "Auddio.h" #include "Common.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/core/support/Auddio.h b/src/musikcore/support/Auddio.h similarity index 97% rename from src/core/support/Auddio.h rename to src/musikcore/support/Auddio.h index d383e52e6..9448268f9 100644 --- a/src/core/support/Auddio.h +++ b/src/musikcore/support/Auddio.h @@ -35,7 +35,7 @@ #pragma once #include -#include +#include namespace musik { namespace core { namespace auddio { using LyricsCallback = std::function; diff --git a/src/core/support/Common.cpp b/src/musikcore/support/Common.cpp similarity index 99% rename from src/core/support/Common.cpp rename to src/musikcore/support/Common.cpp index ab221097a..ed9291d6e 100644 --- a/src/core/support/Common.cpp +++ b/src/musikcore/support/Common.cpp @@ -33,8 +33,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "pch.hpp" -#include -#include +#include +#include #include #include #include diff --git a/src/core/support/Common.h b/src/musikcore/support/Common.h similarity index 98% rename from src/core/support/Common.h rename to src/musikcore/support/Common.h index 657b6f52e..98f49d374 100644 --- a/src/core/support/Common.h +++ b/src/musikcore/support/Common.h @@ -36,7 +36,7 @@ #include #include -#include +#include namespace musik { namespace core { diff --git a/src/core/support/Duration.cpp b/src/musikcore/support/Duration.cpp similarity index 100% rename from src/core/support/Duration.cpp rename to src/musikcore/support/Duration.cpp diff --git a/src/core/support/Duration.h b/src/musikcore/support/Duration.h similarity index 100% rename from src/core/support/Duration.h rename to src/musikcore/support/Duration.h diff --git a/src/core/support/LastFm.cpp b/src/musikcore/support/LastFm.cpp similarity index 98% rename from src/core/support/LastFm.cpp rename to src/musikcore/support/LastFm.cpp index e4c5c3b0b..4c2cc3d81 100644 --- a/src/core/support/LastFm.cpp +++ b/src/musikcore/support/LastFm.cpp @@ -35,9 +35,9 @@ #include "pch.hpp" #include "LastFm.h" #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/core/support/LastFm.h b/src/musikcore/support/LastFm.h similarity index 98% rename from src/core/support/LastFm.h rename to src/musikcore/support/LastFm.h index fac0ca5fa..6c8731c43 100644 --- a/src/core/support/LastFm.h +++ b/src/musikcore/support/LastFm.h @@ -34,7 +34,7 @@ #pragma once -#include +#include namespace musik { namespace core { namespace lastfm { struct Session { diff --git a/src/core/support/Messages.h b/src/musikcore/support/Messages.h similarity index 100% rename from src/core/support/Messages.h rename to src/musikcore/support/Messages.h diff --git a/src/core/support/Playback.cpp b/src/musikcore/support/Playback.cpp similarity index 97% rename from src/core/support/Playback.cpp rename to src/musikcore/support/Playback.cpp index d4115bf8a..a7687199d 100644 --- a/src/core/support/Playback.cpp +++ b/src/musikcore/support/Playback.cpp @@ -34,9 +34,9 @@ #include "pch.hpp" #include "Playback.h" -#include -#include -#include +#include +#include +#include #include using namespace musik::core; diff --git a/src/core/support/Playback.h b/src/musikcore/support/Playback.h similarity index 96% rename from src/core/support/Playback.h rename to src/musikcore/support/Playback.h index c35bfdc68..92807eda9 100644 --- a/src/core/support/Playback.h +++ b/src/musikcore/support/Playback.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include namespace musik { namespace core { diff --git a/src/core/support/PreferenceKeys.cpp b/src/musikcore/support/PreferenceKeys.cpp similarity index 100% rename from src/core/support/PreferenceKeys.cpp rename to src/musikcore/support/PreferenceKeys.cpp diff --git a/src/core/support/PreferenceKeys.h b/src/musikcore/support/PreferenceKeys.h similarity index 100% rename from src/core/support/PreferenceKeys.h rename to src/musikcore/support/PreferenceKeys.h diff --git a/src/core/support/Preferences.cpp b/src/musikcore/support/Preferences.cpp similarity index 98% rename from src/core/support/Preferences.cpp rename to src/musikcore/support/Preferences.cpp index c5637fd25..c80937342 100644 --- a/src/core/support/Preferences.cpp +++ b/src/musikcore/support/Preferences.cpp @@ -34,9 +34,9 @@ #include "pch.hpp" -#include -#include -#include +#include +#include +#include #include diff --git a/src/core/support/Preferences.h b/src/musikcore/support/Preferences.h similarity index 97% rename from src/core/support/Preferences.h rename to src/musikcore/support/Preferences.h index 0918ac036..f50f917b7 100644 --- a/src/core/support/Preferences.h +++ b/src/musikcore/support/Preferences.h @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace musik { namespace core { diff --git a/src/core/utfutil.h b/src/musikcore/utfutil.h similarity index 100% rename from src/core/utfutil.h rename to src/musikcore/utfutil.h diff --git a/src/musikcube/Main.cpp b/src/musikcube/Main.cpp index a9192958a..174a788d6 100644 --- a/src/musikcube/Main.cpp +++ b/src/musikcube/Main.cpp @@ -48,16 +48,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/BrowseLayout.cpp b/src/musikcube/app/layout/BrowseLayout.cpp index dcd9a163a..362a9d5ac 100755 --- a/src/musikcube/app/layout/BrowseLayout.cpp +++ b/src/musikcube/app/layout/BrowseLayout.cpp @@ -37,13 +37,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/BrowseLayout.h b/src/musikcube/app/layout/BrowseLayout.h index a9a0ee99d..297da1e20 100755 --- a/src/musikcube/app/layout/BrowseLayout.h +++ b/src/musikcube/app/layout/BrowseLayout.h @@ -39,9 +39,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/musikcube/app/layout/CategorySearchLayout.cpp b/src/musikcube/app/layout/CategorySearchLayout.cpp index 8e0c9636f..8a282a29c 100644 --- a/src/musikcube/app/layout/CategorySearchLayout.cpp +++ b/src/musikcube/app/layout/CategorySearchLayout.cpp @@ -40,8 +40,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/CategorySearchLayout.h b/src/musikcube/app/layout/CategorySearchLayout.h index bc2cbe4e5..5ef3b4a02 100644 --- a/src/musikcube/app/layout/CategorySearchLayout.h +++ b/src/musikcube/app/layout/CategorySearchLayout.h @@ -41,9 +41,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include @@ -72,7 +72,7 @@ namespace musik { protected: virtual void OnLayout(); virtual void ProcessMessage(musik::core::runtime::IMessage &message); - + private: void InitializeWindows(musik::core::audio::PlaybackService& playback); void OnCategoryEntryActivated(cursespp::ListWindow* sender, size_t index); diff --git a/src/musikcube/app/layout/ConsoleLayout.cpp b/src/musikcube/app/layout/ConsoleLayout.cpp index bc3fa8d1f..498473815 100755 --- a/src/musikcube/app/layout/ConsoleLayout.cpp +++ b/src/musikcube/app/layout/ConsoleLayout.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/musikcube/app/layout/DirectoryLayout.cpp b/src/musikcube/app/layout/DirectoryLayout.cpp index e7699f6ef..5b3869819 100644 --- a/src/musikcube/app/layout/DirectoryLayout.cpp +++ b/src/musikcube/app/layout/DirectoryLayout.cpp @@ -34,9 +34,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/musikcube/app/layout/DirectoryLayout.h b/src/musikcube/app/layout/DirectoryLayout.h index 79e98a1d7..9e1de9a37 100644 --- a/src/musikcube/app/layout/DirectoryLayout.h +++ b/src/musikcube/app/layout/DirectoryLayout.h @@ -41,9 +41,9 @@ #include #include #include -#include +#include -#include +#include #include diff --git a/src/musikcube/app/layout/HotkeysLayout.cpp b/src/musikcube/app/layout/HotkeysLayout.cpp index 11466971c..3a0432f9e 100644 --- a/src/musikcube/app/layout/HotkeysLayout.cpp +++ b/src/musikcube/app/layout/HotkeysLayout.cpp @@ -34,7 +34,7 @@ #include #include "HotkeysLayout.h" -#include +#include #include #include #include diff --git a/src/musikcube/app/layout/LibraryLayout.cpp b/src/musikcube/app/layout/LibraryLayout.cpp index 253a0c50e..18ce0160c 100755 --- a/src/musikcube/app/layout/LibraryLayout.cpp +++ b/src/musikcube/app/layout/LibraryLayout.cpp @@ -38,10 +38,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "LibraryLayout.h" diff --git a/src/musikcube/app/layout/LibraryLayout.h b/src/musikcube/app/layout/LibraryLayout.h index ba67f5991..2450355e9 100755 --- a/src/musikcube/app/layout/LibraryLayout.h +++ b/src/musikcube/app/layout/LibraryLayout.h @@ -43,9 +43,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/musikcube/app/layout/LibraryNotConnectedLayout.cpp b/src/musikcube/app/layout/LibraryNotConnectedLayout.cpp index f19c0c18d..feeb9baa8 100644 --- a/src/musikcube/app/layout/LibraryNotConnectedLayout.cpp +++ b/src/musikcube/app/layout/LibraryNotConnectedLayout.cpp @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/musikcube/app/layout/LibraryNotConnectedLayout.h b/src/musikcube/app/layout/LibraryNotConnectedLayout.h index 57bd55bd0..0b5599d1a 100644 --- a/src/musikcube/app/layout/LibraryNotConnectedLayout.h +++ b/src/musikcube/app/layout/LibraryNotConnectedLayout.h @@ -35,7 +35,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/musikcube/app/layout/LocalLibrarySettingsLayout.cpp b/src/musikcube/app/layout/LocalLibrarySettingsLayout.cpp index c7a100e04..32d472248 100644 --- a/src/musikcube/app/layout/LocalLibrarySettingsLayout.cpp +++ b/src/musikcube/app/layout/LocalLibrarySettingsLayout.cpp @@ -41,11 +41,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/LocalLibrarySettingsLayout.h b/src/musikcube/app/layout/LocalLibrarySettingsLayout.h index 97ddee8fb..30df16543 100644 --- a/src/musikcube/app/layout/LocalLibrarySettingsLayout.h +++ b/src/musikcube/app/layout/LocalLibrarySettingsLayout.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include namespace musik { namespace cube { diff --git a/src/musikcube/app/layout/LyricsLayout.cpp b/src/musikcube/app/layout/LyricsLayout.cpp index fecb0383c..aeb27b82b 100644 --- a/src/musikcube/app/layout/LyricsLayout.cpp +++ b/src/musikcube/app/layout/LyricsLayout.cpp @@ -34,10 +34,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/musikcube/app/layout/LyricsLayout.h b/src/musikcube/app/layout/LyricsLayout.h index 93b64b288..21eb6f4aa 100644 --- a/src/musikcube/app/layout/LyricsLayout.h +++ b/src/musikcube/app/layout/LyricsLayout.h @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include namespace musik { namespace cube { diff --git a/src/musikcube/app/layout/MainLayout.cpp b/src/musikcube/app/layout/MainLayout.cpp index 509effe53..982175ca5 100755 --- a/src/musikcube/app/layout/MainLayout.cpp +++ b/src/musikcube/app/layout/MainLayout.cpp @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/MainLayout.h b/src/musikcube/app/layout/MainLayout.h index b3037b6a8..960df32a1 100755 --- a/src/musikcube/app/layout/MainLayout.h +++ b/src/musikcube/app/layout/MainLayout.h @@ -39,10 +39,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/musikcube/app/layout/NowPlayingLayout.cpp b/src/musikcube/app/layout/NowPlayingLayout.cpp index f6e284f99..e336662c9 100755 --- a/src/musikcube/app/layout/NowPlayingLayout.cpp +++ b/src/musikcube/app/layout/NowPlayingLayout.cpp @@ -37,15 +37,15 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "NowPlayingLayout.h" #include diff --git a/src/musikcube/app/layout/NowPlayingLayout.h b/src/musikcube/app/layout/NowPlayingLayout.h index fe31e14b0..4e5215cba 100755 --- a/src/musikcube/app/layout/NowPlayingLayout.h +++ b/src/musikcube/app/layout/NowPlayingLayout.h @@ -38,10 +38,10 @@ #include #include #include -#include -#include +#include +#include -#include +#include #include diff --git a/src/musikcube/app/layout/RemoteLibrarySettingsLayout.cpp b/src/musikcube/app/layout/RemoteLibrarySettingsLayout.cpp index 6a4419b07..728baa76a 100644 --- a/src/musikcube/app/layout/RemoteLibrarySettingsLayout.cpp +++ b/src/musikcube/app/layout/RemoteLibrarySettingsLayout.cpp @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/RemoteLibrarySettingsLayout.h b/src/musikcube/app/layout/RemoteLibrarySettingsLayout.h index c9a054e71..3966cebf6 100644 --- a/src/musikcube/app/layout/RemoteLibrarySettingsLayout.h +++ b/src/musikcube/app/layout/RemoteLibrarySettingsLayout.h @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include namespace musik { namespace cube { class RemoteLibrarySettingsLayout: public cursespp::LayoutBase { diff --git a/src/musikcube/app/layout/SettingsLayout.cpp b/src/musikcube/app/layout/SettingsLayout.cpp index a375fe81f..adb902377 100755 --- a/src/musikcube/app/layout/SettingsLayout.cpp +++ b/src/musikcube/app/layout/SettingsLayout.cpp @@ -43,12 +43,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/SettingsLayout.h b/src/musikcube/app/layout/SettingsLayout.h index 05bed02ca..a6d6dcebb 100755 --- a/src/musikcube/app/layout/SettingsLayout.h +++ b/src/musikcube/app/layout/SettingsLayout.h @@ -46,10 +46,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/TrackSearchLayout.cpp b/src/musikcube/app/layout/TrackSearchLayout.cpp index b509df971..3357dddcd 100755 --- a/src/musikcube/app/layout/TrackSearchLayout.cpp +++ b/src/musikcube/app/layout/TrackSearchLayout.cpp @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/layout/TrackSearchLayout.h b/src/musikcube/app/layout/TrackSearchLayout.h index 1624c5c96..72e9533bf 100755 --- a/src/musikcube/app/layout/TrackSearchLayout.h +++ b/src/musikcube/app/layout/TrackSearchLayout.h @@ -39,9 +39,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/musikcube/app/model/DirectoryAdapter.cpp b/src/musikcube/app/model/DirectoryAdapter.cpp index cf729129e..2c9746c16 100755 --- a/src/musikcube/app/model/DirectoryAdapter.cpp +++ b/src/musikcube/app/model/DirectoryAdapter.cpp @@ -34,7 +34,7 @@ #include -#include +#include #include #include #include diff --git a/src/musikcube/app/overlay/BrowseOverlays.cpp b/src/musikcube/app/overlay/BrowseOverlays.cpp index 1e936625d..4233a7170 100644 --- a/src/musikcube/app/overlay/BrowseOverlays.cpp +++ b/src/musikcube/app/overlay/BrowseOverlays.cpp @@ -36,8 +36,8 @@ #include "BrowseOverlays.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/musikcube/app/overlay/BrowseOverlays.h b/src/musikcube/app/overlay/BrowseOverlays.h index cf2ca7720..3ee573115 100644 --- a/src/musikcube/app/overlay/BrowseOverlays.h +++ b/src/musikcube/app/overlay/BrowseOverlays.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include namespace musik { diff --git a/src/musikcube/app/overlay/ColorThemeOverlay.cpp b/src/musikcube/app/overlay/ColorThemeOverlay.cpp index 0d6a5a1b5..b57e01ef1 100644 --- a/src/musikcube/app/overlay/ColorThemeOverlay.cpp +++ b/src/musikcube/app/overlay/ColorThemeOverlay.cpp @@ -36,9 +36,9 @@ #include "ColorThemeOverlay.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/musikcube/app/overlay/EqualizerOverlay.cpp b/src/musikcube/app/overlay/EqualizerOverlay.cpp index 6ae7944d4..9ffdc6717 100644 --- a/src/musikcube/app/overlay/EqualizerOverlay.cpp +++ b/src/musikcube/app/overlay/EqualizerOverlay.cpp @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/src/musikcube/app/overlay/EqualizerOverlay.h b/src/musikcube/app/overlay/EqualizerOverlay.h index 563324aa7..01cba30c0 100644 --- a/src/musikcube/app/overlay/EqualizerOverlay.h +++ b/src/musikcube/app/overlay/EqualizerOverlay.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/src/musikcube/app/overlay/LastFmOverlay.cpp b/src/musikcube/app/overlay/LastFmOverlay.cpp index 300529e8f..e76f7c633 100644 --- a/src/musikcube/app/overlay/LastFmOverlay.cpp +++ b/src/musikcube/app/overlay/LastFmOverlay.cpp @@ -35,8 +35,8 @@ #include #include "LastFmOverlay.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/musikcube/app/overlay/PlayQueueOverlays.cpp b/src/musikcube/app/overlay/PlayQueueOverlays.cpp index ca7f00d9a..25183c7f1 100644 --- a/src/musikcube/app/overlay/PlayQueueOverlays.cpp +++ b/src/musikcube/app/overlay/PlayQueueOverlays.cpp @@ -38,16 +38,16 @@ #include "PlayQueueOverlays.h" -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -148,14 +148,14 @@ static void queryTracksByCategory( } static void queryPlaylists( - ILibraryPtr library, + ILibraryPtr library, std::function)> callback) { std::shared_ptr query( new CategoryListQuery(Playlists::TABLE_NAME, "")); library->Enqueue(query, 0, [callback, query](auto q) { - callback(query->GetStatus() == IQuery::Finished + callback(query->GetStatus() == IQuery::Finished ? query : std::shared_ptr()); }); } @@ -650,7 +650,7 @@ void PlayQueueOverlays::ShowAlbumDividerOverlay( void PlayQueueOverlays::ShowLoadPlaylistOverlay( PlaybackService& playback, ILibraryPtr library, PlaylistSelectedCallback selectedCallback) { - auto playlistsCallback = + auto playlistsCallback = [&playback, library, selectedCallback] (std::shared_ptr playlistQuery) { diff --git a/src/musikcube/app/overlay/PlayQueueOverlays.h b/src/musikcube/app/overlay/PlayQueueOverlays.h index e146a5432..31b814fbd 100644 --- a/src/musikcube/app/overlay/PlayQueueOverlays.h +++ b/src/musikcube/app/overlay/PlayQueueOverlays.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace musik { diff --git a/src/musikcube/app/overlay/PlaybackOverlays.cpp b/src/musikcube/app/overlay/PlaybackOverlays.cpp index 3a2d06041..a0c71f180 100644 --- a/src/musikcube/app/overlay/PlaybackOverlays.cpp +++ b/src/musikcube/app/overlay/PlaybackOverlays.cpp @@ -36,9 +36,9 @@ #include "PlaybackOverlays.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/overlay/PlaybackOverlays.h b/src/musikcube/app/overlay/PlaybackOverlays.h index e1d1af50a..64f1c1ac7 100644 --- a/src/musikcube/app/overlay/PlaybackOverlays.h +++ b/src/musikcube/app/overlay/PlaybackOverlays.h @@ -35,8 +35,8 @@ #pragma once #include -#include -#include +#include +#include namespace musik { namespace cube { diff --git a/src/musikcube/app/overlay/PluginOverlay.cpp b/src/musikcube/app/overlay/PluginOverlay.cpp index 0f1bdad34..e26cadb61 100644 --- a/src/musikcube/app/overlay/PluginOverlay.cpp +++ b/src/musikcube/app/overlay/PluginOverlay.cpp @@ -36,11 +36,11 @@ #include "PluginOverlay.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/overlay/PreampOverlay.cpp b/src/musikcube/app/overlay/PreampOverlay.cpp index a3ebddc0a..c0c2c4996 100644 --- a/src/musikcube/app/overlay/PreampOverlay.cpp +++ b/src/musikcube/app/overlay/PreampOverlay.cpp @@ -37,10 +37,10 @@ #include "PreampOverlay.h" #include "PlaybackOverlays.h" -#include -#include +#include +#include -#include +#include #include #include diff --git a/src/musikcube/app/overlay/PreampOverlay.h b/src/musikcube/app/overlay/PreampOverlay.h index f82c775a7..ee09c734b 100644 --- a/src/musikcube/app/overlay/PreampOverlay.h +++ b/src/musikcube/app/overlay/PreampOverlay.h @@ -36,9 +36,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/overlay/ServerOverlay.cpp b/src/musikcube/app/overlay/ServerOverlay.cpp index 170e17e48..848683782 100644 --- a/src/musikcube/app/overlay/ServerOverlay.cpp +++ b/src/musikcube/app/overlay/ServerOverlay.cpp @@ -36,8 +36,8 @@ #include "ServerOverlay.h" -#include -#include +#include +#include #include diff --git a/src/musikcube/app/overlay/ServerOverlay.h b/src/musikcube/app/overlay/ServerOverlay.h index ce0fb3982..ebcd3c160 100644 --- a/src/musikcube/app/overlay/ServerOverlay.h +++ b/src/musikcube/app/overlay/ServerOverlay.h @@ -36,8 +36,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/src/musikcube/app/overlay/SettingsOverlays.cpp b/src/musikcube/app/overlay/SettingsOverlays.cpp index c845d3897..b116e48ca 100644 --- a/src/musikcube/app/overlay/SettingsOverlays.cpp +++ b/src/musikcube/app/overlay/SettingsOverlays.cpp @@ -36,10 +36,10 @@ #include "SettingsOverlays.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/overlay/TrackOverlays.cpp b/src/musikcube/app/overlay/TrackOverlays.cpp index f58121978..50754a585 100644 --- a/src/musikcube/app/overlay/TrackOverlays.cpp +++ b/src/musikcube/app/overlay/TrackOverlays.cpp @@ -35,8 +35,8 @@ #include #include "TrackOverlays.h" -#include -#include +#include +#include #include #include #include diff --git a/src/musikcube/app/overlay/TrackOverlays.h b/src/musikcube/app/overlay/TrackOverlays.h index 63fa05199..ebd6d0a74 100644 --- a/src/musikcube/app/overlay/TrackOverlays.h +++ b/src/musikcube/app/overlay/TrackOverlays.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/src/musikcube/app/overlay/VisualizerOverlay.cpp b/src/musikcube/app/overlay/VisualizerOverlay.cpp index 5098fabef..4cf7ccbc5 100644 --- a/src/musikcube/app/overlay/VisualizerOverlay.cpp +++ b/src/musikcube/app/overlay/VisualizerOverlay.cpp @@ -36,7 +36,7 @@ #include "VisualizerOverlay.h" -#include +#include #include #include diff --git a/src/musikcube/app/util/ConsoleLogger.cpp b/src/musikcube/app/util/ConsoleLogger.cpp index 579397564..553e8581f 100644 --- a/src/musikcube/app/util/ConsoleLogger.cpp +++ b/src/musikcube/app/util/ConsoleLogger.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/musikcube/app/util/ConsoleLogger.h b/src/musikcube/app/util/ConsoleLogger.h index 2e9cdc3aa..c7cdf8f38 100644 --- a/src/musikcube/app/util/ConsoleLogger.h +++ b/src/musikcube/app/util/ConsoleLogger.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/src/musikcube/app/util/GlobalHotkeys.cpp b/src/musikcube/app/util/GlobalHotkeys.cpp index a4c36d992..dc724f305 100755 --- a/src/musikcube/app/util/GlobalHotkeys.cpp +++ b/src/musikcube/app/util/GlobalHotkeys.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include using namespace musik::core; using namespace musik::core::audio; diff --git a/src/musikcube/app/util/GlobalHotkeys.h b/src/musikcube/app/util/GlobalHotkeys.h index 34f754475..5bb836b35 100755 --- a/src/musikcube/app/util/GlobalHotkeys.h +++ b/src/musikcube/app/util/GlobalHotkeys.h @@ -36,8 +36,8 @@ #include -#include -#include +#include +#include namespace musik { namespace cube { diff --git a/src/musikcube/app/util/Hotkeys.cpp b/src/musikcube/app/util/Hotkeys.cpp index 7976a44bb..0e475614c 100755 --- a/src/musikcube/app/util/Hotkeys.cpp +++ b/src/musikcube/app/util/Hotkeys.cpp @@ -34,7 +34,7 @@ #include #include "Hotkeys.h" -#include +#include #include #include #include diff --git a/src/musikcube/app/util/Messages.h b/src/musikcube/app/util/Messages.h index 349e3eda0..729ebde9b 100644 --- a/src/musikcube/app/util/Messages.h +++ b/src/musikcube/app/util/Messages.h @@ -35,7 +35,7 @@ #pragma once #include -#include +#include namespace musik { namespace cube { diff --git a/src/musikcube/app/util/Playback.cpp b/src/musikcube/app/util/Playback.cpp index 00b46d9ff..eb9a7f7ae 100755 --- a/src/musikcube/app/util/Playback.cpp +++ b/src/musikcube/app/util/Playback.cpp @@ -35,7 +35,7 @@ #include #include "Playback.h" -#include +#include using namespace musik::core; using namespace musik::core::audio; diff --git a/src/musikcube/app/util/Playback.h b/src/musikcube/app/util/Playback.h index 8d3417be7..d67689ed0 100755 --- a/src/musikcube/app/util/Playback.h +++ b/src/musikcube/app/util/Playback.h @@ -36,9 +36,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/musikcube/app/util/Rating.cpp b/src/musikcube/app/util/Rating.cpp index eb1097c71..e39f561df 100644 --- a/src/musikcube/app/util/Rating.cpp +++ b/src/musikcube/app/util/Rating.cpp @@ -36,9 +36,9 @@ #include "Rating.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/util/TrackRowRenderers.cpp b/src/musikcube/app/util/TrackRowRenderers.cpp index 4df7ba630..e2a49e390 100644 --- a/src/musikcube/app/util/TrackRowRenderers.cpp +++ b/src/musikcube/app/util/TrackRowRenderers.cpp @@ -38,9 +38,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/musikcube/app/util/TrackRowRenderers.h b/src/musikcube/app/util/TrackRowRenderers.h index 6fef4c03e..a386af4f9 100644 --- a/src/musikcube/app/util/TrackRowRenderers.h +++ b/src/musikcube/app/util/TrackRowRenderers.h @@ -34,7 +34,7 @@ #pragma once -#include +#include namespace musik { namespace cube { diff --git a/src/musikcube/app/util/UpdateCheck.cpp b/src/musikcube/app/util/UpdateCheck.cpp index 1b1686046..2c7c5dcb8 100644 --- a/src/musikcube/app/util/UpdateCheck.cpp +++ b/src/musikcube/app/util/UpdateCheck.cpp @@ -40,8 +40,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/musikcube/app/util/UpdateCheck.h b/src/musikcube/app/util/UpdateCheck.h index 68cec437d..be2c346f3 100644 --- a/src/musikcube/app/util/UpdateCheck.h +++ b/src/musikcube/app/util/UpdateCheck.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include namespace musik { namespace cube { class UpdateCheck : private musik::core::runtime::IMessageTarget { diff --git a/src/musikcube/app/window/CategoryListView.cpp b/src/musikcube/app/window/CategoryListView.cpp index 2d89d67b2..067a4e405 100755 --- a/src/musikcube/app/window/CategoryListView.cpp +++ b/src/musikcube/app/window/CategoryListView.cpp @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/musikcube/app/window/CategoryListView.h b/src/musikcube/app/window/CategoryListView.h index 32e8e96a7..d8c73e52b 100755 --- a/src/musikcube/app/window/CategoryListView.h +++ b/src/musikcube/app/window/CategoryListView.h @@ -39,12 +39,12 @@ #include #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/musikcube/app/window/TrackListView.cpp b/src/musikcube/app/window/TrackListView.cpp index a4e259a23..43ce2ead8 100755 --- a/src/musikcube/app/window/TrackListView.cpp +++ b/src/musikcube/app/window/TrackListView.cpp @@ -40,10 +40,10 @@ #include #include -#include -#include +#include +#include -#include +#include #include #include @@ -472,7 +472,7 @@ IScrollAdapter::EntryPtr TrackListView::Adapter::GetEntry(cursespp::ScrollableWi if (track) { std::string album = track->GetMetadataState() == MetadataState::Loaded ? track->GetString(constants::Track::ALBUM) : "-"; - + if (!album.size()) { album = _TSTR("tracklist_unknown_album"); } @@ -520,7 +520,7 @@ IScrollAdapter::EntryPtr TrackListView::Adapter::GetEntry(cursespp::ScrollableWi entry->SetAttrs(attrs); return entry; } - + std::string text = parent.renderer( track, rawIndex, this->GetWidth(), parent.trackNumType); diff --git a/src/musikcube/app/window/TrackListView.h b/src/musikcube/app/window/TrackListView.h index 94eb12106..1ad252ab6 100755 --- a/src/musikcube/app/window/TrackListView.h +++ b/src/musikcube/app/window/TrackListView.h @@ -41,11 +41,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/src/musikcube/app/window/TransportWindow.cpp b/src/musikcube/app/window/TransportWindow.cpp index 239ef485b..94c9c92c8 100755 --- a/src/musikcube/app/window/TransportWindow.cpp +++ b/src/musikcube/app/window/TransportWindow.cpp @@ -39,13 +39,13 @@ #include #include -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/musikcube/app/window/TransportWindow.h b/src/musikcube/app/window/TransportWindow.h index e503fbd93..7d552bf30 100755 --- a/src/musikcube/app/window/TransportWindow.h +++ b/src/musikcube/app/window/TransportWindow.h @@ -36,10 +36,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace musik { diff --git a/src/musikcube/cursespp/Colors.cpp b/src/musikcube/cursespp/Colors.cpp index 413c9202d..3e28ebc8f 100755 --- a/src/musikcube/cursespp/Colors.cpp +++ b/src/musikcube/cursespp/Colors.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include using namespace musik::core; diff --git a/src/musikcube/cursespp/InputOverlay.cpp b/src/musikcube/cursespp/InputOverlay.cpp index 4876b08e7..079b1f752 100644 --- a/src/musikcube/cursespp/InputOverlay.cpp +++ b/src/musikcube/cursespp/InputOverlay.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include using namespace cursespp; diff --git a/src/musikcube/cursespp/SchemaOverlay.cpp b/src/musikcube/cursespp/SchemaOverlay.cpp index 33da4e9fc..d57cf3ffa 100644 --- a/src/musikcube/cursespp/SchemaOverlay.cpp +++ b/src/musikcube/cursespp/SchemaOverlay.cpp @@ -36,8 +36,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/src/musikcube/cursespp/Window.cpp b/src/musikcube/cursespp/Window.cpp index fab51ca9a..51f691331 100755 --- a/src/musikcube/cursespp/Window.cpp +++ b/src/musikcube/cursespp/Window.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include using namespace cursespp; using namespace musik::core::runtime; diff --git a/src/musikcube/cursespp/cursespp/IWindow.h b/src/musikcube/cursespp/cursespp/IWindow.h index 83aa89508..6d223f988 100644 --- a/src/musikcube/cursespp/cursespp/IWindow.h +++ b/src/musikcube/cursespp/cursespp/IWindow.h @@ -40,8 +40,8 @@ #include #include -#include -#include +#include +#include #include namespace cursespp { diff --git a/src/musikcube/cursespp/cursespp/NumberValidator.h b/src/musikcube/cursespp/cursespp/NumberValidator.h index 5f54e6392..7122ca790 100644 --- a/src/musikcube/cursespp/cursespp/NumberValidator.h +++ b/src/musikcube/cursespp/cursespp/NumberValidator.h @@ -36,7 +36,7 @@ #pragma once #include -#include +#include namespace cursespp { diff --git a/src/musikcube/cursespp/cursespp/SchemaOverlay.h b/src/musikcube/cursespp/cursespp/SchemaOverlay.h index 4b42e1bbe..66dea8764 100644 --- a/src/musikcube/cursespp/cursespp/SchemaOverlay.h +++ b/src/musikcube/cursespp/cursespp/SchemaOverlay.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include namespace cursespp { class SchemaOverlay { diff --git a/src/musikcube/cursespp/cursespp/Window.h b/src/musikcube/cursespp/cursespp/Window.h index 9eb86cf4b..d5da71393 100644 --- a/src/musikcube/cursespp/cursespp/Window.h +++ b/src/musikcube/cursespp/cursespp/Window.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #ifdef WIN32 #define IDLE_TIMEOUT_MS 10 diff --git a/src/musikcube/stdafx.h b/src/musikcube/stdafx.h index e2062b10a..ef21c386a 100644 --- a/src/musikcube/stdafx.h +++ b/src/musikcube/stdafx.h @@ -38,17 +38,17 @@ asio's streambuf. include it up front so work around this */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include diff --git a/src/musikcubed/main.cpp b/src/musikcubed/main.cpp index 873c6541b..77bbf0297 100644 --- a/src/musikcubed/main.cpp +++ b/src/musikcubed/main.cpp @@ -7,15 +7,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/musikwin/Main.cpp b/src/musikwin/Main.cpp index 907c68e0d..d7ffa00bc 100644 --- a/src/musikwin/Main.cpp +++ b/src/musikwin/Main.cpp @@ -41,10 +41,10 @@ processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/musikwin/app/controller/MainController.cpp b/src/musikwin/app/controller/MainController.cpp index 4ab279fb8..d9efc7a92 100644 --- a/src/musikwin/app/controller/MainController.cpp +++ b/src/musikwin/app/controller/MainController.cpp @@ -33,11 +33,11 @@ ////////////////////////////////////////////////////////////////////////////// #include "MainController.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace musik::win; using namespace musik::core; diff --git a/src/musikwin/app/controller/MainController.h b/src/musikwin/app/controller/MainController.h index 28315c5c2..ca5b392f8 100644 --- a/src/musikwin/app/controller/MainController.h +++ b/src/musikwin/app/controller/MainController.h @@ -36,11 +36,11 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include #include #include diff --git a/src/musikwin/app/view/MainWindow.cpp b/src/musikwin/app/view/MainWindow.cpp index 23112580e..5963b1033 100644 --- a/src/musikwin/app/view/MainWindow.cpp +++ b/src/musikwin/app/view/MainWindow.cpp @@ -34,8 +34,8 @@ #include "MainWindow.h" -#include -#include +#include +#include #include diff --git a/src/musikwin/app/view/MainWindow.h b/src/musikwin/app/view/MainWindow.h index c1a8ea88b..8aefe0e3f 100644 --- a/src/musikwin/app/view/MainWindow.h +++ b/src/musikwin/app/view/MainWindow.h @@ -35,7 +35,7 @@ #pragma once #include -#include +#include namespace musik { namespace win { class MainWindow : public win32cpp::TopLevelWindow { diff --git a/src/plugins/alsaout/AlsaOut.cpp b/src/plugins/alsaout/AlsaOut.cpp index f1488c33f..2685affe4 100755 --- a/src/plugins/alsaout/AlsaOut.cpp +++ b/src/plugins/alsaout/AlsaOut.cpp @@ -34,8 +34,8 @@ #include "AlsaOut.h" -#include -#include +#include +#include static musik::core::sdk::IPreferences* prefs; diff --git a/src/plugins/alsaout/AlsaOut.h b/src/plugins/alsaout/AlsaOut.h index e5bf002b9..5b558705f 100755 --- a/src/plugins/alsaout/AlsaOut.h +++ b/src/plugins/alsaout/AlsaOut.h @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/plugins/alsaout/alsaout_plugin.cpp b/src/plugins/alsaout/alsaout_plugin.cpp index 9e4bd9039..1447f881a 100755 --- a/src/plugins/alsaout/alsaout_plugin.cpp +++ b/src/plugins/alsaout/alsaout_plugin.cpp @@ -34,9 +34,9 @@ #include "pch.h" -#include -#include -#include +#include +#include +#include #include "AlsaOut.h" diff --git a/src/plugins/alsaout/pch.h b/src/plugins/alsaout/pch.h index 658bc6360..d9a0a4cea 100755 --- a/src/plugins/alsaout/pch.h +++ b/src/plugins/alsaout/pch.h @@ -35,7 +35,7 @@ // Precompiled headers #pragma once -#include +#include #include #include diff --git a/src/plugins/cddadecoder/CddaDataStream.h b/src/plugins/cddadecoder/CddaDataStream.h index 05e0bb8a5..e406154aa 100755 --- a/src/plugins/cddadecoder/CddaDataStream.h +++ b/src/plugins/cddadecoder/CddaDataStream.h @@ -32,7 +32,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include +#include #include "ntddcdrm.h" #include "devioctl.h" diff --git a/src/plugins/cddadecoder/CddaDataStreamFactory.h b/src/plugins/cddadecoder/CddaDataStreamFactory.h index 927640b3d..340eb0825 100755 --- a/src/plugins/cddadecoder/CddaDataStreamFactory.h +++ b/src/plugins/cddadecoder/CddaDataStreamFactory.h @@ -32,8 +32,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include using namespace musik::core::sdk; diff --git a/src/plugins/cddadecoder/CddaDecoder.h b/src/plugins/cddadecoder/CddaDecoder.h index fcee5781c..380308b5e 100644 --- a/src/plugins/cddadecoder/CddaDecoder.h +++ b/src/plugins/cddadecoder/CddaDecoder.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include "CddaDataStream.h" #include "ntddcdrm.h" diff --git a/src/plugins/cddadecoder/CddaDecoderFactory.h b/src/plugins/cddadecoder/CddaDecoderFactory.h index fc0d4e0f7..3452316b2 100644 --- a/src/plugins/cddadecoder/CddaDecoderFactory.h +++ b/src/plugins/cddadecoder/CddaDecoderFactory.h @@ -34,7 +34,7 @@ #pragma once -#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/cddadecoder/CddaIndexerSource.cpp b/src/plugins/cddadecoder/CddaIndexerSource.cpp index bfd195b4c..cb3adc612 100644 --- a/src/plugins/cddadecoder/CddaIndexerSource.cpp +++ b/src/plugins/cddadecoder/CddaIndexerSource.cpp @@ -36,7 +36,7 @@ #include "CddaIndexerSource.h" -#include +#include #include diff --git a/src/plugins/cddadecoder/CddaIndexerSource.h b/src/plugins/cddadecoder/CddaIndexerSource.h index da617de8c..92212c1c1 100644 --- a/src/plugins/cddadecoder/CddaIndexerSource.h +++ b/src/plugins/cddadecoder/CddaIndexerSource.h @@ -32,7 +32,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include +#include #include "CddaDataModel.h" #include diff --git a/src/plugins/cddadecoder/cddadecoder_plugin.cpp b/src/plugins/cddadecoder/cddadecoder_plugin.cpp index 0cf7453b6..0fa11962f 100644 --- a/src/plugins/cddadecoder/cddadecoder_plugin.cpp +++ b/src/plugins/cddadecoder/cddadecoder_plugin.cpp @@ -38,8 +38,8 @@ #include "CddaDataStreamFactory.h" #include "CddaIndexerSource.h" -#include -#include +#include +#include BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { if (reason == DLL_PROCESS_DETACH) { diff --git a/src/plugins/coreaudioout/CoreAudioOut.cpp b/src/plugins/coreaudioout/CoreAudioOut.cpp index 5d6f19467..49053876b 100644 --- a/src/plugins/coreaudioout/CoreAudioOut.cpp +++ b/src/plugins/coreaudioout/CoreAudioOut.cpp @@ -33,8 +33,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "CoreAudioOut.h" -#include -#include +#include +#include #include #include diff --git a/src/plugins/coreaudioout/CoreAudioOut.h b/src/plugins/coreaudioout/CoreAudioOut.h index c22f4a807..92b883f86 100644 --- a/src/plugins/coreaudioout/CoreAudioOut.h +++ b/src/plugins/coreaudioout/CoreAudioOut.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/src/plugins/coreaudioout/coreaudioout_plugin.cpp b/src/plugins/coreaudioout/coreaudioout_plugin.cpp index 7cfcde676..c60fb082b 100644 --- a/src/plugins/coreaudioout/coreaudioout_plugin.cpp +++ b/src/plugins/coreaudioout/coreaudioout_plugin.cpp @@ -32,9 +32,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include "CoreAudioOut.h" diff --git a/src/plugins/directsoundout/DirectSoundOut.cpp b/src/plugins/directsoundout/DirectSoundOut.cpp index 5cbf91a01..b006d307e 100644 --- a/src/plugins/directsoundout/DirectSoundOut.cpp +++ b/src/plugins/directsoundout/DirectSoundOut.cpp @@ -34,10 +34,10 @@ #include "DirectSoundOut.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/plugins/directsoundout/DirectSoundOut.h b/src/plugins/directsoundout/DirectSoundOut.h index dbe2b5b65..38378ec07 100644 --- a/src/plugins/directsoundout/DirectSoundOut.h +++ b/src/plugins/directsoundout/DirectSoundOut.h @@ -47,8 +47,8 @@ #include #include -#include -#include +#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/directsoundout/directsoundout_plugin.cpp b/src/plugins/directsoundout/directsoundout_plugin.cpp index 42cd1fb48..e400bd5ba 100644 --- a/src/plugins/directsoundout/directsoundout_plugin.cpp +++ b/src/plugins/directsoundout/directsoundout_plugin.cpp @@ -34,8 +34,8 @@ #include "pch.h" -#include -#include +#include +#include #include "DirectSoundOut.h" diff --git a/src/plugins/dsp_example_echo/DSPEcho.h b/src/plugins/dsp_example_echo/DSPEcho.h index ace90a9a8..9997a6da0 100644 --- a/src/plugins/dsp_example_echo/DSPEcho.h +++ b/src/plugins/dsp_example_echo/DSPEcho.h @@ -1,38 +1,38 @@ ////////////////////////////////////////////////////////////////////////////// -// Copyright 2007, Daniel Önnerby +// Copyright 2007, Daniel �nnerby // // All rights reserved. // -// Redistribution and use in source and binary forms, with or without +// Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are met: // // * Redistributions of source code must retain the above copyright notice, // this list of conditions and the following disclaimer. // -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the // documentation and/or other materials provided with the distribution. // -// * Neither the name of the author nor the names of other contributors may -// be used to endorse or promote products derived from this software -// without specific prior written permission. +// * Neither the name of the author nor the names of other contributors may +// be used to endorse or promote products derived from this software +// without specific prior written permission. // -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. // ////////////////////////////////////////////////////////////////////////////// #pragma once -#include +#include using namespace musik::core::audio; diff --git a/src/plugins/dsp_example_echo/dsp_echo_plugin.cpp b/src/plugins/dsp_example_echo/dsp_echo_plugin.cpp index b9f4ca6ea..0f6833111 100644 --- a/src/plugins/dsp_example_echo/dsp_echo_plugin.cpp +++ b/src/plugins/dsp_example_echo/dsp_echo_plugin.cpp @@ -2,7 +2,7 @@ // // License Agreement: // -// The following are Copyright © 2008, Daniel Önnerby +// The following are Copyright � 2008, Daniel �nnerby // // All rights reserved. // @@ -36,7 +36,7 @@ #include "pch.h" -#include +#include #include "DSPEcho.h" @@ -51,7 +51,7 @@ class DSPEchoPlugin : public musik::core::IPlugin const utfchar* Name() { return TEXT("DSP echo example"); }; const utfchar* Version() { return TEXT("1"); }; - const utfchar* Author() { return TEXT("Daniel Önnerby"); }; + const utfchar* Author() { return TEXT("Daniel �nnerby"); }; }; extern "C" __declspec(dllexport) musik::core::IPlugin* GetPlugin() diff --git a/src/plugins/dsp_example_echo/pch.h b/src/plugins/dsp_example_echo/pch.h index 8cd77a3b0..d27b70a0c 100644 --- a/src/plugins/dsp_example_echo/pch.h +++ b/src/plugins/dsp_example_echo/pch.h @@ -2,7 +2,7 @@ // // License Agreement: // -// The following are Copyright © 2008, Daniel Önnerby +// The following are Copyright � 2008, Daniel �nnerby // // All rights reserved. // @@ -37,6 +37,6 @@ // Precompiled headers #pragma once -#include +#include //#include "vld/vld.h" diff --git a/src/plugins/ffmpegdecoder/FfmpegDecoder.cpp b/src/plugins/ffmpegdecoder/FfmpegDecoder.cpp index 7c498ca03..a288d1fda 100644 --- a/src/plugins/ffmpegdecoder/FfmpegDecoder.cpp +++ b/src/plugins/ffmpegdecoder/FfmpegDecoder.cpp @@ -33,7 +33,7 @@ ////////////////////////////////////////////////////////////////////////////// #include "FfmpegDecoder.h" -#include +#include #include #include diff --git a/src/plugins/ffmpegdecoder/FfmpegDecoder.h b/src/plugins/ffmpegdecoder/FfmpegDecoder.h index c63546c4f..3028a78f0 100644 --- a/src/plugins/ffmpegdecoder/FfmpegDecoder.h +++ b/src/plugins/ffmpegdecoder/FfmpegDecoder.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include extern "C" { #include diff --git a/src/plugins/ffmpegdecoder/plugin.cpp b/src/plugins/ffmpegdecoder/plugin.cpp index 300116b42..3a794edbc 100644 --- a/src/plugins/ffmpegdecoder/plugin.cpp +++ b/src/plugins/ffmpegdecoder/plugin.cpp @@ -32,9 +32,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include "FfmpegDecoder.h" extern "C" { diff --git a/src/plugins/flacdecoder/FlacDecoder.h b/src/plugins/flacdecoder/FlacDecoder.h index dfdc137bc..4f97def9c 100644 --- a/src/plugins/flacdecoder/FlacDecoder.h +++ b/src/plugins/flacdecoder/FlacDecoder.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/plugins/flacdecoder/FlacDecoderFactory.h b/src/plugins/flacdecoder/FlacDecoderFactory.h index 8885f0ea6..560339c22 100644 --- a/src/plugins/flacdecoder/FlacDecoderFactory.h +++ b/src/plugins/flacdecoder/FlacDecoderFactory.h @@ -34,7 +34,7 @@ #pragma once -#include +#include class FlacDecoderFactory : public musik::core::sdk::IDecoderFactory { public: diff --git a/src/plugins/flacdecoder/flacdecoder_plugin.cpp b/src/plugins/flacdecoder/flacdecoder_plugin.cpp index e3f6174e2..b4763dca4 100644 --- a/src/plugins/flacdecoder/flacdecoder_plugin.cpp +++ b/src/plugins/flacdecoder/flacdecoder_plugin.cpp @@ -34,8 +34,8 @@ #include "stdafx.h" -#include -#include +#include +#include #include "FlacDecoderFactory.h" diff --git a/src/plugins/gmedecoder/Constants.h b/src/plugins/gmedecoder/Constants.h index 2b0d6ee3f..c6d8a7e82 100644 --- a/src/plugins/gmedecoder/Constants.h +++ b/src/plugins/gmedecoder/Constants.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/src/plugins/gmedecoder/GmeDataStream.cpp b/src/plugins/gmedecoder/GmeDataStream.cpp index cd0630da4..1000f92c4 100644 --- a/src/plugins/gmedecoder/GmeDataStream.cpp +++ b/src/plugins/gmedecoder/GmeDataStream.cpp @@ -34,8 +34,8 @@ #include "Constants.h" #include "GmeDataStream.h" -#include -#include +#include +#include #include using namespace musik::core::sdk; diff --git a/src/plugins/gmedecoder/GmeDataStream.h b/src/plugins/gmedecoder/GmeDataStream.h index fb995736f..c6594f88e 100644 --- a/src/plugins/gmedecoder/GmeDataStream.h +++ b/src/plugins/gmedecoder/GmeDataStream.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include class GmeDataStream: public musik::core::sdk::IDataStream { diff --git a/src/plugins/gmedecoder/GmeDecoder.cpp b/src/plugins/gmedecoder/GmeDecoder.cpp index 7009bae3a..335a8d4db 100644 --- a/src/plugins/gmedecoder/GmeDecoder.cpp +++ b/src/plugins/gmedecoder/GmeDecoder.cpp @@ -35,8 +35,8 @@ #include "Constants.h" #include "GmeDecoder.h" #include "GmeDataStream.h" -#include -#include +#include +#include #include static const int BUFFER_SAMPLE_COUNT = 2048; diff --git a/src/plugins/gmedecoder/GmeDecoder.h b/src/plugins/gmedecoder/GmeDecoder.h index b2ccb41ec..03fa47f5d 100644 --- a/src/plugins/gmedecoder/GmeDecoder.h +++ b/src/plugins/gmedecoder/GmeDecoder.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "GmeDataStream.h" #include #include diff --git a/src/plugins/gmedecoder/GmeIndexerSource.cpp b/src/plugins/gmedecoder/GmeIndexerSource.cpp index f50f97d54..9b5ed80cd 100644 --- a/src/plugins/gmedecoder/GmeIndexerSource.cpp +++ b/src/plugins/gmedecoder/GmeIndexerSource.cpp @@ -34,10 +34,10 @@ #include "Constants.h" #include "GmeIndexerSource.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/plugins/gmedecoder/GmeIndexerSource.h b/src/plugins/gmedecoder/GmeIndexerSource.h index 3f32e315a..d48370a2c 100644 --- a/src/plugins/gmedecoder/GmeIndexerSource.h +++ b/src/plugins/gmedecoder/GmeIndexerSource.h @@ -35,7 +35,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/plugins/gmedecoder/gme/pwm.c b/src/plugins/gmedecoder/gme/pwm.c index 19bb4467f..31e2533b0 100644 --- a/src/plugins/gmedecoder/gme/pwm.c +++ b/src/plugins/gmedecoder/gme/pwm.c @@ -1,8 +1,8 @@ /*************************************************************************** * Gens: PWM audio emulator. * * * - * Copyright (c) 1999-2002 by Stéphane Dallongeville * - * Copyright (c) 2003-2004 by Stéphane Akhoun * + * Copyright (c) 1999-2002 by St�phane Dallongeville * + * Copyright (c) 2003-2004 by St�phane Akhoun * * Copyright (c) 2008-2009 by David Korth * * * * This program is free software; you can redistribute it and/or modify it * @@ -29,8 +29,8 @@ #define INLINE static __inline #endif -//#include "gens_core/mem/mem_sh2.h" -//#include "gens_core/cpu/sh2/sh2.h" +//#include "gens_musikcore/mem/mem_sh2.h" +//#include "gens_musikcore/cpu/sh2/sh2.h" #define CHILLY_WILLY_SCALE 1 @@ -89,7 +89,7 @@ typedef struct _pwm_chip int PWM_Scale; //int PWM_Loudness; #endif - + int clock; } pwm_chip; #if CHILLY_WILLY_SCALE @@ -114,10 +114,10 @@ void PWM_Init(pwm_chip* chip) chip->PWM_Mode = 0; chip->PWM_Out_R = 0; chip->PWM_Out_L = 0; - + memset(chip->PWM_FIFO_R, 0x00, sizeof(chip->PWM_FIFO_R)); memset(chip->PWM_FIFO_L, 0x00, sizeof(chip->PWM_FIFO_L)); - + chip->PWM_RP_R = 0; chip->PWM_WP_R = 0; chip->PWM_RP_L = 0; @@ -126,7 +126,7 @@ void PWM_Init(pwm_chip* chip) chip->PWM_Int_Tmp = 0; chip->PWM_FIFO_L_Tmp = 0; chip->PWM_FIFO_R_Tmp = 0; - + //PWM_Loudness = 0; PWM_Set_Cycle(chip, 0); PWM_Set_Int(chip, 0); @@ -148,7 +148,7 @@ void PWM_Set_Cycle(pwm_chip* chip, unsigned int cycle) cycle--; chip->PWM_Cycle = (cycle & 0xFFF); chip->PWM_Cycle_Cnt = chip->PWM_Cycles; - + #if CHILLY_WILLY_SCALE // TODO: Fix Chilly Willy's new scaling algorithm. PWM_Recalc_Scale(chip); @@ -200,39 +200,39 @@ void PWM_Clear_Timer(pwm_chip* chip) // Rx_LL: Right -> Ignore, Left -> Left PWM_SHIFT(L, L); break; - + case 0x02: case 0x0E: // Rx_LR: Right -> Ignore, Left -> Right PWM_SHIFT(L, R); break; - + case 0x04: case 0x07: // RL_Lx: Right -> Left, Left -> Ignore PWM_SHIFT(R, L); break; - + case 0x05: case 0x09: // RR_LL: Right -> Right, Left -> Left PWM_SHIFT(L, L); PWM_SHIFT(R, R); break; - + case 0x06: case 0x0A: // RL_LR: Right -> Left, Left -> Right PWM_SHIFT(L, R); PWM_SHIFT(R, L); break; - + case 0x08: case 0x0B: // RR_Lx: Right -> Right, Left -> Ignore PWM_SHIFT(R, R); break; - + case 0x00: case 0x03: case 0x0C: @@ -247,30 +247,30 @@ void PWM_Clear_Timer(pwm_chip* chip) void PWM_Update_Timer(unsigned int cycle) { // Don't do anything if PWM is disabled in the Sound menu. - + // Don't do anything if PWM isn't active. if ((PWM_Mode & 0x0F) == 0x00) return; - + if (PWM_Cycle == 0x00 || (PWM_Cycle_Cnt > cycle)) return; - + PWM_Shift_Data(); - + PWM_Cycle_Cnt += PWM_Cycle; - + PWM_Int_Cnt--; if (PWM_Int_Cnt == 0) { PWM_Int_Cnt = PWM_Int; - + if (PWM_Mode & 0x0080) { // RPT => generate DREQ1 as well as INT SH2_DMA1_Request(&M_SH2, 1); SH2_DMA1_Request(&S_SH2, 1); } - + if (_32X_MINT & 1) SH2_Interrupt(&M_SH2, 6); if (_32X_SINT & 1) @@ -283,7 +283,7 @@ INLINE int PWM_Update_Scale(pwm_chip* chip, int PWM_In) { if (PWM_In == 0) return 0; - + // TODO: Chilly Willy's new scaling algorithm breaks drx's Sonic 1 32X (with PWM drums). #ifdef CHILLY_WILLY_SCALE //return (((PWM_In & 0xFFF) - chip->PWM_Offset) * chip->PWM_Scale) >> (8 - PWM_Loudness); @@ -296,16 +296,16 @@ INLINE int PWM_Update_Scale(pwm_chip* chip, int PWM_In) #else const int PWM_adjust = ((chip->PWM_Cycle >> 1) + 1); int PWM_Ret = ((chip->PWM_In & 0xFFF) - PWM_adjust); - + // Increase PWM volume so it's audible. PWM_Ret <<= (5+2); - + // Make sure the PWM isn't oversaturated. if (PWM_Ret > 32767) PWM_Ret = 32767; else if (PWM_Ret < -32768) PWM_Ret = -32768; - + return PWM_Ret; #endif } @@ -316,21 +316,21 @@ void PWM_Update(pwm_chip* chip, int **buf, int length) int tmpOutL; int tmpOutR; int i; - + //if (!PWM_Enable) // return; - + if (chip->PWM_Out_L == 0 && chip->PWM_Out_R == 0) { memset(buf[0], 0x00, length * sizeof(int)); memset(buf[1], 0x00, length * sizeof(int)); return; } - + // New PWM scaling algorithm provided by Chilly Willy on the Sonic Retro forums. tmpOutL = PWM_Update_Scale(chip, (int)chip->PWM_Out_L); tmpOutR = PWM_Update_Scale(chip, (int)chip->PWM_Out_R); - + for (i = 0; i < length; i ++) { buf[0][i] = tmpOutL; @@ -342,7 +342,7 @@ void PWM_Update(pwm_chip* chip, int **buf, int length) void pwm_update(void *_chip, stream_sample_t **outputs, int samples) { pwm_chip *chip = (pwm_chip *) _chip; - + PWM_Update(chip, outputs, samples); } @@ -352,17 +352,17 @@ void * device_start_pwm(int clock) //pwm_state *chip = get_safe_token(device); pwm_chip *chip; int rate; - + chip = (pwm_chip *) malloc(sizeof(pwm_chip)); if (!chip) return chip; rate = 22020; // that's the rate the PWM is mostly used chip->clock = clock; - + PWM_Init(chip); /* allocate the stream */ //chip->stream = stream_create(device, 0, 2, device->clock / 384, chip, rf5c68_update); - + return chip; } @@ -382,7 +382,7 @@ void device_reset_pwm(void *_chip) void pwm_chn_w(void *_chip, UINT8 Channel, UINT16 data) { pwm_chip *chip = (pwm_chip *) _chip; - + if (chip->clock == 1) { // old-style commands switch(Channel) @@ -439,6 +439,6 @@ void pwm_chn_w(void *_chip, UINT8 Channel, UINT16 data) break; } } - + return; } diff --git a/src/plugins/gmedecoder/plugin.cpp b/src/plugins/gmedecoder/plugin.cpp index 123b99ac0..79b597420 100644 --- a/src/plugins/gmedecoder/plugin.cpp +++ b/src/plugins/gmedecoder/plugin.cpp @@ -33,14 +33,14 @@ ////////////////////////////////////////////////////////////////////////////// #include "Constants.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GmeDecoder.h" #include "GmeIndexerSource.h" #include "GmeDataStream.h" diff --git a/src/plugins/httpdatastream/HttpDataStream.cpp b/src/plugins/httpdatastream/HttpDataStream.cpp index 6c5099a6e..448433a44 100755 --- a/src/plugins/httpdatastream/HttpDataStream.cpp +++ b/src/plugins/httpdatastream/HttpDataStream.cpp @@ -37,7 +37,7 @@ #include "HttpDataStream.h" #include "LruDiskCache.h" -#include +#include #include #include diff --git a/src/plugins/httpdatastream/HttpDataStream.h b/src/plugins/httpdatastream/HttpDataStream.h index ec5c0933e..65b7b2a68 100755 --- a/src/plugins/httpdatastream/HttpDataStream.h +++ b/src/plugins/httpdatastream/HttpDataStream.h @@ -32,7 +32,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include +#include #include #include diff --git a/src/plugins/httpdatastream/HttpDataStreamFactory.h b/src/plugins/httpdatastream/HttpDataStreamFactory.h index 5c422a4a5..0f6013ad3 100755 --- a/src/plugins/httpdatastream/HttpDataStreamFactory.h +++ b/src/plugins/httpdatastream/HttpDataStreamFactory.h @@ -32,7 +32,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/httpdatastream/httpdatastream_plugin.cpp b/src/plugins/httpdatastream/httpdatastream_plugin.cpp index c8bcc3e48..f92a247f5 100644 --- a/src/plugins/httpdatastream/httpdatastream_plugin.cpp +++ b/src/plugins/httpdatastream/httpdatastream_plugin.cpp @@ -36,8 +36,8 @@ #include "HttpDataStreamFactory.h" -#include -#include +#include +#include #include #include diff --git a/src/plugins/libopenmptdecoder/OpenMptDataStream.cpp b/src/plugins/libopenmptdecoder/OpenMptDataStream.cpp index 4c187e339..401e09ef5 100644 --- a/src/plugins/libopenmptdecoder/OpenMptDataStream.cpp +++ b/src/plugins/libopenmptdecoder/OpenMptDataStream.cpp @@ -34,9 +34,9 @@ #include "Utility.h" #include "OpenMptDataStream.h" -#include -#include -#include +#include +#include +#include #include using namespace musik::core::sdk; diff --git a/src/plugins/libopenmptdecoder/OpenMptDataStream.h b/src/plugins/libopenmptdecoder/OpenMptDataStream.h index ddad89157..d840b916d 100644 --- a/src/plugins/libopenmptdecoder/OpenMptDataStream.h +++ b/src/plugins/libopenmptdecoder/OpenMptDataStream.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include class OpenMptDataStream: public musik::core::sdk::IDataStream { diff --git a/src/plugins/libopenmptdecoder/OpenMptDecoder.cpp b/src/plugins/libopenmptdecoder/OpenMptDecoder.cpp index a14054977..589f5018a 100644 --- a/src/plugins/libopenmptdecoder/OpenMptDecoder.cpp +++ b/src/plugins/libopenmptdecoder/OpenMptDecoder.cpp @@ -34,7 +34,7 @@ #include "OpenMptDecoder.h" #include "OpenMptDataStream.h" -#include +#include #include using namespace musik::core::sdk; diff --git a/src/plugins/libopenmptdecoder/OpenMptDecoder.h b/src/plugins/libopenmptdecoder/OpenMptDecoder.h index f03c76b22..c67dfd90a 100644 --- a/src/plugins/libopenmptdecoder/OpenMptDecoder.h +++ b/src/plugins/libopenmptdecoder/OpenMptDecoder.h @@ -34,9 +34,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include class OpenMptDecoder: public musik::core::sdk::IDecoder { diff --git a/src/plugins/libopenmptdecoder/OpenMptIndexerSource.cpp b/src/plugins/libopenmptdecoder/OpenMptIndexerSource.cpp index d3f20f89e..a6798e0ff 100644 --- a/src/plugins/libopenmptdecoder/OpenMptIndexerSource.cpp +++ b/src/plugins/libopenmptdecoder/OpenMptIndexerSource.cpp @@ -34,9 +34,9 @@ #include "Utility.h" #include "OpenMptIndexerSource.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/plugins/libopenmptdecoder/OpenMptIndexerSource.h b/src/plugins/libopenmptdecoder/OpenMptIndexerSource.h index 57333c0d0..6963badcb 100644 --- a/src/plugins/libopenmptdecoder/OpenMptIndexerSource.h +++ b/src/plugins/libopenmptdecoder/OpenMptIndexerSource.h @@ -35,7 +35,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/plugins/libopenmptdecoder/Utility.cpp b/src/plugins/libopenmptdecoder/Utility.cpp index 28973474c..b02af7f08 100644 --- a/src/plugins/libopenmptdecoder/Utility.cpp +++ b/src/plugins/libopenmptdecoder/Utility.cpp @@ -34,8 +34,8 @@ #include "Utility.h" #include -#include -#include +#include +#include #ifdef WIN32 #include diff --git a/src/plugins/libopenmptdecoder/Utility.h b/src/plugins/libopenmptdecoder/Utility.h index 55ffcbd37..fdbf0e2e8 100644 --- a/src/plugins/libopenmptdecoder/Utility.h +++ b/src/plugins/libopenmptdecoder/Utility.h @@ -36,7 +36,7 @@ #include #include -#include +#include static const std::string PLUGIN_NAME = "libopenmpt"; static const std::string EXTERNAL_ID_PREFIX = "libopenmpt"; diff --git a/src/plugins/libopenmptdecoder/plugin.cpp b/src/plugins/libopenmptdecoder/plugin.cpp index 8a71dff8b..ad0faa797 100644 --- a/src/plugins/libopenmptdecoder/plugin.cpp +++ b/src/plugins/libopenmptdecoder/plugin.cpp @@ -32,15 +32,15 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Utility.h" #include "OpenMptDataStream.h" #include "OpenMptDecoder.h" diff --git a/src/plugins/m4adecoder/M4aDecoder.h b/src/plugins/m4adecoder/M4aDecoder.h index 0641059da..b6753fa9e 100644 --- a/src/plugins/m4adecoder/M4aDecoder.h +++ b/src/plugins/m4adecoder/M4aDecoder.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include #include diff --git a/src/plugins/m4adecoder/M4aDecoderFactory.h b/src/plugins/m4adecoder/M4aDecoderFactory.h index 3e152b965..3422b89ea 100644 --- a/src/plugins/m4adecoder/M4aDecoderFactory.h +++ b/src/plugins/m4adecoder/M4aDecoderFactory.h @@ -34,7 +34,7 @@ #pragma once -#include +#include class M4aDecoderFactory : public musik::core::sdk::IDecoderFactory { public: diff --git a/src/plugins/m4adecoder/m4adecoder.vcproj b/src/plugins/m4adecoder/m4adecoder.vcproj index bd0337878..b1d351c8e 100644 --- a/src/plugins/m4adecoder/m4adecoder.vcproj +++ b/src/plugins/m4adecoder/m4adecoder.vcproj @@ -40,7 +40,7 @@ -#include +#include +#include #ifdef WIN32 #define DLLEXPORT __declspec(dllexport) diff --git a/src/plugins/macosmediakeys/plugin.mm b/src/plugins/macosmediakeys/plugin.mm index e59e51c6a..a2a31c865 100644 --- a/src/plugins/macosmediakeys/plugin.mm +++ b/src/plugins/macosmediakeys/plugin.mm @@ -32,10 +32,10 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include "SPMediaKeyTap.h" diff --git a/src/plugins/mpg123decoder/Mpg123Decoder.h b/src/plugins/mpg123decoder/Mpg123Decoder.h index 95fdf7ba1..561ff46c3 100644 --- a/src/plugins/mpg123decoder/Mpg123Decoder.h +++ b/src/plugins/mpg123decoder/Mpg123Decoder.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/src/plugins/mpg123decoder/Mpg123DecoderFactory.h b/src/plugins/mpg123decoder/Mpg123DecoderFactory.h index 4e1a60724..bc653ce96 100644 --- a/src/plugins/mpg123decoder/Mpg123DecoderFactory.h +++ b/src/plugins/mpg123decoder/Mpg123DecoderFactory.h @@ -34,7 +34,7 @@ #pragma once -#include +#include class Mpg123DecoderFactory : public musik::core::sdk::IDecoderFactory { public: diff --git a/src/plugins/mpg123decoder/mpg123decoder_plugin.cpp b/src/plugins/mpg123decoder/mpg123decoder_plugin.cpp index b42acfcc7..8e1e7aa8b 100644 --- a/src/plugins/mpg123decoder/mpg123decoder_plugin.cpp +++ b/src/plugins/mpg123decoder/mpg123decoder_plugin.cpp @@ -33,7 +33,7 @@ ////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include +#include #include "Mpg123DecoderFactory.h" #ifdef WIN32 diff --git a/src/plugins/mpg123decoder/stdafx.h b/src/plugins/mpg123decoder/stdafx.h index 7cb02f7a3..61a653025 100644 --- a/src/plugins/mpg123decoder/stdafx.h +++ b/src/plugins/mpg123decoder/stdafx.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include #ifdef WIN32 diff --git a/src/plugins/mpris/mpris.cpp b/src/plugins/mpris/mpris.cpp index f8e4d45fe..0179504ad 100644 --- a/src/plugins/mpris/mpris.cpp +++ b/src/plugins/mpris/mpris.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include extern "C" { #include diff --git a/src/plugins/mpris/mpris.h b/src/plugins/mpris/mpris.h index 094b55410..e10752b9e 100644 --- a/src/plugins/mpris/mpris.h +++ b/src/plugins/mpris/mpris.h @@ -1,8 +1,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/src/plugins/nomaddecoder/NomadDecoder.h b/src/plugins/nomaddecoder/NomadDecoder.h index 8cb2dad07..f7679d4b4 100644 --- a/src/plugins/nomaddecoder/NomadDecoder.h +++ b/src/plugins/nomaddecoder/NomadDecoder.h @@ -34,8 +34,8 @@ #pragma once -#include -#include +#include +#include extern "C" { #include diff --git a/src/plugins/nomaddecoder/NomadDecoderFactory.h b/src/plugins/nomaddecoder/NomadDecoderFactory.h index 7805d40fb..0f3df933e 100644 --- a/src/plugins/nomaddecoder/NomadDecoderFactory.h +++ b/src/plugins/nomaddecoder/NomadDecoderFactory.h @@ -34,7 +34,7 @@ #pragma once -#include +#include class NomadDecoderFactory : public musik::core::sdk::IDecoderFactory { public: diff --git a/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp b/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp index 7d1a838ad..3a28f5595 100644 --- a/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp +++ b/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp @@ -34,8 +34,8 @@ #include "stdafx.h" -#include -#include +#include +#include #include "NomadDecoderFactory.h" diff --git a/src/plugins/nullout/NullOut.cpp b/src/plugins/nullout/NullOut.cpp index 124c9c2e4..5c63bf8aa 100644 --- a/src/plugins/nullout/NullOut.cpp +++ b/src/plugins/nullout/NullOut.cpp @@ -34,9 +34,9 @@ #include "NullOut.h" -#include -#include -#include +#include +#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/nullout/NullOut.h b/src/plugins/nullout/NullOut.h index 27f0a8f4c..3402df83f 100644 --- a/src/plugins/nullout/NullOut.h +++ b/src/plugins/nullout/NullOut.h @@ -35,7 +35,7 @@ #include "pch.h" -#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/nullout/nullout_plugin.cpp b/src/plugins/nullout/nullout_plugin.cpp index 62d1e355f..1ddc26872 100644 --- a/src/plugins/nullout/nullout_plugin.cpp +++ b/src/plugins/nullout/nullout_plugin.cpp @@ -34,9 +34,9 @@ #include "pch.h" -#include -#include -#include +#include +#include +#include #include "NullOut.h" #ifdef WIN32 diff --git a/src/plugins/oggdecoder/OggDecoder.h b/src/plugins/oggdecoder/OggDecoder.h index cc4688ae3..f9b510a72 100644 --- a/src/plugins/oggdecoder/OggDecoder.h +++ b/src/plugins/oggdecoder/OggDecoder.h @@ -33,7 +33,7 @@ ////////////////////////////////////////////////////////////////////////////// #pragma once -#include +#include #include #include diff --git a/src/plugins/oggdecoder/OggDecoderFactory.h b/src/plugins/oggdecoder/OggDecoderFactory.h index e9bd1392e..3550fc8dd 100644 --- a/src/plugins/oggdecoder/OggDecoderFactory.h +++ b/src/plugins/oggdecoder/OggDecoderFactory.h @@ -34,7 +34,7 @@ #pragma once -#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/oggdecoder/oggdecoder_plugin.cpp b/src/plugins/oggdecoder/oggdecoder_plugin.cpp index 5ef7718ed..6ec47648d 100644 --- a/src/plugins/oggdecoder/oggdecoder_plugin.cpp +++ b/src/plugins/oggdecoder/oggdecoder_plugin.cpp @@ -33,8 +33,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include -#include +#include +#include #include "OggDecoderFactory.h" #ifdef WIN32 diff --git a/src/plugins/pulseout/PulseOut.cpp b/src/plugins/pulseout/PulseOut.cpp index 4d011d518..f4e5da1d0 100755 --- a/src/plugins/pulseout/PulseOut.cpp +++ b/src/plugins/pulseout/PulseOut.cpp @@ -33,8 +33,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "PulseOut.h" -#include -#include +#include +#include #include #include #include diff --git a/src/plugins/pulseout/PulseOut.h b/src/plugins/pulseout/PulseOut.h index c107e81c6..ef2e4f44d 100755 --- a/src/plugins/pulseout/PulseOut.h +++ b/src/plugins/pulseout/PulseOut.h @@ -35,8 +35,8 @@ #include "pch.h" -#include -#include +#include +#include #include #include "pulse_blocking_stream.h" diff --git a/src/plugins/pulseout/pch.h b/src/plugins/pulseout/pch.h index 658bc6360..d9a0a4cea 100755 --- a/src/plugins/pulseout/pch.h +++ b/src/plugins/pulseout/pch.h @@ -35,7 +35,7 @@ // Precompiled headers #pragma once -#include +#include #include #include diff --git a/src/plugins/pulseout/pulseout_plugin.cpp b/src/plugins/pulseout/pulseout_plugin.cpp index 7774da652..b0b652153 100755 --- a/src/plugins/pulseout/pulseout_plugin.cpp +++ b/src/plugins/pulseout/pulseout_plugin.cpp @@ -34,9 +34,9 @@ #include "pch.h" -#include -#include -#include +#include +#include +#include #include "PulseOut.h" diff --git a/src/plugins/server/BlockingTranscoder.h b/src/plugins/server/BlockingTranscoder.h index 22fea5831..5d009c06a 100644 --- a/src/plugins/server/BlockingTranscoder.h +++ b/src/plugins/server/BlockingTranscoder.h @@ -32,9 +32,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include "Context.h" #include #include diff --git a/src/plugins/server/Context.h b/src/plugins/server/Context.h index 5eae9e258..74593cb2b 100644 --- a/src/plugins/server/Context.h +++ b/src/plugins/server/Context.h @@ -34,10 +34,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/plugins/server/HttpServer.cpp b/src/plugins/server/HttpServer.cpp index a23d7c42c..ef1ae738b 100644 --- a/src/plugins/server/HttpServer.cpp +++ b/src/plugins/server/HttpServer.cpp @@ -38,7 +38,7 @@ #include "Transcoder.h" #include "TranscodingAudioDataStream.h" -#include +#include #include #include diff --git a/src/plugins/server/Snapshots.h b/src/plugins/server/Snapshots.h index 5fc47cdf5..498af783c 100644 --- a/src/plugins/server/Snapshots.h +++ b/src/plugins/server/Snapshots.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #include #include diff --git a/src/plugins/server/Transcoder.cpp b/src/plugins/server/Transcoder.cpp index 06caa3aec..49bbc731c 100644 --- a/src/plugins/server/Transcoder.cpp +++ b/src/plugins/server/Transcoder.cpp @@ -37,7 +37,7 @@ #include "TranscodingAudioDataStream.h" #include "Constants.h" #include "Util.h" -#include +#include #include #include #include diff --git a/src/plugins/server/Transcoder.h b/src/plugins/server/Transcoder.h index f59297d68..ff30a8bff 100644 --- a/src/plugins/server/Transcoder.h +++ b/src/plugins/server/Transcoder.h @@ -35,10 +35,10 @@ #pragma once #include "Context.h" -#include -#include -#include -#include +#include +#include +#include +#include #include class Transcoder { diff --git a/src/plugins/server/TranscodingAudioDataStream.h b/src/plugins/server/TranscodingAudioDataStream.h index 61a6107cd..f4fb39649 100644 --- a/src/plugins/server/TranscodingAudioDataStream.h +++ b/src/plugins/server/TranscodingAudioDataStream.h @@ -32,9 +32,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include "Context.h" #include #include diff --git a/src/plugins/server/Util.h b/src/plugins/server/Util.h index 6fe77ebe9..8bea75dd8 100644 --- a/src/plugins/server/Util.h +++ b/src/plugins/server/Util.h @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include #ifdef WIN32 #include diff --git a/src/plugins/server/WebSocketServer.cpp b/src/plugins/server/WebSocketServer.cpp index 8a36b1292..eb73d027d 100644 --- a/src/plugins/server/WebSocketServer.cpp +++ b/src/plugins/server/WebSocketServer.cpp @@ -37,7 +37,7 @@ #include -#include +#include using websocketpp::lib::placeholders::_1; using websocketpp::lib::placeholders::_2; diff --git a/src/plugins/server/WebSocketServer.h b/src/plugins/server/WebSocketServer.h index 38d9ec747..104b28a91 100644 --- a/src/plugins/server/WebSocketServer.h +++ b/src/plugins/server/WebSocketServer.h @@ -35,8 +35,8 @@ #include "Context.h" #include "Snapshots.h" -#include -#include +#include +#include #include #include diff --git a/src/plugins/server/main.cpp b/src/plugins/server/main.cpp index 9167d5d77..dbbf09ad9 100644 --- a/src/plugins/server/main.cpp +++ b/src/plugins/server/main.cpp @@ -38,8 +38,8 @@ #include "HttpServer.h" #include "WebSocketServer.h" -#include -#include +#include +#include #include #include diff --git a/src/plugins/sndioout/SndioOut.cpp b/src/plugins/sndioout/SndioOut.cpp index 82aef7ec4..c1c87fda6 100644 --- a/src/plugins/sndioout/SndioOut.cpp +++ b/src/plugins/sndioout/SndioOut.cpp @@ -34,8 +34,8 @@ #include "SndioOut.h" -#include -#include +#include +#include #include #include #include diff --git a/src/plugins/sndioout/SndioOut.h b/src/plugins/sndioout/SndioOut.h index 264c4a436..d8016f85a 100644 --- a/src/plugins/sndioout/SndioOut.h +++ b/src/plugins/sndioout/SndioOut.h @@ -33,7 +33,7 @@ ////////////////////////////////////////////////////////////////////////////// #pragma once -#include +#include #include #include #include diff --git a/src/plugins/sndioout/plugin.cpp b/src/plugins/sndioout/plugin.cpp index 98baa31a0..9c8da0810 100644 --- a/src/plugins/sndioout/plugin.cpp +++ b/src/plugins/sndioout/plugin.cpp @@ -32,8 +32,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include "SndioOut.h" class SndioPlugin : public musik::core::sdk::IPlugin { diff --git a/src/plugins/stockencoders/FfmpegEncoder.h b/src/plugins/stockencoders/FfmpegEncoder.h index 2de8102d4..9e96d1252 100644 --- a/src/plugins/stockencoders/FfmpegEncoder.h +++ b/src/plugins/stockencoders/FfmpegEncoder.h @@ -40,8 +40,8 @@ #ifdef FFMPEG_ENABLED -#include -#include +#include +#include #include extern "C" { diff --git a/src/plugins/stockencoders/LameEncoder.h b/src/plugins/stockencoders/LameEncoder.h index c232540da..24b93164b 100644 --- a/src/plugins/stockencoders/LameEncoder.h +++ b/src/plugins/stockencoders/LameEncoder.h @@ -32,8 +32,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include class LameEncoder: public musik::core::sdk::IStreamingEncoder { diff --git a/src/plugins/stockencoders/main.cpp b/src/plugins/stockencoders/main.cpp index 091b77004..15c4ff3d8 100644 --- a/src/plugins/stockencoders/main.cpp +++ b/src/plugins/stockencoders/main.cpp @@ -32,9 +32,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/plugins/stockencoders/shared.h b/src/plugins/stockencoders/shared.h index 5c2eaa1c7..712ea676f 100644 --- a/src/plugins/stockencoders/shared.h +++ b/src/plugins/stockencoders/shared.h @@ -34,7 +34,7 @@ #pragma once -#include +#include #ifdef WIN32 #define DLLEXPORT __declspec(dllexport) diff --git a/src/plugins/supereqdsp/SuperEqDsp.cpp b/src/plugins/supereqdsp/SuperEqDsp.cpp index 855eaf270..63bfb75cd 100644 --- a/src/plugins/supereqdsp/SuperEqDsp.cpp +++ b/src/plugins/supereqdsp/SuperEqDsp.cpp @@ -28,9 +28,9 @@ #include "constants.h" #include "SuperEqDsp.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/plugins/supereqdsp/SuperEqDsp.h b/src/plugins/supereqdsp/SuperEqDsp.h index ddbfe23a5..661b0ce25 100644 --- a/src/plugins/supereqdsp/SuperEqDsp.h +++ b/src/plugins/supereqdsp/SuperEqDsp.h @@ -28,7 +28,7 @@ #pragma once -#include +#include #include "supereq/Equ.h" using namespace musik::core::sdk; diff --git a/src/plugins/supereqdsp/supereqdsp_plugin.cpp b/src/plugins/supereqdsp/supereqdsp_plugin.cpp index e18d9b3bb..bf4b4a9f7 100644 --- a/src/plugins/supereqdsp/supereqdsp_plugin.cpp +++ b/src/plugins/supereqdsp/supereqdsp_plugin.cpp @@ -27,10 +27,10 @@ ////////////////////////////////////////////////////////////////////////////// #include "constants.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "SuperEqDsp.h" class SuperEqPlugin : public musik::core::sdk::IPlugin { diff --git a/src/plugins/taglib_plugin/TaglibMetadataReader.h b/src/plugins/taglib_plugin/TaglibMetadataReader.h index 04cacd381..530dcf507 100644 --- a/src/plugins/taglib_plugin/TaglibMetadataReader.h +++ b/src/plugins/taglib_plugin/TaglibMetadataReader.h @@ -56,7 +56,7 @@ #include -#include +#include class TaglibMetadataReader : public musik::core::sdk::ITagReader { public: diff --git a/src/plugins/taglib_plugin/taglib_plugin.cpp b/src/plugins/taglib_plugin/taglib_plugin.cpp index cb83df6fa..5bcff6681 100644 --- a/src/plugins/taglib_plugin/taglib_plugin.cpp +++ b/src/plugins/taglib_plugin/taglib_plugin.cpp @@ -34,8 +34,8 @@ #include "stdafx.h" #include "TaglibMetadataReader.h" -#include -#include +#include +#include #ifdef WIN32 #define DLLEXPORT __declspec(dllexport) diff --git a/src/plugins/wasapiout/WasapiOut.cpp b/src/plugins/wasapiout/WasapiOut.cpp index 3cc7a6b2c..765056cc1 100644 --- a/src/plugins/wasapiout/WasapiOut.cpp +++ b/src/plugins/wasapiout/WasapiOut.cpp @@ -33,9 +33,9 @@ ////////////////////////////////////////////////////////////////////////////// #include "WasapiOut.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/plugins/wasapiout/WasapiOut.h b/src/plugins/wasapiout/WasapiOut.h index 004d0e9d8..0cf51f166 100644 --- a/src/plugins/wasapiout/WasapiOut.h +++ b/src/plugins/wasapiout/WasapiOut.h @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/wasapiout/wasapiout_plugin.cpp b/src/plugins/wasapiout/wasapiout_plugin.cpp index 3c08882fc..0c3f75ba5 100644 --- a/src/plugins/wasapiout/wasapiout_plugin.cpp +++ b/src/plugins/wasapiout/wasapiout_plugin.cpp @@ -34,10 +34,10 @@ #include "pch.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "WasapiOut.h" class WasapiPlugin : public musik::core::sdk::IPlugin { diff --git a/src/plugins/waveout/WaveOut.cpp b/src/plugins/waveout/WaveOut.cpp index 7c826909a..acd0a00a7 100644 --- a/src/plugins/waveout/WaveOut.cpp +++ b/src/plugins/waveout/WaveOut.cpp @@ -36,8 +36,8 @@ #include "WaveOut.h" #include #include -#include -#include +#include +#include #define MAX_VOLUME 0xFFFF #define MAX_BUFFERS_PER_OUTPUT 16 diff --git a/src/plugins/waveout/WaveOut.h b/src/plugins/waveout/WaveOut.h index 930604870..617af1506 100644 --- a/src/plugins/waveout/WaveOut.h +++ b/src/plugins/waveout/WaveOut.h @@ -38,8 +38,8 @@ #include #include #include "WaveOutBuffer.h" -#include -#include +#include +#include using namespace musik::core::sdk; diff --git a/src/plugins/waveout/WaveOutBuffer.h b/src/plugins/waveout/WaveOutBuffer.h index e8b6fd0c4..1d65ec3c4 100644 --- a/src/plugins/waveout/WaveOutBuffer.h +++ b/src/plugins/waveout/WaveOutBuffer.h @@ -35,8 +35,8 @@ #pragma once #include "pch.h" -#include -#include +#include +#include class WaveOut; diff --git a/src/plugins/waveout/waveout_plugin.cpp b/src/plugins/waveout/waveout_plugin.cpp index db4b1ea7e..3986c2100 100644 --- a/src/plugins/waveout/waveout_plugin.cpp +++ b/src/plugins/waveout/waveout_plugin.cpp @@ -33,8 +33,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "pch.h" -#include -#include +#include +#include #include "WaveOut.h" class WaveOutPlugin : public musik::core::sdk::IPlugin { diff --git a/src/plugins/win32gdivis/GdiVis.cpp b/src/plugins/win32gdivis/GdiVis.cpp index cb4fe3ecd..f198e211e 100644 --- a/src/plugins/win32gdivis/GdiVis.cpp +++ b/src/plugins/win32gdivis/GdiVis.cpp @@ -7,9 +7,9 @@ #include -#include -#include -#include +#include +#include +#include #include "MemoryDC.h" diff --git a/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp b/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp index 4b73eebf8..789979785 100644 --- a/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp +++ b/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp @@ -34,9 +34,9 @@ #include "pch.h" -#include -#include -#include +#include +#include +#include #include