mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-03 23:14:13 +00:00 
			
		
		
		
	merge: fix: load libopenmpt on demand (!469)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/469 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <marie@kaifa.ch>
This commit is contained in:
		
						commit
						0690b9a429
					
				
					 8 changed files with 90 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -43,7 +43,6 @@ html
 | 
			
		|||
		link(rel='stylesheet' href='/assets/phosphor-icons/bold/style.css')
 | 
			
		||||
		link(rel='stylesheet' href='/static-assets/fonts/sharkey-icons/style.css')
 | 
			
		||||
		link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
 | 
			
		||||
		script(src='/client-assets/libopenmpt.js')
 | 
			
		||||
 | 
			
		||||
		if !config.clientManifestExists
 | 
			
		||||
				script(type="module" src="/vite/@vite/client")
 | 
			
		||||
| 
						 | 
				
			
			@ -73,7 +72,6 @@ html
 | 
			
		|||
		script.
 | 
			
		||||
			var VERSION = "#{version}";
 | 
			
		||||
			var CLIENT_ENTRY = "#{clientEntry.file}";
 | 
			
		||||
			window.libopenmpt = window.Module;
 | 
			
		||||
 | 
			
		||||
		script(type='application/json' id='misskey_meta' data-generated-at=now)
 | 
			
		||||
			!= metaJson
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
				
			
			@ -1,9 +1,12 @@
 | 
			
		|||
/* global libopenmpt UTF8ToString writeAsciiToMemory */
 | 
			
		||||
// @ts-nocheck
 | 
			
		||||
/* eslint-disable */
 | 
			
		||||
 | 
			
		||||
const ChiptuneAudioContext = window.AudioContext || window.webkitAudioContext;
 | 
			
		||||
 | 
			
		||||
