1.5.1-beta.2 (#2259)

* Fixed freeze on startup if song number was not a string value
- Fixed show not loading in output if presented before loaded

* Fixed stage editor freezing with some old items

* Partial implmentation of AmazingLife.  Fixed truncted media names.

* Fixed stage editor freezing with some old items

* Fixed project media import not always working cross platform
- Shorter slide notes preview
- Fixed text edit freeze when having empty textbox last in layer

* Option to disable arrow right/left to change project item on last/first slide

* Scripture rewrite (#2252)

* Scripture rewrite

* Scripture rewrite

* Fixes & cleanup

* Polishing

* Fixed shows search freeze with bad show file

* Fixed media folder not opening

* Hardware acceleration enabled by default also on macOS
- Many small fixes

* Use stock Electron 37.7
- This fixes performance issues on macOS 26 Tahoe

* Playing media from project clears slide content properly
- Media set to foreground cleared when slide is played
- Fixed slide also deleted when undoing media adding

* Change global volume per output (#2258)

* Audio channels

* Better audio mixer
- Change global volume per output
- Mute/unmute global volume
- Audio mute by video fading back to correct volume if playlist

* Metronome updates

* Double click scripture drawer tab to play
- Double click audio playlist tab to play
- Visual metronome stage item
- Fixed calendar to show month incorrect
- Player video triggers video start action activation
- Small tweaks
- Version update

---------

Co-authored-by: Jeremy Zongker <jeremy@zongker.net>

Author: vassbo

.github/workflows/release.yml

@@ -76,8 +76,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libfontconfig1-dev uuid-dev --fix-missing
 
-      - name: Use stock Electron on ARM64
-        run: npm run replace-electron
+      # WIDEVINE
+      # - name: Use stock Electron on ARM64
+      #   run: npm run replace-electron
 
       - name: Install dependencies
         run: npm install

config/building/electron-builder.yaml

@@ -2,8 +2,10 @@ appId: app.freeshow
 productName: FreeShow
 artifactName: FreeShow-${version}-${arch}.${ext}
 
-electronDownload:
-    mirror: https://github.com/castlabs/electron-releases/releases/download/
+# WIDEVINE
+# Use castlabs electron builds to get widevine support
+# electronDownload:
+#     mirror: https://github.com/castlabs/electron-releases/releases/download/
 
 files:
     - build/electron/**

config/building/electron-replace-lnxarm.js

@@ -1,19 +1,22 @@
-const fs = require("fs")
+// WIDEVINE
+// github:castlabs/electron-releases#v37.0.0+wvcus
 
-// castlabs electron has no build for Linux arm64
-const version = "37.0.0"
-const integrity = "sha512-QhdtwF7Hq1qfnUXigYp1+bTGuLYTmYTir5KnrMXxWJoWfNhURRU2EYuTktBHoWT5mtv/GmmRjGEiR3IS2p9SSA=="
+// const fs = require("fs")
 
-// replace package.json entry
-const pkg = JSON.parse(fs.readFileSync("package.json", "utf8"))
-pkg.devDependencies["electron"] = version
-fs.writeFileSync("package.json", JSON.stringify(pkg, null, 2))
+// // castlabs electron has no build for Linux arm64
+// const version = "37.0.0"
+// const integrity = "sha512-QhdtwF7Hq1qfnUXigYp1+bTGuLYTmYTir5KnrMXxWJoWfNhURRU2EYuTktBHoWT5mtv/GmmRjGEiR3IS2p9SSA=="
 
-// replace package-lock.json entry
-const lock = JSON.parse(fs.readFileSync("package-lock.json", "utf8"))
-if (lock.packages && lock.packages["node_modules/electron"]) {
-    lock.packages["node_modules/electron"].version = version
-    lock.packages["node_modules/electron"].resolved = `https://registry.npmjs.org/electron/-/electron-${version}.tgz`
-    lock.packages["node_modules/electron"].integrity = integrity
-}
-fs.writeFileSync("package-lock.json", JSON.stringify(lock, null, 2))
+// // replace package.json entry
+// const pkg = JSON.parse(fs.readFileSync("package.json", "utf8"))
+// pkg.devDependencies["electron"] = version
+// fs.writeFileSync("package.json", JSON.stringify(pkg, null, 2))
+
+// // replace package-lock.json entry
+// const lock = JSON.parse(fs.readFileSync("package-lock.json", "utf8"))
+// if (lock.packages && lock.packages["node_modules/electron"]) {
+//     lock.packages["node_modules/electron"].version = version
+//     lock.packages["node_modules/electron"].resolved = `https://registry.npmjs.org/electron/-/electron-${version}.tgz`
+//     lock.packages["node_modules/electron"].integrity = integrity
+// }
+// fs.writeFileSync("package-lock.json", JSON.stringify(lock, null, 2))

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "freeshow",
-    "version": "1.5.1-beta.1",
+    "version": "1.5.1-beta.2",
     "private": true,
     "main": "build/electron/index.js",
     "description": "Show song lyrics and more for free!",
@@ -74,7 +74,7 @@
         "@typescript-eslint/eslint-plugin": "^5.62.0",
         "@typescript-eslint/parser": "^5.62.0",
         "cross-env": "^7.0.3",
-        "electron": "github:castlabs/electron-releases#v37.0.0+wvcus",
+        "electron": "^37.7.0",
         "electron-builder": "^26.0.19",
         "eslint": "^8.57.1",
         "eslint-config-prettier": "^8.10.2",
@@ -120,6 +120,7 @@
         "follow-redirects": "^1.15.11",
         "genius-lyrics": "^4.4.7",
         "grandiose": "github:ChurchApps/grandiose#a334962",
+        "json-bible": "^1.1.0",
         "jzz": "^1.9.5",
         "libreoffice-convert": "^1.6.1",
         "mdb-reader": "^1.2.1",
@@ -138,6 +139,7 @@
         "sqlite3": "5.1.6",
         "uid": "^2.0.2",
         "ultimate-guitar": "^2.0.3",
+        "upath": "^2.0.1",
         "word-extractor": "^1.0.4",
         "xml2js": "^0.6.2",
         "youtube-player": "^5.6.0"

package.json

@@ -219,6 +219,7 @@
         "allow_gaining_tip": "Allow setting volume above 100% (May cause distortion)",
         "pre_fader_volume_meter": "Pre fader volume meter",
         "mixer": "Mixer",
+        "main": "Main",
         "metronome": "Metronome",
         "toggle_metronome": "Toggle metronome",
         "use_metadata_bpm": "Use BPM from metadata",
@@ -1069,6 +1070,7 @@
         "slide_tracker": "Progress",
         "visualizer": "Visualizer",
         "captions": "Captions",
+        "metronome": "Metronome",
         "icon": "Icon",
         "effect": "Effect",
         "slide_text": "Slide text",
@@ -1262,6 +1264,7 @@
         "auto_group_numbers": "Auto assign group numbers",
         "transparent_slides": "Transparent slide preview",
         "full_colors": "High contrast group colors",
+        "next_item_on_last_slide": "Arrow right/left changes project item on last/first slide",
         "slide_number_keys": "Play slides with number keys",
         "auto_shortcut_first_letter": "Auto shortcut to first letter in text",
         "startup_projects_list": "Show the projects list on startup",

public/assets/mixer_slider.webp

@@ -243,7 +243,7 @@ export function startImport(data: { channel: string; format: { name: string; ext
 }
 
 // BIBLE
-export function loadScripture(msg: { id: string; path: string; name: string; data: any }) {
+export function loadScripture(msg: { id: string; path: string; name: string }) {
     const bibleFolder: string = getDataFolder(msg.path || "", dataFolderNames.scriptures)
     let filePath: string = path.join(bibleFolder, msg.name + ".fsb")
 
@@ -253,7 +253,6 @@ export function loadScripture(msg: { id: string; path: string; name: string; dat
     if (bible.error) filePath = path.join(app.getPath("documents"), "Bibles", msg.name + ".fsb")
     bible = loadFile(filePath, msg.id)
 
-    if (msg.data) return { ...bible, data: msg.data }
     return bible
 }