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

r984 - oipf/js/utils
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 15:41:58 +0000 (Mon, 30 Mar 2015) New Revision: 984 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/984 Log: Addition of namespace for all methods and deletion of exception firing in method "verifyASuitableTunerIsAvailable". Modified: oipf/js/utils/ChannelUtils.js Modified: oipf/js/utils/ChannelUtils.js =================================================================== --- oipf/js/utils/ChannelUtils.js 2015-03-30 15:40:32 UTC (rev 983) +++ oipf/js/utils/ChannelUtils.js 2015-03-30 15:41:58 UTC (rev 984) @@ -1,4 +1,6 @@ -function findChannel(channelCollection, channel, step) { +var channelUtils = {}; + +channelUtils.findChannel = function(channelCollection, channel, step) { for (var i = 0, l = channelCollection.length; i < l; i++ ) { if (channelCollection[i] == channel) { @@ -20,11 +22,11 @@ } } return null; -} +}; -function isAValidDVBTChannel(channel) { +channelUtils.isAValidDVBTChannel = function (channel) { return (channel.onid) && (channel.tsid) && (channel.sid); -} +}; /* * Description: @@ -41,7 +43,7 @@ * * Return: Tuner */ -function verifyASuitableTunerAvailable(idType, object) { +channelUtils.verifyASuitableTunerAvailable = function(idType, object) { var config = oipfObjectFactory.createConfigurationObject(); var availableTuners = config.localSystem.tuners; @@ -55,24 +57,16 @@ } } - if (idType == 40 || idType == 41) { - timeout(0) - .then(object.fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 8]))); - } else { - //this.onChannelChangeError && this.onChannelChangeError(null, 2); - timeout(0) - .then(object.fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 0]))); - } return null; -} +}; -function getChannelByDsd(channelCollection, dsd) { +channelUtils.getChannelByDsd = function(channelCollection, dsd) { for (var i = 0, l = channelCollection.length; i < l; i++) { if (channelCollection[i].dsd == dsd) { return channelCollection[i]; } } -} +}; /* * Description: @@ -84,7 +78,7 @@ * - dsd: the delivery system descriptor string necessary to create a channel by intermediate of method * createChannelObject. */ -function isAValidTerrestrialDsd(dsd) { +channelUtils.isAValidTerrestrialDsd = function(dsd) { var dsdAttributes = dsd.split(","); if (TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length == dsdAttributes.length) { @@ -98,12 +92,12 @@ return true; } -} +}; -function getChannelByIpBroadcastID(channelCollection, ipBroadcastID) { +channelUtils.getChannelByIpBroadcastID = function(channelCollection, ipBroadcastID) { for (var i = 0, l = channelCollection.length; i < l; i++) { if (channelCollection[i].ipBroadcastID == ipBroadcastID) { return channelCollection[i]; } } -} +};

1 0

r983 - oipf/js/impl
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 15:40:32 +0000 (Mon, 30 Mar 2015) New Revision: 983 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/983 Log: Exception management when no tuner available is performed out of method "verifyASuitabletunerIsAvailable" in method "_channelSwitch". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-30 15:28:05 UTC (rev 982) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-30 15:40:32 UTC (rev 983) @@ -877,7 +877,15 @@ if (channelUtils.verifyASuitableTunerAvailable(channelToChange.idType, this)) { timeout(0) .then(this.changeStateToConnectingWhenSwitching.bind(this, channelToChange)); - } + } else if (channelToChange.idType == 40 || channelToChange.idType == 41) { + timeout(0) + .then(object._fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 8]))); + } else { + + timeout(0) + .then(object._fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 0]))); + } + } } else {

1 0

r982 - oipf/js/impl
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 15:28:05 +0000 (Mon, 30 Mar 2015) New Revision: 982 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/982 Log: A missing argument has been added to method call "verifyASuitableTunerAvailable". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-30 13:47:10 UTC (rev 981) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-30 15:28:05 UTC (rev 982) @@ -356,7 +356,7 @@ case this._STOPPED: //FIX-ME :Make enable video and audio presentation - if (!channelUtils.verifyASuitableTunerAvailable(currentChannel.idType)) { + if (!channelUtils.verifyASuitableTunerAvailable(currentChannel.idType, this)) { this._timer = oipf.utils.timeout(0) .then(this.changePlayState.bind(this, this._STOPPED, 0)); } else {

1 0

r981 - oipf/js/impl
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 13:47:10 +0000 (Mon, 30 Mar 2015) New Revision: 981 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/981 Log: Addition of property "_eventManager" and methods "addEventListener", "_fireEvent", "removeEventListener". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-30 12:44:49 UTC (rev 980) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-30 13:47:10 UTC (rev 981) @@ -148,6 +148,7 @@ this._listeners = {}; this._callbacks = {}; this._channelService = channelService; + this._eventManager = new EventManager; }, /*! @@ -371,9 +372,21 @@ return this.currentChannel; }, + addEventListener: function(type, listener) { + this._eventManager.addEventListener(type, listener, this); + }, + + _fireEvent: function(event) { + this._eventManager.fireEvent(event, this); + }, + + removeEventListener: function(type, listener) { + this._eventManager.removeEventListener(type, listener, this); + }, + changePlayState: function(state, error) { this.playState = state; - this.fireEvent(createCustomEvent("PlayStateChange", [this.playState, error])); + this._fireEvent(createCustomEvent("PlayStateChange", [this.playState, error])); }, noTransientError: function(channel){ @@ -394,7 +407,7 @@ if (this.noTransientError(this._CONNECTING) && this.noPermanentError(this._CONNECTING, channel)) { this.playState = this._CONNECTING; - this.fireEvent(createCustomEvent("PlayStateChange", [this.playState])); + this._fireEvent(createCustomEvent("PlayStateChange", [this.playState])); timeout(0) .then(this.changeStateToPresentingWhenSwitching.bind(this, channel)); } @@ -405,9 +418,9 @@ if (this.noTransientError(this._PRESENTING)) { this.setCurrentChannel(channel); this.playState = this._PRESENTING; - this.fireEvent(createCustomEvent("PlayStateChange", [this.playState])); + this._fireEvent(createCustomEvent("PlayStateChange", [this.playState])); timeout(0) - .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeSucceeded", [channel]))); + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeSucceeded", [channel]))); } }, @@ -636,7 +649,7 @@ } else { timeout(0) - .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); } } else { @@ -831,7 +844,7 @@ //Verify that the currentChannel exists in the channel list of channel configuration if (!channelConfig.channelList.getChannel(this.currentChannel.channelId)) { timeout(0) - .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); /*setTimeout(function () { self.onChannelChangeError && self.onChannelChangeError(null, 100); }, 0);*/ @@ -870,13 +883,13 @@ } else { //When the OITF does not maintain channel list or favourite list by itself timeout(0) - .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 10]))); + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 10]))); } } else { //When this method is called in play state UNREALIZED timeout(0) - .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); } } }); \ No newline at end of file

1 0

r980 - oipf/js/lib
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 12:44:49 +0000 (Mon, 30 Mar 2015) New Revision: 980 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/980 Log: This object retrieved his original character. Deletion of methods "addEventListener" and "fireEvent" and properties "listeners" and "callbacks". Modified: oipf/js/lib/Class.js Modified: oipf/js/lib/Class.js =================================================================== --- oipf/js/lib/Class.js 2015-03-30 12:29:32 UTC (rev 979) +++ oipf/js/lib/Class.js 2015-03-30 12:44:49 UTC (rev 980) @@ -11,22 +11,5 @@ child.prototype.__proto__ = parent.prototype; child.prototype.super = parent.prototype; - child.prototype.addEventListener = function(type, listener) { - var listenersList = this.listeners[type]; - - if (listenersList) { - listenersList.push(listener); - } else { - this.listeners[type] = [listener]; - } - - }; - - child.prototype.fireEvent = function(event) { - this.listeners[event.type].forEach(function(element){ - element.apply(this, event.detail); - }); - }; - return child; };

