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

feat: added feedback-streams to input-choice for multiviewer-layout #17

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9a83fc3
feat: add management lock
Saelmala Sep 10, 2024
e210ab6
fix: build error
Saelmala Sep 10, 2024
d67930e
fix: remove left-over file, has been renamed
Saelmala Sep 10, 2024
e373e58
Feat/thumbnail fetch (#14)
LucasMaupin Sep 16, 2024
1a57886
Feat/thumbnail fetch (#14)
LucasMaupin Sep 16, 2024
5353712
feat: add management lock
Saelmala Sep 10, 2024
34f5d5e
fix: use global context instead of state
Saelmala Sep 16, 2024
e5e899d
fix: remove duplicates
Saelmala Sep 16, 2024
09002de
Merge branch 'main' into feat-add-management-lock
Saelmala Sep 16, 2024
15f2787
fix: errors after conflict solving
Saelmala Sep 17, 2024
bb9a855
fix: build error
Saelmala Sep 17, 2024
d0d4e2a
fix: remove leftover file, unused import
Saelmala Sep 17, 2024
abf5bc9
fix: delete source doesn't need to be locked
Saelmala Sep 17, 2024
ff5eb34
fix: update lock
Saelmala Sep 17, 2024
34a0421
Merge pull request #13 from Eyevinn/feat-add-management-lock
Saelmala Sep 17, 2024
c669245
Feat/specify multiview layout when doing production-config(#16)
malmen237 Sep 19, 2024
9e68995
feat: added feedback-streams to input-choice for multiviewer-layout
malmen237 Sep 19, 2024
bbe0d18
fix: removed unnecessary undefined
malmen237 Sep 20, 2024
a43df1b
fix: when added a new layout it will be chosen in output-form on save
malmen237 Sep 20, 2024
4ae4c36
feat: preview and program is now selectable and restructured the way …
malmen237 Sep 23, 2024
34713a3
fix: corrected lint error
malmen237 Sep 23, 2024
e25ed38
fix: corrected ts-error
malmen237 Sep 23, 2024
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
4 changes: 3 additions & 1 deletion src/api/ateliereLive/ingest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ export async function getSourceThumbnail(
process.env.LIVE_URL
),
{
next: { tags: ['image'] },
method: 'POST',
body: JSON.stringify({
encoder: 'auto',
Expand All @@ -114,7 +115,8 @@ export async function getSourceThumbnail(
width
}),
headers: {
authorization: getAuthorizationHeader()
authorization: getAuthorizationHeader(),
cache: 'no-store'
}
}
);
Expand Down
3 changes: 2 additions & 1 deletion src/api/ateliereLive/pipelines/pipelines.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ export async function getPipelines(): Promise<
name: pipeline.name,
uuid: pipeline.uuid,
outputs: pipeline.outputs,
streams: pipeline.streams
streams: pipeline.streams,
feedback_streams: pipeline.feedback_streams
};
});
}
Expand Down
11 changes: 11 additions & 0 deletions src/api/manager/presets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export async function getMultiviewPresets(): Promise<MultiviewPreset[]> {
const db = await getDatabase();
return await db.collection<MultiviewPreset>('multiviews').find({}).toArray();
}

export async function getMultiviewPreset(
id: string
): Promise<WithId<MultiviewPreset>> {
Expand All @@ -26,6 +27,16 @@ export async function getMultiviewPreset(
.collection<MultiviewPreset>('multiviews')
.findOne({ _id: new ObjectId(id) })) as WithId<MultiviewPreset>;
}

export async function putMultiviewPreset(
newMultiviewPreset: MultiviewPreset
): Promise<void> {
const db = await getDatabase();
await db
.collection('multiviews')
.insertOne({ ...newMultiviewPreset, _id: new ObjectId() });
}

export async function putPreset(
id: string,
preset: PresetWithId
Expand Down
3 changes: 2 additions & 1 deletion src/api/mongoClient/dbClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ async function bootstrapDbCollections(db: Db) {
const multiviews = await db.collection('multiviews').countDocuments();
if (multiviews === 0) {
Log().info('Bootstrapping database with default multiview');
await db.collection('multiviews').insertOne(defaultMultiview);

await db.collection('multiviews').insertMany(defaultMultiview);
} else {
await migrateMultiviewPresets(db);
}
Expand Down
Loading
Loading