@christianriedl/media 1.0.277 → 1.0.278
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/playerService.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IRest } from '@christianriedl/rest';
|
|
2
|
-
import { ILogger, InjectionKey
|
|
2
|
+
import { ILogger, InjectionKey } from '@christianriedl/utils';
|
|
3
3
|
import { EMediaType } from "./iMedia";
|
|
4
4
|
export declare enum EPlayState {
|
|
5
5
|
PowerOff = 0,
|
|
@@ -36,8 +36,8 @@ export interface IPlayerConfiguration {
|
|
|
36
36
|
playerName: string;
|
|
37
37
|
shortName: string;
|
|
38
38
|
sensorName: string;
|
|
39
|
-
online:
|
|
40
|
-
playerState:
|
|
39
|
+
online: boolean;
|
|
40
|
+
playerState: IPlayerState | null;
|
|
41
41
|
}
|
|
42
42
|
export declare const getPlayerSymbol: InjectionKey<() => PlayerService>;
|
|
43
43
|
export declare class PlayerService {
|
package/dist/playerService.js
CHANGED
|
@@ -34,7 +34,7 @@ export class PlayerService {
|
|
|
34
34
|
this.playerNames = players.result;
|
|
35
35
|
for (let i = 0; i < this.playerConfigurations.length; i++) {
|
|
36
36
|
const config = this.playerConfigurations[i];
|
|
37
|
-
config.online
|
|
37
|
+
config.online = this.playerNames.includes(config.playerName);
|
|
38
38
|
}
|
|
39
39
|
return this.playerNames;
|
|
40
40
|
}
|
|
@@ -43,12 +43,16 @@ export class PlayerService {
|
|
|
43
43
|
const config = this.playerConfigurations.find(c => c.playerName === playerName);
|
|
44
44
|
if (result.ok) {
|
|
45
45
|
const playerState = result.result;
|
|
46
|
-
config
|
|
47
|
-
|
|
46
|
+
if (config && playerState && !!playerState.state) {
|
|
47
|
+
config.playerState = playerState;
|
|
48
|
+
config.online = true;
|
|
49
|
+
}
|
|
48
50
|
return playerState;
|
|
49
51
|
}
|
|
50
|
-
config
|
|
51
|
-
|
|
52
|
+
if (config) {
|
|
53
|
+
config.online = false;
|
|
54
|
+
config.playerState = null;
|
|
55
|
+
}
|
|
52
56
|
return null;
|
|
53
57
|
}
|
|
54
58
|
async play(playerRequest) {
|
|
@@ -80,10 +84,10 @@ export class PlayerService {
|
|
|
80
84
|
for (let i = 0; i < this.playerConfigurations.length; i++) {
|
|
81
85
|
const config = this.playerConfigurations[i];
|
|
82
86
|
if (config.sensorName && this.getSensorOnline)
|
|
83
|
-
config.online
|
|
87
|
+
config.online = this.getSensorOnline(config.sensorName);
|
|
84
88
|
else
|
|
85
|
-
config.online
|
|
86
|
-
if (config.online
|
|
89
|
+
config.online = false;
|
|
90
|
+
if (config.online)
|
|
87
91
|
count++;
|
|
88
92
|
}
|
|
89
93
|
return count;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playerService.js","sourceRoot":"","sources":["../src/playerService.ts"],"names":[],"mappings":"AAOA,MAAM,CAAN,IAAY,UAQX;AARD,WAAY,UAAU;IAClB,mDAAY,CAAA;IACZ,iDAAO,CAAA;IACP,+CAAM,CAAA;IACN,iDAAO,CAAA;IACP,2CAAI,CAAA;IACJ,iDAAO,CAAA;IACP,mDAAQ,CAAA;AACZ,CAAC,EARW,UAAU,KAAV,UAAU,QAQrB;AAkCD,MAAM,CAAC,MAAM,eAAe,GAAsC,MAAM,CAAC,YAAY,CAAC,CAAC;AAEvF,MAAM,OAAO,aAAa;IACtB,IAAI,CAAQ;IACZ,QAAQ,CAAS;IACjB,GAAG,CAAU;IACb,WAAW,GAAa,EAAE,CAAC;IAC3B,oBAAoB,CAAyB;IAC7C,aAAa,CAAwB;IACrC,eAAe,CAAwC;IACvD,YAAY,IAAW,EAAE,GAAY,EAAE,OAA+B,EAAE,eAAsD;QAC1H,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC;QAChC,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC;QACpC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACpC,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,SAAsB,EAAE,OAAiB;QACtD,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,IAAI,SAAS;YACT,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAChC,IAAI,OAAO;YACP,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAW,mBAAmB,EAAE,KAAK,CAAC,CAAC;QAC9E,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,MAAkB,CAAC;QACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"playerService.js","sourceRoot":"","sources":["../src/playerService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -368,15 +368,15 @@
|
|
|
368
368
|
itemName.value = item.title;
|
|
369
369
|
nameTimer = window.setTimeout(() => { clearName(); }, mediaAppConfig.nameDurationMS);
|
|
370
370
|
}
|
|
371
|
-
if (playerService.
|
|
371
|
+
if (playerService.currentPlayer) {
|
|
372
372
|
const request = {
|
|
373
|
-
playerName: playerService.
|
|
373
|
+
playerName: playerService.currentPlayer.playerName,
|
|
374
374
|
folderId: item.dlnaParentId,
|
|
375
375
|
mediaId: item.dlnaid,
|
|
376
376
|
trackNo: -1,
|
|
377
377
|
withStreamTitle: false
|
|
378
378
|
};
|
|
379
|
-
const rc = playerService!.play(request).then(() => );
|
|
379
|
+
const rc = playerService!.play(request).then(() => {});
|
|
380
380
|
}
|
|
381
381
|
}
|
|
382
382
|
function createBlob(item: IPictureFile) {
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
import { inject, ref, reactive, computed, onMounted, onUnmounted, nextTick, watch, StyleValue } from 'vue';
|
|
3
3
|
import type { ComponentPublicInstance } from 'vue';
|
|
4
4
|
import { useRouter, useRoute } from 'vue-router';
|
|
5
|
-
import { IAppState, IAppConfig, EDevice, EBrowser, appStateSymbol, appConfigSymbol,
|
|
6
|
-
import { IRestResult, IValueResult } from '@christianriedl/rest';
|
|
5
|
+
import { IAppState, IAppConfig, EDevice, EBrowser, appStateSymbol, appConfigSymbol, Helper, EScope } from '@christianriedl/utils';
|
|
6
|
+
import { IRestResult, IValueResult, authorizeSymbol } from '@christianriedl/rest';
|
|
7
7
|
import { EItemType, EMediaType, IMediaFolder, IMediaItem, IPhotoSelection, IMediaService, getMediaBinSymbol,
|
|
8
8
|
IPlayerConfiguration, getPlayerSymbol, IMediaAppConfig, MediaHelper, LocationHelper
|
|
9
9
|
} from '@christianriedl/media';
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
if (supportsLocalMedia) {
|
|
60
60
|
playerService.getPlayersOnline();
|
|
61
61
|
for (let i = 0; i < playerService.playerConfigurations.length; i++) {
|
|
62
|
-
const config = playerService.playerConfigurations
|
|
62
|
+
const config = playerService.playerConfigurations[i];
|
|
63
63
|
if (!config.playerState) {
|
|
64
64
|
playerService.getPlayerState(config.playerName);
|
|
65
65
|
}
|
package/src/views/VideosPage.vue
CHANGED
|
@@ -188,7 +188,7 @@
|
|
|
188
188
|
if (supportsLocalMedia) {
|
|
189
189
|
playerService.getPlayersOnline();
|
|
190
190
|
for (let i = 0; i < playerService.playerConfigurations.length; i++) {
|
|
191
|
-
const config = playerService.playerConfigurations
|
|
191
|
+
const config = playerService.playerConfigurations[i];
|
|
192
192
|
if (!config.playerState) {
|
|
193
193
|
await playerService.getPlayerState(config.playerName);
|
|
194
194
|
}
|