Skip to content

Commit 7237e2d

Browse files
author
Jeremy White
committed
Added displayImage support, tweaked how metadata is handled
1 parent 7415069 commit 7237e2d

File tree

1 file changed

+30
-13
lines changed

1 file changed

+30
-13
lines changed

scripts/connectsdk.js

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ var connectsdk = (function () {
4747
var listeners = this._listeners && this._listeners[event];
4848
var args = Array.prototype.slice.call(arguments, 1);
4949

50+
// TODO: upper-case first char
5051
if (this["on" + event]) {
5152
this["on" + event].apply(this, args);
5253
}
@@ -226,15 +227,12 @@ var connectsdk = (function () {
226227
}
227228
},
228229

229-
loadMedia: function (media) {
230+
onLoadMedia: function (media) {
230231
var mediaElement = this.mediaElement;
231-
if (mediaElement && media && media.src) {
232-
console.log("Loading", media.src);
233-
var metadata = media.metadata;
234-
if (metadata) {
235-
metadata.poster && (mediaElement.poster = metadata.poster);
236-
}
237-
mediaElement.src = media.src;
232+
if (mediaElement && media && media.mediaURL) {
233+
console.log("Loading", media.mediaURL);
234+
// TODO: pull metadata
235+
mediaElement.src = media.mediaURL;
238236
mediaElement.load();
239237
} else {
240238
console.log("Failed to load media.");
@@ -610,6 +608,8 @@ var connectsdk = (function () {
610608
this._handleGetDuration(message);
611609
} else if (commandType === 'playMedia') {
612610
this._handlePlayMedia(message);
611+
} else if (commandType === 'displayImage') {
612+
this._handleDisplayImage(message);
613613
}
614614
},
615615

@@ -670,12 +670,29 @@ var connectsdk = (function () {
670670
var mediaCommand = message.payload.mediaCommand;
671671
var commandType = mediaCommand.type;
672672
var requestId = mediaCommand.requestId;
673-
var media = {
674-
src: mediaCommand.mediaURL,
675-
metadata: mediaCommand.metadata
676-
};
677673

678-
this.connectManager.loadMedia(media);
674+
this.connectManager.emit('LoadMedia', mediaCommand);
675+
676+
this._send({
677+
type: 'p2p',
678+
to: from,
679+
payload: {
680+
contentType: 'connectsdk.mediaCommandResponse',
681+
mediaCommandResponse: {
682+
type: commandType,
683+
requestId: requestId
684+
}
685+
}
686+
});
687+
},
688+
689+
_handleDisplayImage: function (message) {
690+
var from = message.from;
691+
var mediaCommand = message.payload.mediaCommand;
692+
var commandType = mediaCommand.type;
693+
var requestId = mediaCommand.requestId;
694+
695+
this.connectManager.emit('LoadImage', mediaCommand);
679696

680697
this._send({
681698
type: 'p2p',

0 commit comments

Comments
 (0)