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

r936 - oipf/view
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 14:34:47 +0000 (Wed, 11 Mar 2015) New Revision: 936 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/936 Log: Renaming javascript source file "ChannelTools" in "ChannelUtils". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-11 14:31:03 UTC (rev 935) +++ oipf/view/test.html 2015-03-11 14:34:47 UTC (rev 936) @@ -12,7 +12,7 @@ <link rel="stylesheet" type="text/css" href="css/test.css"/> <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../js/utils/Calculation.js" type="text/javascript"></script> - <script src="../js/utils/ChannelTools.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/lib/Collection.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script>

1 0

r935 - oipf/js/utils
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 14:31:03 +0000 (Wed, 11 Mar 2015) New Revision: 935 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/935 Log: The methods which was contained in "ChannelUtils" become javascript "anonymous functions". Added: oipf/js/utils/ChannelUtils.js Removed: oipf/js/utils/ChannelTools.js Deleted: oipf/js/utils/ChannelTools.js =================================================================== --- oipf/js/utils/ChannelTools.js 2015-03-11 14:03:55 UTC (rev 934) +++ oipf/js/utils/ChannelTools.js 2015-03-11 14:31:03 UTC (rev 935) @@ -1,120 +0,0 @@ -/* - * 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 ChannelTools = Class.extend({ - - init: function() { - }, - - findChannel: function(channelCollection, channel, 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". - * 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; - }, - - getChannelByDsd: function(channelCollection, dsd) { - for (var i = 0, l = channelCollection.length; i < l; i++) { - if (channelCollection[i].dsd == dsd) { - return channelCollection[i]; - } - } - }, - - /* - * Description: - * This method verify the validity of the terrestrial delivery system descriptor. - * The argument will be compare to the dsd array byte defined either in - * the transport stream or directly in the terminal. - * - * Arguments - * - dsd: the delivery system descriptor string necessary to create a channel by intermediate of method - * createChannelObject. - */ - isAValidTerrestrialDsd: function(dsd) { - var dsdAttributes = dsd.split(","); - - if (TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length == dsdAttributes.length) { - - for (var i = 0, l = TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length; i < l; i++) { - - if (!(TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR[i] == dsdAttributes[i])) { - return false; - } - } - - return true; - } - }, - - getChannelByIpBroadcastID: function(channelCollection, ipBroadcastID) { - for (var i = 0, l = channelCollection.length; i < l; i++) { - if (channelCollection[i].ipBroadcastID == ipBroadcastID) { - return channelCollection[i]; - } - } - } - -}); - Copied: oipf/js/utils/ChannelUtils.js (from rev 933, oipf/js/utils/ChannelTools.js) =================================================================== --- oipf/js/utils/ChannelUtils.js (rev 0) +++ oipf/js/utils/ChannelUtils.js 2015-03-11 14:31:03 UTC (rev 935) @@ -0,0 +1,107 @@ +function findChannel(channelCollection, channel, 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; +} + +function isAValidDVBTChannel(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 + */ +function verifyASuitableTunerAvailable(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; +} + +function getChannelByDsd(channelCollection, dsd) { + for (var i = 0, l = channelCollection.length; i < l; i++) { + if (channelCollection[i].dsd == dsd) { + return channelCollection[i]; + } + } +} + +/* + * Description: + * This method verify the validity of the terrestrial delivery system descriptor. + * The argument will be compare to the dsd array byte defined either in + * the transport stream or directly in the terminal. + * + * Arguments + * - dsd: the delivery system descriptor string necessary to create a channel by intermediate of method + * createChannelObject. + */ +function isAValidTerrestrialDsd(dsd) { + var dsdAttributes = dsd.split(","); + + if (TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length == dsdAttributes.length) { + + for (var i = 0, l = TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length; i < l; i++) { + + if (!(TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR[i] == dsdAttributes[i])) { + return false; + } + } + + return true; + } +} + +function getChannelByIpBroadcastID(channelCollection, ipBroadcastID) { + for (var i = 0, l = channelCollection.length; i < l; i++) { + if (channelCollection[i].ipBroadcastID == ipBroadcastID) { + return channelCollection[i]; + } + } +}

1 0

r934 - oipf/js/impl/model
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 14:03:55 +0000 (Wed, 11 Mar 2015) New Revision: 934 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/934 Log: Implementation of method "getChannelBySourceID". Modified: oipf/js/impl/model/ChannelList.js Modified: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js 2015-03-11 14:01:58 UTC (rev 933) +++ oipf/js/impl/model/ChannelList.js 2015-03-11 14:03:55 UTC (rev 934) @@ -63,9 +63,7 @@ var self = this; if (nid) { - var test = function(i) { - if (self[i].onid == onid && self[i].tsid == tsid && self[i].sid == sid && self[i].nid == nid) { return self[i]; } @@ -73,7 +71,6 @@ } else { test = function(i) { - if (self[i].onid == onid && self[i].tsid == tsid && self[i].sid == sid) { return self[i]; } @@ -81,9 +78,10 @@ } for (var i = 0, l = this.length; i < l; i++) { - test(i); } + + return null; }, /* @@ -99,7 +97,12 @@ * Return: Channel */ getChannelBySourceID: function(sourceID) { - + + for (var i = 0, l = this.length; i < l; i++) { + if (this[i].sourceID == sourceID) { + return this[i]; + } + } } }); \ No newline at end of file