1 0

r979 - oipf/js/impl
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 12:29:32 +0000 (Mon, 30 Mar 2015) New Revision: 979 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/979 Log: Additon of clause "else" in case Unrealized for method "bindToCurrentChannel". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-30 12:02:50 UTC (rev 978) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-30 12:29:32 UTC (rev 979) @@ -324,15 +324,13 @@ //Call method to claim scarces resources if (currentChannel) { this._timer = oipf.utils.timeout(0) - .then(this.changePlayState.bind(this, this._CONNECTING)) - .then(this.setCurrentChannel.bind(this, currentChannel)) - .then(this.changePlayState.bind(this, this._PRESENTING)); + .then(this.changePlayState.bind(this, this._CONNECTING)) + .then(this.setCurrentChannel.bind(this, currentChannel)) + .then(this.changePlayState.bind(this, this._PRESENTING)); + } else { + this._timer = oipf.utils.timeout(0) + .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); } - /* - * When there isn't channel presented, the video-broadcast - * object and his state equals to Unrealized, so it's not - * necessary to change its state. - */ break; case this._CONNECTING:

1 0

r978 - oipf/js/impl/model/constants
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 12:02:50 +0000 (Mon, 30 Mar 2015) New Revision: 978 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/978 Log: This file contains all channel "idType". Added: oipf/js/impl/model/constants/IdType.js Added: oipf/js/impl/model/constants/IdType.js =================================================================== --- oipf/js/impl/model/constants/IdType.js (rev 0) +++ oipf/js/impl/model/constants/IdType.js 2015-03-30 12:02:50 UTC (rev 978) @@ -0,0 +1,21 @@ +/* + * 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 ID_ANALOG = 0; +var ID_DVB_C = 10; +var ID_DVB_S = 11; +var ID_DVB_T = 12; +var ID_DVB_SI_DIRECT = 13; +var ID_DVB_C2 = 14; +var ID_DVB_S2 = 15; +var ID_DVB_T2 = 16; +var ID_ISDB_C = 20; +var ID_ISDB_S = 21; +var ID_ISDB_T = 22; +var ID_ATSC_T = 30; +var ID_IPTV_SDS = 40; +var ID_IPTV_URI = 41; +

1 0

r977 - oipf/js/impl
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 10:27:42 +0000 (Mon, 30 Mar 2015) New Revision: 977 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/977 Log: Deletion of variable self in method "bindToCurrentChannel". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-30 10:24:58 UTC (rev 976) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-30 10:27:42 UTC (rev 977) @@ -315,7 +315,6 @@ var channelConfig = this._channelService; var currentChannel = channelConfig.currentChannel; - var self = this; this._timer && this._timer.cancel(); switch (this.playState) { @@ -328,12 +327,11 @@ .then(this.changePlayState.bind(this, this._CONNECTING)) .then(this.setCurrentChannel.bind(this, currentChannel)) .then(this.changePlayState.bind(this, this._PRESENTING)); - } /* * When there isn't channel presented, the video-broadcast * object and his state equals to Unrealized, so it's not - * necessary to change its state. + * necessary to change its state. */ break;

