Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.9.5 #233

Merged
merged 44 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
907e320
Reverted electron
vassbo Jul 1, 2023
8a96640
🚩 Updated Italian
vassbo Jul 1, 2023
90f97e7
Update italian language JSON (#198)
grnsmn Jul 10, 2023
187fe0c
Hungarian translation added and modified: public/lang/hu.json (#203)
i-janos Jul 12, 2023
d2572ab
Aded Serbian translation to dev (#211)
ikslavok Jul 17, 2023
b3eeb76
✨ Tweaked UI
vassbo Jul 19, 2023
bb05f24
✨ UI improvements
vassbo Jul 20, 2023
ccc25fa
✨ Tweaked UI
vassbo Jul 21, 2023
0dbe67a
✨ Tweaked settings UI
vassbo Jul 22, 2023
9179852
✨ Enhancements
vassbo Jul 22, 2023
7597302
✨ Small changes
vassbo Jul 23, 2023
2eddc5f
✨ Improvements
vassbo Jul 23, 2023
b65b8b9
🖼 Import custom SVG icons
vassbo Jul 24, 2023
653ac19
📖 Updated README
vassbo Jul 24, 2023
04ff32d
📖 Updated README
vassbo Jul 24, 2023
7f3f59d
🌟 Trendy lines
vassbo Jul 24, 2023
04e1f83
💾 App should not close before saving
vassbo Jul 25, 2023
47004f9
Merge branch 'main' into dev
vassbo Jul 25, 2023
252fe9e
✨ Fixed DMG size
vassbo Jul 25, 2023
b5c6423
Merge branch 'dev' of https://github.com/vassbo/freeshow into dev
vassbo Jul 25, 2023
c429e2c
🚩 Updated Polish | EN typo | DMG window section added (#222)
lubomsky Jul 26, 2023
7eea2cf
✨ Animations
vassbo Aug 1, 2023
9374959
✨ Item transitions
vassbo Aug 3, 2023
0f9b1a1
🖼 Remote output screen mirror
vassbo Aug 3, 2023
6a69607
📦 Backup & Restore
vassbo Aug 4, 2023
e5c08a7
✨ Improvements
vassbo Aug 4, 2023
93bd4b4
✨ Auto find media files
vassbo Aug 5, 2023
5c75c0c
📄 Text Editor working properly!
vassbo Aug 5, 2023
2f7f63a
Merge branch 'main' into dev
vassbo Aug 5, 2023
a478a76
✔ Fixed issue in output stream file
vassbo Aug 5, 2023
f452db3
Merge branch 'dev' of https://github.com/vassbo/freeshow into dev
vassbo Aug 5, 2023
af1fe32
Merge branch 'main' into dev
vassbo Aug 5, 2023
8f18d3c
🌐 Website item
vassbo Aug 8, 2023
9e115a0
Merge branch 'dev' of https://github.com/vassbo/freeshow into dev
vassbo Aug 8, 2023
0fe5068
💻 Support for NDI®
vassbo Aug 8, 2023
15a849b
💻 Proper preview
vassbo Aug 11, 2023
2a4c64c
✨ Improvements
vassbo Aug 12, 2023
9513bf4
✨ British English, and more
vassbo Aug 14, 2023
a425400
📄 Better chords
vassbo Aug 15, 2023
b00b60e
Version update
vassbo Aug 15, 2023
99ac3ae
Merge branch 'main' into dev
vassbo Aug 15, 2023
76cc5f0
✔ Disabling NDI on Linux for now
vassbo Aug 16, 2023
d80fb26
Merge branch 'dev' of https://github.com/vassbo/freeshow into dev
vassbo Aug 16, 2023
76ef6f8
Merge branch 'main' into dev
vassbo Aug 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"express": "^4.17.2",
"font-list": "^1.4.5",
"genius-lyrics": "^4.4.3",
"grandiose": "rse/grandiose#cf09bb84",
"grandiose": "vassbo/grandiose#b7ddf3a",
"jzz": "^1.5.9",
"node-pre-gyp": "^0.17.0",
"npm-run-all": "^4.1.5",
Expand Down
24 changes: 22 additions & 2 deletions src/electron/ndi/ndi.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import grandiose from "grandiose"
// import grandiose from "grandiose"
import os from "os"
// import type { VideoFrame } from "grandiose"
import { toApp } from ".."
Expand All @@ -17,10 +17,14 @@ import util from "./vingester-util"
let timeStart = BigInt(Date.now()) * BigInt(1e6) - process.hrtime.bigint()

export async function findStreamsNDI(): Promise<any> {
// not linux
if (os.platform() === "linux") return
const grandiose = require("grandiose")

return new Promise((resolve, reject) => {
grandiose
.find({ showLocalSources: true })
.then((a) => {
.then((a: any) => {
resolve(a)
})
.catch((err: any) => reject(err))
Expand All @@ -31,6 +35,10 @@ export async function findStreamsNDI(): Promise<any> {
export async function receiveStreamNDI({ source }: any) {
if (receivers[source.urlAddress]) return

// not linux
if (os.platform() === "linux") return
const grandiose = require("grandiose")

let receiver = await grandiose.receive({ source })

let timeout = 5000 // Optional timeout, default is 10000ms
Expand Down Expand Up @@ -75,6 +83,10 @@ export async function createSenderNDI(id: string, title: string = "") {
if (NDI[id]) return
NDI[id] = {}

// not linux
if (os.platform() === "linux") return
const grandiose = require("grandiose")

NDI[id].name = "FreeShow NDI"
if (title) NDI[id].name = NDI[id].name + " - " + title
console.log("NDI - creating sender: " + NDI[id].name)
Expand Down Expand Up @@ -109,6 +121,10 @@ export async function createSenderNDI(id: string, title: string = "") {
export async function sendVideoBufferNDI(id: string, buffer: any, { size = { width: 1280, height: 720 }, ratio = 16 / 9, framerate = 1 }) {
if (!NDI[id].sender) return

// not linux
if (os.platform() === "linux") return
const grandiose = require("grandiose")

/* convert from ARGB (Electron/Chromium on big endian CPU)
to BGRA (supported input of NDI SDK). On little endian
CPU the input is already BGRA. */
Expand Down Expand Up @@ -157,6 +173,10 @@ export async function sendVideoBufferNDI(id: string, buffer: any, { size = { wid
export async function sendAudioBufferNDI(id: string, buffer: Buffer, { sampleRate, noChannels, bytesForFloat32 }: any) {
if (!NDI[id].sender) return

// not linux
if (os.platform() === "linux") return
const grandiose = require("grandiose")

/* convert from PCM/signed-16-bit/little-endian data
to NDI's "PCM/planar/signed-float32/little-endian */
const pcmconvert: any = {} // TODO:
Expand Down
3 changes: 2 additions & 1 deletion src/frontend/components/settings/tabs/Outputs.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,11 @@
<CombinedInput>
<p>
<T id="actions.enable" /> NDI®
{#if $os.platform === "linux"}(Currently not supported on Linux){/if}
<span class="connections">{$ndiData[currentOutput.id || ""]?.connections || ""}</span>
</p>
<div class="alignRight">
<Checkbox checked={currentOutput.ndi} on:change={(e) => updateOutput("ndi", isChecked(e))} />
<Checkbox disabled={$os.platform === "linux"} checked={currentOutput.ndi} on:change={(e) => updateOutput("ndi", isChecked(e))} />
</div>
</CombinedInput>

Expand Down