export function ChiptuneJsConfig (repeatCount: number, context: AudioContext) {
 | 
			
		||||
let libopenmpt
 | 
			
		||||
let libopenmptLoadPromise
 | 
			
		||||
 | 
			
		||||
export function ChiptuneJsConfig (repeatCount?: number, context?: AudioContext) {
 | 
			
		||||
	this.repeatCount = repeatCount;
 | 
			
		||||
	this.context = context;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -20,6 +23,28 @@ export function ChiptuneJsPlayer (config: object) {
 | 
			
		|||
	this.volume = 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ChiptuneJsPlayer.prototype.initialize = function() {
 | 
			
		||||
	if (libopenmptLoadPromise) return libopenmptLoadPromise;
 | 
			
		||||
	if (libopenmpt) return Promise.resolve();
 | 
			
		||||
 | 
			
		||||
	libopenmptLoadPromise = new Promise(async (resolve, reject) => {
 | 
			
		||||
		try {
 | 
			
		||||
			const { Module } = await import('./libopenmpt/libopenmpt.js');
 | 
			
		||||
			await new Promise((resolve) => {
 | 
			
		||||
				Module['onRuntimeInitialized'] = resolve;
 | 
			
		||||
			})
 | 
			
		||||
			libopenmpt = Module;
 | 
			
		||||
			resolve()
 | 
			
		||||
		} catch (e) {
 | 
			
		||||
			reject(e)
 | 
			
		||||
		} finally {
 | 
			
		||||
			libopenmptLoadPromise = undefined;
 | 
			
		||||
		}
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	return libopenmptLoadPromise;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ChiptuneJsPlayer.prototype.constructor = ChiptuneJsPlayer;
 | 
			
		||||
 | 
			
		||||
ChiptuneJsPlayer.prototype.fireEvent = function (eventName: string, response) {
 | 
			
		||||
| 
						 | 
				
			
			@ -61,12 +86,12 @@ ChiptuneJsPlayer.prototype.seek = function (position: number) {
 | 
			
		|||
 | 
			
		||||
ChiptuneJsPlayer.prototype.metadata = function () {
 | 
			
		||||
	const data = {};
 | 
			
		||||
	const keys = UTF8ToString(libopenmpt._openmpt_module_get_metadata_keys(this.currentPlayingNode.modulePtr)).split(';');
 | 
			
		||||
	const keys = libopenmpt.UTF8ToString(libopenmpt._openmpt_module_get_metadata_keys(this.currentPlayingNode.modulePtr)).split(';');
 | 
			
		||||
	let keyNameBuffer = 0;
 | 
			
		||||
	for (const key of keys) {
 | 
			
		||||
		keyNameBuffer = libopenmpt._malloc(key.length + 1);
 | 
			
		||||
		writeAsciiToMemory(key, keyNameBuffer);
 | 
			
		||||
		data[key] = UTF8ToString(libopenmpt._openmpt_module_get_metadata(this.currentPlayingNode.modulePtr, keyNameBuffer));
 | 
			
		||||
		libopenmpt.writeAsciiToMemory(key, keyNameBuffer);
 | 
			
		||||
		data[key] = libopenmpt.UTF8ToString(libopenmpt._openmpt_module_get_metadata(this.currentPlayingNode.modulePtr, keyNameBuffer));
 | 
			
		||||
		libopenmpt._free(keyNameBuffer);
 | 
			
		||||
	}
 | 
			
		||||
	return data;
 | 
			
		||||
| 
						 | 
				
			
			@ -84,7 +109,7 @@ ChiptuneJsPlayer.prototype.unlock = function () {
 | 
			
		|||
};
 | 
			
		||||
 | 
			
		||||
ChiptuneJsPlayer.prototype.load = function (input) {
 | 
			
		||||
	return new Promise((resolve, reject) => {
 | 
			
		||||
	return this.initialize().then(() => new Promise((resolve, reject) => {
 | 
			
		||||
		if(this.touchLocked) {
 | 
			
		||||
			this.unlock();
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			@ -106,7 +131,7 @@ ChiptuneJsPlayer.prototype.load = function (input) {
 | 
			
		|||
				reject(error);
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
	});
 | 
			
		||||
	}));
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
ChiptuneJsPlayer.prototype.play = function (buffer: ArrayBuffer) {
 | 
			
		||||
| 
						 | 
				
			
			@ -180,7 +205,7 @@ ChiptuneJsPlayer.prototype.getPatternNumRows = function (pattern: number) {
 | 
			
		|||
 | 
			
		||||
ChiptuneJsPlayer.prototype.getPatternRowChannel = function (pattern: number, row: number, channel: number) {
 | 
			
		||||
	if (this.currentPlayingNode && this.currentPlayingNode.modulePtr) {
 | 
			
		||||
		return UTF8ToString(libopenmpt._openmpt_module_format_pattern_row_channel(this.currentPlayingNode.modulePtr, pattern, row, channel, 0, true));
 | 
			
		||||
		return libopenmpt.UTF8ToString(libopenmpt._openmpt_module_format_pattern_row_channel(this.currentPlayingNode.modulePtr, pattern, row, channel, 0, true));
 | 
			
		||||
	}
 | 
			
		||||
	return '';
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										25
									
								
								packages/frontend/src/scripts/libopenmpt/LICENSE
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								packages/frontend/src/scripts/libopenmpt/LICENSE
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,25 @@
 | 
			
		|||
Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors
 | 
			
		||||
Copyright (c) 1997-2003, Olivier Lapicque
 | 
			
		||||
All rights reserved.
 | 
			
		||||
 | 
			
		||||
Redistribution and use in source and binary forms, with or without
 | 
			
		||||
modification, are permitted provided that the following conditions are met:
 | 
			
		||||
    * Redistributions of source code must retain the above copyright
 | 
			
		||||
      notice, this list of conditions and the following disclaimer.
 | 
			
		||||
    * Redistributions in binary form must reproduce the above copyright
 | 
			
		||||
      notice, this list of conditions and the following disclaimer in the
 | 
			
		||||
      documentation and/or other materials provided with the distribution.
 | 
			
		||||
    * Neither the name of the OpenMPT project nor the
 | 
			
		||||
      names of its contributors may be used to endorse or promote products
 | 
			
		||||
      derived from this software without specific prior written permission.
 | 
			
		||||
 | 
			
		||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 | 
			
		||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | 
			
		||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 | 
			
		||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
 | 
			
		||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | 
			
		||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 | 
			
		||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 | 
			
		||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 | 
			
		||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 | 
			
		||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | 
			
		||||
							
								
								
									
										8
									
								
								packages/frontend/src/scripts/libopenmpt/libopenmpt.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								packages/frontend/src/scripts/libopenmpt/libopenmpt.js
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										23
									
								
								packages/frontend/src/scripts/libopenmpt/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								packages/frontend/src/scripts/libopenmpt/readme.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,23 @@
 | 
			
		|||
modifications made to `libopenmpt.js` (can be taken from https://lib.openmpt.org/libopenmpt/download/):
 | 
			
		||||
 | 
			
		||||
at the beginning of the file:
 | 
			
		||||
```js
 | 
			
		||||
// @ts-nocheck
 | 
			
		||||
/* eslint-disable */
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
at the end of the file:
 | 
			
		||||
```js
 | 
			
		||||
Module.UTF8ToString = UTF8ToString;
 | 
			
		||||
Module.writeAsciiToMemory = writeAsciiToMemory;
 | 
			
		||||
export { Module }
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
replace
 | 
			
		||||
```
 | 
			
		||||
wasmBinaryFile="libopenmpt.wasm"
 | 
			
		||||
```
 | 
			
		||||
with
 | 
			
		||||
```
 | 
			
		||||
wasmBinaryFile=new URL("./libopenmpt.wasm", import.meta.url).href
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ import meta from '../../package.json';
 | 
			
		|||
import pluginUnwindCssModuleClassName from './lib/rollup-plugin-unwind-css-module-class-name.js';
 | 
			
		||||
import pluginJson5 from './vite.json5.js';
 | 
			
		||||
 | 
			
		||||
const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.json', '.json5', '.svg', '.sass', '.scss', '.css', '.vue'];
 | 
			
		||||
const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.json', '.json5', '.svg', '.sass', '.scss', '.css', '.vue', '.wasm'];
 | 
			
		||||
 | 
			
		||||
const hash = (str: string, seed = 0): number => {
 | 
			
		||||
	let h1 = 0xdeadbeef ^ seed,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue