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

r904 - oipf/js/utils
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 13:07:51 +0000 (Mon, 02 Mar 2015) New Revision: 904 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/904 Log: Use of loop (for) in method "findChannel" and new approach to retrieve the next/previous channel. Modified: oipf/js/utils/ChannelTools.js Modified: oipf/js/utils/ChannelTools.js =================================================================== --- oipf/js/utils/ChannelTools.js 2015-03-02 13:06:01 UTC (rev 903) +++ oipf/js/utils/ChannelTools.js 2015-03-02 13:07:51 UTC (rev 904) @@ -4,19 +4,38 @@ * and open the template in the editor. */ var ChannelTools = Class.extend({ + init: function() { }, + findChannel: function(channelCollection, channel, step) { - for (var keys = Object.keys(channelCollection) in channelCollection) { - if (channelCollection[keys] == channel) { - return channelCollection[Math.abs((keys%(channelCollection.length))+step)]; + for (var i = 0, l = channelCollection.length; i < l; i++ ) { + + if (channelCollection[i] == channel) { + + if ((i == 0) && (step == -1)) { + var index = channelCollection.length + step; + + } else { + + if((i == (channelCollection.length-1)) && (step == 1)) { + index = 0; + + } else { + index = i + step; + + } + } + return channelCollection[index]; } } return null; }, + isAValidDVBTChannel: function(channel) { return (channel.onid) && (channel.tsid) && (channel.sid); }, + /* * Description: * This method verify that a tuner is available to receive a channel with this "idType".

1 0

r903 - oipf/js/test
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 13:06:01 +0000 (Mon, 02 Mar 2015) New Revision: 903 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/903 Log: New test method added: "testNextChannel". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-03-02 10:08:34 UTC (rev 902) +++ oipf/js/test/VideoBroadcastTest.js 2015-03-02 13:06:01 UTC (rev 903) @@ -148,6 +148,7 @@ videoBroadcastObject.onChannelChangeSucceeded = function(channel) { if (self.assertNotNull(channel)) { console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Successful"); + console.log(channel.name); resolve("Successfull"); } else { console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); @@ -160,6 +161,52 @@ }, + testNextChannel: function(resolve, reject) { + console.log("***************************************************************************************************************************"); + + console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Pending"); + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + videoBroadcastObject.playstate = 2; + videoBroadcastObject.currentChannel = videoBroadcastObject.getChannelConfig().currentChannel; + videoBroadcastObject.nextChannel(); + + var self = this; + videoBroadcastObject.onPlayStateChange = function(state, error) { + + videoBroadcastObject.playstate = state; + + if (error) { + var errorText = self.error[error]; + console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Failure"); + + reject("Failure:" + errorText); + } + + }; + + videoBroadcastObject.onChannelChangeError = function(channel, error) { + var errorText = self.error[error]; + console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Failure"); + + reject("Failure:" + errorText); + }; + + videoBroadcastObject.onChannelChangeSucceeded = function(channel) { + if (self.assertNotNull(channel)) { + console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Successful"); + console.log(channel.name); + resolve("Successfull"); + } else { + console.log("[TEST-RUNNING][Info] Id: vbTestNextChannel, Label: Switch to next channel in channel list, State: Failure"); + reject("Failure : The channel is null for a unknown reason."); + } + + }; + console.log("***************************************************************************************************************************"); + + + }, + verifWantedPlayState: function (currentObject, object,receivedPlayState, wantedPlayState) { if (currentObject.assertEquals(receivedPlayState, wantedPlayState)) { object.playstate = receivedPlayState;

1 0

r902 - oipf/js/impl
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 10:08:34 +0000 (Mon, 02 Mar 2015) New Revision: 902 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/902 Log: Addition of method "channelSwitch". In fact, the code present initially in "prevChannel" has been moved to "channelSwitch" in order to also be used in "nextChannel". "prevChannel" and "nextChannel" are very similar. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-02 09:29:09 UTC (rev 901) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-02 10:08:34 UTC (rev 902) @@ -373,63 +373,7 @@ * */ prevChannel: function() { - //claimed scarce resources - //Call method to claim scarce resources - - var channelConfig = this.getChannelConfig(); - var favouriteLists = channelConfig.favouriteLists; - //Verify that OITF maintain channel list or favourite list by itself - if (channelConfig && favouriteLists && (this.playstate > 0) && (this.playstate < 4)) { - - //Verify that the currentChannel exists in the channel list of channel configuration - if (!channelConfig.channelList.getChannel(this.currentChannel.channelId)) { - var self = this; - setTimeout(function () { - self.onChannelChangeError && self.onChannelChangeError(null, 100); - }, 0); - - if (this.playstate == 1) { - self = this; - setTimeout(function () { - self.onPlayStateChange && self.onPlayStateChange(0, 100); - }, 0); - } - } else { - - /* - * The norm affirm that the value "undefined" for the property "currentFavouriteList" - * means no current favourite list is activating. - * But test on this value for "currentFavouriteList" can cause confusion - * and when her value equals null, we have not the wanted behaviours. - */ - if (channelConfig.currentFavouriteList.length == 0) { - //Find the previous channel into channel list - var channelCollection = channelConfig.channelList; - } else { - //Find the previous channel into the current favourite list - channelCollection = channelConfig.currentFavouriteLists; - } - var _channelTools = new ChannelTools(); - var previousChannel = _channelTools.findChannel(channelCollection, this.currentChannel, - 1); - var tunerFound = _channelTools.verifyASuitableTunerAvailable(previousChannel.idType, this); - if (tunerFound) { - //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. - this.currentChannel = previousChannel; - self = this; - setTimeout(function () { - self.onPlayStateChange && self.onPlayStateChange(1); - self.onChannelChangeSucceeded && self.onChannelChangeSucceeded(previousChannel); - }, 0); - } - } - - } else { - //When the OITF does not maintain channel list or favourite list by itself - self = this; - setTimeout(function () { - self.onChannelChangeError && self.onChannelChangeError(null, 10); - }, 0); - } + this._channelSwitch(this, -1); }, /* * Description: @@ -464,8 +408,7 @@ * */ nextChannel: function() { - - + this._channelSwitch(this, 1); }, /* * Description: @@ -477,7 +420,6 @@ * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ setFullScreen: function(fullscreen) { - }, /* * Description: @@ -489,7 +431,6 @@ * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ setVolume: function(volume) { - }, /* * Description: @@ -501,8 +442,6 @@ * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ getVolume: function() { - - }, /* * Description: @@ -514,8 +453,6 @@ * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ release: function() { - - }, /* * Description: @@ -529,7 +466,65 @@ * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). */ stop: function() { + }, + + _channelSwitch: function(object, step) { + //claimed scarce resources + //Call method to claim scarce resources + var channelConfig = object.getChannelConfig(); + var favouriteLists = channelConfig.favouriteLists; + //Verify that OITF maintain channel list or favourite list by itself + if (channelConfig && favouriteLists && (object.playstate > 0) && (object.playstate < 4)) { + //Verify that the currentChannel exists in the channel list of channel configuration + if (!channelConfig.channelList.getChannel(object.currentChannel.channelId)) { + var self = object; + setTimeout(function () { + self.onChannelChangeError && self.onChannelChangeError(null, 100); + }, 0); + + if (object.playstate == 1) { + self = object; + setTimeout(function () { + self.onPlayStateChange && self.onPlayStateChange(0, 100); + }, 0); + } + } else { + + /* + * The norm affirm that the value "undefined" for the property "currentFavouriteList" + * means no current favourite list is activating. + * But test on this value for "currentFavouriteList" can cause confusion + * and when her value equals null, we have not the wanted behaviours. + */ + if (channelConfig.currentFavouriteList.length == 0) { + //Find the previous channel into channel list + var channelCollection = channelConfig.channelList; + } else { + //Find the previous channel into the current favourite list + channelCollection = channelConfig.currentFavouriteLists; + } + var _channelTools = new ChannelTools(); + var previousChannel = _channelTools.findChannel(channelCollection, object.currentChannel, step); + var tunerFound = _channelTools.verifyASuitableTunerAvailable(previousChannel.idType, object); + if (tunerFound) { + //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. + object.currentChannel = previousChannel; + self = object; + setTimeout(function () { + self.onPlayStateChange && self.onPlayStateChange(1); + self.onChannelChangeSucceeded && self.onChannelChangeSucceeded(previousChannel); + }, 0); + } + } + + } else { + //When the OITF does not maintain channel list or favourite list by itself + self = object; + setTimeout(function () { + self.onChannelChangeError && self.onChannelChangeError(null, 10); + }, 0); + } } }); \ No newline at end of file

1 0

r901 - oipf/js/impl
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 09:29:09 +0000 (Mon, 02 Mar 2015) New Revision: 901 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/901 Log: Deletion of method "_findChannel" and "_verifyASuitableTunerAvailable", these one are present into class "ChannelTools". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-02 09:21:46 UTC (rev 900) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-02 09:29:09 UTC (rev 901) @@ -409,9 +409,9 @@ //Find the previous channel into the current favourite list channelCollection = channelConfig.currentFavouriteLists; } - var previousChannel = this._findChannel(channelCollection, this.currentChannel, - 1); - console.log(previousChannel, channelCollection, this.currentChannel); - var tunerFound = this._verifyASuitableTunerAvailable(previousChannel.idType); + var _channelTools = new ChannelTools(); + var previousChannel = _channelTools.findChannel(channelCollection, this.currentChannel, - 1); + var tunerFound = _channelTools.verifyASuitableTunerAvailable(previousChannel.idType, this); if (tunerFound) { //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. this.currentChannel = previousChannel; @@ -531,53 +531,5 @@ stop: function() { - }, - - _findChannel: function(channelCollection, channel, step) { - for (var keys = Object.keys(channelCollection) in channelCollection) { - if (channelCollection[keys] == channel) { - return channelCollection[Math.abs((keys%(channelCollection.length))+step)]; - } - } - return null; - }, - - /* - * Description: - * This method verify that a tuner is available to receive a channel with this "idType". - * And return the first tuner found which match the "idType". - * Actually all video broadcast will use the same tuner because there is only one and - * this choice would be directed by parameter. - * - * ToDo :Normally the method should check if the tuner don't locked by another object but - * no way to do that in the norm. - * - * Argument: - * - idType : the type of tuner researched. - * - * Return: Tuner - */ - _verifyASuitableTunerAvailable: function(idType) { - var config = oipfObjectFactory.createConfigurationObject(); - var availableTuners = config.localSystem.tuners; - - for (var i = 0; i < availableTuners.length; i++) { - var tunerIdTypes = availableTuners[i].idTypes; - for (var j = 0; j < tunerIdTypes.length; j++) { - var tuner = availableTuners[i]; - if (tunerIdTypes[j] == idType) { - return tuner; - } - } - } - - if (idType == 40 || idType == 41) { - this.onChannelChangeError && this.onChannelChangeError(null, 8); - } else { - //this.onChannelChangeError && this.onChannelChangeError(null, 2); - this.onChannelChangeError && this.onChannelChangeError(null, 0); - } - return null; } - }); \ No newline at end of file

1 0

r900 - oipf/view
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 09:21:46 +0000 (Mon, 02 Mar 2015) New Revision: 900 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/900 Log: Reorganization of source files. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-02 09:15:50 UTC (rev 899) +++ oipf/view/test.html 2015-03-02 09:21:46 UTC (rev 900) @@ -16,7 +16,6 @@ <script src="../js/lib/Collection.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> - <script src="../data/data.js" type="text/javascript"></script> <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> <script src="../js/impl/model/Query.js" type="text/javascript"></script> <script src="../js/impl/model/Tuner.js" type="text/javascript"></script> @@ -36,6 +35,7 @@ <script src="../js/test/SearchManagerTest.js" type="text/javascript"></script> <script src="../js/test/VideoBroadcastTest.js" type="text/javascript"></script> <script src="../js/test/Test.js" type="text/javascript"></script> + <script src="../data/data.js" type="text/javascript"></script> <script src="../js/initObj/init.js" type="text/javascript"></script> <script>

1 0

r899 - oipf/js/utils
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 09:15:50 +0000 (Mon, 02 Mar 2015) New Revision: 899 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/899 Log: New method "isAValidChannelDVBTChannel" and "verifyASuitableTunerAvailable". Modified: oipf/js/utils/ChannelTools.js Modified: oipf/js/utils/ChannelTools.js =================================================================== --- oipf/js/utils/ChannelTools.js 2015-03-02 09:07:53 UTC (rev 898) +++ oipf/js/utils/ChannelTools.js 2015-03-02 09:15:50 UTC (rev 899) @@ -13,7 +13,46 @@ } } return null; + }, + isAValidDVBTChannel: function(channel) { + return (channel.onid) && (channel.tsid) && (channel.sid); + }, + /* + * Description: + * This method verify that a tuner is available to receive a channel with this "idType". + * And return the first tuner found which match the "idType". + * Actually all video broadcast will use the same tuner because there is only one and + * this choice would be directed by parameter. + * + * ToDo :Normally the method should check if the tuner don't locked by another object but + * no way to do that in the norm. + * + * Argument: + * - idType : the type of tuner researched. + * + * Return: Tuner + */ + verifyASuitableTunerAvailable: function(idType, object) { + var config = oipfObjectFactory.createConfigurationObject(); + var availableTuners = config.localSystem.tuners; + + for (var i = 0; i < availableTuners.length; i++) { + var tunerIdTypes = availableTuners[i].idTypes; + for (var j = 0; j < tunerIdTypes.length; j++) { + var tuner = availableTuners[i]; + if (tunerIdTypes[j] == idType) { + return tuner; + } + } + } + + if (idType == 40 || idType == 41) { + object.onChannelChangeError && object.onChannelChangeError(null, 8); + } else { + //this.onChannelChangeError && this.onChannelChangeError(null, 2); + object.onChannelChangeError && object.onChannelChangeError(null, 0); + } + return null; } - });

1 0

r898 - oipf/js/impl
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 09:07:53 +0000 (Mon, 02 Mar 2015) New Revision: 898 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/898 Log: Deletion of method "_isAValidDVBTChannel". This method will be moved into class "ChannelTools". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-02 09:05:34 UTC (rev 897) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-02 09:07:53 UTC (rev 898) @@ -542,10 +542,6 @@ return null; }, - _isAValidDVBTChannel: function(channel) { - return (channel.onid != null) && (channel.tsid != null) && (channel.sid != null); - }, - /* * Description: * This method verify that a tuner is available to receive a channel with this "idType".

1 0

r897 - oipf/js/utils
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 09:05:34 +0000 (Mon, 02 Mar 2015) New Revision: 897 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/897 Log: The index of a array is always positive so use of function "Math.abs" into method "findChannel". Because to find a channel the index is subject to a calculation in order to always loop on the list of channels. Modified: oipf/js/utils/ChannelTools.js Modified: oipf/js/utils/ChannelTools.js =================================================================== --- oipf/js/utils/ChannelTools.js 2015-03-02 08:49:32 UTC (rev 896) +++ oipf/js/utils/ChannelTools.js 2015-03-02 09:05:34 UTC (rev 897) @@ -7,10 +7,9 @@ init: function() { }, findChannel: function(channelCollection, channel, step) { - for (var keys = Object.keys(channelCollection) in channelCollection) { if (channelCollection[keys] == channel) { - return channelCollection[(keys % channelCollection.length) + step]; + return channelCollection[Math.abs((keys%(channelCollection.length))+step)]; } } return null;

1 0

r896 - oipf/js/impl
by ygrego＠users.nuiton.org 02 Mar '15

02 Mar '15

Author: ygrego Date: 2015-03-02 08:49:32 +0000 (Mon, 02 Mar 2015) New Revision: 896 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/896 Log: Use another kind of loop("for") into method "_verifyASuitableTunerAvailable". The other one("for in") was not appropriate. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-28 22:11:45 UTC (rev 895) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-02 08:49:32 UTC (rev 896) @@ -565,11 +565,11 @@ var config = oipfObjectFactory.createConfigurationObject(); var availableTuners = config.localSystem.tuners; - for (var tKeys = Object.keys(availableTuners) in availableTuners) { - var tunerIdTypes = availableTuners[tKeys].idTypes; - for (var tunerIdKeys = Object.keys(availableTuners[tKeys]) in tunerIdTypes) { - var tuner = availableTuners[tKeys]; - if (tunerIdTypes[tunerIdKeys] == idType) { + for (var i = 0; i < availableTuners.length; i++) { + var tunerIdTypes = availableTuners[i].idTypes; + for (var j = 0; j < tunerIdTypes.length; j++) { + var tuner = availableTuners[i]; + if (tunerIdTypes[j] == idType) { return tuner; } }

1 0

r895 - oipf/js/impl
by ygrego＠users.nuiton.org 28 Feb '15

28 Feb '15

Author: ygrego Date: 2015-02-28 22:11:45 +0000 (Sat, 28 Feb 2015) New Revision: 895 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/895 Log: A channel must have a identifer type at her instanciation so this information is added now. Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-02-28 22:06:22 UTC (rev 894) +++ oipf/js/impl/ChannelConfig.js 2015-02-28 22:11:45 UTC (rev 895) @@ -98,10 +98,11 @@ var channelType = "TYPE_TV"; var channelName = "ARTE"; - var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); + var channelIdType = 12; + var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); + var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); this.currentChannel = channelArte; this.channelList = new ChannelList(channelArte, channelFrance5);

1 0