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

r1714 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 07:48:16 +0000 (Mon, 15 Jun 2015) New Revision: 1714 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1714 Log: Method useful for activate or deactivate an application. Modified: oipf/lib/js/impl/ApplicationManagerObject.js Modified: oipf/lib/js/impl/ApplicationManagerObject.js =================================================================== --- oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-15 07:46:04 UTC (rev 1713) +++ oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-15 07:48:16 UTC (rev 1714) @@ -189,4 +189,16 @@ return this._applicationVisualizationMode; } + _removeFromActiveList(app) { + this._activeApplicationsList = this._activeApplicationsList.filter(function(itemList) { + return itemList.window != app.window; + }); + } + + _removeFromVisibleList(app) { + this._visibleApplicationsList = this._visibleApplicationsList.filter(function(itemList) { + return itemList.window != app.window; + }); + } + }

1 0

r1713 - oipf/emulator
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 07:46:04 +0000 (Mon, 15 Jun 2015) New Revision: 1713 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1713 Log: Make accessible the directory lib. Modified: oipf/emulator/server.js Modified: oipf/emulator/server.js =================================================================== --- oipf/emulator/server.js 2015-06-15 07:41:10 UTC (rev 1712) +++ oipf/emulator/server.js 2015-06-15 07:46:04 UTC (rev 1713) @@ -1,12 +1,12 @@ -var express = require('express'); +var express = require("express"); var app = express(); -app.use(express.static('.')); +app.use(express.static("..")); -app.get('/', function(req, res){ - res.sendFile('view/index.html', {root: "."}); -}); +app.get("/", function(req, res) { + res.sendFile("view/index.html", {root: "."}); +}) app.listen(4000); -console.log('Server running at http://192.168.99.190:4000/'); +console.log("Server running at http://localhost:4000/");

1 0

