diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 4b03c63b2..df68949c4 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -24,7 +24,6 @@ set(CORE_SOURCES ./support/Common.cpp ./support/Preferences.cpp ./support/PreferenceKeys.cpp - ./support/Version.cpp ../3rdparty/src/md5/md5.c ../3rdparty/src/sqlite/sqlite3.c ) diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index f21df0982..dbea01129 100755 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -112,7 +112,6 @@ - @@ -167,7 +166,6 @@ - diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 81dc09fd0..edc740346 100755 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -91,9 +91,6 @@ src\plugin - - src\support - src\library\metadata @@ -198,9 +195,6 @@ src\plugin - - src\support - src\library\metadata diff --git a/src/core/io/LocalFileStream.h b/src/core/io/LocalFileStream.h index 1d8dea0f5..d396e3004 100644 --- a/src/core/io/LocalFileStream.h +++ b/src/core/io/LocalFileStream.h @@ -46,7 +46,7 @@ namespace musik { namespace core { namespace io { - class LocalFileStream : public musik::core::sdk::IDataStream{ + class LocalFileStream : public musik::core::sdk::IDataStream { public: using PositionType = musik::core::sdk::PositionType; diff --git a/src/core/support/Version.cpp b/src/core/support/Version.cpp deleted file mode 100644 index 791668cff..000000000 --- a/src/core/support/Version.cpp +++ /dev/null @@ -1,83 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2007-2016 musikcube team -// -// All rights reserved. -// -// 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 -// 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. -// -// 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. -// -////////////////////////////////////////////////////////////////////////////// - -#include "pch.hpp" -#include -#include - -using namespace musik::core; - -Version::Version() -: version(0) { -} - -Version::Version(VERSION major, VERSION minor, VERSION revision, VERSION build) { - version = ((major & 0xff) << 48) | ((minor & 0xff) << 32) | ((revision & 0xff) << 16) | (build & 0xff); -} - -Version::Version(VERSION version) -: version(version){ -} - -void Version::setVersion(VERSION major, VERSION minor, VERSION revision, VERSION build){ - version = ((major & 0xff) << 48) | ((minor & 0xff) << 32) | ((revision & 0xff) << 16) | (build & 0xff); -} - -void Version::setVersion(VERSION version){ - version = version; -} - -Version::~Version(void){ -} - -std::string Version::getVersion() { - return boost::str(boost::format("%1%.%2%.%3%.%4%") - % ((version >> 48) & 0xff) - % ((version >> 32) & 0xff) - % ((version >> 16) & 0xff) - % (version & 0xff)); -} - -int Version::getMajorVersion() { - return (int)((version >> 48) & 0xff); -} -int Version::getMinorVersion() { - return (int)((version >> 32) & 0xff); -} -int Version::getRevisionVersion() { - return (int)((version >> 16) & 0xff); -} -int Version::getBuildVersion() { - return (int)(version & 0xff); -} diff --git a/src/core/support/Version.h b/src/core/support/Version.h deleted file mode 100644 index ca770b06d..000000000 --- a/src/core/support/Version.h +++ /dev/null @@ -1,63 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2007-2016 musikcube team -// -// All rights reserved. -// -// 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 -// 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. -// -// 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 - -namespace musik { namespace core { - class Version{ - public: - Version(); - Version(VERSION major, VERSION minor, VERSION revision, VERSION build); - Version(VERSION version); - ~Version(); - - std::string getVersion(); - void setVersion(VERSION major, VERSION minor, VERSION revision, VERSION build); - void setVersion(VERSION version); - - int getMajorVersion(); - int getMinorVersion(); - int getRevisionVersion(); - int getBuildVersion(); - - private: - VERSION version; - }; -} } - - diff --git a/src/musikbox/app/util/Version.h b/src/musikbox/app/util/Version.h index 71d3d4668..8b1db256e 100644 --- a/src/musikbox/app/util/Version.h +++ b/src/musikbox/app/util/Version.h @@ -1,3 +1,3 @@ #pragma once -#define VERSION "0.4.0" +#define VERSION "0.4.1"