mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 13:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Removed some win32-specific code from App.cpp that was causing the

Browse Source 
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:
casey langen 2017-02-14 23:06:45 -08:00
parent e8dd776b3f
commit d25d07893c
9 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/contrib/directsoundout/directsoundout.vcxproj
View File

@ -101,7 +101,6 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>false</GenerateDebugInformation>
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>

1
src/contrib/nullout/nullout.vcxproj
View File

@ -101,7 +101,6 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>false</GenerateDebugInformation>
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>

1
src/contrib/wasapiout/wasapiout.vcxproj
View File

@ -101,7 +101,6 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>false</GenerateDebugInformation>
<FullProgramDatabaseFile>false</FullProgramDatabaseFile>

1
src/contrib/waveout/waveout.vcxproj
View File

@ -101,7 +101,6 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>false</GenerateDebugInformation>
</Link>

2
src/contrib/websocket_remote/websocket_remote.vcxproj
View File

@ -71,6 +71,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)\bin\$(Configuration)\plugins\</OutDir>
<IntDir>.\obj\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\bin\$(Configuration)\plugins\</OutDir>
@ -122,7 +123,6 @@
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>

1
src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj
View File

@ -101,7 +101,6 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>false</GenerateDebugInformation>
</Link>

2
src/musikbox/app/util/Version.h
View File

@ -1,3 +1,3 @@
#pragma once
#define VERSION "0.8.0"
#define VERSION "0.9.0"

28
src/musikbox/cursespp/App.cpp
View File

@ -52,8 +52,6 @@
#include <csignal>
#endif
#define HIDDEN_IDLE_TIMEOUT_MS 500
using namespace cursespp;
using namespace std::chrono;
@ -61,21 +59,6 @@ static OverlayStack overlays;
static bool disconnected = false;
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
static void hangupHandler(int signal) {
disconnected = true;
@ -180,11 +163,7 @@ void App::Run(ILayoutPtr layout) {
this->ChangeLayout(layout);
while (!quit && !disconnected) {
visible = isVisible();
timeout(visible
? IDLE_TIMEOUT_MS
: HIDDEN_IDLE_TIMEOUT_MS);
timeout(IDLE_TIMEOUT_MS);
if (this->state.input) {
/* 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) {
/* the current input is about to lose focus. reset the timeout */
wtimeout(
this->state.focused->GetContent(),
isVisible() ? 0 : HIDDEN_IDLE_TIMEOUT_MS);
wtimeout(this->state.focused->GetContent(), IDLE_TIMEOUT_MS);
}
if (this->state.layout) {

2
src/musikdroid/app/build.gradle
View File

@ -10,7 +10,7 @@ android {
minSdkVersion 16
targetSdkVersion 25
versionCode 1
versionName "1.0"
versionName "0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}