r1712 - oipf/emulator/view
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 07:41:10 +0000 (Mon, 15 Jun 2015) New Revision: 1712 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1712 Log: Unnecessary files. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-12 14:23:16 UTC (rev 1711) +++ oipf/emulator/view/index.html 2015-06-15 07:41:10 UTC (rev 1712) @@ -9,92 +9,25 @@ <title>TV Emulator</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" type="text/css" href="../css/main.css"/> <link rel="stylesheet" type="text/css" href="../node_modules/bootstrap/dist/css/bootstrap.min.css"> - - <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ParentalControlManagerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/RecordingSchedulerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ConfigurationConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/MetadataSearchConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/DaeMimeType.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/IdType.js" type="text/javascript"></script> - - <script src="../js/lib/Class.js" type="text/javascript"></script> - <script src="../js/utils/Timeout.js" type="text/javascript"></script> - <script src="../js/utils/Calculation.js" type="text/javascript"></script> - <script src="../js/utils/ChannelUtils.js" type="text/javascript"></script> - <script src="../js/utils/Utils.js" type="text/javascript"></script> - <script src="../js/utils/EventManager.js" type="text/javascript"></script> - <script src="../js/utils/TimerManager.js" type="text/javascript"></script> - <script src="../js/utils/TimerRecordingManager.js" type="text/javascript"></script> - <script src="../js/utils/MetadataManager.js" type="text/javascript"></script> - <script src="../js/utils/DateUtils.js" type="text/javascript"></script> - <script src="../js/utils/XmlParser.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeService.js" type="text/javascript"></script> - <script src="../js/utils/XmlToJson.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeHelper.js" type="text/javascript"></script> - - <script src="../configuration/ConfigDefaultProperties.js" type="text/javascript"></script> - <script src="../configuration/CapabilitiesProperties.js" type="text/javascript"></script> - <script src="../configuration/OipfConfiguration.js" type="text/javascript"></script> - - <script src="../js/impl/model/Collection.js" type="text/javascript"></script> - <script src="../js/impl/model/SignalInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/LNBInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterface.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> - <script src="../js/impl/model/Programme.js" type="text/javascript"></script> - <script src="../js/impl/model/AVOutput.js" type="text/javascript"></script> - <script src="../js/impl/model/Tuner.js" type="text/javascript"></script> - <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/AVOutputCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/TunerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterfaceCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/ScheduledRecordingCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/Query.js" type="text/javascript"></script> - <script src="../js/impl/model/Configuration.js" type="text/javascript"></script> - <script src="../js/impl/model/LocalSystem.js" type="text/javascript"></script> - <script src="../js/impl/model/Channel.js" type="text/javascript"></script> - <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> - <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> - <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> - <script src="../js/impl/model/ScheduledRecording.js" type="text/javascript"></script> - <script src="../js/impl/model/Recording.js" type="text/javascript"></script> - <script src="../js/impl/model/Application.js" type="text/javascript"></script> - - <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> - <script src="../js/impl/ConfigurationObject.js" type="text/javascript"></script> - <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> - <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script> - <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> - <script src="../js/impl/RecordingSchedulerObject.js" type="text/javascript"></script> - <script src="../js/impl/CapabilitiesObject.js" type="text/javascript"></script> - <script src="../js/impl/ParentalControlManagerObject.js" type="text/javascript"></script> - <script src="../js/impl/ApplicationManagerObject.js" type="text/javascript"></script> - - <script src="../js/utils/ChannelService.js" type="text/javascript"></script> - <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> - <script src="../init/init.js" type="text/javascript"></script> - + <script src="../node_modules/angular/angular.js"></script> <script src="../js/filters/VolumeFilter.js"></script> <script src="../js/contollers/RemoteControlControllers.js"></script> <script src="../js/emulator.js"></script> - + </head> <body> - + <div class="container-fluid" ng-controller="RemoteControlController"> <div class="row"> <div id="emulator" class="col-md-9"> - + <div id="volumeView" class="text-center" ng-show="volumeViewActive"> <div> <h3> <span class="label label-default"> - {{currentVolume}} + {{currentVolume}} <span class="glyphicon glyphicon-volume-up"></span> </span> </h3> @@ -104,26 +37,26 @@ </div> </div> </div> - </div> - + </div> + <div id="imgChannel" class="text-center" ng-show="emulatorON"> <h1>{{channel}}</h1> </div> - + <div id="channelNumberSwitchView" class="text-center" ng-show="channelNumberActive"> <span class="badge">{{channelNumber}}</span> </div> - + </div> - + <div class="col-sm-2 col-sm-offset-1"> - + <div class="panel panel-default"> <div class="panel-body"> <div class="row"> <div class="col-md-2 col-md-offset-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> - <span class="glyphicon glyphicon-off"></span> + <span class="glyphicon glyphicon-off"></span> </button> </div> </div> @@ -140,7 +73,7 @@ </div> <div class="col-md-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('3')"> - <span>3</span> + <span>3</span> </button> </div> </div> @@ -157,7 +90,7 @@ </div> <div class="col-md-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('6')"> - <span>6</span> + <span>6</span> </button> </div> </div> @@ -174,14 +107,14 @@ </div> <div class="col-md-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('9')"> - <span>9</span> + <span>9</span> </button> </div> </div> <div class="row"> <div class="col-md-2 col-md-offset-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('0')"> - <span>0</span> + <span>0</span> </button> </div> </div> @@ -218,31 +151,31 @@ </div> </div> </div> - + </div> - +  - + </div> </div> - - - + </body> -</html> \ No newline at end of file +</html>

1 0

r1711 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 14:23:16 +0000 (Fri, 12 Jun 2015) New Revision: 1711 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1711 Log: Avoid the duplication of somes properties, unnecessary. Modified: oipf/lib/js/impl/ApplicationManagerObject.js Modified: oipf/lib/js/impl/ApplicationManagerObject.js =================================================================== --- oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-12 14:11:54 UTC (rev 1710) +++ oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-12 14:23:16 UTC (rev 1711) @@ -160,23 +160,19 @@ this.widgets = null; this._currentApplication = null; - this._rootApplication = null; + this._hiddenSystemRootNode = []; + this._activeApplicationsList = new ApplicationCollection(); + this._visibleApplicationsList = new ApplicationCollection(); - this._hiddenSystemRootNode = null; - - this._activeApplicationsList = null; - - this._visibleApplicationsList = null; this._applicationVisualizationMode = applicationVisualizationMode; + this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); - this._hiddenSystemRootNode = []; - this._activeApplicationsList = new ApplicationCollection(); + this._createRootApplication(); }

1 0