1 0

r976 - oipf/js/impl
by ygrego＠users.nuiton.org 30 Mar '15

30 Mar '15

Author: ygrego Date: 2015-03-30 10:24:58 +0000 (Mon, 30 Mar 2015) New Revision: 976 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/976 Log: Deletion in method "bindToCurrentChannel" of clause "else" in case UNREALIZED which has been replaced by a comment in order to give more indication at this point in the method. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-26 16:38:37 UTC (rev 975) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-30 10:24:58 UTC (rev 976) @@ -329,10 +329,12 @@ .then(this.setCurrentChannel.bind(this, currentChannel)) .then(this.changePlayState.bind(this, this._PRESENTING)); - } else { - this._timer = oipf.utils.timeout(0) - .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); } + /* + * When there isn't channel presented, the video-broadcast + * object and his state equals to Unrealized, so it's not + * necessary to change its state. + */ break; case this._CONNECTING:

1 0

r975 - oipf/js/impl
by ygrego＠users.nuiton.org 26 Mar '15

26 Mar '15

Author: ygrego Date: 2015-03-26 16:38:37 +0000 (Thu, 26 Mar 2015) New Revision: 975 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/975 Log: -The namespace "channelUtils" has been added to following methods "findChannel", "verifyASuitableTunerAvailable", "getChannelByDsd, "isAValidTerrestrialDsd", "getChannelByIpBroadcastID" when these one are called. -The calls to "getChannelConfig" have been replaced by "_channelService". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-26 16:05:41 UTC (rev 974) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-26 16:38:37 UTC (rev 975) @@ -282,7 +282,7 @@ * in section 7.13.9. The method SHALL return the value null if the channel list is not * (partially) managed by the OITF (i.e., if the channel list information is managed entirely in the network). */ - getChannelConfig: function() { + getChannelConfigr: function() { return oipfObjectFactory.createChannelConfig(); }, @@ -312,7 +312,7 @@ * TODO : binding of necessary ressources */ bindToCurrentChannel: function() { - var channelConfig = this.getChannelConfig(); + var channelConfig = this._channelService; var currentChannel = channelConfig.currentChannel; var self = this; @@ -357,7 +357,7 @@ case this._STOPPED: //FIX-ME :Make enable video and audio presentation - if (!verifyASuitableTunerAvailable(currentChannel.idType)) { + if (!channelUtils.verifyASuitableTunerAvailable(currentChannel.idType)) { this._timer = oipf.utils.timeout(0) .then(this.changePlayState.bind(this, this._STOPPED, 0)); } else { @@ -510,14 +510,14 @@ if (CHANNEL_CREATION[idType]) { //Verify a channel of this idType (ID_DVB_SI_DIRECT = 13). - if (isAValidTerrestrialDsd(dsd)) { //Verify the dsd validity. + if (channelUtils.isAValidTerrestrialDsd (dsd)) { //Verify the dsd validity. if ((sid >= 1) && (sid <= 65535)) { //Verify the rigth range of service id. var newChannel = new Channel(idType, dsd, sid, "localChannel" + createUUID()); - var channelConfig = this.getChannelConfig(); + var channelConfig = this._channelService; - if (getChannelByDsd(channelConfig.channelList, dsd)) { + if (channelUtils.getChannelByDsd(channelConfig.channelList, dsd)) { /* Normally channelList is readonly but the method documentation say * that the channel must be add if it not already present. @@ -591,11 +591,11 @@ } if (idType == 30) { - var equivalentChannel = this.getChannelConfig().channelList.getChannelBySourceID(sourceID); + var equivalentChannel = this._channelService.channelList.getChannelBySourceID(sourceID); } else if (idType == 40) { - equivalentChannel = getChannelByIpBroadcastID(ipBroadcastID); + equivalentChannel = channelUtils.getChannelByIpBroadcastID(ipBroadcastID); } else { - equivalentChannel = this.getChannelConfig().channelList.getChannelByTriplet(onid, tsid, sid); + equivalentChannel = this._channelService.channelList.getChannelByTriplet(onid, tsid, sid); } if (equivalentChannel) { @@ -604,7 +604,7 @@ newChannel = new Channel(arguments.push("localChannel:"+createUUID())); } - this.getChannelConfig().channelList.push(newChannel); + this._channelService.channelList.push(newChannel); } return null; @@ -632,7 +632,7 @@ if (this.playState >= this._CONNECTING && this.playState <= this._STOPPED && channel) { - if (verifyASuitableTunerAvailable(channel.idType, this) && channel.idType != 41) { + if (channelUtils.verifyASuitableTunerAvailable(channel.idType, this) && channel.idType != 41) { timeout(0) .then(this.changeStateToConnectingWhenSwitching.bind(this, channel)); @@ -823,7 +823,7 @@ //claimed scarce resources //Call method to claim scarce resources - var channelConfig = this.getChannelConfig(); + var channelConfig = this._channelService; var favouriteLists = channelConfig.favouriteLists; if ((this.playState > 0) && (this.playState < 4)) { @@ -861,9 +861,9 @@ channelCollection = channelConfig.currentFavouriteLists; } - var channelToChange = findChannel(channelCollection, this.currentChannel, step); + var channelToChange = channelUtils.findChannel(channelCollection, this.currentChannel, step); - if (verifyASuitableTunerAvailable(channelToChange.idType, this)) { + if (channelUtils.verifyASuitableTunerAvailable(channelToChange.idType, this)) { timeout(0) .then(this.changeStateToConnectingWhenSwitching.bind(this, channelToChange)); }

1 0