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.

Sign up for GitHub

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

Fix obs-websocket v5, add replay button #104

Merged
merged 8 commits into from
Sep 2, 2022
Merged

Fix obs-websocket v5, add replay button #104

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f90a9f5
fix obs-websocket v5, add replay button
filiphanes Sep 1, 2022
072c997
Fixing linting issues with `npm lint`
Niek Sep 1, 2022
7597939
revert GetStudioModeEnabled, replay buffer alert
filiphanes Sep 1, 2022
766f003
Merge branch 'dev' of github.com:filiphanes/obs-web into dev
filiphanes Sep 1, 2022
7f70dba
Merge branch 'master' of https://github.com/Niek/obs-web into dev
filiphanes Sep 2, 2022
44fe1df
update README.md
filiphanes Sep 2, 2022
30bac25
Linting
Niek Sep 2, 2022
8b1edd7
Cannot re-assign const
Niek Sep 2, 2022
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 src/App.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
mdiAccessPoint, mdiAccessPointOff,
mdiRecord, mdiStop, mdiPause, mdiPlayPause,
mdiConnection,
mdiMotionPlayOutline, mdiMotionPlay,
mdiMotionPlayOutline, mdiMotionPlay
} from '@mdi/js'
import Icon from 'mdi-svelte'
import { compareVersions } from 'compare-versions'
Expand Down
2 changes: 1 addition & 1 deletion src/ProgramPreview.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
})
if (data && data.imageData && program) {
program.src = data.imageData
program.className = ''
program.className = ''
}

if (isStudioMode) {
Expand Down
16 changes: 8 additions & 8 deletions src/SceneSwitcher.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$: window.localStorage.setItem('sceneIcons', JSON.stringify(sceneIcons))

onMount(async function () {
let data = await sendCommand('GetSceneList')
const data = await sendCommand('GetSceneList')
console.log('GetSceneList', data)
programScene = data.currentProgramSceneName || ''
previewScene = data.currentPreviewSceneName
Expand Down Expand Up @@ -47,18 +47,18 @@

obs.on('SceneRemoved', async (data) => {
console.log('SceneRemoved', data)
for (let i=0; i < scenes.length; i++) {
if (scenes[i].sceneName == data.sceneName) {
delete scenes[i];
for (let i = 0; i < scenes.length; i++) {
if (scenes[i].sceneName === data.sceneName) {
delete scenes[i]
}
}
})

obs.on('SceneNameChanged', async (data) => {
console.log('SceneNameChanged', data)
for (let i=0; i < scenes.length; i++) {
if (scenes[i].sceneName == data.oldSceneName) {
scenes[i].sceneName = data.sceneName;
for (let i = 0; i < scenes.length; i++) {
if (scenes[i].sceneName === data.oldSceneName) {
scenes[i].sceneName = data.sceneName
}
}
// Rename in sceneIcons
Expand All @@ -67,7 +67,7 @@

obs.on('CurrentProgramSceneChanged', (data) => {
console.log('CurrentProgramSceneChanged', data)
programScene = data.sceneName || '';
programScene = data.sceneName || ''
})

obs.on('CurrentPreviewSceneChanged', async (data) => {
Expand Down
10 changes: 5 additions & 5 deletions src/SourceSwitcher.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
let items = []
const itemsIndex = {}
let currentItemId = ''
let screenshottedIds = new Set()
const screenshottedIds = new Set()

import { onMount } from 'svelte'
import { obs, sendCommand } from './obs.js'
Expand All @@ -18,7 +18,7 @@
const data = await sendCommand('GetSceneItemList', { sceneName: name })
items = data.sceneItems || items
for (let i = 0; i < items.length; i++) {
const item = items[i];
const item = items[i]
itemsIndex[item.sceneItemId] = i
if (item.sceneItemEnabled) {
currentItemId = item.sceneItemId
Expand Down Expand Up @@ -86,11 +86,11 @@

async function getItemScreenshot (item) {
if (item.img) return item.img
let data = null;
let retry = item.sceneItemEnabled ? 3 : 1;
let data = null
let retry = item.sceneItemEnabled ? 3 : 1
while (retry--) {
// Random sleep to avoid burst of thumbnail rendering
await new Promise(r => setTimeout(r, Math.random()*500+100));
await new Promise((resolve) => setTimeout(resolve, Math.random() * 500 + 100))
data = await sendCommand('GetSourceScreenshot', {
sourceName: item.sourceName,
imageFormat: 'jpg',
Expand Down