Removed "glue" sub-project. Moved related functionality to core. This

makes things a bit simpler.
This commit is contained in:
casey langen 2018-01-15 21:58:47 -08:00
parent a1bb0a86d6
commit 1215917ccb
21 changed files with 38 additions and 288 deletions

View File

@ -83,7 +83,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
endif()
add_subdirectory(src/core)
add_subdirectory(src/glue)
add_subdirectory(src/musikcube)
add_subdirectory(src/plugins/taglib_plugin)
add_subdirectory(src/plugins/nullout)
@ -104,7 +103,7 @@ endif()
add_dependencies(taglibreader taglib)
add_dependencies(musikcube musikcore musikglue taglibreader nullout server httpdatastream stockencoders)
add_dependencies(musikcube musikcore taglibreader nullout server httpdatastream stockencoders)
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
add_subdirectory(src/plugins/alsaout)

View File

@ -47,8 +47,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nomaddecoder", "src\plugins
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directsoundout", "src\plugins\directsoundout\directsoundout.vcxproj", "{51C18730-DC48-411A-829D-F2B3B7AC4C97}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glue", "src\glue\glue.vcxproj", "{01869283-4CC3-4DA4-A06C-3DF6A0DE98CC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nullout", "src\plugins\nullout\nullout.vcxproj", "{BA3902E0-8915-4E59-AD3B-F9960507F234}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "src\plugins\server\server.vcxproj", "{43A78C57-C9A3-4852-B0BE-05335C5C077D}"
@ -151,12 +149,6 @@ Global
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release|Win32.ActiveCfg = Release|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release|Win32.Build.0 = Release|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release|x64.ActiveCfg = Release|Win32
{01869283-4CC3-4DA4-A06C-3DF6A0DE98CC}.Debug|Win32.ActiveCfg = Debug|Win32
{01869283-4CC3-4DA4-A06C-3DF6A0DE98CC}.Debug|Win32.Build.0 = Debug|Win32
{01869283-4CC3-4DA4-A06C-3DF6A0DE98CC}.Debug|x64.ActiveCfg = Debug|Win32
{01869283-4CC3-4DA4-A06C-3DF6A0DE98CC}.Release|Win32.ActiveCfg = Release|Win32
{01869283-4CC3-4DA4-A06C-3DF6A0DE98CC}.Release|Win32.Build.0 = Release|Win32
{01869283-4CC3-4DA4-A06C-3DF6A0DE98CC}.Release|x64.ActiveCfg = Release|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug|Win32.ActiveCfg = Debug|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug|Win32.Build.0 = Debug|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug|x64.ActiveCfg = Debug|Win32

View File

@ -44,7 +44,9 @@ set(CORE_SOURCES
./plugin/Plugins.cpp
./runtime/Message.cpp
./runtime/MessageQueue.cpp
./support/Duration.cpp
./support/Common.cpp
./support/Playback.cpp
./support/Preferences.cpp
./support/PreferenceKeys.cpp
../3rdparty/src/sqlite/sqlite3.c

View File

@ -139,6 +139,8 @@
<ClCompile Include="runtime\Message.cpp" />
<ClCompile Include="runtime\MessageQueue.cpp" />
<ClCompile Include="support\Common.cpp" />
<ClCompile Include="support\Duration.cpp" />
<ClCompile Include="support\Playback.cpp" />
<ClCompile Include="support\PreferenceKeys.cpp" />
<ClCompile Include="support\Preferences.cpp" />
</ItemGroup>
@ -238,7 +240,9 @@
<ClInclude Include="sdk\ITagStore.h" />
<ClInclude Include="sdk\IVisualizer.h" />
<ClInclude Include="support\Common.h" />
<ClInclude Include="support\Duration.h" />
<ClInclude Include="support\Messages.h" />
<ClInclude Include="support\Playback.h" />
<ClInclude Include="support\PreferenceKeys.h" />
<ClInclude Include="support\Preferences.h" />
<ClInclude Include="utfutil.h" />

View File

@ -211,6 +211,12 @@
<ClCompile Include="audio\ProxyTransport.cpp">
<Filter>src\audio</Filter>
</ClCompile>
<ClCompile Include="support\Playback.cpp">
<Filter>src\support</Filter>
</ClCompile>
<ClCompile Include="support\Duration.cpp">
<Filter>src\support</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.hpp">
@ -510,5 +516,11 @@
<ClInclude Include="audio\ProxyTransport.h">
<Filter>src\audio</Filter>
</ClInclude>
<ClInclude Include="support\Duration.h">
<Filter>src\support</Filter>
</ClInclude>
<ClInclude Include="support\Playback.h">
<Filter>src\support</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -36,7 +36,7 @@
#include "Duration.h"
#include <boost/lexical_cast.hpp>
namespace musik { namespace glue { namespace duration {
namespace musik { namespace core { namespace duration {
std::string Duration(int seconds) {
int mins = (seconds / 60);

View File

@ -36,7 +36,7 @@
#include <string>
namespace musik { namespace glue { namespace duration {
namespace musik { namespace core { namespace duration {
std::string Duration(const std::string& str);
std::string Duration(int seconds);

View File

@ -41,7 +41,7 @@ using namespace musik::core::audio;
using namespace musik::core::sdk;
namespace musik {
namespace glue {
namespace core {
namespace playback {
void PauseOrResume(ITransport& transport) {
int state = transport.GetPlaybackState();

View File

@ -38,7 +38,7 @@
#include <core/sdk/IPlaybackService.h>
namespace musik {
namespace glue {
namespace core {
namespace playback {
void VolumeUp(musik::core::audio::ITransport& transport);
void VolumeDown(musik::core::audio::ITransport& transport);

View File

@ -1,13 +0,0 @@
set(GLUE_SOURCES
./util/Duration.cpp
./util/Playback.cpp
)
include_directories(
.
..
../3rdparty/include
)
add_library(musikglue STATIC ${GLUE_SOURCES})
target_link_libraries(musikglue ${musikcube_LINK_LIBS} musikcore)

View File

@ -1,20 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glue", "glue.vcproj", "{01869283-4cc3-4da4-a06c-3df6a0de98cc}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{01869283-4cc3-4da4-a06c-3df6a0de98cc}.Debug|Win32.ActiveCfg = Debug|Win32
{01869283-4cc3-4da4-a06c-3df6a0de98cc}.Debug|Win32.Build.0 = Debug|Win32
{01869283-4cc3-4da4-a06c-3df6a0de98cc}.Release|Win32.ActiveCfg = Release|Win32
{01869283-4cc3-4da4-a06c-3df6a0de98cc}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -1,111 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{01869283-4cc3-4da4-a06c-3df6a0de98cc}</ProjectGuid>
<RootNamespace>glue</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj/$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj/$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_65_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_65_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<FunctionLevelLinking>true</FunctionLevelLinking>
<ExceptionHandling>Sync</ExceptionHandling>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\3rdparty\3rdparty.vcxproj">
<Project>{b2165720-b4b2-4f4b-8888-8c390c3cb4db}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.hpp" />
<ClInclude Include="util\Duration.h" />
<ClInclude Include="util\Playback.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="util\Duration.cpp" />
<ClCompile Include="util\Playback.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{43832bfe-7403-43a4-8a7a-6f0c3aaf69f4}</UniqueIdentifier>
</Filter>
<Filter Include="src\audio">
<UniqueIdentifier>{df549fdf-a398-4ade-94b5-89aca3719470}</UniqueIdentifier>
</Filter>
<Filter Include="src\util">
<UniqueIdentifier>{bbbddc84-ecce-43e4-baa1-c93978765231}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.hpp">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="util\Playback.h">
<Filter>src\util</Filter>
</ClInclude>
<ClInclude Include="util\Duration.h">
<Filter>src\util</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="util\Playback.cpp">
<Filter>src\util</Filter>
</ClCompile>
<ClCompile Include="util\Duration.cpp">
<Filter>src\util</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -1,35 +0,0 @@
//////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2007-2017 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"

View File

@ -1,38 +0,0 @@
//////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2007-2017 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 <core/config.h>
#include <algorithm>

View File

@ -46,7 +46,7 @@
#include <app/util/Hotkeys.h>
#include <app/util/Messages.h>
#include <glue/util/Playback.h>
#include <core/support/Playback.h>
#include "LibraryLayout.h"
@ -358,7 +358,7 @@ bool LibraryLayout::KeyPress(const std::string& key) {
return true;
}
else if (key == " " || key == "M- ") {
musik::glue::playback::PauseOrResume(this->transport);
musik::core::playback::PauseOrResume(this->transport);
return true;
}

View File

@ -42,7 +42,7 @@
#include <app/overlay/PlayQueueOverlays.h>
#include <core/library/query/local/NowPlayingTrackListQuery.h>
#include <core/library/query/local/GetPlaylistQuery.h>
#include <glue/util/Duration.h>
#include <core/support/Duration.h>
#include "NowPlayingLayout.h"
#include <set>
@ -55,7 +55,6 @@ using namespace musik::core::audio;
using namespace musik::core::library;
using namespace musik::cube;
using namespace musik::core::db::local;
using namespace musik::glue;
using namespace cursespp;
static std::set<std::string> EDIT_KEYS;

View File

@ -42,7 +42,7 @@
#include <core/audio/Visualizer.h>
#include <glue/util/Playback.h>
#include <core/support/Playback.h>
using namespace musik::core;
using namespace musik::core::audio;
@ -65,15 +65,15 @@ bool GlobalHotkeys::Handle(const std::string& kn) {
return true;
}
else if (Hotkeys::Is(Hotkeys::TogglePause, kn)) {
musik::glue::playback::PauseOrResume(this->transport);
core::playback::PauseOrResume(this->transport);
return true;
}
else if (Hotkeys::Is(Hotkeys::VolumeUp, kn)) {
musik::glue::playback::VolumeUp(this->transport);
core::playback::VolumeUp(this->transport);
return true;
}
else if (Hotkeys::Is(Hotkeys::VolumeDown, kn)) {
musik::glue::playback::VolumeDown(this->transport);
core::playback::VolumeDown(this->transport);
return true;
}
else if (Hotkeys::Is(Hotkeys::Previous, kn)) {
@ -85,11 +85,11 @@ bool GlobalHotkeys::Handle(const std::string& kn) {
return true;
}
else if (Hotkeys::Is(Hotkeys::SeekBack, kn)) {
musik::glue::playback::SeekBack(this->playback);
core::playback::SeekBack(this->playback);
return true;
}
else if (Hotkeys::Is(Hotkeys::SeekForward, kn)) {
musik::glue::playback::SeekForward(this->playback);
core::playback::SeekForward(this->playback);
return true;
}
else if (Hotkeys::Is(Hotkeys::ToggleRepeat, kn)) {

View File

@ -43,7 +43,7 @@
#include <core/library/LocalLibraryConstants.h>
#include <core/audio/PlaybackService.h>
#include <glue/util/Duration.h>
#include <core/support/Duration.h>
#include <app/util/Hotkeys.h>
#include <app/util/Playback.h>
@ -60,7 +60,6 @@ using namespace musik::core::library;
using namespace musik::core::runtime;
using namespace musik::core::sdk;
using namespace musik::cube;
using namespace musik::glue;
using namespace cursespp;
using namespace std::chrono;
@ -348,7 +347,7 @@ static std::string formatWithoutAlbum(TrackPtr track, size_t width) {
TRACK_COL_WIDTH);
std::string duration = text::Align(
musik::glue::duration::Duration(track->GetString(constants::Track::DURATION)),
musik::core::duration::Duration(track->GetString(constants::Track::DURATION)),
text::AlignRight,
DURATION_COL_WIDTH);

View File

@ -39,14 +39,14 @@
#include <cursespp/Colors.h>
#include <cursespp/Text.h>
#include <glue/util/Duration.h>
#include <glue/util/Playback.h>
#include <core/support/Duration.h>
#include <core/debug.h>
#include <core/library/LocalLibraryConstants.h>
#include <core/library/query/local/ReplayGainQuery.h>
#include <core/support/PreferenceKeys.h>
#include <core/runtime/Message.h>
#include <core/support/Playback.h>
#include <app/util/Hotkeys.h>
#include <app/util/Messages.h>
@ -68,7 +68,6 @@ using namespace musik::core::db;
using namespace musik::core::sdk;
using namespace musik::core::runtime;
using namespace musik::cube;
using namespace musik::glue;
using namespace std::chrono;
using namespace cursespp;
@ -219,7 +218,7 @@ struct musik::cube::TransportDisplayCache {
}
}
totalTime = musik::glue::duration::Duration(secondsTotal);
totalTime = musik::core::duration::Duration(secondsTotal);
totalTimeCols = u8cols(totalTime);
}
}
@ -610,7 +609,7 @@ void TransportWindow::Update(TimeMode timeMode) {
secondsCurrent = (int) round(this->lastTime);
}
const std::string currentTime = musik::glue::duration::Duration(
const std::string currentTime = musik::core::duration::Duration(
std::min(secondsCurrent, displayCache->secondsTotal));
const std::string replayGain = replayGainEnabled ? "rg" : "";

View File

@ -274,9 +274,6 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\vorbis\*" "$(TargetDir)" /Y /e</
<Project>{b2165720-b4b2-4f4b-9634-8c390c3cb4db}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\glue\glue.vcxproj">
<Project>{01869283-4cc3-4da4-a06c-3df6a0de98cc}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="musikcube.rc" />