r1710 - oipf/test/js
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 14:11:54 +0000 (Fri, 12 Jun 2015) New Revision: 1710 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1710 Log: The VideoBroadcastObject must be created only one time. Modified: oipf/test/js/TestConfig.js Modified: oipf/test/js/TestConfig.js =================================================================== --- oipf/test/js/TestConfig.js 2015-06-12 14:06:48 UTC (rev 1709) +++ oipf/test/js/TestConfig.js 2015-06-12 14:11:54 UTC (rev 1710) @@ -171,11 +171,7 @@ this.blocked = function() {}; this.bindToCurrentChannel = this.blocked; this.onChangeState = this.blocked; - this.createVideoBroadcast = function() { - if (!this.vidBroadObj) { - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - } - } + this.createVideoBroadcastObject = this.blocked; } onPVREvent(resolve, reject, event) {

1 0

r1709 - oipf/test/js
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 14:06:48 +0000 (Fri, 12 Jun 2015) New Revision: 1709 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1709 Log: The method which will use this variable waits a 'String'. Modified: oipf/test/js/SearchManagerTest.js Modified: oipf/test/js/SearchManagerTest.js =================================================================== --- oipf/test/js/SearchManagerTest.js 2015-06-12 12:37:33 UTC (rev 1708) +++ oipf/test/js/SearchManagerTest.js 2015-06-12 14:06:48 UTC (rev 1709) @@ -182,7 +182,7 @@ testSearchingForProgrammesWithDurationLowerThanOneHour(resolve, reject) { var self = this; - var value = 3600; + var value = "3600"; this.addTransition(this.UNREALIZED, this.CONNECTING);

1 0

r1708 - oipf/test/js
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 12:37:33 +0000 (Fri, 12 Jun 2015) New Revision: 1708 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1708 Log: Don't blocked the tuner by severals creations of VideoBroadcastObject. Modified: oipf/test/js/TestConfig.js Modified: oipf/test/js/TestConfig.js =================================================================== --- oipf/test/js/TestConfig.js 2015-06-12 11:51:07 UTC (rev 1707) +++ oipf/test/js/TestConfig.js 2015-06-12 12:37:33 UTC (rev 1708) @@ -146,73 +146,21 @@ constructor() { super(); - - this.startEndStates = { - "00": "unrealizedToUnrealized", - "01": "unrealizedToConnecting", - "12": "connectingToPresenting", - "33": "stopToStop", - "nullnull": "noStatesDefined" - }; - this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); - } + this.createVideoBroadcastObject(); - beforeTest(resolve, reject) { - this.beforeTest(resolve, reject); - this.cancel = true; - } - - noStatesDefined(begin, end, callback) { - this.reject("Untestable Case."); - } - - unrealizedToConnecting(begin, end, callback) { - if (callback) { - throw "Untestable Case."; - } - } - - connectingToPresenting(begin, end, callback) { - /* - * Avoid that the future transition C->P be canceled. - * More extend super method beforeTest in order to reset - * 'startEndStates' property. + /*The VideoBroadcastObject must be created on TV only one time if the TV own only one tuner + *because this one block this tuner. */ - - if (this.cancel) { - callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); - this.cancel = false; - } else { - this.pushTransition(begin, end, callback, null); - } + this.createVideoBroadcastObject = function() {}; + console.log(this.createVideoBroadcastObject); } - pushTransition(begin, end, callback, error) { - this.transitions.push({ - begin: begin, - end: end, - error: error, - callback: callback - }); - } - - pushTransitionWithError(begin, end, callback, error) { - var method = this.startEndStates["" + begin + end]; - if (method) { - this[method].call(this, begin, end, callback); - } else { - this.pushTransition(begin, end, callback, error); + addTransition(begin, end, callback) { + if (begin + end == 3) { + callback && callback(); } } - - addTransition(begin, end, callback) { - this.addTransitionWithError(begin, end, callback, null); - } - - addTransitionWithError(begin, end, callback, error) { - this.pushTransitionWithError(begin, end, callback, error); - } }; console.log("SearchManagerTest class redefined.");

1 0

r1707 - oipf/test/js
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 11:51:07 +0000 (Fri, 12 Jun 2015) New Revision: 1707 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1707 Log: Redefine where and when the VideoBroadcastObject will be created at redefinion of somes tests classes for their launching on TV. Modified: oipf/test/js/RecordingSchedulerTest.js oipf/test/js/SearchManagerTest.js oipf/test/js/VideoBroadcastTest.js Modified: oipf/test/js/RecordingSchedulerTest.js =================================================================== --- oipf/test/js/RecordingSchedulerTest.js 2015-06-12 10:49:36 UTC (rev 1706) +++ oipf/test/js/RecordingSchedulerTest.js 2015-06-12 11:51:07 UTC (rev 1707) @@ -11,10 +11,6 @@ this.timer = 3 * 60 * 1000; //3minutes, we had increased timer for unresolved tests. } - createVideoBroadcast() { - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - } - deleteAndStopStartedRecording() { var recordings = this.recordingSchedulerObject.recordings; @@ -42,7 +38,7 @@ this.recordingSchedulerObject .addEventListener("PVREvent", this.onPVREventCopy, false); - this.createVideoBroadcast(); + this.createVideoBroadcastObject(); this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); this.vidBroadObj .addEventListener("PlayStateChange", this.onPlayStateChange, false); Modified: oipf/test/js/SearchManagerTest.js =================================================================== --- oipf/test/js/SearchManagerTest.js 2015-06-12 10:49:36 UTC (rev 1706) +++ oipf/test/js/SearchManagerTest.js 2015-06-12 11:51:07 UTC (rev 1707) @@ -11,8 +11,8 @@ } beforeTest(resolve, reject) { + this.createVideoBroadcastObject(); this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); this.transitions = []; Modified: oipf/test/js/VideoBroadcastTest.js =================================================================== --- oipf/test/js/VideoBroadcastTest.js 2015-06-12 10:49:36 UTC (rev 1706) +++ oipf/test/js/VideoBroadcastTest.js 2015-06-12 11:51:07 UTC (rev 1707) @@ -31,7 +31,7 @@ } beforeTest(resolve, reject) { - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + this.createVideoBroadcastObject(); this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); this.transitions = [];

1 0

r1706 - oipf/test/js
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 10:49:36 +0000 (Fri, 12 Jun 2015) New Revision: 1706 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1706 Log: This modification permits to manage when and where the VideoBroadcastObject will be created in a test class. Modified: oipf/test/js/TestCase.js Modified: oipf/test/js/TestCase.js =================================================================== --- oipf/test/js/TestCase.js 2015-06-11 15:35:59 UTC (rev 1705) +++ oipf/test/js/TestCase.js 2015-06-12 10:49:36 UTC (rev 1706) @@ -90,5 +90,9 @@ } } + createVideoBroadcastObject() { + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + } + }

