From 7e2e36372a1a9821b672717ed2a4430e21e0fa69 Mon Sep 17 00:00:00 2001 From: bjakja Date: Sat, 8 Feb 2020 23:18:38 +0100 Subject: [PATCH] Added naming of AVX releases, fixed bad spectrum sizing after turn off karaoke --- Kainote.sln | 186 ++++++++++++++++++------------------ Kaiplayer/AudioBox.cpp | 9 +- Kaiplayer/AudioBox.h | 2 +- Kaiplayer/Kaiplayer.vcxproj | 4 +- Kaiplayer/config.cpp | 6 +- Kaiplayer/dshowplayer.cpp | 3 +- Kaiplayer/kainoteMain.cpp | 15 ++- 7 files changed, 118 insertions(+), 107 deletions(-) diff --git a/Kainote.sln b/Kainote.sln index af21e7896..5d7930c01 100644 --- a/Kainote.sln +++ b/Kainote.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KaiNote", "Kaiplayer\Kaiplayer.vcxproj", "{180DEA91-88AF-4FEB-8B82-7F3716E118BB}" ProjectSection(ProjectDependencies) = postProject @@ -662,10 +662,10 @@ Global {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX|Win32.Build.0 = Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX|x64.ActiveCfg = Release|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX|x64.Build.0 = Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Rel_AVX2|x64.Build.0 = Release|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release log|Win32.ActiveCfg = Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release log|Win32.Build.0 = Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release log|x64.ActiveCfg = Release|x64 @@ -730,10 +730,10 @@ Global {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX|Win32.Build.0 = Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX|x64.ActiveCfg = Release|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX|x64.Build.0 = Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Rel_AVX2|x64.Build.0 = Release|x64 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release log|Win32.ActiveCfg = Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release log|Win32.Build.0 = Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release log|x64.ActiveCfg = Release|x64 @@ -798,10 +798,10 @@ Global {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX|Win32.Build.0 = Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX|x64.ActiveCfg = Release|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX|x64.Build.0 = Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Rel_AVX2|x64.Build.0 = Release|x64 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release log|Win32.ActiveCfg = Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release log|Win32.Build.0 = Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release log|x64.ActiveCfg = Release|x64 @@ -866,10 +866,10 @@ Global {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX|Win32.Build.0 = Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX|x64.ActiveCfg = Release|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX|x64.Build.0 = Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Rel_AVX2|x64.Build.0 = Release|x64 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release log|Win32.ActiveCfg = Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release log|Win32.Build.0 = Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release log|x64.ActiveCfg = Release|x64 @@ -934,10 +934,10 @@ Global {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX|Win32.Build.0 = Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX|x64.ActiveCfg = Release|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX|x64.Build.0 = Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Rel_AVX2|x64.Build.0 = Release|x64 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release log|Win32.ActiveCfg = Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release log|Win32.Build.0 = Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release log|x64.ActiveCfg = Release|x64 @@ -1002,10 +1002,10 @@ Global {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX|Win32.Build.0 = Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX|x64.ActiveCfg = Release|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX|x64.Build.0 = Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Rel_AVX2|x64.Build.0 = Release|x64 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release log|Win32.ActiveCfg = Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release log|Win32.Build.0 = Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release log|x64.ActiveCfg = Release|x64 @@ -1070,10 +1070,10 @@ Global {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX|Win32.Build.0 = Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX|x64.ActiveCfg = Release|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX|x64.Build.0 = Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Rel_AVX2|x64.Build.0 = Release|x64 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release log|Win32.ActiveCfg = Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release log|Win32.Build.0 = Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release log|x64.ActiveCfg = Release|x64 @@ -1138,10 +1138,10 @@ Global {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX|Win32.Build.0 = Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX|x64.ActiveCfg = Release|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX|x64.Build.0 = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Rel_AVX2|x64.Build.0 = Release|x64 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release log|Win32.ActiveCfg = Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release log|Win32.Build.0 = Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release log|x64.ActiveCfg = Release|x64 @@ -1206,10 +1206,10 @@ Global {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX|Win32.Build.0 = Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX|x64.ActiveCfg = Release|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX|x64.Build.0 = Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Rel_AVX2|x64.Build.0 = Release|x64 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release log|Win32.ActiveCfg = Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release log|Win32.Build.0 = Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release log|x64.ActiveCfg = Release|x64 @@ -1274,10 +1274,10 @@ Global {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX|Win32.Build.0 = Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX|x64.ActiveCfg = Release|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX|x64.Build.0 = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Rel_AVX2|x64.Build.0 = Release|x64 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release log|Win32.ActiveCfg = Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release log|Win32.Build.0 = Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release log|x64.ActiveCfg = Release|x64 @@ -1342,10 +1342,10 @@ Global {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX|Win32.Build.0 = Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX|x64.ActiveCfg = Release|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX|x64.Build.0 = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Rel_AVX2|x64.Build.0 = Release|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release log|Win32.ActiveCfg = Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release log|Win32.Build.0 = Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release log|x64.ActiveCfg = Release|x64 @@ -1410,10 +1410,10 @@ Global {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX|Win32.Build.0 = Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX|x64.ActiveCfg = Release|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX|x64.Build.0 = Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Rel_AVX2|x64.Build.0 = Release|x64 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release log|Win32.ActiveCfg = Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release log|Win32.Build.0 = Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release log|x64.ActiveCfg = Release|x64 @@ -1478,10 +1478,10 @@ Global {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX|Win32.Build.0 = Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX|x64.ActiveCfg = Release|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX|x64.Build.0 = Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Rel_AVX2|x64.Build.0 = Release|x64 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release log|Win32.ActiveCfg = Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release log|Win32.Build.0 = Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release log|x64.ActiveCfg = Release|x64 @@ -1546,10 +1546,10 @@ Global {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX|Win32.Build.0 = Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX|x64.ActiveCfg = Release|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX|x64.Build.0 = Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Rel_AVX2|x64.Build.0 = Release|x64 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release log|Win32.ActiveCfg = Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release log|Win32.Build.0 = Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release log|x64.ActiveCfg = Release|x64 @@ -1614,10 +1614,10 @@ Global {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX|Win32.Build.0 = Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX|x64.ActiveCfg = Release|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX|x64.Build.0 = Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Rel_AVX2|x64.Build.0 = Release|x64 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release log|Win32.ActiveCfg = Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release log|Win32.Build.0 = Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release log|x64.ActiveCfg = Release|x64 @@ -1682,10 +1682,10 @@ Global {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX|Win32.Build.0 = Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX|x64.ActiveCfg = Release|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX|x64.Build.0 = Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Rel_AVX2|x64.Build.0 = Release|x64 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release log|Win32.ActiveCfg = Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release log|Win32.Build.0 = Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release log|x64.ActiveCfg = Release|x64 @@ -1750,10 +1750,10 @@ Global {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX|Win32.Build.0 = Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX|x64.ActiveCfg = Release|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX|x64.Build.0 = Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Rel_AVX2|x64.Build.0 = Release|x64 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release log|Win32.ActiveCfg = Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release log|Win32.Build.0 = Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release log|x64.ActiveCfg = Release|x64 @@ -1818,10 +1818,10 @@ Global {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX|Win32.Build.0 = Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX|x64.ActiveCfg = Release|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX|x64.Build.0 = Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Rel_AVX2|x64.Build.0 = Release|x64 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release log|Win32.ActiveCfg = Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release log|Win32.Build.0 = Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release log|x64.ActiveCfg = Release|x64 @@ -1886,10 +1886,10 @@ Global {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX|Win32.Build.0 = Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX|x64.ActiveCfg = Release|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX|x64.Build.0 = Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Rel_AVX2|x64.Build.0 = Release|x64 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release log|Win32.ActiveCfg = Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release log|Win32.Build.0 = Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release log|x64.ActiveCfg = Release|x64 @@ -1954,10 +1954,10 @@ Global {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX|Win32.Build.0 = Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX|x64.ActiveCfg = Release|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX|x64.Build.0 = Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Rel_AVX2|x64.Build.0 = Release|x64 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release log|Win32.ActiveCfg = Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release log|Win32.Build.0 = Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release log|x64.ActiveCfg = Release|x64 @@ -2022,10 +2022,10 @@ Global {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX|Win32.Build.0 = Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX|x64.ActiveCfg = Release|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX|x64.Build.0 = Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Rel_AVX2|x64.Build.0 = Release|x64 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release log|Win32.ActiveCfg = Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release log|Win32.Build.0 = Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release log|x64.ActiveCfg = Release|x64 @@ -2090,10 +2090,10 @@ Global {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX|Win32.Build.0 = Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX|x64.ActiveCfg = Release|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX|x64.Build.0 = Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Rel_AVX2|x64.Build.0 = Release|x64 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release log|Win32.ActiveCfg = Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release log|Win32.Build.0 = Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release log|x64.ActiveCfg = Release|x64 @@ -2158,10 +2158,10 @@ Global {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX|Win32.Build.0 = Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX|x64.ActiveCfg = Release|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX|x64.Build.0 = Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|Win32.ActiveCfg = Rel_AVX2|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|Win32.Build.0 = Rel_AVX2|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|x64.ActiveCfg = Rel_AVX2|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|x64.Build.0 = Rel_AVX2|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|Win32.ActiveCfg = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|Win32.Build.0 = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|x64.ActiveCfg = Release|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Rel_AVX2|x64.Build.0 = Release|x64 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release log|Win32.ActiveCfg = Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release log|Win32.Build.0 = Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release log|x64.ActiveCfg = Release|x64 diff --git a/Kaiplayer/AudioBox.cpp b/Kaiplayer/AudioBox.cpp index a1887312c..b87b57356 100644 --- a/Kaiplayer/AudioBox.cpp +++ b/Kaiplayer/AudioBox.cpp @@ -472,13 +472,16 @@ void AudioBox::OnKaraoke(wxCommandEvent &event) { audioDisplay->hasKara = !audioDisplay->hasKara; int value = -1; if (audioDisplay->hasKara){ - lastVerticalZoom = HorizontalZoom->GetValue(); + lastHorizontalZoom = HorizontalZoom->GetValue(); if (!audioDisplay->karaoke){ audioDisplay->karaoke = new Karaoke(audioDisplay); } audioDisplay->karaoke->Split(); - value = MAX(lastVerticalZoom - 20, 30); + value = MAX(lastHorizontalZoom - 20, 30); } else{ - value = lastVerticalZoom; + if (lastHorizontalZoom > -1) + value = lastHorizontalZoom; + else + value = MIN(HorizontalZoom->GetValue() + 20, 70); } if (value > -1){ audioDisplay->SetSamplesPercent(value); diff --git a/Kaiplayer/AudioBox.h b/Kaiplayer/AudioBox.h index 579181b72..b5f494ac7 100644 --- a/Kaiplayer/AudioBox.h +++ b/Kaiplayer/AudioBox.h @@ -115,7 +115,7 @@ class AudioBox : public wxPanel { bool holding; bool arrows; int oldy; - unsigned char lastVerticalZoom = -1; + char lastHorizontalZoom = -1; public: AudioDisplay *audioDisplay; diff --git a/Kaiplayer/Kaiplayer.vcxproj b/Kaiplayer/Kaiplayer.vcxproj index fbe2e75f7..f6e40751b 100644 --- a/Kaiplayer/Kaiplayer.vcxproj +++ b/Kaiplayer/Kaiplayer.vcxproj @@ -416,7 +416,7 @@ git rev-parse --abbrev-ref HEAD >> gitparams.h MaxSpeed true c:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Include;..\Thirdparty\BaseClasses;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include;..\Thirdparty\Hunspell\src\hunspell;..\Thirdparty\wxWidgets\include;..\Thirdparty\wxWidgets\lib\vc_lib\mswu;..\Thirdparty\zlib-1.2.8;..\Thirdparty\freetype-2.6\include;..\Thirdparty\luajit\include;..\Thirdparty\luabins\include;..\Thirdparty\icu\source\common;..\Thirdparty\icu\source\i18n;..\Thirdparty\boost_1_61_0;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;__WXMSW__;__WXDEBUG__;_MBCS;HUNSPELL_STATIC;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;__WXMSW__;__WXDEBUG__;_MBCS;HUNSPELL_STATIC;INSTRUCTIONS="AVX2";%(PreprocessorDefinitions) MultiThreadedDLL true Level3 @@ -458,7 +458,7 @@ git rev-parse --abbrev-ref HEAD >> gitparams.h MaxSpeed true c:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Include;..\Thirdparty\BaseClasses;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include;..\Thirdparty\Hunspell\src\hunspell;..\Thirdparty\wxWidgets\include;..\Thirdparty\wxWidgets\lib\vc_lib\mswu;..\Thirdparty\zlib-1.2.8;..\Thirdparty\freetype-2.6\include;..\Thirdparty\luajit\include;..\Thirdparty\luabins\include;..\Thirdparty\icu\source\common;..\Thirdparty\icu\source\i18n;..\Thirdparty\boost_1_61_0;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;__WXMSW__;__WXDEBUG__;_MBCS;HUNSPELL_STATIC;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;__WXMSW__;__WXDEBUG__;_MBCS;HUNSPELL_STATIC;INSTRUCTIONS="AVX";%(PreprocessorDefinitions) MultiThreadedDLL true Level3 diff --git a/Kaiplayer/config.cpp b/Kaiplayer/config.cpp index 77d826a7a..28e1619ca 100644 --- a/Kaiplayer/config.cpp +++ b/Kaiplayer/config.cpp @@ -35,13 +35,15 @@ #define ADD_QUOTES_HELPER(s) #s #define ADD_QUOTES(s) ADD_QUOTES_HELPER(s) + + config::config() { wxString gitVersion; #ifdef GIT_CUR_COMMIT - gitVersion = " " + wxString(ADD_QUOTES(GIT_BRANCH)) + " " + wxString(ADD_QUOTES(GIT_CUR_COMMIT)).Left(7); + gitVersion = L" " + wxString(ADD_QUOTES(GIT_BRANCH)) + L" " + wxString(ADD_QUOTES(GIT_CUR_COMMIT)).Left(7); #endif - progname = _T("Kainote v") + wxString(VersionKainote) + gitVersion; + progname = L"Kainote v" + wxString(VersionKainote) + gitVersion; #if _DEBUG progname += " DEBUG"; #endif diff --git a/Kaiplayer/dshowplayer.cpp b/Kaiplayer/dshowplayer.cpp index d0dfb9021..2e906c186 100644 --- a/Kaiplayer/dshowplayer.cpp +++ b/Kaiplayer/dshowplayer.cpp @@ -243,7 +243,8 @@ bool DShowPlayer::OpenFile(wxString sFileName, bool vobsub) HR(strpin.obj->QueryPinInfo(&pinfo), _("Nie można pobrać informacji o pinie splittera")); if (FAILED(pinfo.pFilter->QueryInterface(IID_IAMStreamSelect, (void**)&stream))) { - KaiLog(_("Błąd interfejsu wyboru ścieżek")); + //No need to inform cause it will spam on avi/wmv + //KaiLog(_("Błąd interfejsu wyboru ścieżek")); } } hr = pSource->QueryInterface(IID_IAMExtendedSeeking, (void**)&chapters); diff --git a/Kaiplayer/kainoteMain.cpp b/Kaiplayer/kainoteMain.cpp index b8aa6312c..e695ab223 100644 --- a/Kaiplayer/kainoteMain.cpp +++ b/Kaiplayer/kainoteMain.cpp @@ -46,6 +46,10 @@ #define logging 5 #endif +#if !defined INSTRUCTIONS +#define INSTRUCTIONS L"" +#endif + void EnableCrashingOnCrashes() { typedef BOOL(WINAPI *tGetPolicy)(LPDWORD lpFlags); @@ -69,7 +73,7 @@ void EnableCrashingOnCrashes() } KainoteFrame::KainoteFrame(const wxPoint &pos, const wxSize &size) - : KaiFrame(0, -1, _("Bez nazwy - ") + Options.progname, pos, size, wxDEFAULT_FRAME_STYLE, "Kainote_main_window") + : KaiFrame(0, -1, _("Bez nazwy - ") + Options.progname + L" " + wxString(INSTRUCTIONS), pos, size, wxDEFAULT_FRAME_STYLE, "Kainote_main_window") , badResolution(false) , fc(NULL) { @@ -1397,11 +1401,12 @@ TabPanel* KainoteFrame::GetTab() return Tabs->GetPage(); } + void KainoteFrame::Label(int iter/*=0*/, bool video/*=false*/, int wtab/*=-1*/, bool onlyTabs /*= false*/) { TabPanel* atab = (wtab < 0) ? GetTab() : Tabs->Page(wtab); wxString whiter; - if (atab->Grid->IsModified()){ whiter << iter << "*"; } + if (atab->Grid->IsModified()){ whiter << iter << L"*"; } /*MEMORYSTATUSEX statex; statex.dwLength = sizeof (statex); @@ -1412,8 +1417,8 @@ void KainoteFrame::Label(int iter/*=0*/, bool video/*=false*/, int wtab/*=-1*/, wxString memtxt= wxString::Format(" RAM: %i KB / %i KB", totalmem-availmem, totalmem);*/ wxString name = (video) ? atab->VideoName : whiter + atab->SubsName; if (!onlyTabs) - SetLabel(name + " - " + Options.progname /*+ memtxt*/); - if (name.Len()>35){ name = name.SubString(0, 35) + "..."; } + SetLabel(name + L" - " + Options.progname + L" " + wxString(INSTRUCTIONS)); + if (name.Len()>35){ name = name.SubString(0, 35) + L"..."; } Tabs->SetPageText((wtab < 0) ? Tabs->GetSelection() : wtab, name); } @@ -1604,7 +1609,7 @@ void KainoteFrame::OnPageChanged(wxCommandEvent& event) whiter << iter << "*"; } wxString name = (!cur->editor) ? cur->VideoName : cur->SubsName; - SetLabel(whiter + name + " - " + Options.progname); + SetLabel(whiter + name + " - " + Options.progname + L" " + wxString(INSTRUCTIONS)); if (cur->Video->GetState() != None){ SetStatusText(getfloat(cur->Video->fps) + " FPS", 4); wxString tar;