Skip to content

Commit 44e6f15

Browse files
AlwinEschAlwinEsch
authored
Merge pull request #15 from AlwinEsch/Matrix-change
[Matrix] Add screenshots and fanart, change settings to new style and update nasm
2 parents f71117e + b9d4ecf commit 44e6f15

19 files changed

+245
-35
lines changed

‎depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From: Alwin Esch <[email protected]>
2+
Date: Thu, 19 Sep 2019 19:29:39 +0100
3+
Subject: [PATCH] Set EXTERNAL_DEPENDENCIES to 0, needed to prevent Perl
4+
5+
Perl not available on build system, but test without was OK.
6+
---
7+
Mkfiles/msvc.mak | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
11+
index 4112c7f..22da9c6 100644
12+
--- a/Mkfiles/msvc.mak
13+
+++ b/Mkfiles/msvc.mak
14+
@@ -364,7 +364,7 @@ everything: all docs nsis
15+
# Does this version of this file have external dependencies? This definition
16+
# will be automatically updated by mkdep.pl as needed.
17+
#
18+
-EXTERNAL_DEPENDENCIES = 1
19+
+EXTERNAL_DEPENDENCIES = 0
20+
21+
#
22+
# Generate dependency information for this Makefile only.
23+
--
24+
2.19.2.windows.1
25+

‎depends/windows/nasmw/CMakeLists.txt‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(nasmw)
33

4-
install(
5-
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
6-
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
7-
)
4+
include(ExternalProject)
5+
6+
externalproject_add(nasmw
7+
SOURCE_DIR ${PROJECT_SOURCE_DIR}
8+
BINARY_DIR ${PROJECT_SOURCE_DIR}
9+
INSTALL_DIR ${PROJECT_SOURCE_DIR}
10+
CONFIGURE_COMMAND ""
11+
BUILD_COMMAND nmake /f Mkfiles/msvc.mak
12+
INSTALL_COMMAND "")
13+
14+
install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
15+
RENAME nasmw.exe)

‎depends/windows/nasmw/nasmw.sha256‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
91b9f784b1286e3de73dabfdc7466c198b96fef7080e00710411119959935809
1+
b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc

‎depends/windows/nasmw/nasmw.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nasmw http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip
1+
nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz

‎depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From: Alwin Esch <[email protected]>
2+
Date: Thu, 19 Sep 2019 19:29:39 +0100
3+
Subject: [PATCH] Set EXTERNAL_DEPENDENCIES to 0, needed to prevent Perl
4+
5+
Perl not available on build system, but test without was OK.
6+
---
7+
Mkfiles/msvc.mak | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
11+
index 4112c7f..22da9c6 100644
12+
--- a/Mkfiles/msvc.mak
13+
+++ b/Mkfiles/msvc.mak
14+
@@ -364,7 +364,7 @@ everything: all docs nsis
15+
# Does this version of this file have external dependencies? This definition
16+
# will be automatically updated by mkdep.pl as needed.
17+
#
18+
-EXTERNAL_DEPENDENCIES = 1
19+
+EXTERNAL_DEPENDENCIES = 0
20+
21+
#
22+
# Generate dependency information for this Makefile only.
23+
--
24+
2.19.2.windows.1
25+

‎depends/windowsstore/nasmw/CMakeLists.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
cmake_minimum_required(VERSION 3.5)
2+
project(nasmw)
3+
4+
include(ExternalProject)
5+
6+
# Prevent this on UWP ARM build
7+
if(NOT CMAKE_GENERATOR MATCHES ARM)
8+
externalproject_add(nasmw
9+
SOURCE_DIR ${PROJECT_SOURCE_DIR}
10+
BINARY_DIR ${PROJECT_SOURCE_DIR}
11+
INSTALL_DIR ${PROJECT_SOURCE_DIR}
12+
CONFIGURE_COMMAND ""
13+
BUILD_COMMAND nmake /f Mkfiles/msvc.mak
14+
INSTALL_COMMAND "")
15+
else()
16+
externalproject_add(nasmw
17+
SOURCE_DIR ${PROJECT_SOURCE_DIR}
18+
BINARY_DIR ${PROJECT_SOURCE_DIR}
19+
INSTALL_DIR ${PROJECT_SOURCE_DIR}
20+
CONFIGURE_COMMAND ""
21+
BUILD_COMMAND cmake -E echo "NASM not used on UWP ARM"
22+
INSTALL_COMMAND "")
23+
endif()
24+
25+
install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
26+
RENAME nasmw.exe
27+
OPTIONAL)

‎depends/windowsstore/nasmw/nasmw.sha256‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc

‎depends/windowsstore/nasmw/nasmw.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz

‎src/MilkdropXBMC.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ ADDON_STATUS CVisualizationMilkdrop::Create()
148148
g_plugin->PluginPreInitialize(0, 0);
149149
}
150150