1 0

r1705 - oipf/lib/configuration
by ygrego＠users.nuiton.org 11 Jun '15

11 Jun '15

Author: ygrego Date: 2015-06-11 15:35:59 +0000 (Thu, 11 Jun 2015) New Revision: 1705 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1705 Log: Refactor this class in an ES6 class. Modified: oipf/lib/configuration/ConfigDefaultProperties.js Modified: oipf/lib/configuration/ConfigDefaultProperties.js =================================================================== --- oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-11 15:31:19 UTC (rev 1704) +++ oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-11 15:35:59 UTC (rev 1705) @@ -1,18 +1,18 @@ -/* +/* * 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. */ -var ConfigDefaultProperties = Class.extend({ - - init: function() { - +class ConfigDefaultProperties { + + constructor() { + this.restrictedPowerState = { 0: true, // OFF 6: true // FACTORY_RESET }, - + this.tvStandardsSupported = { 1: true, 2: true, @@ -20,13 +20,13 @@ 8: true, 16: true }, - + this.screenSize = { "1280x720": true, //HD 720 "1920x1080": true, //HD 1080 "640x480": true //VGA }, - + this.configuration = { preferredAudioLanguage: "fra", preferredSubtitleLanguage: "fra", @@ -36,16 +36,16 @@ pvrPolicy: configurationConstants.pvrPolicy.WATCHED_RECORDINGS, pvrSaveEpisodes: 5, pvrSaveDays: 15, - pvrStartPadding: 0, //Measured in (s) + pvrStartPadding: 0, //Measured in (s) pvrEndPadding: 0, //Measured in (s) preferredTimeShiftMode: videoBroadcastConstants.timeShiftMode.OFF }; - + this.startupInformation = { urlSource: null, url: null }; - + this.aVOutput = { name: null, type: null, @@ -63,15 +63,15 @@ supportedAspectRatios: null, current3DMode: null }; - + this.signalInfo = { strength: null, quality: null, - ber: null, + ber: null, snr: null, lock: null }; - + this.lNBInfo = { lnbType: null, lnbLowFreq: null, @@ -81,7 +81,7 @@ lnbStopFrequency: null, orbitalPosition: null }; - + this.tuner = { id: null, enableTuner: true, @@ -90,17 +90,17 @@ frontEndPosition: null, powerOnExternal: null }; - + var idTypes = new IntegerCollection(12, 11); var tunerTNT = new Tuner("TNT", idTypes, this.tuner); var tuners = new TunerCollection(tunerTNT); - - var masterAVOutput = + + var masterAVOutput = new AVOutput("master", "both", true, this.aVOutput); - - var networkInterface = + + var networkInterface = new NetworkInterface("192.168.99.191", "6D:FF:29:E1:AF:33", true, true); - + this.localSystem = { deviceID: undefined, systemReady: false, @@ -128,8 +128,8 @@ tvStandard: configurationConstants.tvStandard.SECAM, pvrSupport: 1, startupInformation: null - }; - + }; + } -}); +}

1 0