1 0

r933 - oipf/js/utils
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 14:01:58 +0000 (Wed, 11 Mar 2015) New Revision: 933 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/933 Log: A new method added: "getChannelByIpBroadcastID". Modified: oipf/js/utils/ChannelTools.js Modified: oipf/js/utils/ChannelTools.js =================================================================== --- oipf/js/utils/ChannelTools.js 2015-03-11 13:28:01 UTC (rev 932) +++ oipf/js/utils/ChannelTools.js 2015-03-11 14:01:58 UTC (rev 933) @@ -106,6 +106,14 @@ return true; } + }, + + getChannelByIpBroadcastID: function(channelCollection, ipBroadcastID) { + for (var i = 0, l = channelCollection.length; i < l; i++) { + if (channelCollection[i].ipBroadcastID == ipBroadcastID) { + return channelCollection[i]; + } + } } });

1 0

r932 - oipf/js/initObj
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 13:28:01 +0000 (Wed, 11 Mar 2015) New Revision: 932 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/932 Log: New channel identifier type added to object "CHANNEL_CREATION". Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-03-11 12:44:10 UTC (rev 931) +++ oipf/js/initObj/init.js 2015-03-11 13:28:01 UTC (rev 932) @@ -12,8 +12,20 @@ * can be created. */ var CHANNEL_CREATION = { - 12 : true, - 13 : true + 0: true, //ID_ANALOG + 10: true, //ID_DVB_C + 11: true, //ID_DVB_S + 12: true, //ID_DVB_T + 13: true, //ID_DVB_SI_DIRECT + 14: true, //ID_DVB_C2 + 15: true, //ID_DVB_S2 + 16: true, //ID_DVB_T2 + 20: true, //ID_ISDB_C + 21: true, //ID_ISDB_S + 22: true, //ID_ISDB_T + 30: true, //ID_ATSC_T + 40: true, //ID_IPTV_SDS + 41: true //ID_IPTV_URI }; /* * Description:

1 0

r931 - oipf/js/impl/model
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 12:44:10 +0000 (Wed, 11 Mar 2015) New Revision: 931 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/931 Log: Implementation of method "getChannelByTriplet". Modified: oipf/js/impl/model/ChannelList.js Modified: oipf/js/impl/model/ChannelList.js =================================================================== --- oipf/js/impl/model/ChannelList.js 2015-03-11 11:19:15 UTC (rev 930) +++ oipf/js/impl/model/ChannelList.js 2015-03-11 12:44:10 UTC (rev 931) @@ -24,12 +24,12 @@ * Return: Channel */ getChannel: function(channelID) { - for (var i = 0; i < this.super.length; i++) { + for (var i = 0; i < this.length; i++) { var channel = (this)[i]; - console.log(channel.channelId, channelID, "----------------OUT", channel); - console.log("Test", channel.channelID == channelID, channel.channelId, channelID); - if (channel.channelID == channelID) { - console.log(channel, "----------------"); + console.log("channelId:38" == "channelId:38" , channel.channelId, channelID, "----------------OUT", channel); + console.log(channel.channelId, channelID, "-----------------"); + if (channel.channelId == channelID) { + console.log(channel, "OK----------------"); return channel; } } @@ -60,7 +60,30 @@ * Return: Channel */ getChannelByTriplet: function(onid, tsid, sid, nid) { - + var self = this; + + if (nid) { + + var test = function(i) { + + if (self[i].onid == onid && self[i].tsid == tsid && self[i].sid == sid && self[i].nid == nid) { + return self[i]; + } + }; + + } else { + test = function(i) { + + if (self[i].onid == onid && self[i].tsid == tsid && self[i].sid == sid) { + return self[i]; + } + }; + } + + for (var i = 0, l = this.length; i < l; i++) { + + test(i); + } }, /*

1 0

r930 - oipf/js/impl
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 11:19:15 +0000 (Wed, 11 Mar 2015) New Revision: 930 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/930 Log: Into method "createChannelObject" just pass the "arguments" object in call of methods. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-11 11:17:53 UTC (rev 929) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-11 11:19:15 UTC (rev 930) @@ -408,10 +408,10 @@ createChannelObject: function() { if (arguments.length == 3 && arguments[0] == 13) { - this._createDvbSiChannelObject(arguments[0], arguments[1], arguments[2]); + this._createDvbSiChannelObject(arguments); } else { if (arguments.length >= 2) { // Some argments can be optional but a minimum of 2 is required. - this._createAnyDvbChannelObject(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]); + this._createAnyDvbChannelObject(arguments); } } return null; @@ -429,7 +429,7 @@ if ((sid >= 1) && (sid <= 65535)) { //Verify the rigth range of service id. - var newChannel = new Channel("localChannel" + createUUID(), "TYPE_TV", idType, dsd, sid); + var newChannel = new Channel(idType, dsd, sid, "localChannel" + createUUID()); var channelConfig = this.getChannelConfig(); channelTools = new ChannelTools();

1 0

r929 - oipf/js/impl
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 11:17:53 +0000 (Wed, 11 Mar 2015) New Revision: 929 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/929 Log: New declaration of channel object. Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-03-11 11:12:08 UTC (rev 928) +++ oipf/js/impl/ChannelConfig.js 2015-03-11 11:17:53 UTC (rev 929) @@ -39,7 +39,7 @@ * Visibility Type : readonly Channel */ currentChannel: null, - + /* * Description: * The list of channels. @@ -67,7 +67,7 @@ * * Visibility Type : readonly ChannelList */ - channelList: null, + channelList: null, /* Visibility : readonly FavouriteListCollection */ @@ -93,19 +93,20 @@ }, init: function() { - - var calculation = new Calculation();//Necessary to generate a unique id for each channel. - + var channelType = "TYPE_TV"; var channelName = "ARTE"; var channelIdType = 12; - var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); + var channelArte = new Channel(channelIdType, 52, 53, 54, channelName); channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); + var channelFrance5 = new Channel(channelIdType, 12, 13, 14, channelName); + + channelName = "FRANCE_4"; + var channelFrance4 = new Channel(channelIdType, 22, 23, 24, channelName); this.currentChannel = channelArte; - this.channelList = new ChannelList(channelArte, channelFrance5); + this.channelList = new ChannelList(channelArte, channelFrance5, channelFrance4); this.favouriteLists = new FavouriteListCollection(); this.currentFavouriteList = new FavouriteList(); },

1 0

r928 - oipf/js/impl/model
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 11:12:08 +0000 (Wed, 11 Mar 2015) New Revision: 928 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/928 Log: All the following methods: "_createChannelATSC_T", "_createChannelIPTV", "_createChannelDVBOrISDB", "_createChannelDVB_SI_DIRECT" have been created in order to have differents definitions of "Channel" constructor. That can be useful in usage of method "createChannelObject", a mapping between the arguments of this method and those of "Channel" constructor. Modified: oipf/js/impl/model/Channel.js Modified: oipf/js/impl/model/Channel.js =================================================================== --- oipf/js/impl/model/Channel.js 2015-03-11 10:41:27 UTC (rev 927) +++ oipf/js/impl/model/Channel.js 2015-03-11 11:12:08 UTC (rev 928) @@ -82,13 +82,80 @@ * Visibility Type: readonly Integer */ sid: null, + + /* + * Description: + * For channels of type ID_DVB_SI_DIRECT created through createChannelObject() , this property defines + * the delivery system descriptor (tuning parameters) as defined by DVB-SI [EN 300 468] section 6.2.13. + * + * The dsd property provides a string whose characters shall be restricted to the ISO Latin-1 character set. + * Each character in the dsd represents a byte of a delivery system descriptor as defined by DVB-SI [EN 300 + * 468] section 6.2.13, such that a byte at position "i" in the delivery system descriptor is equal the Latin-1 + * character code of the character at position "i" in the dsd. + * + * Described in the syntax of JavaScript: let sdd[] be the byte array of a system delivery descriptor, in which + * sdd[0] is the descriptor_tag, then, dsd is its equivalent string, if : + * dsd.length==sdd.length and + * for each integer i : 0<=i<dsd.length holds: sdd[i] == dsd.charCodeAt(i). + */ + dsd: null, + + /* + * Description: + * ATSC source_ID value. + * + * Visibility Type: readonly Integer + */ + sourceId: null, + + /* + * Description: + * If the channel has an idType of ID_IPTV_SDS, this property denotes the DVB textual service identifier of the + * IP broadcast service, specified in the format “ServiceName.DomainName” with the ServiceName and + * DomainName as defined in [DVB-IPTV]. + * If the Channel has an idType of ID_IPTV_URI, this element denotes a URI of the IP broadcast service. + * + * Visibility Type: readonly String + */ + ipBroadcastID: null, + init: function () { + var dispatcher = { 3: "_createChannelATSC_T", 4: "_createChannelDVB_SI_DIRECT", 5: "_createChannelDVBOrISDB", 6: "_createChannelIPTV"}; + this.channelId = createUUID(); + this[dispatcher[arguments.length]].apply(this, arguments); + + }, - init: function (name, channelType, channelId, idType) { + _createChannelATSC_T: function(idType, sourceID, name) { + this.idType = idType; + this.sourceID = sourceID; this.name = name; - this.channelType = CHANNEL_CONSTANT[channelType]; - this.channelId = channelId; + }, + + _createChannelIPTV: function(idType, onid, tsid, sid, ipBroadcastID, name) { this.idType = idType; + this.ipBroadcastID = ipBroadcastID; + this.name = name; + if (idType == 41) { + this.onid = onid; + this.tsid = tsid; + this.sid = sid; + } + }, + + _createChannelDVBOrISDB: function(idType, onid, tsid, sid, name){ + this.idType = idType; + this.onid = onid; + this.tsid = tsid; + this.sid = sid; + this.name = name; + }, + + _createChannelDVB_SI_DIRECT: function(idType, dsd, sid, name){ + this.idType = idType; + this.dsd = dsd; + this.sid = sid; + this.name = name; } - + }); \ No newline at end of file

1 0

r927 - oipf/js/impl/model
by ygrego＠users.nuiton.org 11 Mar '15

11 Mar '15

Author: ygrego Date: 2015-03-11 10:41:27 +0000 (Wed, 11 Mar 2015) New Revision: 927 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/927 Log: Renaming of property "lentgh" to "length". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-03-10 17:11:19 UTC (rev 926) +++ oipf/js/impl/model/SearchResults.js 2015-03-11 10:41:27 UTC (rev 927) @@ -25,7 +25,7 @@ * * Visibility: readonly */ - lentgh: null, + length: null, /* * Description : @@ -46,6 +46,7 @@ totalSize: null, _search: null, + _currentQuery: null, init: function(currentQuery) {

1 0