151-
g_plugin->m_fBlendTimeAuto = kodi::GetSettingFloat("Automatic Blend Time") + 1;
152-
g_plugin->m_fTimeBetweenPresets = kodi::GetSettingFloat("Time Between Presets") * 5 + 5;
153-
g_plugin->m_fTimeBetweenPresetsRand = kodi::GetSettingFloat("Additional Random Time") * 5 + 5;
151+
g_plugin->m_fBlendTimeAuto = kodi::GetSettingFloat("Automatic Blend Time");
152+
g_plugin->m_fTimeBetweenPresets = kodi::GetSettingFloat("Time Between Presets");
153+
g_plugin->m_fTimeBetweenPresetsRand = kodi::GetSettingFloat("Additional Random Time");
154154
g_plugin->m_bHardCutsDisabled = !kodi::GetSettingBoolean("Enable Hard Cuts");
155-
g_plugin->m_fHardCutLoudnessThresh = kodi::GetSettingFloat("Loudness Threshold For Hard Cuts") / 5.0f + 1.25f;
156-
g_plugin->m_fHardCutHalflife = kodi::GetSettingFloat("Average Time Between Hard Cuts") * 5 + 5;
157-
g_plugin->m_max_fps_fs = kodi::GetSettingFloat("Maximum Refresh Rate") * 5 + 20;
155+
g_plugin->m_fHardCutLoudnessThresh = kodi::GetSettingFloat("Loudness Threshold For Hard Cuts");
156+
g_plugin->m_fHardCutHalflife = kodi::GetSettingFloat("Average Time Between Hard Cuts");
157+
g_plugin->m_max_fps_fs = kodi::GetSettingFloat("Maximum Refresh Rate");
158158
g_plugin->m_bAlways3D = kodi::GetSettingBoolean("Enable Stereo 3d");
159159
lastLockedStatus = kodi::GetSettingBoolean("lastlockedstatus");
160160
lastPresetIndx = kodi::GetSettingInt("lastpresetidx");
@@ -311,19 +311,19 @@ ADDON_STATUS CVisualizationMilkdrop::SetSetting(const std::string& settingName,
311311
return ADDON_STATUS_UNKNOWN;
312312

313313
if (settingName == "Automatic Blend Time")
314-
g_plugin->m_fBlendTimeAuto = (float)(settingValue.GetInt() + 1);
314+
g_plugin->m_fBlendTimeAuto = settingValue.GetFloat();
315315
else if (settingName == "Time Between Presets")
316-
g_plugin->m_fTimeBetweenPresets = (float)(settingValue.GetInt() * 5 + 5);
316+
g_plugin->m_fTimeBetweenPresets = settingValue.GetFloat();
317317
else if (settingName == "Additional Random Time")
318-
g_plugin->m_fTimeBetweenPresetsRand = (float)(settingValue.GetInt() * 5 + 5);
318+
g_plugin->m_fTimeBetweenPresetsRand = settingValue.GetFloat();
319319
else if (settingName == "Enable Hard Cuts")
320320
g_plugin->m_bHardCutsDisabled = !settingValue.GetBoolean();
321321
else if (settingName == "Loudness Threshold For Hard Cuts")
322-
g_plugin->m_fHardCutLoudnessThresh = (float)(settingValue.GetInt() / 5.0f + 1.25f);
322+
g_plugin->m_fHardCutLoudnessThresh = settingValue.GetFloat();
323323
else if (settingName == "Average Time Between Hard Cuts")
324-
g_plugin->m_fHardCutHalflife = (float)settingValue.GetInt() * 5 + 5;
324+
g_plugin->m_fHardCutHalflife = settingValue.GetFloat();
325325
else if (settingName == "Maximum Refresh Rate")
326-
g_plugin->m_max_fps_fs = settingValue.GetInt() * 5 + 20;
326+
g_plugin->m_max_fps_fs = settingValue.GetInt();
327327
else if (settingName == "Enable Stereo 3d")
328328
g_plugin->m_bAlways3D = settingValue.GetBoolean();
329329
else if (settingName == "lastlockedstatus")

‎visualization.milkdrop/addon.xml.in‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<addon
33
id="visualization.milkdrop"
4-
version="2.1.0"
4+
version="2.1.1"
55
name="MilkDrop"
66
provider-name="Team Kodi">
77
<requires>@ADDON_DEPENDS@</requires>
@@ -113,5 +113,16 @@
113113
<description lang="zh_CN">MilkDrop 是来自于 Winamp 音乐播放器的可视化效果插件。在你听音乐时，MilkDrop 通过节拍检测触发的无数迷幻的效果，带你与声波一起飞翔，给你带来丰富的音乐和视觉旅程。</description>
114114
<description lang="zh_TW">MilkDrop是來自於Winamp音樂播放器的視覺效果插件。在您在聽音樂時，MilkDrop通過節奏偵測觸發的無數夢幻的效果，帶您穿越聆聽中的音樂饗宴，也給您帶來豐富的聲音和視覺效果的奇幻旅程。</description>
115115
<platform>@PLATFORM@</platform>
116+
<assets>
117+
<icon>resources/icon.png</icon>
118+
<fanart>resources/fanart.jpg</fanart>
119+
<screenshot>resources/screenshot-01.jpg</screenshot>
120+
<screenshot>resources/fanart.jpg</screenshot>
121+
<screenshot>resources/screenshot-02.jpg</screenshot>
122+
<screenshot>resources/screenshot-03.jpg</screenshot>
123+
<screenshot>resources/screenshot-04.jpg</screenshot>
124+
<screenshot>resources/screenshot-05.jpg</screenshot>
125+
<screenshot>resources/screenshot-06.jpg</screenshot>
126+
</assets>
116127
</extension>
117128
</addon>

0 commit comments

Comments
 (0)