Rename musikbox -> musikcube and update all build scripts, docs, and

other files accordingly.

CMakeLists.txt

@@ -5,22 +5,22 @@
 
 cmake_minimum_required(VERSION 3.0)
 
-project(musikbox)
-set (musikbox_VERSION_MAJOR 0)
-set (musikbox_VERSION_MINOR 20)
-set (musikbox_VERSION_PATCH 2)
-set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
+project(musikcube)
+set (musikcube_VERSION_MAJOR 0)
+set (musikcube_VERSION_MINOR 20)
+set (musikcube_VERSION_PATCH 2)
+set (musikcube_VERSION "${musikcube_VERSION_MAJOR}.${musikcube_VERSION_MINOR}.${musikcube_VERSION_PATCH}")
 
 include(CMakeToolsHelpers OPTIONAL)
 
 include(ExternalProject)
 
 ExternalProject_Add(taglib
-    SOURCE_DIR "${musikbox_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11"
+    SOURCE_DIR "${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11"
     BUILD_IN_SOURCE 0
     DOWNLOAD_COMMAND ""
     UPDATE_COMMAND ""
-    CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX:PATH=${musikbox_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/"
+    CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX:PATH=${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/"
     INSTALL_COMMAND make install
 )
 
@@ -50,15 +50,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Modules)
 
 # SET (CMAKE_BUILD_TYPE DEBUG)
-set (LIBRARY_OUTPUT_PATH ${musikbox_SOURCE_DIR}/bin/plugins)
-set (EXECUTABLE_OUTPUT_PATH ${musikbox_SOURCE_DIR}/bin)
+set (LIBRARY_OUTPUT_PATH ${musikcube_SOURCE_DIR}/bin/plugins)
+set (EXECUTABLE_OUTPUT_PATH ${musikcube_SOURCE_DIR}/bin)
 
 link_directories (
-  ${musikbox_SOURCE_DIR}/bin/plugins
-  ${musikbox_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/lib
+  ${musikcube_SOURCE_DIR}/bin/plugins
+  ${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/lib
 )
 
-set (musikbox_LINK_LIBS
+set (musikcube_LINK_LIBS
   ${linux_LINK_LIBS}
   ${BOOST_LINK_LIBS}
   dl
@@ -66,11 +66,11 @@ set (musikbox_LINK_LIBS
 )
 
 include_directories (
-  "${musikbox_SOURCE_DIR}/src"
-  "${musikbox_SOURCE_DIR}/src/core"
-  "${musikbox_SOURCE_DIR}/src/musikbox"
-  "${musikbox_SOURCE_DIR}/src/3rdparty/include"
-  "${musikbox_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/include"
+  "${musikcube_SOURCE_DIR}/src"
+  "${musikcube_SOURCE_DIR}/src/core"
+  "${musikcube_SOURCE_DIR}/src/musikcube"
+  "${musikcube_SOURCE_DIR}/src/3rdparty/include"
+  "${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/include"
 )
 
 # "/usr/local" doesn't seem to be included by default on macOS 10.12+
@@ -81,7 +81,7 @@ endif ()
 
 add_subdirectory(src/core)
 add_subdirectory(src/glue)
-add_subdirectory(src/musikbox)
+add_subdirectory(src/musikcube)
 add_subdirectory(src/plugins/taglib_plugin)
 add_subdirectory(src/plugins/m4adecoder)
 add_subdirectory(src/plugins/oggdecoder)
@@ -103,7 +103,7 @@ endif (CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 # install the binary
 install(
-  FILES bin/musikbox DESTINATION share/musikcube
+  FILES bin/musikcube DESTINATION share/musikcube
   PERMISSIONS
     OWNER_EXECUTE OWNER_READ OWNER_WRITE
     GROUP_EXECUTE GROUP_READ GROUP_WRITE
@@ -145,8 +145,8 @@ else (CMAKE_SYSTEM_NAME MATCHES "Linux")
 endif (CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 file(GLOB sdk_headers "src/core/sdk/*.h")
-file(GLOB themes "src/musikbox/data/themes/*.json")
-file(GLOB locales "src/musikbox/data/locales/*.json")
+file(GLOB themes "src/musikcube/data/themes/*.json")
+file(GLOB locales "src/musikcube/data/locales/*.json")
 
 file(COPY ${themes}
     DESTINATION bin/themes
@@ -173,7 +173,7 @@ install(
 
 # shell script that starts the app.
 install(
-  FILES src/musikbox/musikbox
+  FILES src/musikcube/musikcube
   DESTINATION bin/
   PERMISSIONS
     OWNER_EXECUTE OWNER_READ OWNER_WRITE
@@ -184,14 +184,14 @@ install(
 if (GENERATE_DEB MATCHES "1")
   if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     set(CPACK_GENERATOR "DEB")
-    set(CPACK_PACKAGE_DESCRIPTION "musikbox, a terminal-based music player and library")
-    set(CPACK_PACKAGE_VERSION_MAJOR "${musikbox_VERSION_MAJOR}")
-    set(CPACK_PACKAGE_VERSION_MINOR "${musikbox_VERSION_MINOR}")
-    set(CPACK_PACKAGE_VERSION_PATCH "${musikbox_VERSION_PATCH}")
+    set(CPACK_PACKAGE_DESCRIPTION "musikcube, a terminal-based music player and library")
+    set(CPACK_PACKAGE_VERSION_MAJOR "${musikcube_VERSION_MAJOR}")
+    set(CPACK_PACKAGE_VERSION_MINOR "${musikcube_VERSION_MINOR}")
+    set(CPACK_PACKAGE_VERSION_PATCH "${musikcube_VERSION_PATCH}")
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-thread${DEB_BOOST_VERSION}, libboost-system${DEB_BOOST_VERSION}, libboost-filesystem${DEB_BOOST_VERSION}, libboost-date-time${DEB_BOOST_VERSION}, libboost-atomic${DEB_BOOST_VERSION}, libboost-chrono${DEB_BOOST_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libflac8, libfaad2, libncursesw5, libasound2, libpulse0, pulseaudio, libmicrohttpd10, libmp3lame0")
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER "casey langen")
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE})
-    set(CPACK_PACKAGE_FILE_NAME "musikbox_${musikbox_VERSION}_${DEB_ARCHITECTURE}")
+    set(CPACK_PACKAGE_FILE_NAME "musikcube_${musikcube_VERSION}_${DEB_ARCHITECTURE}")
     include(CPack)
   endif()
 endif()

README.md

@@ -1,12 +1,8 @@
 # musikcube
 
-a cross-platform audio engine, library, player and server written in c++.
+a cross-platform, terminal-based audio engine, library, player and server written in c++.
 
-# musikbox
-
-a curses frontend to musikcube.
-
-musicbox compiles and runs easily on windows, macos and linux. it also runs well on a raspberry pi with raspbian, and can be setup as a streaming audio server.
+musikcube compiles and runs easily on windows, macos and linux. it also runs well on a raspberry pi with raspbian, and can be setup as a streaming audio server.
 
  [keyboard shortcuts are described in the user guide.](https://github.com/clangen/musikcube/wiki/user-guide)
 
@@ -22,7 +18,7 @@ and on linux:
 
 ![linux screenshot](https://raw.githubusercontent.com/clangen/clangen-projects-static/master/musikcube/screenshots/linux.png)
 
-you can also stream audio from, or remote control musikbox using the `musikdroid` android app, which can be downloaded in the `releases` section above. it looks like this:
+you can also stream audio from, or remote control musikcube using the `musikdroid` android app, which can be downloaded in the `releases` section above. it looks like this:
 
 ![android screenshot](https://raw.githubusercontent.com/clangen/clangen-projects-static/master/musikcube/screenshots/android.png)
 
@@ -32,13 +28,13 @@ binaries are available in the [releases](https://github.com/clangen/musikcube/re
 
 while macos binaries are provided, you can also install via homebrew as follows:
 
-- `brew tap clangen/musikbox`
-- `brew install musikbox`
-- `musikbox`
+- `brew tap clangen/musikcube`
+- `brew install musikcube`
+- `musikcube`
 
 # raspberry pi
 
-musikbox runs well on a raspberry pi, connected to you home stereo. [see here for detailed setup instructions](https://github.com/clangen/musikcube/wiki/raspberry-pi).
+musikcube runs well on a raspberry pi, connected to you home stereo. [see here for detailed setup instructions](https://github.com/clangen/musikcube/wiki/raspberry-pi).
 
 # compiling
 
@@ -50,7 +46,7 @@ a list of all keyboard shortcuts can be found in the [user guide](https://github
 
 # streaming server
 
-musikbox ships with a streaming audio server enabled by default. it runs a websocket server on port 7905, used for metadata retrieval. an http server runs on port 7906, and is used to serve (optionally transcoded) audio data to clients.
+musikcube ships with a streaming audio server enabled by default. it runs a websocket server on port 7905, used for metadata retrieval. an http server runs on port 7906, and is used to serve (optionally transcoded) audio data to clients.
 
 **it's important to understand that, out of the box, the server (and remote api) should NOT be considered safe for use outside of a local network**. the websockets service only supports a simple password challenge, and the audio http server just handles Basic authorization. it does not provide ssl or tls. the server also stores the password in plain text in a settings file on the local machine.
 

archive-macos.sh

@@ -13,7 +13,7 @@ make clean
 cmake -DCMAKE_BUILD_TYPE=Release -DLINK_STATICALLY=true .
 make -j4
 
-DIRNAME="musikbox_macos_$VERSION"
+DIRNAME="musikcube_macos_$VERSION"
 OUTPATH="bin/dist/$DIRNAME"
 
 rm -rf "$OUTPATH"
@@ -21,15 +21,15 @@ rm -rf "$OUTPATH"
 mkdir -p "$OUTPATH/plugins"
 mkdir -p "$OUTPATH/locales"
 mkdir -p "$OUTPATH/themes"
-cp bin/musikbox "$OUTPATH" 
+cp bin/musikcube "$OUTPATH" 
 cp bin/plugins/*.dylib "$OUTPATH/plugins"
 cp bin/locales/*.json "$OUTPATH/locales"
 cp bin/themes/*.json "$OUTPATH/themes"
 
-strip bin/musikbox
+strip bin/musikcube
 strip bin/plugins/*.dylib
 
 pushd bin/dist 
-tar cvf musikbox_macos_$VERSION.tar $DIRNAME
-bzip2 musikbox_macos_$VERSION.tar
+tar cvf musikcube_macos_$VERSION.tar $DIRNAME
+bzip2 musikcube_macos_$VERSION.tar
 popd

archive-win32.sh

@@ -7,8 +7,8 @@ if [ -z "$VERSION" ]; then
   exit
 fi
 
-VANILLA="bin/dist/musikbox_win32_$VERSION"
-MILKDROP="bin/dist/musikbox_win32_with_milkdrop2_$VERSION"
+VANILLA="bin/dist/musikcube_win32_$VERSION"
+MILKDROP="bin/dist/musikcube_win32_with_milkdrop2_$VERSION"
 
 rm -rf "$VANILLA"
 rm -rf "$MILKDROP"
@@ -16,27 +16,27 @@ rm -rf "$MILKDROP"
 mkdir -p "$VANILLA/plugins"
 mkdir -p "$VANILLA/themes"
 mkdir -p "$VANILLA/locales"
-cp bin/release/musikbox.exe "$VANILLA" 
+cp bin/release/musikcube.exe "$VANILLA" 
 cp bin/release/*.dll "$VANILLA" 
 cp bin/release/plugins/*.dll "$VANILLA/plugins"
 cp bin/release/themes/*.json "$VANILLA/themes"
 cp bin/release/locales/*.json "$VANILLA/locales"
 rm "$VANILLA/plugins/vis_milk2.dll"
 pushd $VANILLA
-7z a -tzip "musikbox_win32_$VERSION.zip" ./* -mx=9
-mv "musikbox_win32_$VERSION.zip" ..
+7z a -tzip "musikcube_win32_$VERSION.zip" ./* -mx=9
+mv "musikcube_win32_$VERSION.zip" ..
 popd
 
 mkdir -p "$MILKDROP/plugins"
 mkdir -p "$MILKDROP/themes"
 mkdir -p "$MILKDROP/locales"
-cp bin/release/musikbox.exe "$MILKDROP"
+cp bin/release/musikcube.exe "$MILKDROP"
 cp bin/release/*.dll "$MILKDROP" 
 cp bin/release/plugins/*.dll "$MILKDROP/plugins"
 cp bin/release/themes/*.json "$MILKDROP/themes"
 cp bin/release/locales/*.json "$MILKDROP/locales"
 cp -rfp bin/release/plugins/Milkdrop2 "$MILKDROP/plugins"
 pushd $MILKDROP
-7z a -tzip "musikbox_win32_with_milkdrop2_$VERSION.zip" ./* -mx=9
-mv "musikbox_win32_with_milkdrop2_$VERSION.zip" ..
+7z a -tzip "musikcube_win32_with_milkdrop2_$VERSION.zip" ./* -mx=9
+mv "musikcube_win32_with_milkdrop2_$VERSION.zip" ..
 popd

musikcube.sln

@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "musikbox", "src\musikbox\musikbox.vcxproj", "{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "musikcube", "src\musikcube\musikcube.vcxproj", "{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{68AA481E-3CCE-440F-8CCE-69F1B371C89D} = {68AA481E-3CCE-440F-8CCE-69F1B371C89D}
 		{51C18730-DC48-411A-829D-F2B3B7AC4C97} = {51C18730-DC48-411A-829D-F2B3B7AC4C97}

src/core/CMakeLists.txt

@@ -57,4 +57,4 @@ include_directories(
 )
 
 add_library(musikcore STATIC ${CORE_SOURCES})
-target_link_libraries(musikcore ${musikbox_LINK_LIBS})
+target_link_libraries(musikcore ${musikcube_LINK_LIBS})

src/glue/CMakeLists.txt

@@ -11,4 +11,4 @@ include_directories(
 )
 
 add_library(musikglue STATIC ${GLUE_SOURCES})
-target_link_libraries(musikglue ${musikbox_LINK_LIBS} musikcore)
+target_link_libraries(musikglue ${musikcube_LINK_LIBS} musikcore)

src/musikbox/musikbox.in

@@ -1,5 +0,0 @@
-#!/bin/bash
-pushd @musikbox_INSTALL_DIR@/share/musikcube/ > /dev/null
-{
-  ./musikbox && popd
-} || popd > /dev/null

src/musikbox/player.vcxproj.filters

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Source Files\curses">
-      <UniqueIdentifier>{7ff6ce0d-725d-497c-9ecc-afcbe79faa5b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\windows">
-      <UniqueIdentifier>{80afa65b-4102-40a7-8f73-b06776d9d610}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TransportEvents.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BorderedWindow.cpp">
-      <Filter>Source Files\curses</Filter>
-    </ClCompile>
-    <ClCompile Include="Colors.cpp">
-      <Filter>Source Files\curses</Filter>
-    </ClCompile>
-    <ClCompile Include="SimpleScrollAdapter.cpp">
-      <Filter>Source Files\curses</Filter>
-    </ClCompile>
-    <ClCompile Include="IScrollAdapter.h">
-      <Filter>Source Files\curses</Filter>
-    </ClCompile>
-    <ClCompile Include="LogWindow.cpp">
-      <Filter>Source Files\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="OutputWindow.cpp">
-      <Filter>Source Files\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="TransportWindow.cpp">
-      <Filter>Source Files\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="Screen.cpp">
-      <Filter>Source Files\curses</Filter>
-    </ClCompile>
-    <ClCompile Include="CommandWindow.cpp">
-      <Filter>Source Files\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="ScrollableWindow.cpp">
-      <Filter>Source Files\curses</Filter>
-    </ClCompile>
-    <ClCompile Include="SystemInfo.cpp">
-      <Filter>Source Files\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="ResourcesWindow.cpp">
-      <Filter>Source Files\windows</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TransportEvents.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BorderedWindow.h">
-      <Filter>Source Files\curses</Filter>
-    </ClInclude>
-    <ClInclude Include="Colors.h">
-      <Filter>Source Files\curses</Filter>
-    </ClInclude>
-    <ClInclude Include="SimpleScrollAdapter.h">
-      <Filter>Source Files\curses</Filter>
-    </ClInclude>
-    <ClInclude Include="LogWindow.h">
-      <Filter>Source Files\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="OutputWindow.h">
-      <Filter>Source Files\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="TransportWindow.h">
-      <Filter>Source Files\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="Screen.h">
-      <Filter>Source Files\curses</Filter>
-    </ClInclude>
-    <ClInclude Include="CommandWindow.h">
-      <Filter>Source Files\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="ScrollableWindow.h">
-      <Filter>Source Files\curses</Filter>
-    </ClInclude>
-    <ClInclude Include="curses_config.h">
-      <Filter>Source Files\curses</Filter>
-    </ClInclude>
-    <ClInclude Include="SystemInfo.h">
-      <Filter>Source Files\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="ResourcesWindow.h">
-      <Filter>Source Files\windows</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

src/musikcube/CMakeLists.txt

@@ -1,4 +1,4 @@
-set (BOX_SRCS
+set (CUBE_SRCS
 	./Main.cpp
 	./stdafx.cpp
 	./app/layout/BrowseLayout.cpp
@@ -49,18 +49,18 @@ set (BOX_SRCS
 	./cursespp/Window.cpp
 )
 
-set(musikbox_INSTALL_DIR ${HOMEBREW_PREFIX})
+set(musikcube_INSTALL_DIR ${HOMEBREW_PREFIX})
 
-if (NOT DEFINED musikbox_INSTALL_DIR)
-	set(musikbox_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
+if (NOT DEFINED musikcube_INSTALL_DIR)
+	set(musikcube_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
 endif()
 
-configure_file("musikbox.in" "musikbox" @ONLY)
+configure_file("musikcube.in" "musikcube" @ONLY)
 
-add_executable(musikbox ${BOX_SRCS})
+add_executable(musikcube ${CUBE_SRCS})
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-	target_link_libraries(musikbox ${musikbox_LINK_LIBS} ncursesw panelw musikcore musikglue)
+	target_link_libraries(musikcube ${musikcube_LINK_LIBS} ncursesw panelw musikcore musikglue)
 else (CMAKE_SYSTEM_NAME MATCHES "Linux")
-	target_link_libraries(musikbox ${musikbox_LINK_LIBS} curses panel musikcore musikglue)
+	target_link_libraries(musikcube ${musikcube_LINK_LIBS} curses panel musikcore musikglue)
 endif (CMAKE_SYSTEM_NAME MATCHES "Linux")

src/musikcube/Main.cpp

@@ -75,7 +75,7 @@ using namespace musik::glue;
 using namespace musik::glue::audio;
 using namespace musik::core;
 using namespace musik::core::audio;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 #define MIN_WIDTH 48
@@ -85,7 +85,7 @@ using namespace cursespp;
 int _main(int argc, wchar_t* argv[]);
 
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow) {
-    return App::Running("musikbox") ? 0 : _main(0, 0);
+    return App::Running("musikcube") ? 0 : _main(0, 0);
 }
 
 int _main(int argc, wchar_t* argv[]) {
@@ -110,7 +110,7 @@ int main(int argc, char* argv[]) {
 
 #ifndef WIN32
     #if 1 /*DEBUG*/
-        freopen("/tmp/musikbox.log", "w", stderr);
+        freopen("/tmp/musikcube.log", "w", stderr);
     #else
         freopen("/dev/null", "w", stderr);
     #endif
@@ -139,11 +139,11 @@ int main(int argc, char* argv[]) {
     musik::core::plugin::InstallDependencies(library);
 
     {
-        App app("musikbox"); /* must be before layout creation */
+        App app("musikcube"); /* must be before layout creation */
 
 #ifdef WIN32
         app.SetIcon(IDI_ICON1);
-        app.SetSingleInstanceId("musikbox");
+        app.SetSingleInstanceId("musikcube");
 #endif
         /* fire up the indexer if configured to run on startup */
         if (prefs->GetBool(musik::core::prefs::keys::SyncOnStartup, true)) {
@@ -153,11 +153,11 @@ int main(int argc, char* argv[]) {
         /* set color mode (basic, palette, rgb) */
         Colors::Mode colorMode = Colors::RGB;
 
-        if (prefs->GetBool(musik::box::prefs::keys::DisableCustomColors.c_str(), false)) {
+        if (prefs->GetBool(musik::cube::prefs::keys::DisableCustomColors.c_str(), false)) {
             colorMode = Colors::Basic;
         }
 #ifndef WIN32
-        else if (prefs->GetBool(musik::box::prefs::keys::UsePaletteColors.c_str(), true)) {
+        else if (prefs->GetBool(musik::cube::prefs::keys::UsePaletteColors.c_str(), true)) {
             colorMode = Colors::Palette;
         }
 #endif
@@ -165,15 +165,15 @@ int main(int argc, char* argv[]) {
         app.SetColorMode(colorMode);
 
         /* theme */
-        std::string colorTheme = prefs->GetString(musik::box::prefs::keys::ColorTheme);
+        std::string colorTheme = prefs->GetString(musik::cube::prefs::keys::ColorTheme);
         if (colorTheme.size()) {
             colorTheme = GetApplicationDirectory() + "/themes/" + colorTheme + ".json";
             app.SetColorTheme(colorTheme);
         }
 
         /* tray icon */
-        app.SetMinimizeToTray(prefs->GetBool(musik::box::prefs::keys::MinimizeToTray, false));
-        if (prefs->GetBool(musik::box::prefs::keys::StartMinimized, false)) {
+        app.SetMinimizeToTray(prefs->GetBool(musik::cube::prefs::keys::MinimizeToTray, false));
+        if (prefs->GetBool(musik::cube::prefs::keys::StartMinimized, false)) {
             app.Minimize();
         }
 

src/musikcube/app/layout/BrowseLayout.cpp

@@ -52,7 +52,7 @@ using namespace musik::core;
 using namespace musik::core::audio;
 using namespace musik::core::db::local;
 using namespace musik::core::library;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 static size_t MAX_CATEGORY_WIDTH = 40;

src/musikcube/app/layout/BrowseLayout.h

@@ -47,7 +47,7 @@
 #include <sigslot/sigslot.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class BrowseLayout :
             public cursespp::LayoutBase,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/layout/ConsoleLayout.cpp

@@ -60,7 +60,7 @@ bool tostr(T& t, const std::string& s) {
 using namespace musik::core;
 using namespace musik::core::audio;
 using namespace musik::core::sdk;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 typedef IScrollAdapter::EntryPtr EntryPtr;
@@ -205,7 +205,7 @@ void ConsoleLayout::Help() {
     this->WriteOutput("", s);
     this->WriteOutput("  plugins: list loaded plugins", s);
     this->WriteOutput("", s);
-    this->WriteOutput("  version: show musikbox app version", s);
+    this->WriteOutput("  version: show musikcube app version", s);
     this->WriteOutput("", s);
     this->WriteOutput("  <ctrl+d>: quit\n", s);
 }

src/musikcube/app/layout/ConsoleLayout.h

@@ -49,7 +49,7 @@
 #include "ITopLevelLayout.h"
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class ConsoleLayout :
             public cursespp::LayoutBase,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/layout/ITopLevelLayout.h

@@ -37,7 +37,7 @@
 #include <cursespp/ShortcutsWindow.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class ITopLevelLayout {
             public:
                 virtual ~ITopLevelLayout() { }

src/musikcube/app/layout/LibraryLayout.cpp

@@ -61,7 +61,7 @@ using namespace musik::core::runtime;
 using namespace musik::core;
 using namespace musik::core::audio;
 using namespace musik::core::library;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::core::runtime;
 using namespace cursespp;
 

src/musikcube/app/layout/LibraryLayout.h

@@ -51,7 +51,7 @@
 #include "ITopLevelLayout.h"
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class LibraryLayout :
             public cursespp::LayoutBase,
             public ITopLevelLayout,

src/musikcube/app/layout/MainLayout.cpp

@@ -51,7 +51,7 @@
 #include "MainLayout.h"
 
 using namespace musik;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::core;
 using namespace musik::core::runtime;
 using namespace cursespp;

src/musikcube/app/layout/MainLayout.h

@@ -53,7 +53,7 @@
 #include <sigslot/sigslot.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class MainLayout :
             public cursespp::LayoutBase,
             public cursespp::IViewRoot,

src/musikcube/app/layout/NowPlayingLayout.cpp

@@ -53,7 +53,7 @@ using namespace musik::core::library::constants;
 using namespace musik::core;
 using namespace musik::core::audio;
 using namespace musik::core::library;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::core::db::local;
 using namespace musik::glue;
 using namespace cursespp;

src/musikcube/app/layout/NowPlayingLayout.h

@@ -46,7 +46,7 @@
 #include <sigslot/sigslot.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class NowPlayingLayout :
             public cursespp::LayoutBase,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/layout/SearchLayout.cpp

@@ -45,7 +45,7 @@ using namespace musik::core::library::constants;
 using namespace musik::core;
 using namespace musik::core::audio;
 using namespace musik::core::library;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 #define SEARCH_HEIGHT 3

src/musikcube/app/layout/SearchLayout.h

@@ -48,7 +48,7 @@
 #include <sigslot/sigslot.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class SearchLayout :
             public cursespp::LayoutBase,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/layout/SettingsLayout.cpp

@@ -65,7 +65,7 @@ using namespace musik::core;
 using namespace musik::core::audio;
 using namespace musik::core::library::constants;
 using namespace musik::core::sdk;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::glue::audio;
 using namespace cursespp;
 using namespace std::placeholders;
@@ -153,10 +153,10 @@ void SettingsLayout::OnCheckboxChanged(cursespp::Checkbox* cb, bool checked) {
 #ifdef ENABLE_MINIMIZE_TO_TRAY
     else if (cb == minimizeToTrayCheckbox.get()) {
         app.SetMinimizeToTray(checked);
-        this->prefs->SetBool(box::prefs::keys::MinimizeToTray, checked);
+        this->prefs->SetBool(cube::prefs::keys::MinimizeToTray, checked);
     }
     else if (cb == startMinimizedCheckbox.get()) {
-        this->prefs->SetBool(box::prefs::keys::StartMinimized, checked);
+        this->prefs->SetBool(cube::prefs::keys::StartMinimized, checked);
     }
 #endif
 }
@@ -472,7 +472,7 @@ void SettingsLayout::OnVisibilityChanged(bool visible) {
 }
 
 void SettingsLayout::CheckShowFirstRunDialog() {
-    if (!this->prefs->GetBool(box::prefs::keys::FirstRunSettingsDisplayed)) {
+    if (!this->prefs->GetBool(cube::prefs::keys::FirstRunSettingsDisplayed)) {
         if (!this->firstRunDialog) {
             this->firstRunDialog.reset(new DialogOverlay());
 
@@ -493,7 +493,7 @@ void SettingsLayout::CheckShowFirstRunDialog() {
                     "ENTER",
                     _TSTR("button_ok"),
                     [this](std::string key) {
-                        this->prefs->SetBool(box::prefs::keys::FirstRunSettingsDisplayed, true);
+                        this->prefs->SetBool(cube::prefs::keys::FirstRunSettingsDisplayed, true);
                         this->firstRunDialog.reset();
                     });
 
@@ -511,8 +511,8 @@ void SettingsLayout::LoadPreferences() {
     this->localeDropdown->SetText(arrow + _TSTR("settings_selected_locale") + i18n::Locale::Instance().GetSelectedLocale());
 
     /* color theme */
-    bool disableCustomColors = this->prefs->GetBool(box::prefs::keys::DisableCustomColors);
-    std::string colorTheme = this->prefs->GetString(box::prefs::keys::ColorTheme);
+    bool disableCustomColors = this->prefs->GetBool(cube::prefs::keys::DisableCustomColors);
+    std::string colorTheme = this->prefs->GetString(cube::prefs::keys::ColorTheme);
 
     if (colorTheme == "" && !disableCustomColors) {
         colorTheme = _TSTR("settings_default_theme_name");
@@ -525,13 +525,13 @@ void SettingsLayout::LoadPreferences() {
 
 #ifdef ENABLE_256_COLOR_OPTION
     this->paletteCheckbox->CheckChanged.disconnect(this);
-    this->paletteCheckbox->SetChecked(this->prefs->GetBool(box::prefs::keys::UsePaletteColors, true));
+    this->paletteCheckbox->SetChecked(this->prefs->GetBool(cube::prefs::keys::UsePaletteColors, true));
     this->paletteCheckbox->CheckChanged.connect(this, &SettingsLayout::OnCheckboxChanged);
 #endif
 
 #ifdef ENABLE_MINIMIZE_TO_TRAY
-    this->minimizeToTrayCheckbox->SetChecked(this->prefs->GetBool(box::prefs::keys::MinimizeToTray, false));
-    this->startMinimizedCheckbox->SetChecked(this->prefs->GetBool(box::prefs::keys::StartMinimized, false));
+    this->minimizeToTrayCheckbox->SetChecked(this->prefs->GetBool(cube::prefs::keys::MinimizeToTray, false));
+    this->startMinimizedCheckbox->SetChecked(this->prefs->GetBool(cube::prefs::keys::StartMinimized, false));
 #endif
 
     /* output plugin */

src/musikcube/app/layout/SettingsLayout.h

@@ -58,7 +58,7 @@
 #include "ITopLevelLayout.h"
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class SettingsLayout :
             public ITopLevelLayout,
             public cursespp::LayoutBase,

src/musikcube/app/layout/TrackSearchLayout.cpp

@@ -51,7 +51,7 @@ using namespace musik::core::db::local;
 using namespace musik::core::library;
 using namespace musik::core::library::constants;
 using namespace musik::core::runtime;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 #define SEARCH_HEIGHT 3

src/musikcube/app/layout/TrackSearchLayout.h

@@ -45,7 +45,7 @@
 #include <sigslot/sigslot.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class TrackSearchLayout :
             public cursespp::LayoutBase,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/model/DirectoryAdapter.cpp

@@ -41,7 +41,7 @@
 
 #include "DirectoryAdapter.h"
 
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 using namespace boost::filesystem;
 

src/musikcube/app/model/DirectoryAdapter.h

@@ -41,7 +41,7 @@
 #include <stack>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class DirectoryAdapter : public cursespp::ScrollAdapterBase {
             public:
                 DirectoryAdapter();

src/musikcube/app/overlay/ColorThemeOverlay.cpp

@@ -40,7 +40,7 @@
 #include <core/support/PreferenceKeys.h>
 #include <core/support/Preferences.h>
 
-#include <musikbox/app/util/PreferenceKeys.h>
+#include <app/util/PreferenceKeys.h>
 
 #include <cursespp/App.h>
 #include <cursespp/Colors.h>
@@ -52,7 +52,7 @@
 
 using namespace musik;
 using namespace musik::core;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 using namespace boost::filesystem;
 
@@ -87,8 +87,8 @@ void ColorThemeOverlay::Show(std::function<void()> callback) {
     auto prefs = core::Preferences::
         ForComponent(core::prefs::components::Settings);
 
-    std::string currentTheme = prefs->GetString(box::prefs::keys::ColorTheme);
-    bool disableCustomColors = prefs->GetBool(box::prefs::keys::DisableCustomColors);
+    std::string currentTheme = prefs->GetString(cube::prefs::keys::ColorTheme);
+    bool disableCustomColors = prefs->GetBool(cube::prefs::keys::DisableCustomColors);
 
     int selectedIndex = disableCustomColors ? 1 : 0;
 
@@ -132,8 +132,8 @@ void ColorThemeOverlay::Show(std::function<void()> callback) {
             [callback, prefs, themes, currentTheme, disableCustomColors]
             (ListOverlay* overlay, IScrollAdapterPtr adapter, size_t index) {
                 if (index == 0) {
-                    prefs->SetString(box::prefs::keys::ColorTheme, "");
-                    prefs->SetBool(box::prefs::keys::DisableCustomColors, false);
+                    prefs->SetString(cube::prefs::keys::ColorTheme, "");
+                    prefs->SetBool(cube::prefs::keys::DisableCustomColors, false);
                     Colors::SetTheme("");
 
                     if (disableCustomColors) {
@@ -141,8 +141,8 @@ void ColorThemeOverlay::Show(std::function<void()> callback) {
                     }
                 }
                 else if (index == 1) {
-                    prefs->SetString(box::prefs::keys::ColorTheme, "");
-                    prefs->SetBool(box::prefs::keys::DisableCustomColors, true);
+                    prefs->SetString(cube::prefs::keys::ColorTheme, "");
+                    prefs->SetBool(cube::prefs::keys::DisableCustomColors, true);
 
                     if (!disableCustomColors) {
                         showNeedsRestart();
@@ -151,8 +151,8 @@ void ColorThemeOverlay::Show(std::function<void()> callback) {
                 else {
                     std::string selected = themes->at(index - 2).c_str();
                     if (selected != currentTheme) {
-                        prefs->SetString(box::prefs::keys::ColorTheme, selected.c_str());
-                        prefs->SetBool(box::prefs::keys::DisableCustomColors, false);
+                        prefs->SetString(cube::prefs::keys::ColorTheme, selected.c_str());
+                        prefs->SetBool(cube::prefs::keys::DisableCustomColors, false);
                         Colors::SetTheme(ThemesDirectory() + selected + ".json");
 
                         if (disableCustomColors) {
@@ -176,7 +176,7 @@ void ColorThemeOverlay::Show256ColorsInfo(bool enabled, std::function<void()> ca
         ForComponent(core::prefs::components::Settings);
 
     if (enabled) {
-        prefs->SetBool(box::prefs::keys::UsePaletteColors, enabled);
+        prefs->SetBool(cube::prefs::keys::UsePaletteColors, enabled);
         prefs->Save();
         showNeedsRestart(callback);
     }
@@ -188,7 +188,7 @@ void ColorThemeOverlay::Show256ColorsInfo(bool enabled, std::function<void()> ca
             .SetMessage(_TSTR("color_theme_256_overlay_message"))
             .AddButton(
                 "y", "y", _TSTR("button_yes"), [prefs, callback](std::string key) {
-                    prefs->SetBool(box::prefs::keys::UsePaletteColors, false);
+                    prefs->SetBool(cube::prefs::keys::UsePaletteColors, false);
                     prefs->Save();
                     showNeedsRestart(callback);
                 })

src/musikcube/app/overlay/ColorThemeOverlay.h

@@ -37,7 +37,7 @@
 #include <functional>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class ColorThemeOverlay {
             public:
                 static void Show(std::function<void()> callback);

src/musikcube/app/overlay/LocaleOverlay.cpp

@@ -45,7 +45,7 @@
 
 using namespace musik;
 using namespace musik::core;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 using Callback = std::function<void()>;

src/musikcube/app/overlay/LocaleOverlay.h

@@ -37,7 +37,7 @@
 #include <functional>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class LocaleOverlay {
             public:
                 static void Show(std::function<void()> callback);

src/musikcube/app/overlay/PlayQueueOverlays.cpp

@@ -64,7 +64,7 @@ using namespace musik::core::db;
 using namespace musik::core::db::local;
 using namespace musik::core::library::constants;
 using namespace musik::core::runtime;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 using namespace std::chrono;

src/musikcube/app/overlay/PlayQueueOverlays.h

@@ -40,7 +40,7 @@
 #include <app/window/TrackListView.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class PlayQueueOverlays {
             public:
                 using PlaylistSelectedCallback = std::function<void(int64_t)>;

src/musikcube/app/overlay/PlaybackOverlays.cpp

@@ -45,7 +45,7 @@
 
 #include <vector>
 
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::glue::audio;
 using namespace musik::core::audio;
 using namespace musik::core::sdk;

src/musikcube/app/overlay/PlaybackOverlays.h

@@ -38,7 +38,7 @@
 #include <glue/audio/MasterTransport.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class PlaybackOverlays {
             public:
                 static void ShowOutputOverlay(

src/musikcube/app/overlay/PluginOverlay.cpp

@@ -49,7 +49,7 @@
 
 using namespace musik::core;
 using namespace musik::core::sdk;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 static const std::string check = "\xe2\x9c\x93";

src/musikcube/app/overlay/PluginOverlay.h

@@ -35,7 +35,7 @@
 #pragma once
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class PluginOverlay {
             public:
                 static void Show();

src/musikcube/app/overlay/ServerOverlay.cpp

@@ -48,7 +48,7 @@
 using namespace musik;
 using namespace musik::core;
 using namespace musik::core::sdk;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 static const std::string WEBSOCKET_PLUGIN_GUID = "9fc897a3-dfd5-4524-a0fc-b02f46aea4a9";

src/musikcube/app/overlay/ServerOverlay.h

@@ -46,7 +46,7 @@
 #include <cursespp/ShortcutsWindow.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class ServerOverlay : public cursespp::OverlayBase, public sigslot::has_slots<>
 #if (__clang_major__ == 7 && __clang_minor__ == 3)
             , public std::enable_shared_from_this<ServerOverlay>

src/musikcube/app/overlay/VisualizerOverlay.cpp

@@ -43,7 +43,7 @@
 #include <cursespp/ListOverlay.h>
 #include <cursespp/DialogOverlay.h>
 
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::core::audio;
 using namespace cursespp;
 

src/musikcube/app/overlay/VisualizerOverlay.h

@@ -35,7 +35,7 @@
 #pragma once
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class VisualizerOverlay {
             public:
                 static void Show();

src/musikcube/app/util/GlobalHotkeys.cpp

@@ -46,7 +46,7 @@
 using namespace musik::core;
 using namespace musik::core::audio;
 using namespace musik::core::sdk;
-using namespace musik::box;
+using namespace musik::cube;
 
 GlobalHotkeys::GlobalHotkeys(musik::core::audio::PlaybackService& playback, ILibraryPtr library)
 : playback(playback)

src/musikcube/app/util/GlobalHotkeys.h

@@ -40,7 +40,7 @@
 #include <core/library/ILibrary.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class GlobalHotkeys {
             public:
                 GlobalHotkeys(

src/musikcube/app/util/Hotkeys.cpp

@@ -39,7 +39,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::core;
 
 using Id = Hotkeys::Id;

src/musikcube/app/util/Hotkeys.h

@@ -39,7 +39,7 @@
 #include <core/library/ILibrary.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class Hotkeys {
             public:
                 enum Id {

src/musikcube/app/util/Messages.h

@@ -40,7 +40,7 @@
 #include <app/window/TrackListView.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         namespace message {
             static const int JumpToCategory = 1024;
 

src/musikcube/app/util/Playback.cpp

@@ -38,7 +38,7 @@
 
 using namespace musik::core::audio;
 using namespace musik::core::sdk;
-using namespace musik::box;
+using namespace musik::cube;
 
 static const size_t NO_SELECTION = (size_t) -1;
 
@@ -59,7 +59,7 @@ static size_t getSelectedIndex(TrackListView& trackList) {
 }
 
 namespace musik {
-    namespace box {
+    namespace cube {
         namespace playback {
             void Play(TrackListView& trackList, PlaybackService& playback) {
                 auto index = getSelectedIndex(trackList);

src/musikcube/app/util/Playback.h

@@ -40,14 +40,14 @@
 #include <app/window/TrackListView.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         namespace playback {
             void Play(
-                musik::box::TrackListView& trackList,
+                musik::cube::TrackListView& trackList,
                 musik::core::audio::PlaybackService& playback);
 
             bool HotSwap(
-                musik::box::TrackListView& trackList,
+                musik::cube::TrackListView& trackList,
                 musik::core::audio::PlaybackService& playback);
         }
     }

src/musikcube/app/util/PreferenceKeys.cpp

@@ -35,7 +35,7 @@
 #include "stdafx.h"
 #include "PreferenceKeys.h"
 
-namespace musik { namespace box { namespace prefs {
+namespace musik { namespace cube { namespace prefs {
 
     const std::string keys::DisableCustomColors = "DisableCustomColors";
     const std::string keys::UsePaletteColors = "UsePaletteColors";

src/musikcube/app/util/PreferenceKeys.h

@@ -36,7 +36,7 @@
 
 #include <string>
 
-namespace musik { namespace box { namespace prefs {
+namespace musik { namespace cube { namespace prefs {
 
     namespace keys {
         extern const std::string DisableCustomColors;

src/musikcube/app/util/UpdateCheck.cpp

@@ -47,7 +47,7 @@
 #include <app/util/Version.h>
 
 using namespace nlohmann;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::core;
 using namespace musik::core::runtime;
 using namespace cursespp;
@@ -79,7 +79,7 @@ static inline std::string formattedVersion(short major, short minor, short patch
 }
 
 static inline std::string getUserAgent() {
-    return boost::str(boost::format("musikbox %s (%s)")
+    return boost::str(boost::format("musikcube %s (%s)")
         % formattedVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
         % PLATFORM);
 }
@@ -173,7 +173,7 @@ bool UpdateCheck::Run(Callback callback) {
 
 void UpdateCheck::Cancel() {
     std::unique_lock<std::recursive_mutex> lock(this->mutex);
-    
+
     if (this->thread) {
         this->cancel = true;
         if (this->thread->joinable()) {
@@ -185,12 +185,12 @@ void UpdateCheck::Cancel() {
 
 void UpdateCheck::Reset() {
     std::unique_lock<std::recursive_mutex> lock(this->mutex);
-    
+
     if (this->curl) {
         curl_easy_cleanup(this->curl);
         this->curl = nullptr;
     }
-    
+
     this->cancel = false;
     this->callback = Callback();
     this->result = "";

src/musikcube/app/util/UpdateCheck.h

@@ -37,7 +37,7 @@
 #include <mutex>
 #include <core/runtime/IMessageTarget.h>
 
-namespace musik { namespace box {
+namespace musik { namespace cube {
     class UpdateCheck : private musik::core::runtime::IMessageTarget {
         public:
             /* args = updateRequired, version, url */

src/musikcube/app/window/CategoryListView.cpp

@@ -53,7 +53,7 @@ using namespace musik::core::db;
 using namespace musik::core::db::local;
 using namespace musik::core::library::constants;
 using namespace musik::core::runtime;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 static std::map<std::string, std::string> FIELD_TO_ID_MAP = {

src/musikcube/app/window/CategoryListView.h

@@ -49,7 +49,7 @@
 #include <mutex>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class CategoryListView :
             public cursespp::ListWindow,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/window/LogWindow.cpp

@@ -42,7 +42,7 @@
 #include <cursespp/Colors.h>
 #include <cursespp/Screen.h>
 
-using namespace musik::box;
+using namespace musik::cube;
 using namespace cursespp;
 
 typedef IScrollAdapter::IEntry IEntry;

src/musikcube/app/window/LogWindow.h

@@ -45,7 +45,7 @@
 #include <cursespp/SimpleScrollAdapter.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class LogWindow :
             public cursespp::ScrollableWindow,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/window/TrackListView.cpp

@@ -59,7 +59,7 @@ using namespace musik::core::db;
 using namespace musik::core::library;
 using namespace musik::core::runtime;
 using namespace musik::core::sdk;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::glue;
 using namespace cursespp;
 

src/musikcube/app/window/TrackListView.h

@@ -47,7 +47,7 @@
 #include <core/library/ILibrary.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         class TrackListView :
             public cursespp::ListWindow,
 #if (__clang_major__ == 7 && __clang_minor__ == 3)

src/musikcube/app/window/TransportWindow.cpp

@@ -64,7 +64,7 @@ using namespace musik::core::library;
 using namespace musik::core::db;
 using namespace musik::core::sdk;
 using namespace musik::core::runtime;
-using namespace musik::box;
+using namespace musik::cube;
 using namespace musik::glue;
 using namespace std::chrono;
 using namespace cursespp;
@@ -163,7 +163,7 @@ static struct StringCache {
 /* a really boring class that contains a cache of currently playing
 information so we don't have to look it up every time we update the
 view (every second) */
-struct musik::box::TransportDisplayCache {
+struct musik::cube::TransportDisplayCache {
     TrackPtr track;
     std::string title, album, artist, totalTime;
     int secondsTotal;

src/musikcube/app/window/TransportWindow.h

@@ -42,7 +42,7 @@
 #include <sigslot/sigslot.h>
 
 namespace musik {
-    namespace box {
+    namespace cube {
         struct TransportDisplayCache;
 
         class TransportWindow :