- Sandbox-commits - mailman.cloud.codelutin.com

r1805 - in oipf/emulator: . logos
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 19:06:17 +0200 (Fri, 10 Jul 2015) New Revision: 1805 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1805 Log: Permit the display of channel logo in emulator. Added: oipf/emulator/logos/ oipf/emulator/logos/6ter.gif oipf/emulator/logos/cherie25.gif oipf/emulator/logos/franceo.gif oipf/emulator/logos/hd1.gif oipf/emulator/logos/lequipe.gif oipf/emulator/logos/logo1.gif oipf/emulator/logos/logo10.gif oipf/emulator/logos/logo11.gif oipf/emulator/logos/logo12.gif oipf/emulator/logos/logo13.gif oipf/emulator/logos/logo14.gif oipf/emulator/logos/logo15.gif oipf/emulator/logos/logo16.gif oipf/emulator/logos/logo17.gif oipf/emulator/logos/logo18.gif oipf/emulator/logos/logo2.gif oipf/emulator/logos/logo3.gif oipf/emulator/logos/logo4.gif oipf/emulator/logos/logo5.gif oipf/emulator/logos/logo6.gif oipf/emulator/logos/logo7.gif oipf/emulator/logos/logo8.gif oipf/emulator/logos/logo9.gif oipf/emulator/logos/numero23.gif oipf/emulator/logos/rmcDecouverte.gif Added: oipf/emulator/logos/6ter.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/6ter.gif =================================================================== --- oipf/emulator/logos/6ter.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/6ter.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/6ter.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/cherie25.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/cherie25.gif =================================================================== --- oipf/emulator/logos/cherie25.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/cherie25.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/cherie25.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/franceo.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/franceo.gif =================================================================== --- oipf/emulator/logos/franceo.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/franceo.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/franceo.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/hd1.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/hd1.gif =================================================================== --- oipf/emulator/logos/hd1.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/hd1.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/hd1.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/lequipe.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/lequipe.gif =================================================================== --- oipf/emulator/logos/lequipe.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/lequipe.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/lequipe.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo1.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo1.gif =================================================================== --- oipf/emulator/logos/logo1.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo1.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo1.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo10.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo10.gif =================================================================== --- oipf/emulator/logos/logo10.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo10.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo10.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo11.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo11.gif =================================================================== --- oipf/emulator/logos/logo11.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo11.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo11.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo12.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo12.gif =================================================================== --- oipf/emulator/logos/logo12.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo12.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo12.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo13.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo13.gif =================================================================== --- oipf/emulator/logos/logo13.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo13.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo13.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo14.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo14.gif =================================================================== --- oipf/emulator/logos/logo14.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo14.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo14.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo15.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo15.gif =================================================================== --- oipf/emulator/logos/logo15.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo15.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo15.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo16.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo16.gif =================================================================== --- oipf/emulator/logos/logo16.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo16.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo16.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo17.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo17.gif =================================================================== --- oipf/emulator/logos/logo17.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo17.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo17.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo18.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo18.gif =================================================================== --- oipf/emulator/logos/logo18.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo18.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo18.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo2.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo2.gif =================================================================== --- oipf/emulator/logos/logo2.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo2.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo2.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo3.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo3.gif =================================================================== --- oipf/emulator/logos/logo3.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo3.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo3.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo4.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo4.gif =================================================================== --- oipf/emulator/logos/logo4.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo4.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo4.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo5.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo5.gif =================================================================== --- oipf/emulator/logos/logo5.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo5.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo5.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo6.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo6.gif =================================================================== --- oipf/emulator/logos/logo6.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo6.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo6.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo7.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo7.gif =================================================================== --- oipf/emulator/logos/logo7.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo7.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo7.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo8.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo8.gif =================================================================== --- oipf/emulator/logos/logo8.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo8.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo8.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/logo9.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/logo9.gif =================================================================== --- oipf/emulator/logos/logo9.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/logo9.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/logo9.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/numero23.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/numero23.gif =================================================================== --- oipf/emulator/logos/numero23.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/numero23.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/numero23.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oipf/emulator/logos/rmcDecouverte.gif =================================================================== (Binary files differ) Index: oipf/emulator/logos/rmcDecouverte.gif =================================================================== --- oipf/emulator/logos/rmcDecouverte.gif 2015-07-10 17:02:23 UTC (rev 1804) +++ oipf/emulator/logos/rmcDecouverte.gif 2015-07-10 17:06:17 UTC (rev 1805) Property changes on: oipf/emulator/logos/rmcDecouverte.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property

