mirror of
https://github.com/clangen/musikcube.git
synced 2024-10-02 13:02:35 +00:00
- Removed some win32-specific code from App.cpp that was causing the
message queue to get backlogged. - Fixed a few projects that weren't configured properly for performance guided optimizations in win32 - Version bump in preparation for release. we're close now!
This commit is contained in:
parent
e8dd776b3f
commit
d25d07893c
@ -101,7 +101,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>
|
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>
|
||||||
|
@ -101,7 +101,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>
|
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>
|
||||||
|
@ -101,7 +101,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>
|
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>
|
||||||
|
@ -101,7 +101,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
</Link>
|
</Link>
|
||||||
|
@ -71,6 +71,7 @@
|
|||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<OutDir>$(SolutionDir)\bin\$(Configuration)\plugins\</OutDir>
|
<OutDir>$(SolutionDir)\bin\$(Configuration)\plugins\</OutDir>
|
||||||
<IntDir>.\obj\$(Configuration)\</IntDir>
|
<IntDir>.\obj\$(Configuration)\</IntDir>
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<OutDir>$(SolutionDir)\bin\$(Configuration)\plugins\</OutDir>
|
<OutDir>$(SolutionDir)\bin\$(Configuration)\plugins\</OutDir>
|
||||||
@ -122,7 +123,6 @@
|
|||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>
|
||||||
|
@ -101,7 +101,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
</Link>
|
</Link>
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define VERSION "0.8.0"
|
#define VERSION "0.9.0"
|
||||||
|
@ -52,8 +52,6 @@
|
|||||||
#include <csignal>
|
#include <csignal>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define HIDDEN_IDLE_TIMEOUT_MS 500
|
|
||||||
|
|
||||||
using namespace cursespp;
|
using namespace cursespp;
|
||||||
using namespace std::chrono;
|
using namespace std::chrono;
|
||||||
|
|
||||||
@ -61,21 +59,6 @@ static OverlayStack overlays;
|
|||||||
static bool disconnected = false;
|
static bool disconnected = false;
|
||||||
static int64 resizeAt = 0;
|
static int64 resizeAt = 0;
|
||||||
|
|
||||||
static inline bool isVisible() {
|
|
||||||
#ifdef WIN32
|
|
||||||
static HWND hwnd = nullptr;
|
|
||||||
if (!hwnd) {
|
|
||||||
hwnd = musik::box::win32::GetMainWindow();
|
|
||||||
}
|
|
||||||
if (hwnd) {
|
|
||||||
return !IsIconic(hwnd);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
#else
|
|
||||||
return true;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
static void hangupHandler(int signal) {
|
static void hangupHandler(int signal) {
|
||||||
disconnected = true;
|
disconnected = true;
|
||||||
@ -180,11 +163,7 @@ void App::Run(ILayoutPtr layout) {
|
|||||||
this->ChangeLayout(layout);
|
this->ChangeLayout(layout);
|
||||||
|
|
||||||
while (!quit && !disconnected) {
|
while (!quit && !disconnected) {
|
||||||
visible = isVisible();
|
timeout(IDLE_TIMEOUT_MS);
|
||||||
|
|
||||||
timeout(visible
|
|
||||||
? IDLE_TIMEOUT_MS
|
|
||||||
: HIDDEN_IDLE_TIMEOUT_MS);
|
|
||||||
|
|
||||||
if (this->state.input) {
|
if (this->state.input) {
|
||||||
/* if the focused window is an input, allow it to draw a cursor */
|
/* if the focused window is an input, allow it to draw a cursor */
|
||||||
@ -310,10 +289,7 @@ void App::ChangeLayout(ILayoutPtr newLayout) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this->state.input && this->state.focused) {
|
if (this->state.input && this->state.focused) {
|
||||||
/* the current input is about to lose focus. reset the timeout */
|
wtimeout(this->state.focused->GetContent(), IDLE_TIMEOUT_MS);
|
||||||
wtimeout(
|
|
||||||
this->state.focused->GetContent(),
|
|
||||||
isVisible() ? 0 : HIDDEN_IDLE_TIMEOUT_MS);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this->state.layout) {
|
if (this->state.layout) {
|
||||||
|
@ -10,7 +10,7 @@ android {
|
|||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "0.1"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user