Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13 from kaias1jp/nowplaying-node-linux-disabled

Browse Source 
Nowplaying node linux disabled
This commit is contained in:
Cutls 2019-01-29 00:56:05 +09:00 committed by GitHub
commit 7da4cd53d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/main.js
View File

@ -12,7 +12,10 @@ const fm = require('font-manager');
const Menu=electron.Menu const Menu=electron.Menu
var updatewin=null; var updatewin=null;
const join = require('path').join; const join = require('path').join;
// linuxの時は定義しない
if (process.platform!='linux') {
const {NowPlaying,PlayerName} = require("nowplaying-node"); const {NowPlaying,PlayerName} = require("nowplaying-node");
}
// アプリケーションをコントロールするモジュール // アプリケーションをコントロールするモジュール
const app = electron.app; const app = electron.app;
// ウィンドウを作成するモジュール // ウィンドウを作成するモジュール

8
app/package.json
View File

@ -34,14 +34,15 @@
], ],
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"electron": "^3.0.10",
"electron-dl": "^1.11.0", "electron-dl": "^1.11.0",
"font-manager": "^0.3.0", "font-manager": "^0.3.0",
"jimp": "^0.2.28", "jimp": "^0.2.28",
"node-notifier": "^5.2.1", "node-notifier": "^5.2.1",
"nowplaying-node": "^0.1.3",
"sumchecker": "^2.0.2" "sumchecker": "^2.0.2"
}, },
"optionalDependencies": { "optionalDependencies": {
"nowplaying-node": "^0.1.3",
"itunes-nowplaying-mac": "^0.2.3" "itunes-nowplaying-mac": "^0.2.3"
}, },
"build": { "build": {
@ -78,7 +79,8 @@
"electronVersion": "3.0.10" "electronVersion": "3.0.10"
}, },
"devDependencies": { "devDependencies": {
"electron-rebuild": "^1.8.2", "electron-packager": "^13.0.1",
"electron-prebuilt": "^1.4.13" "electron-prebuilt": "^1.4.13",
"electron-rebuild": "^1.8.2"
} }
} }