1 0

r1804 - oipf/lib/data
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 19:02:23 +0200 (Fri, 10 Jul 2015) New Revision: 1804 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1804 Log: Change the url of some logos. Modified: oipf/lib/data/tnt_lite.xml Modified: oipf/lib/data/tnt_lite.xml =================================================================== --- oipf/lib/data/tnt_lite.xml 2015-07-10 16:39:00 UTC (rev 1803) +++ oipf/lib/data/tnt_lite.xml 2015-07-10 17:02:23 UTC (rev 1804) @@ -79,27 +79,27 @@ </channel> <channel id="20"> <display-name>HD1</display-name> - <icon src="http://localhost:4000/emulator/logos/hd1_nl.jpg"/> + <icon src="http://localhost:4000/emulator/logos/hd1.gif"/> </channel> <channel id="21"> <display-name>L'EQUIPE 21</display-name> - <icon src="http://localhost:4000/emulator/logos/logo21.gif" /> + <icon src="http://localhost:4000/emulator/logos/lequipe.gif" /> </channel> <channel id="22"> <display-name>6TER</display-name> - <icon src="http://localhost:4000/emulator/logos/logo22.gif" /> + <icon src="http://localhost:4000/emulator/logos/6ter.gif" /> </channel> <channel id="23"> <display-name>NUMERO 23</display-name> - <icon src="http://localhost:4000/emulator/logos/logo23.gif" /> + <icon src="http://localhost:4000/emulator/logos/numero23.gif" /> </channel> <channel id="24"> <display-name>RMC DECOUVERTE</display-name> - <icon src="http://localhost:4000/emulator/logos/logo24.gif" /> + <icon src="http://localhost:4000/emulator/logos/rmcDecouverte.gif" /> </channel> <channel id="25"> <display-name>CHERIE 25</display-name> - <icon src="http://localhost:4000/emulator/logos/logo25.gif" /> + <icon src="http://localhost:4000/emulator/logos/cherie25.gif" /> </channel> <programme start="20150708050000" stop="20150708050600" channel="14"> <title>Un gars, une fille</title>

1 0

