Commit 76e6b34f authored by 神楽坂玲奈's avatar 神楽坂玲奈

np2

parent 5147ecfd
...@@ -138,9 +138,10 @@ export class AppsService { ...@@ -138,9 +138,10 @@ export class AppsService {
} }
let execute = path.join(cwd, action.execute); let execute = path.join(cwd, action.execute);
if (action.open) { if (action.open) {
let np2 = <App>action.open;
let openAction: Action; let openAction: Action;
openAction = <Action>action.open.actions.get('main'); openAction = <Action>np2.actions.get('main');
let openPath = (<AppLocal>action.open.local).path; let openPath = (<AppLocal>np2.local).path;
if (action.open.id == 'np2fmgen') { if (action.open.id == 'np2fmgen') {
const config_file = path.join((<AppLocal>(<App>action.open).local).path, 'np21nt.ini'); const config_file = path.join((<AppLocal>(<App>action.open).local).path, 'np21nt.ini');
let config = await new Promise((resolve, reject) => { let config = await new Promise((resolve, reject) => {
...@@ -150,12 +151,12 @@ export class AppsService { ...@@ -150,12 +151,12 @@ export class AppsService {
}); });
}); });
const default_config = { const default_config = {
clk_mult: '32', clk_mult: '48',
DIPswtch: '3e f3 7b', DIPswtch: '3e f3 7b',
SampleHz: '44100', SampleHz: '44100',
Latencys: '100', Latencys: '100',
MIX_TYPE: 'true', MIX_TYPE: 'true',
windtype: '1' windtype: '0'
}; };
config['NekoProject21'] = Object.assign({}, default_config, config['NekoProject21']); config['NekoProject21'] = Object.assign({}, default_config, config['NekoProject21']);
config['NekoProject21']['HDD1FILE'] = path.win32.join((process.platform == 'win32' ? '' : 'Z:'), (<AppLocal>app.local).path, action.execute); config['NekoProject21']['HDD1FILE'] = path.win32.join((process.platform == 'win32' ? '' : 'Z:'), (<AppLocal>app.local).path, action.execute);
...@@ -173,11 +174,13 @@ export class AppsService { ...@@ -173,11 +174,13 @@ export class AppsService {
let wine = <App>openAction.open; let wine = <App>openAction.open;
openPath = (<AppLocal>wine.local).path; openPath = (<AppLocal>wine.local).path;
openAction = <Action>(<App>openAction.open).actions.get("main"); openAction = <Action>(<App>openAction.open).actions.get("main");
cwd = (<AppLocal>np2.local).path;
} }
args = args.concat(openAction.args); args = args.concat(openAction.args);
args.push(action.execute); args.push(action.execute);
execute = path.join(openPath, openAction.execute); execute = path.join(openPath, openAction.execute);
env = Object.assign(env, openAction.env); env = Object.assign(env, openAction.env);
} }
args = args.concat(action.args); args = args.concat(action.args);
env = Object.assign(env, action.env); env = Object.assign(env, action.env);
......
...@@ -2029,7 +2029,7 @@ ...@@ -2029,7 +2029,7 @@
{ {
"id": "np2fmgen", "id": "np2fmgen",
"name": { "name": {
"zh-CN": "np2fmgen" "zh-CN": "Neko Project II"
}, },
"dependencies": { "dependencies": {
"win32": [], "win32": [],
...@@ -2078,7 +2078,6 @@ ...@@ -2078,7 +2078,6 @@
"category": "emulator", "category": "emulator",
"actions": { "actions": {
"win32": { "win32": {
}, },
"darwin": { "darwin": {
"main": { "main": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment