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

r976 - oipf/js/impl
by ygrego＠users.nuiton.org March 30, 2015

March 30, 2015

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 March 26, 2015

March 26, 2015

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

r974 - oipf/js/utils
by ygrego＠users.nuiton.org March 26, 2015

March 26, 2015

Author: ygrego Date: 2015-03-26 16:05:41 +0000 (Thu, 26 Mar 2015) New Revision: 974 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/974 Log: This class will replace "ChannelConfig" only in use in objects which need information on channel list. Added: oipf/js/utils/ChannelService.js Added: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js (rev 0) +++ oipf/js/utils/ChannelService.js 2015-03-26 16:05:41 UTC (rev 974) @@ -0,0 +1,39 @@ +/* + * 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 ChannelService = ChannelConfig.extend({ + + channelObject: { + + }, + + init: function(currentChannel) { + this.currentChannel && (this.currentChannel = currentChannel || null); + var channelName = "ARTE"; + var channelIdType = 12; + var channelArte = new Channel(channelIdType, 52, 53, 54, channelName); + + channelName = "FRANCE_5"; + 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, channelFrance4); + this.favouriteLists = new FavouriteListCollection(); + this.currentFavouriteList = new FavouriteList(); + }, + + prevChannel: function(channelCollection, channel) { + return channelUtils.findChannel(channelCollection, channel, -1); + }, + + nextChannel: function(channelCollection, channel) { + return channelUtils.findChannel(channelCollection, channel, 1); + } + +});

1 0

r973 - oipf/js/utils
by ygrego＠users.nuiton.org March 26, 2015

March 26, 2015

Author: ygrego Date: 2015-03-26 16:00:11 +0000 (Thu, 26 Mar 2015) New Revision: 973 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/973 Log: This class permit create and manage a timer. Added: oipf/js/utils/Timeout.js Added: oipf/js/utils/Timeout.js =================================================================== --- oipf/js/utils/Timeout.js (rev 0) +++ oipf/js/utils/Timeout.js 2015-03-26 16:00:11 UTC (rev 973) @@ -0,0 +1,33 @@ +/* + * 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 Timeout = Class.extend({ + timerId: null, + + promise: null, + + init: function(time) { + var self = this; + this.promise = new Promise(function(resolve, reject) { + self.timerId = setTimeout(resolve, time); + }); + }, + + then: function(callback) { + this.promise.then(callback); + return this; + }, + + catch: function(callback) { + this.promise.catch(callback); + return this; + }, + + cancel: function() { + clearTimeout(this.timerId); + } + +}); +

1 0

r972 - oipf/js/impl
by ygrego＠users.nuiton.org March 26, 2015

March 26, 2015

Author: ygrego Date: 2015-03-26 15:57:08 +0000 (Thu, 26 Mar 2015) New Revision: 972 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/972 Log: -Addition of property "_timer" and "_channelService". -The method "bindToCurrentChannel" use the property "_timer" in order to control the differents timers launch in the method. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-26 15:49:01 UTC (rev 971) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-26 15:57:08 UTC (rev 972) @@ -142,11 +142,12 @@ console.log("[INFO] createdCallback called."); }, - init: function () { + init: function (channelService) { console.log("[INFO] constructor of VideoBroadcast class called."); this.playState = 0; - this.listeners = {}; - this.callbacks = {}; + this._listeners = {}; + this._callbacks = {}; + this._channelService = channelService; }, /*! @@ -263,14 +264,14 @@ }, _getCallback : function(type) { - if(this.callbacks) { - return this.callbacks[type]; + if(this._callbacks) { + return this._callbacks[type]; } }, _setCallback: function(type, callback){ - if(this.callbacks) { - this.callbacks[type] = callback; + if(this._callbacks) { + this._callbacks[type] = callback; } }, @@ -314,29 +315,57 @@ var channelConfig = this.getChannelConfig(); var currentChannel = channelConfig.currentChannel; + var self = this; + this._timer && this._timer.cancel(); + switch (this.playState) { case this._UNREALIZED: //claimed scarce resources //Call method to claim scarces resources if (currentChannel) { - timeout(0) - .then(this.changePlayState.bind(this, this._CONNECTING)) - .then(timeout.bind(timeout, 0)) - .then(this.setCurrentChannel(currentChannel)) - .then(timeout.bind(timeout, 0)) - .then(this.changePlayState.bind(this, this._PRESENTING)); - + 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)); + } else { - timeout(0) - .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); + this._timer = oipf.utils.timeout(0) + .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); } break; - + + case this._CONNECTING: + /*if (!verifyASuitableTunerAvailable(currentChannel.idType)) { + this.timer = oipf.utils.timeout(0) + .then(this.changePlayState.bind(this, this._CONNECTING)); + } else { + this.timer = oipf.utils.timeout(0) + .then(this.setCurrentChannel.bind(this, currentChannel)) + .then(this.changePlayState.bind(this, this._PRESENTING)); + }*/ + //Method documentation indicate it don't have effects in this state. + break; + + case this._PRESENTING: + /*if (!verifyASuitableTunerAvailable(currentChannel.idType)) { + this.timer = oipf.utils.timeout(0) + .then(this.changePlayState.bind(this, this._PRESENTING)); + }*/ + //Method documentation indicate it don't have effects in this state. + break; + case this._STOPPED: //FIX-ME :Make enable video and audio presentation - timeout(0) - .then(this.changePlayState.bind(this, this._CONNECTING)); + if (!verifyASuitableTunerAvailable(currentChannel.idType)) { + this._timer = oipf.utils.timeout(0) + .then(this.changePlayState.bind(this, this._STOPPED, 0)); + } else { + 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)); + } break; }