r1803 - in oipf/emulator: js js/contollers js/services view
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:39:00 +0200 (Fri, 10 Jul 2015) New Revision: 1803 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1803 Log: Refactoring global for display of programme information and channel switching. Modified: oipf/emulator/js/contollers/PanelChannelController.js oipf/emulator/js/contollers/RemoteControlController.js oipf/emulator/js/contollers/VideoBroadcastController.js oipf/emulator/js/emulator.js oipf/emulator/js/services/SearchManagerService.js oipf/emulator/js/services/VideoBroadcastService.js oipf/emulator/view/index.html Modified: oipf/emulator/js/contollers/PanelChannelController.js =================================================================== --- oipf/emulator/js/contollers/PanelChannelController.js 2015-07-10 16:37:55 UTC (rev 1802) +++ oipf/emulator/js/contollers/PanelChannelController.js 2015-07-10 16:39:00 UTC (rev 1803) @@ -9,7 +9,9 @@ $scope.startTime; $scope.stopTime; $scope.genres; - $scope.parentalControl; + $scope.duration; + $scope.parentalRating = -10; + $scope.newWidth = "{'width':'50px'}"; $scope.chanLogo = ""; @@ -21,6 +23,10 @@ $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); $scope.programmeTitle = $scope.searchManagerService.getCurrentProgrammeName(); $scope.genres = $scope.searchManagerService.getCurrentProgrammeGenre(); + $scope.startTime = $scope.searchManagerService.getCurrentProgrammeStartTime() * 1000; + $scope.duration = $scope.searchManagerService.getCurrentProgrammeDuration() * 1000; + $scope.stopTime = $scope.duration + $scope.startTime; + $scope.newWidth = "{'width':'70px'}"; $scope.isRequired = true; } else if (!newInfo) { Modified: oipf/emulator/js/contollers/RemoteControlController.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlController.js 2015-07-10 16:37:55 UTC (rev 1802) +++ oipf/emulator/js/contollers/RemoteControlController.js 2015-07-10 16:39:00 UTC (rev 1803) @@ -36,6 +36,9 @@ $scope.$broadcast("VolumeEvent", changeType); }; + $scope.setChannelByNumber = function(number) { + }; + $scope.clickMapping = { POWER: "setPowerChange", 0: "setChannelByNumber", Modified: oipf/emulator/js/contollers/VideoBroadcastController.js =================================================================== --- oipf/emulator/js/contollers/VideoBroadcastController.js 2015-07-10 16:37:55 UTC (rev 1802) +++ oipf/emulator/js/contollers/VideoBroadcastController.js 2015-07-10 16:39:00 UTC (rev 1803) @@ -7,13 +7,13 @@ $scope.configurationService = ConfigurationService; $scope.chanLogo = ""; - + $scope.displayLogo = true; $scope.promiseVolumeView = null; $scope.volumeClass = "glyphicon-volume-down"; $scope.currentVolume = $scope.configurationService.configurationObject.localSystem.volume; $rootScope.channelInfo = false; - $scope.volumeViewActive = true; + $scope.volumeViewActive = false; $scope.setChannelByNumber = function(buttonId) { $scope.channelNumberActive = true; @@ -30,7 +30,23 @@ $scope.$on("ChannelChangeEvent", function(event, changeType) { console.log(changeType); - }); + $scope.videoBroadcastService.changeChannel(changeType) + .then(function() { + console.log($scope.videoBroadcastService.getCurrentChannel().name); + }) + .then(function() { + return $scope.searchManagerService + .findCurrentProgramme($scope.videoBroadcastService.getCurrentChannel()); + }) + .then(function() { + $rootScope.channelInfo = false; + $timeout(function() { + $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); + $scope.displayLogo = true; + $rootScope.channelInfo = true; + }, 1000); + }); + }); $scope.$on("VolumeEvent", function(event, changeType) { console.log("A VolumeEvent has been received: The volume will change."); @@ -77,9 +93,10 @@ .then(function() { console.log("Current programme OK."); $rootScope.channelInfo = true; + $scope.displayLogo = true; console.groupEnd("VideoBroadcastController"); $timeout(function() { - $rootScope.channelInfo = false; +// $rootScope.channelInfo = false; }, 4000); }); } else { @@ -86,6 +103,9 @@ var promise = $scope.videoBroadcastService.release.call($scope.videoBroadcastService); promise.then(function() { console.group("VideoBroadcastController"); + $scope.chanLogo = ""; + $rootScope.channelInfo = false; + $scope.displayLogo = false; console.log("The video-broadcast object have been released, SYSTEM OFF.") console.groupEnd("VideoBroadcastController"); }); Modified: oipf/emulator/js/emulator.js =================================================================== --- oipf/emulator/js/emulator.js 2015-07-10 16:37:55 UTC (rev 1802) +++ oipf/emulator/js/emulator.js 2015-07-10 16:39:00 UTC (rev 1803) @@ -4,11 +4,13 @@ var OIPFServices = angular.module("OIPFServices", []); var Controllers = angular.module("Controllers", []); var Filters = angular.module("Filters", []); +var Directives = angular.module("Directives", []); var emulatorApplication = angular.module("emulatorApplication", [ "OIPFServices", "Controllers", - "Filters" + "Filters", + "Directives" ]); Modified: oipf/emulator/js/services/SearchManagerService.js =================================================================== --- oipf/emulator/js/services/SearchManagerService.js 2015-07-10 16:37:55 UTC (rev 1802) +++ oipf/emulator/js/services/SearchManagerService.js 2015-07-10 16:39:00 UTC (rev 1803) @@ -20,6 +20,14 @@ return this.currentProgramme.genre || ["Unknow"]; }; + searchManagerService.getCurrentProgrammeStartTime = function() { + return this.currentProgramme.startTime || "Unkonw"; + }; + + searchManagerService.getCurrentProgrammeDuration = function() { + return this.currentProgramme.duration || "Unkonw"; + }; + 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-10 16:37:55 UTC (rev 1802) +++ oipf/emulator/js/services/VideoBroadcastService.js 2015-07-10 16:39:00 UTC (rev 1803) @@ -18,7 +18,7 @@ }; videoBroadcastService.getCurrentChannelLogoUrl = function() { - return this.getCurrentChannel().logoUrl; + return this.getCurrentChannel().logoURL; }; videoBroadcastService.bindToCurrentChannel = function() { @@ -27,6 +27,7 @@ this.previousState = this.videoBroadcastObject.playState; this.currentIndex = 0; + this.resetTransition(); this.videoBroadcastObject.onPlayStateChange = function(state, error) { if (state == videoBroadcastConstants.state.PRESENTING) { @@ -52,6 +53,7 @@ var deferred = $q.defer(); if (this.videoBroadcastObject.playState) { + this.resetTransition(); this.currentIndex = 0; this.previousState = this.videoBroadcastObject.playState; @@ -69,8 +71,8 @@ return deferred.promise; }; - videoBroadcastService.prevChannel = function() { - + videoBroadcastService.changeChannel = function(changeType) { + this.resetTransition(); var deferred = $q.defer(); this.currentIndex = 0; @@ -86,36 +88,17 @@ deferred.resolve(); }; - this.videoBroadcastObject.prevChannel && this.videoBroadcastObject.prevChannel(); + if (changeType == "P+") { + this.videoBroadcastObject.nextChannel && this.videoBroadcastObject.prevChannel(); + } else if (changeType == "P-") { + this.videoBroadcastObject.prevChannel && this.videoBroadcastObject.nextChannel(); + } + return deferred.promise; - } - videoBroadcastService.nextChannel = function() { + }; - var deferred = $q.defer(); - this.currentIndex = 0; - - this.videoBroadcastObject.onPlayStateChange = - this.onChangeState.bind(this, deferred.resolve, deferred.reject); - - this.previousState = this.videoBroadcastObject.playState; - - this.addTransition(this.previousState, - videoBroadcastConstants.state.CONNECTING); - - this.addTransition(videoBroadcastConstants.state.CONNECTING, - videoBroadcastConstants.state.PRESENTING); - - this.videoBroadcastObject.onChannelChangeSucceeded = function(channel) { - deferred.resolve(); - }; - - this.videoBroadcastObject.nextChannel && this.videoBroadcastObject.nextChannel(); - - return deferred.promise; - } - videoBroadcastService.setVolume = function(buttonId) { if (buttonId == "V+") { Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-07-10 16:37:55 UTC (rev 1802) +++ oipf/emulator/view/index.html 2015-07-10 16:39:00 UTC (rev 1803) @@ -22,6 +22,7 @@ <script src="./emulator/js/services/ConfigurationService.js"></script> <script src="./emulator/js/services/SearchManagerService.js"></script> <script src="./emulator/js/services/VideoBroadcastService.js"></script> + <script src="./emulator/js/directives/ProgrammeProgress.js"></script> <script src="./emulator/js/contollers/RemoteControlController.js"></script> <script src="./emulator/js/contollers/VideoBroadcastController.js"></script> <script src="./emulator/js/contollers/PowerStateController.js"></script> @@ -43,24 +44,29 @@ </div> <div> <span ng-repeat="genre in genres">{{genre}} </span> + {{duration/60000}}MIN + <p class="csa"> {{parentalRating}} </p> </div> + <div> - <div class="col-md-1">12H45</div> - <div class="col-md-10"></div> - <div class="col-md-1">15h06</div> + <div class="col-md-1">{{startTime | date : 'HH:mm' : '+0200'}}</div> + <div class="col-md-10 border container"> + <div id="programmeState" ng-style="{{newWidth}}"> + </div> + </div> + <div class="col-md-1">{{stopTime | date : 'HH:mm' : '+0200'}}</div> </div> </div> </div> - <div class="off" id="powerStateView" ng-controller="PowerStateController" ng-class="state"> + <div class="off" ng-controller="PowerStateController" ng-class="state"> <div id="imgChannel" ng-show="beforeON"> <h1>EMULATOR</h1> </div> </div> - <object id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> - <img class="pull-right" ng-src="{{chanLogo}}"/> + <img ng-show={{displayLogo}} class="pull-right" ng-src="{{chanLogo}}"/> <div id="volumeView" class="text-center" ng-show="volumeViewActive"> <div> <h3> @@ -202,19 +208,5 @@ </div> </div> - - </body> </html>

1 0

r1802 - in oipf/emulator/js: . directives
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:37:55 +0200 (Fri, 10 Jul 2015) New Revision: 1802 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1802 Log: Do a progress bar for programme in emulator. Added: oipf/emulator/js/directives/ oipf/emulator/js/directives/ProgrammeProgress.js Added: oipf/emulator/js/directives/ProgrammeProgress.js =================================================================== --- oipf/emulator/js/directives/ProgrammeProgress.js (rev 0) +++ oipf/emulator/js/directives/ProgrammeProgress.js 2015-07-10 16:37:55 UTC (rev 1802) @@ -0,0 +1,38 @@ +Directives.directive("programmeProgress", ["$interval", function($interval) { + + function link(scope, element, attrs) { + var timeoutId; +// var increment = 1000 * 100 / scope.duration; + + //FIX-ME: Add a block for programmes already started + function updateProgrammeProgress() { + /*if (element.width == 100) { + + } + element.width += increment + "%";*/ + console.log("WIDTH", element, element.css("width")); + $interval.cancel(timeoutId); + } + + scope.$watch(attrs.programmeProgress, function(value) { + element.animate({ + width: "+=50px" + }); + updateProgrammeProgress(); + }); + + element.on("$destroy", function() { + $interval.cancel(timeoutId); + }); + + /*// start the UI update process; save the timeoutId for canceling + timeoutId = $interval(function() { + updateProgrammeProgress(); // update DOM + }, 1000);*/ + } + + return { + link: link + }; + +}]);

1 0

r1801 - in oipf/lib/js: impl/model utils
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:33:20 +0200 (Fri, 10 Jul 2015) New Revision: 1801 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1801 Log: General refactoring about access of programme data into emulator application. Modified: oipf/lib/js/impl/model/ParentalRatingScheme.js oipf/lib/js/utils/ChannelService.js oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/impl/model/ParentalRatingScheme.js =================================================================== --- oipf/lib/js/impl/model/ParentalRatingScheme.js 2015-07-10 16:28:35 UTC (rev 1800) +++ oipf/lib/js/impl/model/ParentalRatingScheme.js 2015-07-10 16:33:20 UTC (rev 1801) @@ -25,6 +25,7 @@ * when name unequal to "dvb-si" but i don't know with what values. */ constructor(name, values) { + super(); this._iconUri = []; this.name = name; this.threshold = null; Modified: oipf/lib/js/utils/ChannelService.js =================================================================== --- oipf/lib/js/utils/ChannelService.js 2015-07-10 16:28:35 UTC (rev 1800) +++ oipf/lib/js/utils/ChannelService.js 2015-07-10 16:33:20 UTC (rev 1801) @@ -9,22 +9,21 @@ constructor(currentChannel, channelNumber, channelOrigin, channelList) { this.channelNumber = channelNumber; this.channelOrigin = channelOrigin; - this.channelListArray = channelList; this.getNumber = OipfUtils.generateFourDigit.bind(null); this.channelList = new ChannelList(); - this.createChannelList(); + this.createChannelList(channelList); this.favouriteLists = new FavouriteListCollection(); this.currentFavouriteList = new FavouriteList(); this.setCurrentChannel(currentChannel); } - createChannelList() { + createChannelList(channelList) { if (this.channelNumber > 0) { - for (var i = 0, li = this.channelListArray.length; i < li; i++) { - var channel = this.channelListArray[i]; + for (var i = 0, li = channelList.length; i < li; i++) { + var channel = channelList[i]; var newOipfChannel = new Channel(channel); this.channelList && this.channelList.push(newOipfChannel); @@ -87,4 +86,10 @@ } } + addChannel(channel) { + if (channel && this.channelList) { + this.channelList.push(channel); + } + } + } Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-07-10 16:28:35 UTC (rev 1800) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-07-10 16:33:20 UTC (rev 1801) @@ -13,21 +13,31 @@ stop: "duration", "desc#text": "description", "episode-num#text": "episode", - "title#text": "name" + "title#text": "name", + value: "parentalRatings", + src: "_picture" }; this.transformationData = { start: { methodTransformName: "millsecondsSinceJanuary1970", - necessaryData: ["value"] + necessaryData: ["content"] }, stop: { methodTransformName: "millsecondsSinceJanuary1970", - necessaryData: ["value"] + necessaryData: ["content"] }, category: { methodTransformName: "setCategory", - necessaryData: ["value"] + necessaryData: ["content"] + }, + value: { + methodTransformName: "setParentalRating", + necessaryData: ["content"] + }, + src: { + methodTransformName: "setProgrammePicture", + necessaryData: ["content"] } } @@ -68,7 +78,7 @@ if (element instanceof Object && !(element instanceof Array)) { createProgramme(element, programme, key); } else { - self.setProgrammeProperty(element, key, parentKey, programme, channelName); + self.setProgrammeProperty(element, key, parentKey, programme, channelName); } } @@ -80,10 +90,15 @@ if (realChannelName) { var channel = this.channelService.getChannelSimplyByName(realChannelName); + if (!channel) { channel = this.initChannel(realChannelName); + + if (channel) { + this.channelService.addChannel(channel); + } } - channel.logoUrl = channelLogoUrl; + programme.channel = channel; } @@ -111,7 +126,7 @@ element = self.transformInSecondSince01011970(element); }*/ var data = { - value: element, + content: element, key: key }; @@ -176,7 +191,7 @@ return this[methodTransformationName].apply(this, methodTransformationParams); } - return data.value; + return data.content; } getMethodTransformationParameter(data, infoList) { @@ -202,7 +217,7 @@ categoryItem && category.push(categoryItem); } - return category + return category; } millsecondsSinceJanuary1970(date) { @@ -211,5 +226,21 @@ return date; } + setParentalRating(rating) { + var parentalRating = new ParentalRating("dvb-si", rating, "", "0", ""); + + var parentalRatingCollection = new ParentalRatingCollection(parentalRating); + + if (parentalRating && parentalRatingCollection) { + return parentalRatingCollection; + } + + return undefined; + } + + setProgrammePicture(url) { + return url; + } + }

1 0

r1800 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:28:35 +0200 (Fri, 10 Jul 2015) New Revision: 1800 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1800 Log: Now only one file is used for get channel line-up and programmes data. Modified: oipf/lib/js/impl/OipfObjectFactory.js Modified: oipf/lib/js/impl/OipfObjectFactory.js =================================================================== --- oipf/lib/js/impl/OipfObjectFactory.js 2015-07-10 16:25:39 UTC (rev 1799) +++ oipf/lib/js/impl/OipfObjectFactory.js 2015-07-10 16:28:35 UTC (rev 1800) @@ -80,13 +80,11 @@ _setInitPromise() { var self = this; - var channelListUrl = this._oipfConfiguration.channelList; var programmesUrl = this._oipfConfiguration.programmes; - this._initPromise = this._createDocument(channelListUrl, "_setChannelConfig") - .then(function() { - return self._createDocument(programmesUrl, "_setSearchManagerObject"); - }); + this._initPromise = this._createDocument(programmesUrl) + .then(this._setChannelConfig.bind(this)) + .then(this._setSearchManagerObject.bind(this)); } _getInitPromise() { @@ -93,24 +91,35 @@ return this._initPromise; } - _createDocument(filename, callbackName) { + _createDocument(filename) { var self = this; var promise = new Promise(function(resolve, reject) { if (window.XMLHttpRequest) { var xmlHttpRequest = new XMLHttpRequest(); + xmlHttpRequest.open("GET", filename); + xmlHttpRequest.send(); + xmlHttpRequest.onload = function() { + if (this.status == 200 && this.responseXML != null) { var xmlToJson = new XmlToJson(this.responseXML); - var jsonData = xmlToJson.getJson(); - self[callbackName].call(self, jsonData); + self._jsonProgrammesAndChannels = xmlToJson.getJson(); + + if (self._jsonProgrammesAndChannels) { + console.log("Channels and programmes data have been received.") + } + console.log("A new doument has been created."); + resolve(); + } else { console.log("An error occured during the document creation."); + reject(); } }; @@ -655,12 +664,15 @@ } } - _setChannelConfig(channelListJson) { + _setChannelConfig() { + var channelHelper = new ChannelHelper(this._jsonProgrammesAndChannels.tv.channel); + var oipfChannels = channelHelper.getOipfChannels(); + this._channelService = new ChannelService(this._oipfConfiguration.currentChannel, this._oipfConfiguration.channelNumber, this._oipfConfiguration.channelOrigin, - channelListJson.channelList.channel + oipfChannels ); this._channelServicePromise.resolve(this._channelService); @@ -668,11 +680,11 @@ this.channelConfig._fireEventChannelListUpdate(); } - _setSearchManagerObject(programmesJson) { - var somesChannelInfo = programmesJson.tv.channel; + _setSearchManagerObject() { + var somesChannelInfo = this._jsonProgrammesAndChannels.tv.channel; var oipfProgrammes = new ProgrammeHelper(this._channelService, somesChannelInfo) - .initProgrammes(programmesJson.tv.programme); + .initProgrammes(this._jsonProgrammesAndChannels.tv.programme); this._programmeService = new ProgrammeService(oipfProgrammes);

1 0

r1798 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:23:46 +0200 (Fri, 10 Jul 2015) New Revision: 1798 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1798 Log: Transform channel xmltv data into oipf channel object. Added: oipf/lib/js/utils/ChannelHelper.js Added: oipf/lib/js/utils/ChannelHelper.js =================================================================== --- oipf/lib/js/utils/ChannelHelper.js (rev 0) +++ oipf/lib/js/utils/ChannelHelper.js 2015-07-10 16:23:46 UTC (rev 1798) @@ -0,0 +1,95 @@ +class ChannelHelper { + + constructor(jsonChannels) { + this.map = { + "display-name": "setName", + icon: "setLogoUrl" + }; + this.oipfChannels = []; + this.jsonChannels = jsonChannels; + + this.channelDefaultConf = { + name: "", + channelType: "TYPE_TV", + idType: 12, + ccid: null, + tunerID: null, + onid: null, + nid: null, + tsid: null, + sid: null, + sourceID: null, + freq: null, + cni: null, + majorChannel: null, + minorChannel: null, + dsd: "", + favourite: false, + favIDs: null, + locked: false, + manualBlock: true, + ipBroadcastID: null, + channelMaxBitRate: null, + channelTTR: null, + recordable: true, + longName: null, + description: null, + authorised: null, + genre: null, + hidden: false, + is3D: false, + isHD: false, + logoURL: "" + } + } + + getOipfChannels() { + + for (var i = 0, li = this.jsonChannels.length; i < li; i++) { + var channelItem = this.jsonChannels[i]; + var channelConf = {} + var channelItemKeys = Object.keys(channelItem); + + for (var j = 0, lj = channelItemKeys.length; j < lj; j++) { + var channelKey = channelItemKeys[j]; + + var channelKeyValue = channelItem[channelKey]; + + var methodToCall = this.map[channelKey]; + + if (methodToCall) { + this[methodToCall].call(this, channelKeyValue, channelConf); + } + } + + var oipfChannel = this.getDVBTChannel(channelConf); + + if (oipfChannel) { + this.oipfChannels.push(oipfChannel); + } else { + console.log("Error in channel creation"); + } + } + + return this.oipfChannels; + } + + setName(name, channelConf) { + channelConf.name = name || null; + } + + setLogoUrl(logoObject, channelConf) { + channelConf.logoURL = logoObject && logoObject.src || null; + } + + getDVBTChannel(channelConf) { + channelConf.onid = OipfUtils.generateFourDigit(); + channelConf.tsid = OipfUtils.generateFourDigit(); + channelConf.sid = OipfUtils.generateFourDigit(); + channelConf.idType = 12; + + return new Channel(channelConf); + } + +} +

1 0

r1797 - oipf/lib
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:22:40 +0200 (Fri, 10 Jul 2015) New Revision: 1797 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1797 Log: Take into account new object 'ChannelHelper'. Modified: oipf/lib/paths.json Modified: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json 2015-07-10 16:20:07 UTC (rev 1796) +++ oipf/lib/paths.json 2015-07-10 16:22:40 UTC (rev 1797) @@ -21,6 +21,7 @@ "js/utils/ProgrammeService.js", "js/utils/XmlToJson.js", "js/utils/ProgrammeHelper.js", + "js/utils/ChannelHelper.js", "js/utils/ComplexPromise.js", "js/utils/Storage.js", "configuration/ConfigDefaultProperties.js", @@ -27,6 +28,10 @@ "configuration/CapabilitiesProperties.js", "configuration/OipfConfiguration.js", "js/impl/model/Collection.js", + "js/impl/model/ParentalRating.js", + "js/impl/model/ParentalRatingCollection.js", + "js/impl/model/ParentalRatingScheme.js", + "js/impl/model/ParentalRatingSchemeCollection.js", "js/impl/model/ComplexObject.js", "js/impl/model/SignalInfo.js", "js/impl/model/LNBInfo.js",

1 0

r1796 - oipf/emulator/css
by ygrego＠users.nuiton.org 10 Jul '15

10 Jul '15

Author: ygrego Date: 2015-07-10 18:20:07 +0200 (Fri, 10 Jul 2015) New Revision: 1796 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1796 Log: Manage the programme's progress. Modified: oipf/emulator/css/main.css Modified: oipf/emulator/css/main.css =================================================================== --- oipf/emulator/css/main.css 2015-07-09 17:37:32 UTC (rev 1795) +++ oipf/emulator/css/main.css 2015-07-10 16:20:07 UTC (rev 1796) @@ -1,17 +1,3 @@ -/* -To change this license header, choose License Headers in Project Properties. -To change this template file, choose Tools | Templates -and open the template in the editor. -*/ -/* - Created on : 3 juin 2015, 11:33:14 - Author : root -*/ - -/*[class*="col-"] { - padding: 15px; -}*/ - #emulator { height: 600px; background-color: activecaption; @@ -70,11 +56,11 @@ object { width: 100%; height: 100%; - background-color: slategrey; +/* background-color: lightslategray;*/ } .off { - position: absolute; +/* position: absolute;*/ width: 100%; height: 100%; background-color: black; @@ -100,6 +86,18 @@ font-weight: bold; } -.paddingTop { - padding-top: 4px; +p { + padding-top: 3px; } + +#programmeState { + height: 100%; + width: 0.30%; + background-color: white; +} + +.container { + height: 20px; + padding: 0; + display: block; +}

1 0

r1795 - in oipf/lib: . js/impl js/utils
by smaisonneuve＠users.nuiton.org 09 Jul '15

09 Jul '15

Author: smaisonneuve Date: 2015-07-09 19:37:32 +0200 (Thu, 09 Jul 2015) New Revision: 1795 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1795 Log: [Utils] Adding a storage utility to share data into localStorage Added: oipf/lib/js/utils/Storage.js Modified: oipf/lib/js/impl/VideoBroadcastObject.js oipf/lib/paths.json Modified: oipf/lib/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/lib/js/impl/VideoBroadcastObject.js 2015-07-09 13:51:59 UTC (rev 1794) +++ oipf/lib/js/impl/VideoBroadcastObject.js 2015-07-09 17:37:32 UTC (rev 1795) @@ -159,11 +159,18 @@ this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); + this._storage = new Storage(); } createdCallback() { console.log("[INFO] createdCallback called."); this.init(); + + // If multiple video/bcast lives in different windows they should be kept in sync + var changePlayState = this.changePlayState.bind(this); + this._storage.addListener("playState", function(event) { + changePlayState(parseInt(event.newValue)); + }) } _setChannelService() { @@ -239,7 +246,8 @@ * • Number state: * the new state of the video/broadcast object. Valid values are given in the definition of the playState property above. * - * • Number error – if the state has changed due to an error, this field contains an error code detailing the type of error. See the definition of * onChannelChangeError above for valid values. If no error has occurred, this argument SHALL take the value undefined . + * • Number error – if the state has changed due to an error, this field contains an error code detailing the type of error. + * See the definition of onChannelChangeError above for valid values. If no error has occurred, this argument SHALL take the value undefined . */ get onPlayStateChange() { return this._getCallback("PlayStateChange"); Added: oipf/lib/js/utils/Storage.js =================================================================== --- oipf/lib/js/utils/Storage.js (rev 0) +++ oipf/lib/js/utils/Storage.js 2015-07-09 17:37:32 UTC (rev 1795) @@ -0,0 +1,54 @@ +/** + * This class is meant to handle the localStorage data source + **/ +class Storage { + + constructor() { + let listeners = this.listeners = []; + window.addEventListener("storage", function(event) { + let listenersOnKey = listeners[event.key]; + if (listenersOnKey) { + for (let listener of listenersOnKey) { + listener(event); + } + } + }); + } + + /** + * Add a storage listener when a specific key is modified within the localStorage + * @param {String} key the key to listen for modifications + * @param {Function} callback the callback to call on when a modification has been detected + */ + addListener(key, callback) { + this.listeners[key] = this.listeners[key] || []; + this.listeners[key].push(callback); + } + + removeListener(key, callback) { + let listeners = this.listeners[key]; + let index = listeners.indexOf(callback); + if (index >= 0) { + listeners.splice(index, 1); + } + } + + set(key, value) { + // Let's stringify the value to be able to store objects + let string = JSON.stringify(value); + localStorage.setItem(key, string); + } + + get(key) { + let value = localStorage.getItem(key); + return JSON.parse(value); + } + + remove(key) { + localStorage.removeItem(key); + } + + clear() { + localStorage.clear(); + } +} Modified: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json 2015-07-09 13:51:59 UTC (rev 1794) +++ oipf/lib/paths.json 2015-07-09 17:37:32 UTC (rev 1795) @@ -22,6 +22,7 @@ "js/utils/XmlToJson.js", "js/utils/ProgrammeHelper.js", "js/utils/ComplexPromise.js", + "js/utils/Storage.js", "configuration/ConfigDefaultProperties.js", "configuration/CapabilitiesProperties.js", "configuration/OipfConfiguration.js",

1 0