Author: ygrego Date: 2015-07-08 16:00:18 +0200 (Wed, 08 Jul 2015) New Revision: 1780 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1780 Log: Additionnal features in order to manage programmes searching and state of video-broadcast service. Modified: oipf/emulator/js/services/SearchManagerService.js oipf/emulator/js/services/VideoBroadcastService.js Modified: oipf/emulator/js/services/SearchManagerService.js =================================================================== --- oipf/emulator/js/services/SearchManagerService.js 2015-07-08 11:25:55 UTC (rev 1779) +++ oipf/emulator/js/services/SearchManagerService.js 2015-07-08 14:00:18 UTC (rev 1780) @@ -16,6 +16,10 @@ return this.currentProgramme.name || "Programme"; }; + searchManagerService.getCurrentProgrammeGenre = function() { + return this.currentProgramme.genre || ["Unknow"]; + }; + searchManagerObject.onMetadataSearch = function(resolve, reject, search, state) { console.log("[INFO]: onMetadataSearch called"); Modified: oipf/emulator/js/services/VideoBroadcastService.js =================================================================== --- oipf/emulator/js/services/VideoBroadcastService.js 2015-07-08 11:25:55 UTC (rev 1779) +++ oipf/emulator/js/services/VideoBroadcastService.js 2015-07-08 14:00:18 UTC (rev 1780) @@ -1,4 +1,4 @@ -OIPFServices.factory("VideoBroadcastService", ["$q", function(promise) { +OIPFServices.factory("VideoBroadcastService", ["$q", function($q) { var videoBroadcastService = new Service(); var videoBroadcastObject = document.getElementById("videoBroadcast"); @@ -13,8 +13,6 @@ } - videoBroadcastService.promiseManager = promise; - videoBroadcastService.getCurrentChannel = function() { return this.videoBroadcastObject.currentChannel; }; @@ -24,13 +22,14 @@ }; videoBroadcastService.bindToCurrentChannel = function() { + var deferred = $q.defer(); + console.log("bindToCurrentChannel", deferred); - var deferred = this.promiseManager.defer(); this.previousState = this.videoBroadcastObject.playState; this.currentIndex = 0; this.videoBroadcastObject.onPlayStateChange = - this.onChangeState.bind(this, deferred.resolve, deferred.reject); + this.onChangeState.bind(this, deferred.resolve.bind(deferred), deferred.reject.bind(deferred)); this.addTransition(videoBroadcastConstants.state.UNREALIZED, videoBroadcastConstants.state.CONNECTING); @@ -37,7 +36,7 @@ this.addTransition(videoBroadcastConstants.state.CONNECTING, videoBroadcastConstants.state.PRESENTING, - deferred.resolve); + deferred.resolve.bind(deferred)); this.videoBroadcastObject.bindToCurrentChannel(); @@ -46,7 +45,7 @@ videoBroadcastService.release = function() { - var deferred = this.promiseManager.defer(); + var deferred = $q.defer(); if (this.videoBroadcastObject.playState) { this.currentIndex = 0; @@ -68,7 +67,7 @@ videoBroadcastService.prevChannel = function() { - var deferred = this.promiseManager.defer(); + var deferred = $q.defer(); this.currentIndex = 0; this.previousState = this.videoBroadcastObject.playState; @@ -90,7 +89,7 @@ videoBroadcastService.nextChannel = function() { - var deferred = this.promiseManager.defer(); + var deferred = $q.defer(); this.currentIndex = 0; this.previousState = this.videoBroadcastObject.playState; @@ -114,10 +113,10 @@ if (buttonId == "V+") { var volume = this.videoBroadcastObject.getVolume(); - var result = this.videoBroadcastObject.setVolume(volume+1); + var result = this.videoBroadcastObject.setVolume(volume + 1); } else if (buttonId == "V-") { var volume = this.videoBroadcastObject.getVolume(); - result = this.videoBroadcastObject.setVolume(volume-1); + result = this.videoBroadcastObject.setVolume(volume - 1); } return result;