1 0

r971 - oipf/js/impl
by ygrego＠users.nuiton.org March 26, 2015

March 26, 2015

Author: ygrego Date: 2015-03-26 15:49:01 +0000 (Thu, 26 Mar 2015) New Revision: 971 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/971 Log: -Deletion of argument for the method "createVideoBroadcastObject". -Addition of a parameter at creation of VideoBroadcastObject, which has type "ChannelService". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-03-26 10:19:58 UTC (rev 970) +++ oipf/js/impl/OipfObjectFactory.js 2015-03-26 15:49:01 UTC (rev 971) @@ -175,11 +175,11 @@ * so instantiation shall never fail if the object type is supported. The * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . */ - createVideoBroadcastObject: function(requiredCapabilities) { + createVideoBroadcastObject: function() { console.log("[INFO] createVideoBroadcastObject() of OipfObjectFactory class called."); if (this.isObjectSupported("video/broadcast")) { - return new VideoBroadcastObject(requiredCapabilities); + return new VideoBroadcastObject(new ChannelService()); } else { throw new TypeError("This object type is not supported."); }

1 0

r970 - oipf/js/impl
by ygrego＠users.nuiton.org March 26, 2015

March 26, 2015

Author: ygrego Date: 2015-03-26 10:19:58 +0000 (Thu, 26 Mar 2015) New Revision: 970 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/970 Log: -Addition of property "callback". -Addition method "_setCallback", "_getCallback", "noTransientError", "noPermanentError", "changeStateToConnectingWhenSwitching", "changeStateToPresentingWhenSwitching" and "setCurrentChannel". -Definition of getter and setter for method "onPlayStateChange" and "onChannelChangeSucceed". -The method "bindToCurrentChannel" uses now the method "setCurrentChannel". -Complete implementation of method "setChannel", "setVolume" and "getVolume". -The argument "object" of method "_channelSwitch" has been deleted, also in her calls in particular in method "_prevChannel", "_nextChannel". -Refactoring of method "_channelSwitch": -The verification on the state has been separated of verification which verify which entity manages the channel list. -When a channel can be switched the method "changeStateToConnectingWhenSwitching" is called. -All occurrences of "object" changed to "this". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-25 14:02:18 UTC (rev 969) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-26 10:19:58 UTC (rev 970) @@ -146,6 +146,7 @@ console.log("[INFO] constructor of VideoBroadcast class called."); this.playState = 0; this.listeners = {}; + this.callbacks = {}; }, /*! @@ -212,8 +213,14 @@ * * • 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 . */ - onPlayStateChange: null, + get onPlayStateChange() { + return this._getCallback("PlayStateChange"); + }, + set onPlayStateChange(callback) { + this._setCallback("PlayStateChange", callback); + }, + /* * Description: * The function that is called when a request to switch a tuner to another channel has successfully completed. @@ -223,8 +230,14 @@ * * • 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). */ - onChannelChangeSucceeded: null, + get onChannelChangeSucceeded() { + return this._getCallback("ChannelChangeSucceeded"); + }, + set onChannelChangeSucceeded(callback) { + this._setCallback("ChannelChangeSucceeded", callback); + }, + /* * Description: * The function that is called when the value of fullScreen changes. @@ -249,6 +262,18 @@ }, + _getCallback : function(type) { + if(this.callbacks) { + return this.callbacks[type]; + } + }, + + _setCallback: function(type, callback){ + if(this.callbacks) { + this.callbacks[type] = callback; + } + }, + /* * * Description: @@ -287,18 +312,20 @@ */ bindToCurrentChannel: function() { var channelConfig = this.getChannelConfig(); - var currentChan = channelConfig.currentChannel; + var currentChannel = channelConfig.currentChannel; switch (this.playState) { case this._UNREALIZED: //claimed scarce resources //Call method to claim scarces resources - if (currentChan) { + if (currentChannel) { timeout(0) .then(this.changePlayState.bind(this, this._CONNECTING)) .then(timeout.bind(timeout, 0)) - .then(this.changePlayState.bind(this, this._PRESENTING, null, currentChan)); + .then(this.setCurrentChannel(currentChannel)) + .then(timeout.bind(timeout, 0)) + .then(this.changePlayState.bind(this, this._PRESENTING)); } else { timeout(0) @@ -313,15 +340,54 @@ break; } + return this.currentChannel; }, - changePlayState: function(state, error, channel) { + changePlayState: function(state, error) { this.playState = state; - this.currentChannel = (channel? channel : this.currentChannel); this.fireEvent(createCustomEvent("PlayStateChange", [this.playState, error])); }, + noTransientError: function(channel){ + + /*if (channel.locked) { + return true; + } else { + return false; + }*/ + return true; + }, + + noPermanentError: function(channel){ + return true; + }, + + changeStateToConnectingWhenSwitching: function(channel) { + + if (this.noTransientError(this._CONNECTING) && this.noPermanentError(this._CONNECTING, channel)) { + this.playState = this._CONNECTING; + this.fireEvent(createCustomEvent("PlayStateChange", [this.playState])); + timeout(0) + .then(this.changeStateToPresentingWhenSwitching.bind(this, channel)); + } + }, + + changeStateToPresentingWhenSwitching: function(channel) { + + if (this.noTransientError(this._PRESENTING)) { + this.setCurrentChannel(channel); + this.playState = this._PRESENTING; + this.fireEvent(createCustomEvent("PlayStateChange", [this.playState])); + timeout(0) + .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeSucceeded", [channel]))); + } + }, + + setCurrentChannel: function(channel) { + this.currentChannel = channel; + }, + /* * Description: * Creates a Channel object of the specified idType . This method is typically used to create a @@ -527,30 +593,30 @@ * onChannelChangeError property, specifying the value 0 (“Channel not supported by * tuner”) for the errorState , and dispatch the corresponding DOM event (see below). * - * + * FiX-ME: Yannis - 25/03/2015 - No take account trickplay + * FiX-ME: Yannis - 25/03/2015 - No verification about Transport Stream + * FiX-ME: Yannis - 25/03/2015 - No verification about possiblity of a local channel argument + * FiX-ME: Yannis - 25/03/2015 - No verification about same tuning + * parameters of argument channel with */ setChannel: function(channel, trickplay, contentAccessDescriptorURL) { - if ((this.playState >= this._CONNECTING) && (this.playState <= this._STOPPED) && (!channel)) { - var tuner = verifyASuitableTunerAvailable(this, channel.idType); - - if (tuner) { - + if (this.playState >= this._CONNECTING && this.playState <= this._STOPPED && channel) { + + if (verifyASuitableTunerAvailable(channel.idType, this) && channel.idType != 41) { + timeout(0) + .then(this.changeStateToConnectingWhenSwitching.bind(this, channel)); + + } else { + timeout(0) + .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); } } else { - var self = this; timeout(0) - .then(this.release.bind(this)) + //.then(this.release.bind(this)) .then(this.changePlayState.bind(this, this._UNREALIZED)); - - /*setTimeout(function () { - self.playState = 0; - self.release(); - self.onPlayStateChange && self.onPlayStateChange(self.playState); - }, 0);*/ - } }, @@ -587,7 +653,7 @@ * */ prevChannel: function() { - this._channelSwitch(this, -1); + this._channelSwitch(-1); }, /* @@ -623,7 +689,7 @@ * */ nextChannel: function() { - this._channelSwitch(this, 1); + this._channelSwitch(1); }, /* @@ -659,28 +725,17 @@ * - volume: Integer value between 0 up to and including 100 to indicate volume level. * * Actually the norm don't talk about the way to obtain the current master volume for the main - * audio output mixer; So we'll base on the system volume. + * audio output mixer; So we'll base on the system volume. + * FIX-ME: Yannis - 24/03/2015 - Bindind with the configuration object. */ setVolume: function(volume) { - if (!Number.isInteger(volume)) { - + if (!Number.isInteger(volume) || volume < 0 || volume > 100 ) { return false; - - } else { - - if (volume == 0) { - //Muted the sound - return true; - } - if ((volume > 0) && (volume < 100)) { - - } - if (volume == 100) { - configurationObject = oipfObjectFactory.createConfigurationObject(); - - } - } + } + + this._volume = volume; + return true; }, /* @@ -690,6 +745,7 @@ * */ getVolume: function() { + return this._volume || 0; }, /* @@ -734,77 +790,66 @@ } }, - _channelSwitch: function(object, step) { + _channelSwitch: function(step) { //claimed scarce resources //Call method to claim scarce resources - var channelConfig = object.getChannelConfig(); + var channelConfig = this.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)) { + if ((this.playState > 0) && (this.playState < 4)) { + //Verify that OITF maintain channel list or favourite list by itself + if (channelConfig && favouriteLists) { - //Verify that the currentChannel exists in the channel list of channel configuration - if (!channelConfig.channelList.getChannel(object.currentChannel.channelId)) { - timeout(0) - .then(this.fireEvent.bind(this, createCustomEvent.bind(null, "ChannelChangeError", [null, 100]))); - /*setTimeout(function () { - self.onChannelChangeError && self.onChannelChangeError(null, 100); - }, 0);*/ - - if (object.playState == 1) { + //Verify that the currentChannel exists in the channel list of channel configuration + if (!channelConfig.channelList.getChannel(this.currentChannel.channelId)) { timeout(0) - .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); + .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); /*setTimeout(function () { - self.playState = 0; - self.onPlayStateChange && self.onPlayStateChange(self.playState, 100); + self.onChannelChangeError && self.onChannelChangeError(null, 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; + + if (this.playState == 1) { + timeout(0) + .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); + /*setTimeout(function () { + self.playState = 0; + self.onPlayStateChange && self.onPlayStateChange(self.playState, 100); + }, 0);*/ + } } else { - //Find the previous channel into the current favourite list - channelCollection = channelConfig.currentFavouriteLists; + /* + * 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 channelToChange = findChannel(channelCollection, this.currentChannel, step); + + if (verifyASuitableTunerAvailable(channelToChange.idType, this)) { + timeout(0) + .then(this.changeStateToConnectingWhenSwitching.bind(this, channelToChange)); + } } + + } 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]))); - var previousChannel = findChannel(channelCollection, object.currentChannel, step); - - var tunerFound = verifyASuitableTunerAvailable(previousChannel.idType, object); - - if (tunerFound) { - //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. - object.currentChannel = previousChannel; - timeout(0) - .then(this.changePlayState.bind(this, this._CONNECTING)) - .then(timeout.bind(timeout, 0)) - .then(this.changePlayState.bind(this, this._PRESENTING)) - .then(timeout.bind(timeout, 0)) - .then(this.fireEvent.bind(this, createCustomEvent.bind(null, "ChannelChangeSucceeded", [previousChannel]))); - /* - setTimeout(function () { - self.playState = 1; - self.onPlayStateChange && self.onPlayStateChange(self.playState); - self.onChannelChangeSucceeded && self.onChannelChangeSucceeded(previousChannel); - }, 0);*/ - } } - } else { - //When the OITF does not maintain channel list or favourite list by itself + //When this method is called in play state UNREALIZED timeout(0) - .then(this.fireEvent.bind(this, createCustomEvent.bind(null, "ChannelChangeError", [null, 10]))); - /* - setTimeout(function () { - self.onChannelChangeError && self.onChannelChangeError(null, 10); - }, 0);*/ - } + .then(this.fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); + } } }); \ No newline at end of file

1 0

r969 - in oipf: . css view/css
by ygrego＠users.nuiton.org March 25, 2015

March 25, 2015

Author: ygrego Date: 2015-03-25 14:02:18 +0000 (Wed, 25 Mar 2015) New Revision: 969 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/969 Log: The files ("style.css" and "test.css") have been moved from directory "/oipf/view" to directory "oipf/css". Added: oipf/css/ oipf/css/style.css oipf/css/test.css Removed: oipf/view/css/style.css oipf/view/css/test.css Copied: oipf/css/style.css (from rev 948, oipf/view/css/style.css) =================================================================== --- oipf/css/style.css (rev 0) +++ oipf/css/style.css 2015-03-25 14:02:18 UTC (rev 969) @@ -0,0 +1,29 @@ +body { + background-image: url("../img/TV-T&PC.svg"); + background-repeat: no-repeat; + background-size: cover; + background-position: center; +} + +#video-broadcast { + position: absolute; + z-index: -1; + background-image: url("../img/video-broadcast.jpg"); + background-size: cover; + background-repeat: no-repeat; + margin-left: 11%; + height: 90%; + width: 60%; +} + +#prog { + z-index: 2; + background-color:gray; + height: 40%; + width: 40%; + color:white; + margin-left: 20%; + margin-right: 40%; + overflow-y: auto; + visibility: hidden; +} \ No newline at end of file Copied: oipf/css/test.css (from rev 948, oipf/view/css/test.css) =================================================================== --- oipf/css/test.css (rev 0) +++ oipf/css/test.css 2015-03-25 14:02:18 UTC (rev 969) @@ -0,0 +1,96 @@ +/* +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 : 26 févr. 2015, 10:03:51 + Author : root +*/ + +table { + font: 1em sans-serif; + background-color: #efe; + border-collapse: collapse; + empty-cells: show; + border: 1px solid #7a7; + } + +table > caption { + text-align: left; + font-weight: bold; + font-size: 1.5em; + border-bottom: .2em solid #4ca; + margin-bottom: .5em; + } + + +/* shared basics rules */ +table th, +table td { + text-align: left; + padding-right: .5em; + border: 1px solid #7a7; + } + +table th { + font-weight: bold; + padding-left: .5em; + } + + +/* header of table*/ +table > thead > tr:first-child > th { + text-align: center; + color: blue; + } + +table > thead > tr + tr > th { + font-style: italic; + color: gray; + } + +/* size of values exposing */ +table sup { + font-size: 75%; + } + +/* body of table */ +table td { + background-color: #cef; + padding:.5em .5em .5em .3em; + } + +table tbody td:nth-child(4) { + background-color: gainsboro; + } + +table tbody td:nth-child(5) { + text-align: center; + } + +table tbody th:after { + content: " :"; + } + +/* foot of table not used here*/ +table tfoot { + font-weight: bold; + } + +table tfoot th { + color: blue; + } + +table tfoot th:after { + content: " :"; + } + +table > tfoot td { + background-color: #cee; + } + +table > tfoot > tr:first-child td { + border-top: .2em solid #7a7; + } + Deleted: oipf/view/css/style.css =================================================================== --- oipf/view/css/style.css 2015-03-24 17:06:57 UTC (rev 968) +++ oipf/view/css/style.css 2015-03-25 14:02:18 UTC (rev 969) @@ -1,29 +0,0 @@ -body { - background-image: url("../img/TV-T&PC.svg"); - background-repeat: no-repeat; - background-size: cover; - background-position: center; -} - -#video-broadcast { - position: absolute; - z-index: -1; - background-image: url("../img/video-broadcast.jpg"); - background-size: cover; - background-repeat: no-repeat; - margin-left: 11%; - height: 90%; - width: 60%; -} - -#prog { - z-index: 2; - background-color:gray; - height: 40%; - width: 40%; - color:white; - margin-left: 20%; - margin-right: 40%; - overflow-y: auto; - visibility: hidden; -} \ No newline at end of file Deleted: oipf/view/css/test.css =================================================================== --- oipf/view/css/test.css 2015-03-24 17:06:57 UTC (rev 968) +++ oipf/view/css/test.css 2015-03-25 14:02:18 UTC (rev 969) @@ -1,92 +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. -*/ -/* - Created on : 26 févr. 2015, 10:03:51 - Author : root -*/ - -table { - font: 1em sans-serif; - background-color: #efe; - border-collapse: collapse; - empty-cells: show; - border: 1px solid #7a7; - } - -table > caption { - text-align: left; - font-weight: bold; - font-size: 1.5em; - border-bottom: .2em solid #4ca; - margin-bottom: .5em; - } - - -/* shared basics rules */ -table th, -table td { - text-align: center; - padding-right: .5em; - border: 1px solid #7a7; - } - -table th { - font-weight: bold; - padding-left: .5em; - } - - -/* header of table*/ -table > thead > tr:first-child > th { - text-align: center; - color: blue; - } - -table > thead > tr + tr > th { - font-style: italic; - color: gray; - } - -/* size of values exposing */ -table sup { - font-size: 75%; - } - -/* body of table */ -table td { - background-color: #cef; - padding:.5em .5em .5em .3em; - } - -table tbody td:nth-child(4) { - background-color: gainsboro; - } - -table tbody th:after { - content: " :"; - } - -/* foot of table not used here*/ -table tfoot { - font-weight: bold; - } - -table tfoot th { - color: blue; - } - -table tfoot th:after { - content: " :"; - } - -table > tfoot td { - background-color: #cee; - } - -table > tfoot > tr:first-child td { - border-top: .2em solid #7a7; - } -

1 0

r968 - oipf/js/impl
by ygrego＠users.nuiton.org March 24, 2015

March 24, 2015

Author: ygrego Date: 2015-03-24 17:06:57 +0000 (Tue, 24 Mar 2015) New Revision: 968 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/968 Log: -Assignment of well mime-type in method "createNotifSocket" and "createParentalControlManagerObject". -The method "isObjectSupported" has been modified in order to just return a simple boolean. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-03-24 17:01:23 UTC (rev 967) +++ oipf/js/impl/OipfObjectFactory.js 2015-03-24 17:06:57 UTC (rev 968) @@ -123,28 +123,29 @@ isObjectSupported: function(mimeType) { var mimeType_method = { - "application/notifsocket" : "createNotifSocketObject", - "application/oipfApplicationManager" : "createApplicationManagerObject", - "application/oipfCapabilities" : "createCapabilitiesObject", - "application/oipfCodManager" : "createCodManagerObject", - "application/oipfCommunicationServices" : "createCommunicationServicesObject", - "application/oipfConfiguration" : "createConfigurationObject", - "application/oipfDownloadManager" : "createDownloadManagerObject", - "application/oipfDownloadTrigger" : "createDownloadTriggerObject", - "application/oipfDrmAgent" : "createDrmAgentObject", - "application/oipfGatewayInfo" : "createGatewayInfoObject", - "application/oipfMDTF" : "createMDTFObject", - "application/oipfParentalControlManager" : "createParentalControlManagerObject", - "application/oipfRecordingScheduler" : "createRecordingSchedulerObject", - "application/oipfRemoteControlFunction" : "createRemoteControlFunctionObject", - "application/oipfRemoteManagement" : "createRemoteManagementObject", - "application/oipfSearchManager" : "createSearchManagerObject", - "application/oipfStatusView" : "createStatusViewObject", - "video/broadcast" : "createVideoBroadcastObject", - "video/mpeg" : "createVideoMpegObject" + "channelConfig" : true, + "application/notifsocket" : false, + "application/oipfApplicationManager" : false, + "application/oipfCapabilities" : false, + "application/oipfCodManager" : false, + "application/oipfCommunicationServices" : false, + "application/oipfConfiguration" : true, + "application/oipfDownloadManager" : false, + "application/oipfDownloadTrigger" : false, + "application/oipfDrmAgent" : false, + "application/oipfGatewayInfo" : false, + "application/oipfMDTF" : false, + "application/oipfParentalControlManager" : false, + "application/oipfRecordingScheduler" : false, + "application/oipfRemoteControlFunction" : false, + "application/oipfRemoteManagement" : false, + "application/oipfSearchManager" : true, + "application/oipfStatusView" : false, + "video/broadcast" : true, + "video/mpeg" : false }; - return this[mimeType_method[mimeType]]; + return mimeType_method[mimeType]; }, /*! @@ -463,7 +464,7 @@ * implements the interface for the specified object. */ createNotifSocketObject: function() { - if (this.isObjectSupported(NotifSocketObject)) { + if (this.isObjectSupported(NOTIF_SOCKET_DAE_MIME_TYPE)) { console.log("[INFO] createNotifSocketObject() of OipfObjectFactory class called."); return this.notifSocketObject; } else { @@ -484,8 +485,8 @@ * If the object is supported, the method SHALL return a JavaScript Object which * implements the interface for the specified object. */ - createParentalControlManagerObject: function(PARENTAL_CONTROL_MANAGER_DAE_MIME_TYPE) { - if (this.isObjectSupported("video/broadcast")) { + createParentalControlManagerObject: function() { + if (this.isObjectSupported(PARENTAL_CONTROL_MANAGER_DAE_MIME_TYPE)) { console.log("[INFO] createParentalControlManangerObject() of OipfObjectFactory class called."); return this.parentalControlManagerObject; } else {

1 0

r967 - oipf/js/test
by ygrego＠users.nuiton.org March 24, 2015

March 24, 2015

Author: ygrego Date: 2015-03-24 17:01:23 +0000 (Tue, 24 Mar 2015) New Revision: 967 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/967 Log: -New implementation of methods "testCreateX where X equals to one of object present in oipf object factory(eg. VideoBroadcastObject, SearchManagerObject). Each method is binded on method "testobjectCreated". -New methods delared as "testIsXSupported" where X equals to one of object present in oipf object factory. And these one are bound to method "testObjectSupported". All bindings are performed in constructor "init". Modified: oipf/js/test/OipfFactoryTest.js Modified: oipf/js/test/OipfFactoryTest.js =================================================================== --- oipf/js/test/OipfFactoryTest.js 2015-03-24 12:14:41 UTC (rev 966) +++ oipf/js/test/OipfFactoryTest.js 2015-03-24 17:01:23 UTC (rev 967) @@ -5,119 +5,65 @@ */ var OipfFactoryTest = TestCase.extend({ - - oipfObjectFactory: null, - init: function() { - this.oipfObjectFactory = new OipfObjectFactory(); + this.testIsApplicationManagerObjectSupported = this.testObjectSupported.bind(this, APPLICATION_MANAGER_DAE_MIME_TYPE); + this.testIsCapabilitiesObjectSupported = this.testObjectSupported.bind(this, CAPABILITIES_DAE_MIME_TYPE); + this.testIsChannelConfigSupported = this.testObjectSupported.bind(this, CHANNEL_CONFIG_TYPE); + this.testIsCodManagerObjectSupported = this.testObjectSupported.bind(this, COD_MANAGER_DAE_MIME_TYPE); + this.testIsIMSObjectSupported = this.testObjectSupported.bind(this, COMMUNICATION_SERVICES_DAE_MIME_TYPE); + this.testIsConfigurationObjectSupported = this.testObjectSupported.bind(this, CONFIGURATION_DAE_MIME_TYPE); + this.testIsDownloadManagerObjectSupported = this.testObjectSupported.bind(this, DOWNLOAD_MANAGER_DAE_MIME_TYPE); + this.testIsDownloadTriggerObjectSupported = this.testObjectSupported.bind(this, DOWNLOAD_TRIGGER_DAE_MIME_TYPE); + this.testIsDrmAgentObjectSupported = this.testObjectSupported.bind(this, DRM_AGENT_DAE_MIME_TYPE); + this.testIsGatewayInfoObjectSupported = this.testObjectSupported.bind(this, GATEWAY_INFO_DAE_MIME_TYPE); + this.testIsMDTFObjectSupported = this.testObjectSupported.bind(this, MDTF_DAE_MIME_TYPE); + this.testIsNotifSocketObjectSupported = this.testObjectSupported.bind(this, NOTIF_SOCKET_DAE_MIME_TYPE); + this.testIsParentalControlManagerObjectSupported = this.testObjectSupported.bind(this, PARENTAL_CONTROL_MANAGER_DAE_MIME_TYPE); + this.testIsRecordingSchedulerObjectSupported = this.testObjectSupported.bind(this, RECORDING_SCHEDULER_DAE_MIME_TYPE); + this.testIsRemoteControlFunctionObjectSupported = this.testObjectSupported.bind(this, REMOTE_CONTROL_FUNCTION_DAE_MIME_TYPE); + this.testIsRemoteManagementObjectSupported = this.testObjectSupported.bind(this, REMOTE_MANAGEMENT_DAE_MIME_TYPE); + this.testIsSearchManagerObjectSupported = this.testObjectSupported.bind(this, SEARCH_MANAGER_DAE_MIME_TYPE); + this.testIsStatusViewObjectSupported = this.testObjectSupported.bind(this, STATUS_VIEW_DAE_MIME_TYPE); + this.testIsVideoBroadcastObjectSupported = this.testObjectSupported.bind(this, VIDEO_BROADCAST_DAE_MIME_TYPE); + this.testIsVideoMpegObjectSupported = this.testObjectSupported.bind(this, VIDEO_MPEG_DAE_MIME_TYPE); + + this.testCreateApplicationManagerObject = this.testObjectCreated.bind(this, oipfObjectFactory.createApplicationManagerObject); + this.testCreateCapabilitiesObject = this.testObjectCreated.bind(this, oipfObjectFactory.createCapabilitiesObject); + this.testCreateChannelConfig = this.testObjectCreated.bind(this, oipfObjectFactory.createChannelConfig); + this.testCreateCodManagerObject = this.testObjectCreated.bind(this, oipfObjectFactory.createCodManagerObject); + this.testCreateConfigurationObject = this.testObjectCreated.bind(this, oipfObjectFactory.createConfigurationObject); + this.testCreateDownloadManagerObject = this.testObjectCreated.bind(this, oipfObjectFactory.createDownloadManagerObject); + this.testCreateDownloadTriggerObject = this.testObjectCreated.bind(this, oipfObjectFactory.createDownloadTriggerObject); + this.testCreateDrmAgentObject = this.testObjectCreated.bind(this, oipfObjectFactory.createDrmAgentObject); + this.testCreateGatewayInfoObject = this.testObjectCreated.bind(this, oipfObjectFactory.createGatewayInfoObject); + this.testCreateIMSObject = this.testObjectCreated.bind(this, oipfObjectFactory.createIMSObject); + this.testCreateMDTFObject = this.testObjectCreated.bind(this, oipfObjectFactory.createMDTFObject); + this.testCreateNotifSocketObject = this.testObjectCreated.bind(this, oipfObjectFactory.createNotifSocketObject); + this.testCreateParentalControlManagerObject = this.testObjectCreated.bind(this, oipfObjectFactory.createParentalControlManagerObject); + this.testCreateRecordingSchedulerObject = this.testObjectCreated.bind(this, oipfObjectFactory.createRecordingSchedulerObject); + this.testCreateRemoteControlFunctionObject = this.testObjectCreated.bind(this, oipfObjectFactory.createRemoteControlFunctionObject); + this.testCreateRemoteManagementObject = this.testObjectCreated.bind(this, oipfObjectFactory.createRemoteManagementObject); + this.testCreateSearchManagerObject = this.testObjectCreated.bind(this, oipfObjectFactory.createSearchManagerObject); + this.testCreateStatusViewObject = this.testObjectCreated.bind(this, oipfObjectFactory.createStatusViewObject); + this.testCreateVideoBroadcastObject = this.testObjectCreated.bind(this, oipfObjectFactory.createVideoBroadcastObject); + this.testCreateVideoMpegObject = this.testObjectCreated.bind(this, oipfObjectFactory.createVideoMpegObject); }, - verifyObjectImplementation: function(methodName, resolve, reject) { - var method = this.oipfObjectFactory[methodName]; + testObjectCreated: function(method, resolve, reject) { + var object = method.call(oipfObjectFactory); - if(method) { - var object = method(); - - if(this.assertNotNull(object)){ - resolve(); - } else { - reject("The object is null."); - } + if (this.assertNotNull(object)) { + resolve(); } else { - reject("Object not Implemented."); + reject("The object is null."); } }, - - beforeTest: function(resolve, reject) { - this.verifyObjectImplementation = this.verifyObjectImplementation(resolve, reject); - }, - - testCreateApplicationManagerObject: function(resolve, reject) { - this.verifyObjectImplementation("createApplicationManagerObject"); - }, - - testCreateCapabilitiesObject: function(resolve, reject) { - this.verifyObjectImplementation("createCapabilitiesObject"); - }, - - testCreateChannelConfig: function(resolve, reject) { - this.verifyObjectImplementation("createChannelConfig"); - }, - - testCreateCodManagerObject: function(resolve, reject) { - this.verifyObjectImplementation("createCodManagerObject"); - }, - - testCreateConfigurationObject: function(resolve, reject) { - this.verifyObjectImplementation("createConfigurationObject"); - }, - - testCreateDownloadManagerObject: function(resolve, reject) { - this.verifyObjectImplementation("createDownloadManagerObject"); - }, - - testCreateDownloadTriggerObject: function(resolve, reject) { - this.verifyObjectImplementation("createDownloadTriggerObject"); - }, - - testCreateDrmAgentObject: function(resolve, reject) { - this.verifyObjectImplementation("createDrmAgentObject"); - }, - - testCreateGatewayInfoObject: function(resolve, reject) { - this.verifyObjectImplementation("createGatewayInfoObject"); - }, - - testCreateImsObject: function(resolve, reject) { - this.verifyObjectImplementation("createImsObject"); - }, - - testCreateIsObjectSupported: function(resolve, reject) { - if( this.oipfObjectFactory.isObjectSupported) { + + testObjectSupported: function(mimeType, resolve, reject) { + if (oipfObjectFactory.isObjectSupported(mimeType)) { resolve(); } else { reject(); } - }, - - testCreateMdtfObject: function(resolve, reject) { - this.verifyObjectImplementation("createMdtfObject"); - }, - - testCreateNotifSocketObject: function(resolve, reject) { - this.verifyObjectImplementation("createNotifSocketObject"); - }, - - testCreateParentalControlManagerObject: function(resolve, reject) { - this.verifyObjectImplementation("createParentalControlManagerObject"); - }, - - testCreateRecordingSchedulerObject: function(resolve, reject) { - this.verifyObjectImplementation("createRecordingSchedulerObject"); - }, - - testCreateRemoteControlFunctionObject: function(resolve, reject) { - this.verifyObjectImplementation("createRemoteControlFunctionObject"); - }, - - testCreateRemoteManagementObject: function(resolve, reject) { - this.verifyObjectImplementation("createRemoteManagementObject"); - }, - - testCreateSearchManagerObject: function(resolve, reject) { - this.verifyObjectImplementation("createSearchManagerObject"); - }, - - testCreateStatusViewObject: function(resolve, reject) { - this.verifyObjectImplementation("createStatusViewObject"); - }, - - testCreateVideoBroadcastObject: function(resolve, reject) { - this.verifyObjectImplementation("createVideoBroadcastObject"); - }, - - testCreateVideoMpegObject: function() { - this.verifyObjectImplementation("createVideoMpegObject"); } - });

1 0