Merge branch 'develop'

xjbeta · May 5, 2023 · 3455af1 · 3455af1
2 parents 367505f + 69b8d68
commit 3455af1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/Info.json b/Info.json
@@ -1,7 +1,7 @@
 {
     "name": "Danmaku",
     "identifier": "com.xjbeta.danmaku",
-    "version": "0.1.0",
+    "version": "0.1.5",
     "ghVersion": 2,
     "ghRepo": "xjbeta/iina-plugin-danmaku",
     "description": "IINA Danmaku",
@@ -11,6 +11,7 @@
         "url": "https://github.com/xjbeta"
     },
     "entry": "main.js",
+    "globalEntry": "global.js",
     "permissions": [
         "show-osd",
         "menu-items",
@@ -22,8 +23,9 @@
     "allowedDomains": ["127.0.0.1"],
     "preferencesPage": "pref.html",
     "preferenceDefaults": {
-        "keyNum": 10,
-        "keyString": "hello",
-        "keyBool": true
+        "dmOpacity": 1,
+        "dmSpeed": 680,
+        "dmFont": "PingFang SC",
+        "enableIINAPLUSOptsParse": 0
     }
 }
diff --git a/global.js b/global.js
diff --git a/main.js b/main.js
@@ -15,13 +15,6 @@ var danmakuWebInited = false;
 
 var stopped = true;
 
-let defaultPreferences = {
-    dmOpacity: 1,
-    dmSpeed: 680,
-    dmFont: 'PingFang SC',
-    enableIINAPLUSOptsParse: 0
-};
-
 function print(str) {
     console.log('[' + instanceID + '] ' + str);
 };
@@ -219,9 +212,9 @@ function initDanmakuWeb() {
             return;
     };
 
-    iinaPlusOpts.dmOpacity = iina.preferences.get('dmOpacity') ?? defaultPreferences.dmOpacity;
-    iinaPlusOpts.dmSpeed = iina.preferences.get('dmSpeed') ?? defaultPreferences.dmSpeed;
-    iinaPlusOpts.dmFont = iina.preferences.get('dmFont') ?? defaultPreferences.dmFont;
+    iinaPlusOpts.dmOpacity = iina.preferences.get('dmOpacity');
+    iinaPlusOpts.dmSpeed = iina.preferences.get('dmSpeed');
+    iinaPlusOpts.dmFont = iina.preferences.get('dmFont');
 
     var blockList = [];
     if ((iina.preferences.get('blockTypeScroll') ?? 0) == 1) {
@@ -276,13 +269,14 @@ iina.event.on("iina.pip.changed", (pip) => {
 iina.event.on("iina.file-started", () => {
     print('iina.file-started');
     stopped = false;
-    let e = iina.preferences.get('enableIINAPLUSOptsParse') ?? defaultPreferences.enableIINAPLUSOptsParse;
-    if (e == 0) {
-        print('Ignore IINA+ Opts Parse')
-        initMenuItems();
+    let e = iina.preferences.get('enableIINAPLUSOptsParse');
+
+    if (e != 0 && mpv.getString('path') == "-") {
+        parseOpts();
         return;
     }
-    parseOpts();
+    print('Ignore IINA+ Opts Parse')
+    initMenuItems();
 });
 
 iina.event.on("mpv.pause.changed", (isPaused) => {