diff --git a/.gitignore b/.gitignore index 08e8372..ade19f9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ Playback-win32.zip Playback.app Playback.app.zip .DS_Store +debug.log diff --git a/app.js b/app.js index 22e422d..d8e708f 100755 --- a/app.js +++ b/app.js @@ -1,14 +1,10 @@ #!/usr/bin/env electron -var app = require('app') -var BrowserWindow = require('browser-window') -var path = require('path') -var ipc = require('electron').ipcMain -var dialog = require('dialog') -var shell = require('shell') -var powerSaveBlocker = require('electron').powerSaveBlocker -var globalShortcut = require('electron').globalShortcut +const + path = require('path'), + { app, BrowserWindow, dialog, ipcMain, powerSaveBlocker, globalShortcut, shell } = require('electron'); +var ipc = ipcMain var win var link var ready = false @@ -27,14 +23,13 @@ var onopen = function (e, lnk) { app.on('open-file', onopen) app.on('open-url', onopen) -var frame = process.platform === 'win32' - app.on('ready', function () { + win = new BrowserWindow({ title: 'playback', width: 860, height: 470, - frame: frame, + frame: false, show: false, transparent: true }) diff --git a/index.js b/index.js index 6a0c078..888743c 100644 --- a/index.js +++ b/index.js @@ -1,12 +1,11 @@ +const {remote, ipcRenderer} = require('electron'); +const {Menu, MenuItem, clipboard} = remote; var request = require('request') var drop = require('drag-and-drop-files') var mdns = require('multicast-dns')() var concat = require('concat-stream') var vtt = require('srt-to-vtt') -var ipc = require('electron').ipcRenderer -var remote = require('remote') -var Menu = remote.require('menu') -var MenuItem = remote.require('menu-item') +var ipc = ipcRenderer var http = require('http') var rangeParser = require('range-parser') var pump = require('pump') @@ -18,7 +17,6 @@ var network = require('network-address') var chromecasts = require('chromecasts')() var $ = require('dombo') var titlebar = require('titlebar')() -var clipboard = require('clipboard') var player = require('./player') var playlist = require('./playlist') var mouseidle = require('./mouseidle') @@ -54,9 +52,7 @@ $(document).on('paste', function (e) { var media = player($('#player')[0]) var list = playlist() -if (process.platform !== 'win32') { - titlebar.appendTo('#titlebar') -} +titlebar.appendTo('#titlebar') drop($('body')[0], function (files) { for (var i = 0; i < files.length; i++) { diff --git a/package.json b/package.json index b84fd06..ed133c5 100644 --- a/package.json +++ b/package.json @@ -26,19 +26,19 @@ "ytdl-core": "^0.5.1" }, "devDependencies": { - "electron-packager": "^5.1.1", - "electron-prebuilt": "0.35.4" + "electron-packager": "^8.4.0", + "electron-prebuilt": "1.4.12" }, "bin": { "playback": "./app.js" }, "scripts": { - "rebuild": "npm rebuild --runtime=electron --target=0.35.4 --disturl=https://atom.io/download/atom-shell", + "rebuild": "npm rebuild --runtime=electron --target=1.4.12 --disturl=https://atom.io/download/atom-shell", "start": "electron app.js", "dev": "electron app.js test.mp4", - "mac-bundle": "electron-packager . Playback --platform=darwin --arch=x64 --version=0.35.4 --ignore=node_modules/electron-prebuilt && cp info.plist Playback-darwin-x64/Playback.app/Contents/Info.plist && cp icon.icns Playback-darwin-x64/Playback.app/Contents/Resources/atom.icns", - "win-bundle": "electron-packager . Playback --platform=win32 --arch=ia32 --version=0.35.4 --icon=icon.ico", - "linux-64-bundle": "electron-packager . Playback --platform=linux --arch=x64 --version=0.35.4 ignore='node_modules/(electron-packager|electron-prebuilt)'" + "mac-bundle": "electron-packager . Playback --platform=darwin --arch=x64 --version=1.4.12 --ignore=node_modules/electron-prebuilt && cp info.plist Playback-darwin-x64/Playback.app/Contents/Info.plist && cp icon.icns Playback-darwin-x64/Playback.app/Contents/Resources/atom.icns", + "win-bundle": "electron-packager . Playback --platform=win32 --arch=ia32 --version=1.4.12 --icon=icon.ico", + "linux-64-bundle": "electron-packager . Playback --platform=linux --arch=x64 --version=1.4.12 ignore='node_modules/(electron-packager|electron-prebuilt)'" }, "repository": { "type": "git",