Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 apps/app/src/main.mts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function createWindow(log: winston.Logger, superConductor: SuperConductor): void
win.webContents.openDevTools()
}
win
.loadURL(!app.isPackaged ? 'http://127.0.0.1:9124' : `file://${app.getAppPath()}/build/index.html`)
.loadURL(!app.isPackaged ? 'http://localhost:9124' : `file://${app.getAppPath()}/build/index.html`)
.catch(log.error)

const menuOpts = literal<GenerateMenuArgs>({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type PropsType = {

export const CurrentTime = observer(function CurrentTime(props: PropsType) {
// Memoize this, to avoid recalculating it every time the playhead is calculated
const { value, label } = useMemoComputedObject(
const { value, label, value2, label2 } = useMemoComputedObject(
() => {
const playData = store.groupPlayDataStore.groups.get(props.groupId)
if (playData) {
Expand All @@ -21,7 +21,11 @@ export const CurrentTime = observer(function CurrentTime(props: PropsType) {
if (playhead) {
const playheadTime = playhead.playheadTime
if (typeof playheadTime === 'number') {
// Calculate the start time (current time minus playheadTime)
const startTime = new Date(new Date().getTime() - playheadTime)
return {
label2: 'Started at',
value2: startTime.toLocaleTimeString(), // Start time
label: 'ELAPSED',
value: formatDuration(playheadTime, DISPLAY_DECIMAL_COUNT),
}
Expand All @@ -30,7 +34,9 @@ export const CurrentTime = observer(function CurrentTime(props: PropsType) {
const countDown = countDowns[0]

return {
label: 'TO START',
label2: 'Start Time ',
value2: new Date(countDown.timestamp).toLocaleTimeString(),
label: 'Starting in',
value: formatDuration(countDown.duration, DISPLAY_DECIMAL_COUNT, true),
}
}
Expand All @@ -50,6 +56,9 @@ export const CurrentTime = observer(function CurrentTime(props: PropsType) {

return (
<>
<span className="part__time__current-time__label2">{label2}</span>{' '}
<span className="part__time__current-time__value2">{value2}</span>{' '}
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span className="part__time__current-time__label">{label}</span>{' '}
<span className="part__time__current-time__value">{value}</span>
</>
Expand Down
2 changes: 2 additions & 0 deletions doc/FOR_DEVELOPERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Prerequisites

Cannot run yarn 1.2.x anymore with develop branch, must run yarn2, tested with 4.9.2

SuperConductor has some native dependencies which need to be (re)built from source. This requires a full Node.js native module compiler toolchain, including Python 3.

**On Windows**, modern versions of the Node.js installer come with all the necessary build tools, and no further action is required. If you have issues with Python, install [Python 3](https://www.python.org/downloads/).
Expand Down