Skip to content

Commit

Permalink
fix(Webcam): capitalize the connection state (#2019)
Browse files Browse the repository at this point in the history
  • Loading branch information
meteyou authored Nov 5, 2024
1 parent f26af62 commit 0a72a7a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
9 changes: 7 additions & 2 deletions src/components/webcams/streamers/WebrtcCameraStreamer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<v-row v-if="status !== 'connected'">
<v-col class="_webcam_webrtc_output text-center d-flex flex-column justify-center align-center">
<v-progress-circular v-if="status === 'connecting'" indeterminate color="primary" class="mb-3" />
<span class="mt-3">{{ status }}</span>
<span class="mt-3">{{ capitalize(status) }}</span>
</v-col>
</v-row>
</div>
Expand All @@ -22,14 +22,19 @@ import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
import BaseMixin from '@/components/mixins/base'
import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
import WebcamMixin from '@/components/mixins/webcam'
import { capitalize } from '@/plugins/helpers'
interface CameraStreamerResponse extends RTCSessionDescriptionInit {
id: string
iceServers?: RTCIceServer[]
}
@Component
@Component({
methods: { capitalize },
})
export default class WebrtcCameraStreamer extends Mixins(BaseMixin, WebcamMixin) {
capitalize = capitalize
pc: RTCPeerConnection | null = null
useStun = false
aspectRatio: null | number = null
Expand Down
5 changes: 4 additions & 1 deletion src/components/webcams/streamers/WebrtcMediaMTX.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<v-row v-if="status !== 'connected'">
<v-col class="_webcam_webrtc_output text-center d-flex flex-column justify-center align-center">
<v-progress-circular v-if="status === 'connecting'" indeterminate color="primary" class="mb-3" />
<span class="mt-3">{{ status }}</span>
<span class="mt-3">{{ capitalize(status) }}</span>
</v-col>
</v-row>
</div>
Expand All @@ -22,6 +22,7 @@ import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
import BaseMixin from '@/components/mixins/base'
import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
import WebcamMixin from '@/components/mixins/webcam'
import { capitalize } from '@/plugins/helpers'
interface OfferData {
iceUfrag: string
Expand All @@ -31,6 +32,8 @@ interface OfferData {
@Component
export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
capitalize = capitalize
@Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
@Prop({ default: null }) readonly printerUrl!: string | null
@Prop({ type: String, default: null }) readonly page!: string | null
Expand Down

0 comments on commit 0a72a7a

Please sign in to comment.