From bd2583de91b36c69b115cc9e0938352bc8d5d7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Gr=C3=A4f?= <aggraef@gmail.com>
Date: Sat, 4 Feb 2017 03:37:04 +0100
Subject: [PATCH] Get rid of the gui_dir variable which is now obsolete.
---
pd/nw/index.js | 10 +---------
pd/nw/pdgui.js | 10 ----------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/pd/nw/index.js b/pd/nw/index.js
index d17d6ba2f..fa929b0ff 100644
--- a/pd/nw/index.js
+++ b/pd/nw/index.js
@@ -25,30 +25,22 @@ function have_args() {
}
function set_vars(win) {
- var port_no, gui_dir, font_engine_sanity, pd_engine_id;
+ var port_no, font_engine_sanity, pd_engine_id;
// If the GUI was started by Pd, our port number is going to be
// the first argument. If the GUI is supposed to start Pd, we won't
// have any arguments and need to set it here.
if (have_args() && gui.App.argv.length > 1) {
port_no = gui.App.argv[0]; // fed to us by the Pd process
- // looks like this is the same as pwd below
- gui_dir = gui.App.argv[3];
// address unique to the pd_engine
pd_engine_id = gui.App.argv[4];
} else {
// If we're starting Pd, this is the first port number to try. (We'll
// increment it if that port happens to be taken.
port_no = 5400;
- // This is confusing and needs to be rethought. OSX app bundle needs
- // the gui_dir to be "bin", but the actual gui files reside in
- // "bin/../" because of the structure of the nw.js app bundle we use.
- // Anyway, this seems to get all the "doc" links to be found...
- gui_dir = process.platform === "darwin" ? "bin" : pwd;
}
pdgui.set_port(port_no);
pdgui.set_pd_engine_id(pd_engine_id);
pdgui.set_pwd(pwd);
- pdgui.set_gui_dir(gui_dir);
pdgui.set_pd_window(win);
font_engine_sanity = pdgui.set_font_engine_sanity(win);
pdgui.set_app_quitfn(app_quit);
diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js
index 6e340c9ef..442dfcf43 100644
--- a/pd/nw/pdgui.js
+++ b/pd/nw/pdgui.js
@@ -1,7 +1,6 @@
"use strict";
var pwd;
-var gui_dir;
var lib_dir;
var pd_engine_id;
@@ -27,15 +26,6 @@ exports.set_pd_engine_id = function (id) {
exports.defunkify_windows_path = defunkify_windows_path;
-exports.set_gui_dir = function(dir_string) {
- gui_dir = path.normalize(path.join(dir_string, ".."));
- gui_dir = defunkify_windows_path(gui_dir);
-}
-
-exports.get_gui_dir = function() {
- return gui_dir;
-}
-
function gui_set_lib_dir(dir) {
lib_dir = dir;
}
--
GitLab