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

r752 - oipf/js/lib
by ygrego＠users.nuiton.org 30 Jan '15

30 Jan '15

Author: ygrego Date: 2015-01-30 16:53:48 +0000 (Fri, 30 Jan 2015) New Revision: 752 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/752 Log: Move of "Class.js" into "js/lib/" directory. Added: oipf/js/lib/Class.js Added: oipf/js/lib/Class.js =================================================================== --- oipf/js/lib/Class.js (rev 0) +++ oipf/js/lib/Class.js 2015-01-30 16:53:48 UTC (rev 752) @@ -0,0 +1,15 @@ +var Class = new Function(); + +Function.prototype.extend = function(proto) { + var parent = this; + + var child = function() { + this.init && this.init.apply(this, arguments); + }; + + child.prototype = proto; + child.prototype.__proto__ = parent.prototype; + child.prototype.super = parent.prototype; + + return child; +};

1 0

r751 - in oipf/view: . img
by ygrego＠users.nuiton.org 30 Jan '15

30 Jan '15

Author: ygrego Date: 2015-01-30 16:51:53 +0000 (Fri, 30 Jan 2015) New Revision: 751 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/751 Log: Adding of new images to videoBroadcastObject Added: oipf/view/img/ oipf/view/img/TV-T&PC.svg oipf/view/img/video-broadcast.jpg Added: oipf/view/img/TV-T&PC.svg =================================================================== --- oipf/view/img/TV-T&PC.svg (rev 0) +++ oipf/view/img/TV-T&PC.svg 2015-01-30 16:51:53 UTC (rev 751) @@ -0,0 +1,421 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.0" + width="400" + height="320" + viewBox="0 0 400 320" + id="svg2608" + xml:space="preserve"><defs + id="defs2789"><linearGradient + x1="26" + y1="216" + x2="222" + y2="216" + id="linearGradient2998" + xlink:href="#SVGID_1_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)" /><linearGradient + x1="238.71001" + y1="263.3428" + x2="273.71011" + y2="287.67639" + id="linearGradient3000" + xlink:href="#SVGID_2_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)" /><linearGradient + x1="253.00391" + y1="277.52441" + x2="259.75391" + y2="277.52441" + id="linearGradient3002" + xlink:href="#SVGID_3_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8805,-0.4741,-0.4741,-0.8805,162.2281,410.4667)" /><linearGradient + x1="239.0439" + y1="211.6758" + x2="274.0441" + y2="236.0094" + id="linearGradient3004" + xlink:href="#SVGID_4_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)" /><linearGradient + x1="253.21091" + y1="224.86909" + x2="259.96179" + y2="224.86909" + id="linearGradient3006" + xlink:href="#SVGID_5_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9668,-0.2554,-0.2554,-0.9668,66.0736,379.1345)" /><linearGradient + x1="123.8247" + y1="145.83299" + x2="123.8247" + y2="286.1665" + id="linearGradient3008" + xlink:href="#SVGID_6_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)" /></defs> + + + + + + + + + + + + + + + +<g + transform="matrix(1.3285356,0,0,1.3285356,-64.971836,-44.401297)" + id="g2837"><g + transform="translate(50,44.117647)" + id="Layer_14"> + <rect + width="222.66701" + height="17.333" + x="31.167" + y="196.16701" + id="rect2613" + style="fill:#42474a" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_2"> + <path + d="M 291,184 C 291,191.18 285.18,197 278,197 L 22,197 C 14.82,197 9,191.18 9,184 L 9,20.5 C 9,13.32 14.82,7.5 22,7.5 L 278,7.5 C 285.18,7.5 291,13.32 291,20.5 L 291,184 z" + id="path2616" + style="fill:#c0c3c4" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_3"> + <path + d="M 284,181.5 C 284,187.022 279.522,191.5 274,191.5 L 24,191.5 C 18.477,191.5 14,187.022 14,181.5 L 14,23.5 C 14,17.977 18.477,13.5 24,13.5 L 274,13.5 C 279.522,13.5 284,17.977 284,23.5 L 284,181.5 z" + id="path2619" + style="fill:#42474a" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_3_copy"> + <path + d="M 281,179.744 C 281,185.143 276.622,189.522 271.223,189.522 L 26.778,189.522 C 21.378,189.522 17,185.143 17,179.744 L 17,25.255 C 17,19.855 21.377,15.477 26.778,15.477 L 271.223,15.477 C 276.622,15.477 281,19.855 281,25.255 L 281,179.744 L 281,179.744 z" + id="path2622" + style="fill:#bfc3c6" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_3_copy_2"> + <path + d="M 282.414,187.522 L 29.587,187.522 C 24.311,187.522 20.034,183.245 20.034,177.967 L 20.034,27.031 C 20.034,21.755 24.311,17.478 29.587,17.478 L 282.414,17.478 L 282.414,187.522 z" + id="path2625" + style="fill:#42474a" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_3_copy_3"> + <path + d="M 229.691,176.638 C 229.691,181.822 225.489,186.024 220.306,186.024 L 31.694,186.024 C 26.51,186.024 22.309,181.822 22.309,176.638 L 22.309,28.362 C 22.309,23.179 26.51,18.977 31.694,18.977 L 220.308,18.977 C 225.491,18.977 229.693,23.179 229.693,28.362 L 229.691,176.638 L 229.691,176.638 z" + id="path2628" + style="fill:#c0c3c4" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_7"> + + <linearGradient + x1="26" + y1="216" + x2="222" + y2="216" + id="SVGID_1_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)"> + <stop + id="stop2632" + style="stop-color:#e7edf3;stop-opacity:1" + offset="0" /> + <stop + id="stop2634" + style="stop-color:#95999d;stop-opacity:1" + offset="1" /> + <a:midPointStop + offset="0" + style="stop-color:#E7EDF3" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E7EDF3" /> + <a:midPointStop + offset="1" + style="stop-color:#95999D" /> + </linearGradient> + <path + d="M 222,177.5 C 222,180.813 219.313,183.5 216,183.5 L 32,183.5 C 28.687,183.5 26,180.813 26,177.5 L 26,30.5 C 26,27.187 28.687,24.5 32,24.5 L 216,24.5 C 219.313,24.5 222,27.187 222,30.5 L 222,177.5 z" + id="path2636" + style="fill:url(#linearGradient2998)" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_8"> + <path + d="M 219.167,103.833 C 219.167,136.833 217.001,160.867 217.001,160.867 C 215.501,172.117 209.839,176.305 190.5,177.867 C 159.5,180.367 121,179.617 121,179.617 C 121,179.617 87,180.451 56,177.951 C 36.662,176.389 31,172.201 29.5,160.951 C 29.5,160.951 28.333,137.284 28.5,104.167 C 28.667,71.05 31,47 31,47 C 32.5,35.75 38.162,31.56 57.5,30 C 88.5,27.5 122.5,28.333 122.5,28.333 C 122.5,28.333 161,27.583 192,30.083 C 211.339,31.643 217.001,35.833 218.501,47.083 C 218.501,47.083 219.167,70.833 219.167,103.833 z" + id="path2639" + style="fill:#343535" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_11"> + + <linearGradient + x1="238.71001" + y1="263.3428" + x2="273.71011" + y2="287.67639" + id="SVGID_2_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)"> + <stop + id="stop2643" + style="stop-color:#545454;stop-opacity:1" + offset="0" /> + <stop + id="stop2645" + style="stop-color:#ffffff;stop-opacity:1" + offset="0.45100001" /> + <stop + id="stop2647" + style="stop-color:#ffffff;stop-opacity:1" + offset="0.54900002" /> + <stop + id="stop2649" + style="stop-color:#545454;stop-opacity:1" + offset="1" /> + <a:midPointStop + offset="0" + style="stop-color:#545454" /> + <a:midPointStop + offset="0.5" + style="stop-color:#545454" /> + <a:midPointStop + offset="0.451" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.549" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="1" + style="stop-color:#545454" /> + </linearGradient> + <circle + cx="256.375" + cy="44.375" + r="22.875" + id="circle2651" + style="fill:url(#linearGradient3000)" /> + <circle + cx="256.375" + cy="44.375" + r="14.875" + id="circle2653" + style="fill:#37383a" /> + + <linearGradient + x1="253.00391" + y1="277.52441" + x2="259.75391" + y2="277.52441" + id="SVGID_3_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8805,-0.4741,-0.4741,-0.8805,162.2281,410.4667)"> + <stop + id="stop2656" + style="stop-color:#95999d;stop-opacity:1" + offset="0" /> + <stop + id="stop2658" + style="stop-color:#cccccc;stop-opacity:1" + offset="0.49509999" /> + <stop + id="stop2660" + style="stop-color:#95999d;stop-opacity:1" + offset="1" /> + <a:midPointStop + offset="0" + style="stop-color:#95999D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#95999D" /> + <a:midPointStop + offset="0.4951" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#95999D" /> + </linearGradient> + <polygon + points="265.847,53.948 259.243,57.504 247.153,35.052 253.757,31.496 265.847,53.948 " + id="polygon2662" + style="fill:url(#linearGradient3002)" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_11_copy"> + + <linearGradient + x1="239.0439" + y1="211.6758" + x2="274.0441" + y2="236.0094" + id="SVGID_4_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)"> + <stop + id="stop2666" + style="stop-color:#545454;stop-opacity:1" + offset="0" /> + <stop + id="stop2668" + style="stop-color:#ffffff;stop-opacity:1" + offset="0.45100001" /> + <stop + id="stop2670" + style="stop-color:#ffffff;stop-opacity:1" + offset="0.54900002" /> + <stop + id="stop2672" + style="stop-color:#545454;stop-opacity:1" + offset="1" /> + <a:midPointStop + offset="0" + style="stop-color:#545454" /> + <a:midPointStop + offset="0.5" + style="stop-color:#545454" /> + <a:midPointStop + offset="0.451" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.549" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="1" + style="stop-color:#545454" /> + </linearGradient> + <circle + cx="256.70901" + cy="96.042" + r="22.875" + id="circle2674" + style="fill:url(#linearGradient3004)" /> + <circle + cx="256.70901" + cy="96.042" + r="14.875" + id="circle2676" + style="fill:#37383a" /> + + <linearGradient + x1="253.21091" + y1="224.86909" + x2="259.96179" + y2="224.86909" + id="SVGID_5_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9668,-0.2554,-0.2554,-0.9668,66.0736,379.1345)"> + <stop + id="stop2679" + style="stop-color:#95999d;stop-opacity:1" + offset="0" /> + <stop + id="stop2681" + style="stop-color:#cccccc;stop-opacity:1" + offset="0.49509999" /> + <stop + id="stop2683" + style="stop-color:#95999d;stop-opacity:1" + offset="1" /> + <a:midPointStop + offset="0" + style="stop-color:#95999D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#95999D" /> + <a:midPointStop + offset="0.4951" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#95999D" /> + </linearGradient> + <polygon + points="263.716,107.537 256.464,109.452 249.952,84.797 257.204,82.882 263.716,107.537 " + id="polygon2685" + style="fill:url(#linearGradient3006)" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_12"> + <circle + cx="256.375" + cy="44.375" + r="18.625" + id="circle2688" + style="fill:none;stroke:#b2b2b2;stroke-dasharray:3, 2, 4, 2" /> + <circle + cx="256.54199" + cy="96.208" + r="18.625" + id="circle2690" + style="fill:none;stroke:#b2b2b2;stroke-dasharray:3, 1, 4, 1" /> +</g><g + transform="translate(50,44.117647)" + id="Layer_8_copy"> + + <linearGradient + x1="123.8247" + y1="145.83299" + x2="123.8247" + y2="286.1665" + id="SVGID_6_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,-1,0,320)"> + <stop + id="stop2694" + style="stop-color:#e7edf3;stop-opacity:1" + offset="0" /> + <stop + id="stop2696" + style="stop-color:#ffffff;stop-opacity:1" + offset="1" /> + <a:midPointStop + offset="0" + style="stop-color:#E7EDF3" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E7EDF3" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <path + d="M 216.5,103.837 C 216.5,135.914 214.395,159.275 214.395,159.275 C 212.938,170.21 207.433,174.282 188.635,175.799 C 158.502,178.231 121.079,177.5 121.079,177.5 C 121.079,177.5 88.03,178.311 57.897,175.881 C 39.1,174.364 33.596,170.292 32.138,159.356 C 32.138,159.356 31.004,136.352 31.166,104.161 C 31.328,71.97 33.596,48.593 33.596,48.593 C 35.054,37.658 40.558,33.585 59.355,32.069 C 89.488,29.639 122.537,30.449 122.537,30.449 C 122.537,30.449 159.96,29.72 190.093,32.15 C 208.891,33.666 214.395,37.739 215.853,48.674 C 215.853,48.675 216.5,71.761 216.5,103.837 z" + id="path2698" + style="fill:url(#linearGradient3008)" /> +</g></g></svg> \ No newline at end of file Added: oipf/view/img/video-broadcast.jpg =================================================================== (Binary files differ) Property changes on: oipf/view/img/video-broadcast.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r750 - in oipf: data js/impl view
by ygrego＠users.nuiton.org 30 Jan '15

30 Jan '15

Author: ygrego Date: 2015-01-30 16:49:04 +0000 (Fri, 30 Jan 2015) New Revision: 750 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/750 Log: Adding of data in a variable + all non-visuals objects of OipfObjectFactory became one of her properties + VideobroadcastObject is now a html object(Visual object) Modified: oipf/data/data.js oipf/js/impl/OipfObjectFactory.js oipf/js/impl/VideoBroadcastObject.js oipf/view/welcome.html Modified: oipf/data/data.js =================================================================== --- oipf/data/data.js 2015-01-30 09:26:49 UTC (rev 749) +++ oipf/data/data.js 2015-01-30 16:49:04 UTC (rev 750) @@ -1,4 +1,4 @@ -{ +var data = { "tv": { "-generator-info-name": "KaZeR's XMLTV", "-generator-info-url": "http://www.kazer.org", Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-01-30 09:26:49 UTC (rev 749) +++ oipf/js/impl/OipfObjectFactory.js 2015-01-30 16:49:04 UTC (rev 750) @@ -26,10 +26,23 @@ init: function() { console.log("[INFO] constructor of OipfObjectFactory class called."); - this.applicationManagerObject = new ApplicationManagerObject(); - this.channelConfig = new ChannelConfig(); - this.searchManagerObject = new SearchManagerObject(); - this.remoteManagementObject = new RemoteManagementObject(); + //this.applicationManagerObject = new ApplicationManagerObject(); + //this.capabilitiesObject = new CapabilitiesObject(); + //this.codManagerObject = new CodManagerObject(); + //this.channelConfig = new ChannelConfig(); + //this.imsObject = new IMSObecjet(); + //this.mdtfObject = new MDTFObject(); + //this.notifSocketObject = new NotifSocket(); + //this.parentalControlManagerObject = new ParentalControlManagerObject(); + //this.recordingSchedulerObject = new RecordingSchedulerObject(); + //this.searchManagerObject = new SearchManagerObject(); + //this.configurationObject = new ConfigurationObject(); + //this.downloadManagerObject= new DownloadManagerObject(); + //this.downloadTriggerObject= new DownloadTriggerObject(); + //this.drmAgentObject= new DrmAgentObject(); + //this.gatewayInfoObject= new GatewayInfoObject(); + //this.remoteManagementObject = new RemoteManagementObject(); + //this.remoteControlFunctionObject = new RemoteControlFunctionObject(); }, /* @@ -41,6 +54,8 @@ */ applicationManagerObject: null, + capabilitiesObject: null, + codManagerObject: null, /*The ChannelConfig class provides the entry point for applications to get information about the list of channels @@ -71,7 +86,29 @@ * security requirements as defined in section 10. */ remoteManagementObject: null, + + remoteControlFunctionObject: null, + + imsObject : null, + + mdtfObject: null, + + notifSocketObject: null, + + parentalControlManagerObject: null, + + recordingSchedulerObject: null, + + configurationObject: null, + + downloadManagerObject: null, + + downloadTriggerObject: null, + + drmAgentObject: null, + gatewayInfoObject: null, + /* * Description: OITFs SHALL implement the application/oipfSearchManager embedded object. This object provides a * mechanism for applications to create and manage metadata searches. @@ -193,7 +230,7 @@ createCapabilitiesObject: function() { console.log("[INFO] createCapabilitiesObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(capabilities_dae_mime_type); + return this.capabilitiesObject; }, /*! @@ -223,7 +260,7 @@ createConfigurationObject: function() { console.log("[INFO] createConfigurationObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(configuration_dae_mime_type); + return this.configurationObject; }, /*! @@ -233,7 +270,7 @@ createDownloadManagerObject: function() { console.log("[INFO] createDownloadManagerObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(downloadManager_dae_mime_type); + return this.downloadManagerObject; }, /*! @@ -243,7 +280,7 @@ createDownloadTriggerObject: function() { console.log("[INFO] createDownloadTriggerObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(downloadTrigger_dae_mime_type); + return this.downloadTriggerObject; }, /*! @@ -253,7 +290,7 @@ createDrmAgentObject: function() { console.log("[INFO] createDrmAgentObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(drmAgent_dae_mime_type); + return this.drmAgentObject; }, /*! @@ -263,7 +300,7 @@ createGatewayInfoObject: function() { console.log("[INFO] createGatewayInfoObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(gatewayInfo_dae_mime_type); + return this.gatewayInfoObject; }, /*! @@ -273,7 +310,7 @@ createIMSObject: function() { console.log("[INFO] createIMSObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(ims_dae_mime_type); + return this.imsObject; }, /*! @@ -283,7 +320,7 @@ createMDTFObject: function() { console.log("[INFO] createMDTFObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(mdtf_dae_mime_type); + return this.mdtfObject; }, /*! @@ -293,7 +330,7 @@ createNotifSocketObject: function() { console.log("[INFO] createNotifSocketObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(notifSocket_dae_mime_type); + return this.notifSocketObject; }, /*! @@ -303,7 +340,7 @@ createParentalControlManagerObject: function() { console.log("[INFO] createParentalControlManangerObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(parentalControlManager_dae_mime_type); + return this.parentalControlManagerObject; }, /*! @@ -313,7 +350,7 @@ createRecordingSchedulerObject: function() { console.log("[INFO] createRecordingSchedulerObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(recordingScheduler_dae_mime_type); + return this.recordingSchedulerObject; }, /*! @@ -323,7 +360,7 @@ createRemoteControlFunctionObject: function() { console.log("[INFO] createRemoteControlFunctionObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(remoteControlFunction_dae_mime_type); + return this.remoteControlFunctionObject; }, /*! Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-01-30 09:26:49 UTC (rev 749) +++ oipf/js/impl/VideoBroadcastObject.js 2015-01-30 16:49:04 UTC (rev 750) @@ -1,10 +1,8 @@ var VideoBroadcastObject = Class.extend({ - //Default value - width: 200, + width: null, - //Default value - heigth: 200, + heigth: null, playstate: 0, @@ -16,6 +14,21 @@ init: function() { console.log("[INFO] constructor of VideoBroadcast class called."); + + var proto = VideoBroadcastObject.prototype; + proto.createdCallback = function(){ + console.log("OK"); + //this.width= "128"; + //this.height= "128"; + this.align = "middle"; + this.style = "background-image:url(\"../view/img/video-broadcast.jpg\")"; + //this.data = "../view/img/video-broadcast.jpg"; + } + + document.registerElement('video-broadcast', { + prototype: proto, + extends: "object" + }); }, /*! Modified: oipf/view/welcome.html =================================================================== --- oipf/view/welcome.html 2015-01-30 09:26:49 UTC (rev 749) +++ oipf/view/welcome.html 2015-01-30 16:49:04 UTC (rev 750) @@ -1,9 +1,17 @@ <html> <head> <title>TestOIPFLib</title> - - </head> - <body> + <style> + body { + background-image: url("img/TV-T&PC.svg"); + background-repeat: no-repeat; + background-size: cover; + background-position: center; + } + </style> + + <script src="../js/lib/VisualClass.js" type="text/javascript"></script> + <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../data/data.js" type="text/javascript"></script> <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> @@ -13,10 +21,30 @@ <script src="../js/test/test.js" type="text/javascript"></script> <script> testCreatingVidBroadObj(); - testCreatingSearchManagerObj(); - testCreatingChannelConfigObj(); + //document.body.innerHTML ="<object is='video-broadcast'></object>" + //testCreatingSearchManagerObj();<x-foo-with-markup><x-foo-with-markup/> + //testCreatingChannelConfigObj(); </script> + <script> + var XFooProto = Object.create(HTMLElement.prototype); + + XFooProto.createdCallback = function() { + //this.innerHTML = "<b>I'm an x-foo-with-markup!</b>";<object is="x-foo-with-markup"></object> + this.width= "128"; + this.height= "128"; + this.type="application/vnd.adobe.flash-movie"; + this.data= "/img/helloworld.swf"; + }; + + var XFoo = document.registerElement('x-foo-with-markup', {prototype: XFooProto, extends: "object"}); + + </script> + </head> + <body> + + <object is="video-broadcast"></object> + </body> </html> \ No newline at end of file

1 0

r749 - in h2j8test: . src src/main src/main/java src/main/java/org src/main/java/org/test src/main/resources src/test
by echatellier＠users.nuiton.org 30 Jan '15

30 Jan '15

Author: echatellier Date: 2015-01-30 09:26:49 +0000 (Fri, 30 Jan 2015) New Revision: 749 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/749 Log: Initial import. Added: h2j8test/data-backup.sql.gz h2j8test/pom.xml h2j8test/src/ h2j8test/src/main/ h2j8test/src/main/java/ h2j8test/src/main/java/org/ h2j8test/src/main/java/org/test/ h2j8test/src/main/java/org/test/H2J8Test.java h2j8test/src/main/resources/ h2j8test/src/main/resources/log4j.properties h2j8test/src/test/ h2j8test/src/test/java/ Added: h2j8test/data-backup.sql.gz =================================================================== (Binary files differ) Property changes on: h2j8test/data-backup.sql.gz ___________________________________________________________________ Added: svn:mime-type + application/x-gzip Added: h2j8test/pom.xml =================================================================== --- h2j8test/pom.xml (rev 0) +++ h2j8test/pom.xml 2015-01-30 09:26:49 UTC (rev 749) @@ -0,0 +1,20 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.test</groupId> + <artifactId>h2j8test</artifactId> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.4.185</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> Property changes on: h2j8test/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: h2j8test/src/main/java/org/test/H2J8Test.java =================================================================== --- h2j8test/src/main/java/org/test/H2J8Test.java (rev 0) +++ h2j8test/src/main/java/org/test/H2J8Test.java 2015-01-30 09:26:49 UTC (rev 749) @@ -0,0 +1,78 @@ +package org.test; + +import java.io.File; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.Statement; + +public class H2J8Test { + + + public static void main(String[] args) throws Exception { + Class.forName("org.h2.Driver"); + + final File f = createDb(); + Thread t = new Thread() { + public void run() { + try { + restoreDb(f); + } catch (Exception e) { + e.printStackTrace(); + } + }; + }; + t.run(); + t.join(); + } + + private static File createDb() throws Exception { + + Connection conn = DriverManager.getConnection("jdbc:h2:./test_" + System.currentTimeMillis()); + Statement stat = conn.createStatement(); + + // this line would initialize the database + // from the SQL script file 'init.sql' + // stat.execute("runscript from 'init.sql'"); + + stat.execute("create table test(id int primary key, name varchar(255))"); + stat.execute("insert into test values(1, 'Hello')"); + ResultSet rs; + rs = stat.executeQuery("select * from test"); + while (rs.next()) { + System.out.println("test1:" + rs.getString("name")); + } + stat.close(); + + // extract + Statement stat2 = conn.createStatement(); + File file = File.createTempFile("h2test-", ".sql"); + stat2.execute("SCRIPT TO '" + file.getAbsolutePath() + "'"); + + //conn.close(); + + return file; + } + + private static void restoreDb(File file) throws Exception { + + Connection conn = DriverManager.getConnection("jdbc:h2:./test2_" + System.currentTimeMillis()); + + Statement stat = conn.createStatement(); + + //stat.execute("RUNSCRIPT FROM '" + file.getAbsolutePath() + "' COMPRESSION GZIP"); + stat.execute("RUNSCRIPT FROM '" + file.getAbsolutePath() + "'"); + //stat.close(); + + // test list + Statement stat2 = conn.createStatement(); + ResultSet rs; + rs = stat2.executeQuery("select * from fisheryregion"); + while (rs.next()) { + System.out.println("test2:" + rs.getString("name")); + } + stat.close(); + + conn.close(); + } +} Property changes on: h2j8test/src/main/java/org/test/H2J8Test.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: h2j8test/src/main/resources/log4j.properties =================================================================== --- h2j8test/src/main/resources/log4j.properties (rev 0) +++ h2j8test/src/main/resources/log4j.properties 2015-01-30 09:26:49 UTC (rev 749) @@ -0,0 +1,7 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout + +# Console output +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c:%L - %m%n Property changes on: h2j8test/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r748 - /
by echatellier＠users.nuiton.org 30 Jan '15

30 Jan '15

Author: echatellier Date: 2015-01-30 09:25:53 +0000 (Fri, 30 Jan 2015) New Revision: 748 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/748 Log: Initial import. Added: h2j8test/

1 0

r747 - in oipf: . js/impl style style/picture
by ygrego＠users.nuiton.org 30 Jan '15

30 Jan '15

Author: ygrego Date: 2015-01-30 09:03:45 +0000 (Fri, 30 Jan 2015) New Revision: 747 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/747 Log: Adding of a directorie "style" and codManagerObject as property of OipfObjectFactory. Added: oipf/style/ oipf/style/picture/ oipf/style/picture/400px-TV-T&PC.svg.png Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-01-30 08:19:48 UTC (rev 746) +++ oipf/js/impl/OipfObjectFactory.js 2015-01-30 09:03:45 UTC (rev 747) @@ -27,7 +27,7 @@ init: function() { console.log("[INFO] constructor of OipfObjectFactory class called."); this.applicationManagerObject = new ApplicationManagerObject(); - this.channelConfigObject = new channelConfigObject(); + this.channelConfig = new ChannelConfig(); this.searchManagerObject = new SearchManagerObject(); this.remoteManagementObject = new RemoteManagementObject(); }, @@ -41,8 +41,31 @@ */ applicationManagerObject: null, - channelConfigObject: null, + codManagerObject: null, + /*The ChannelConfig class provides the entry point for applications to get information about the list of channels + * available. It can be obtained in two ways: + * -By calling the method getChannelConfig() of the video/broadcast embedded object as defined in + * section 7.13.1.3. + * -By calling the method createChannelConfig() of the object factory API as defined in section 7.1.1. + * The availability of the properties and methods are dependent on the capabilities description as specified in section 9.3. + * The following table provides a list of the capabilities and the associated properties and methods. If the capability is false + * the properties and methods SHALL NOT be available to the application. Properties and methods not listed in the + * following table SHALL be available to all applications as long as the OITF has indicated support for tuner control (i.e. + * <video_broadcast>true</video_broadcast> as defined in section 9.3.1) in their capability. + * ------------------------------------------------------------------------ + * Capability | Properties | Methods + * --------------------------------- --------------- ---------------------- + * Element <extendedAVControl> | onChannelScan | startScan() + * is set to “ true ” as defined in | | stopScan() + * section 9.3.6. | | + * --------------------------------- --------------- ---------------------- + * Element <video_broadcast | |createChannelList() + * type="ID_IPTV_SDS"> is set as | | + * defined in section 9.3.6. | | + */ + channelConfig: null, + /* * Description: Access to the functionality of the application/oipfRemoteManagement embedded object SHALL adhere to the * security requirements as defined in section 10. @@ -55,7 +78,6 @@ */ searchManagerObject: null, - /* * Description: * This method SHALL return true if and only if an object of the specified type is supported by @@ -181,7 +203,7 @@ createChannelConfig: function() { console.log("[INFO] createChannelConfigObject() of OipfObjectFactory class called."); - return this.channelConfigObject; + return this.channelConfig; }, /*! @@ -191,7 +213,7 @@ createCodManagerObject: function() { console.log("[INFO] createCodManagerObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(codManager_dae_mime_type); + return this.codManagerObject; }, /*! Added: oipf/style/picture/400px-TV-T&PC.svg.png =================================================================== (Binary files differ) Property changes on: oipf/style/picture/400px-TV-T&PC.svg.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r746 - oipf/js/impl
by ygrego＠users.nuiton.org 30 Jan '15

30 Jan '15

Author: ygrego Date: 2015-01-30 08:19:48 +0000 (Fri, 30 Jan 2015) New Revision: 746 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/746 Log: Modification of ChannelConfig object documentation Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-01-29 17:10:15 UTC (rev 745) +++ oipf/js/impl/ChannelConfig.js 2015-01-30 08:19:48 UTC (rev 746) @@ -8,11 +8,13 @@ * the properties and methods SHALL NOT be available to the application. Properties and methods not listed in the * following table SHALL be available to all applications as long as the OITF has indicated support for tuner control (i.e. * <video_broadcast>true</video_broadcast> as defined in section 9.3.1) in their capability. + * ------------------------------------------------------------------------ * Capability | Properties | Methods - * Element <extendedAVControl> | onChannelScan | startScan() stopScan() - * is set to “ true ” as defined in | - * section 9.3.6. | - *----------------------------------|---------------|--------------------------- + * --------------------------------- --------------- ---------------------- + * Element <extendedAVControl> | onChannelScan | startScan() + * is set to “ true ” as defined in | | stopScan() + * section 9.3.6. | | + * ---------------------------------|---------------|---------------------- * Element <video_broadcast | |createChannelList() * type="ID_IPTV_SDS"> is set as | | * defined in section 9.3.6. | |

1 0

r745 - oipf/js/impl
by ygrego＠users.nuiton.org 29 Jan '15

29 Jan '15

Author: ygrego Date: 2015-01-29 17:10:15 +0000 (Thu, 29 Jan 2015) New Revision: 745 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/745 Log: Refactoring general of oipf object factory Modified: oipf/js/impl/ApplicationManagerObject.js oipf/js/impl/ChannelConfig.js oipf/js/impl/OipfObjectFactory.js oipf/js/impl/RemoteManagementObject.js oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/ApplicationManagerObject.js =================================================================== --- oipf/js/impl/ApplicationManagerObject.js 2015-01-29 14:11:59 UTC (rev 744) +++ oipf/js/impl/ApplicationManagerObject.js 2015-01-29 17:10:15 UTC (rev 745) @@ -1,19 +1,10 @@ -var Class = new Function(); - -Function.prototype.extend = function(proto) { - var parent = this; - - var child = function() { - this.init && this.init.apply(this, arguments); - }; - - child.prototype = proto; - child.prototype.__proto__ = parent.prototype; - child.prototype.super = parent.prototype; - - return child; -}; - +/* + * Description: An OITF SHALL support a non-visual embedded object of type “ application/oipfApplicationManager ”, with + * the following JavaScript API, to enable applications to access the privileged functionality related to application lifecycle + * and management that is provided by the application model defined in this section. + * If one of the methods on the application/oipfApplicationManager is called by a webpage that is not a + * privileged DAE application, the OITF SHALL throw an error as defined in section 10.1.1. + */ var ApplicationManagerObject = Class.extend({ init : function(){ Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-01-29 14:11:59 UTC (rev 744) +++ oipf/js/impl/ChannelConfig.js 2015-01-29 17:10:15 UTC (rev 745) @@ -1,3 +1,22 @@ +/*The ChannelConfig class provides the entry point for applications to get information about the list of channels + * available. It can be obtained in two ways: + * -By calling the method getChannelConfig() of the video/broadcast embedded object as defined in + * section 7.13.1.3. + * -By calling the method createChannelConfig() of the object factory API as defined in section 7.1.1. + * The availability of the properties and methods are dependent on the capabilities description as specified in section 9.3. + * The following table provides a list of the capabilities and the associated properties and methods. If the capability is false + * the properties and methods SHALL NOT be available to the application. Properties and methods not listed in the + * following table SHALL be available to all applications as long as the OITF has indicated support for tuner control (i.e. + * <video_broadcast>true</video_broadcast> as defined in section 9.3.1) in their capability. + * Capability | Properties | Methods + * Element <extendedAVControl> | onChannelScan | startScan() stopScan() + * is set to “ true ” as defined in | + * section 9.3.6. | + *----------------------------------|---------------|--------------------------- + * Element <video_broadcast | |createChannelList() + * type="ID_IPTV_SDS"> is set as | | + * defined in section 9.3.6. | | + */ var ChannelConfig = Class.extend({ /* Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-01-29 14:11:59 UTC (rev 744) +++ oipf/js/impl/OipfObjectFactory.js 2015-01-29 17:10:15 UTC (rev 745) @@ -18,22 +18,6 @@ var searchManager_dae_mime_type = "application/oipfSearchManager"; var statusView_dae_mime_type = "application/oipfStatusView"; -var Class = new Function(); - -Function.prototype.extend = function(proto) { - var parent = this; - - var child = function() { - this.init && this.init.apply(this, arguments); - }; - - child.prototype = proto; - child.prototype.__proto__ = parent.prototype; - child.prototype.super = parent.prototype; - - return child; -}; - /*! * \class OipfObjectFactory * \brief Provide access to components of a terminal supporting OIFP specification. @@ -42,23 +26,89 @@ init: function() { console.log("[INFO] constructor of OipfObjectFactory class called."); + this.applicationManagerObject = new ApplicationManagerObject(); + this.channelConfigObject = new channelConfigObject(); + this.searchManagerObject = new SearchManagerObject(); + this.remoteManagementObject = new RemoteManagementObject(); }, - listObjects: {}, + /* + * Description: An OITF SHALL support a non-visual embedded object of type “ application/oipfApplicationManager ”, with + * the following JavaScript API, to enable applications to access the privileged functionality related to application lifecycle + * and management that is provided by the application model defined in this section. + * If one of the methods on the application/oipfApplicationManager is called by a webpage that is not a + * privileged DAE application, the OITF SHALL throw an error as defined in section 10.1.1. + */ + applicationManagerObject: null, - /*! - * \class - * \brief + channelConfigObject: null, + + /* + * Description: Access to the functionality of the application/oipfRemoteManagement embedded object SHALL adhere to the + * security requirements as defined in section 10. + */ + remoteManagementObject: null, + + /* + * Description: OITFs SHALL implement the application/oipfSearchManager embedded object. This object provides a + * mechanism for applications to create and manage metadata searches. + */ + searchManagerObject: null, + + + /* + * Description: + * This method SHALL return true if and only if an object of the specified type is supported by + * the OITF, otherwise it SHALL return false. + * + * Argument: + * - mimeType : If the value of the argument is one of the MIME types defined in tables 1 + * to 4 of [OIPF_MEDIA2] or one of the DAE defined mime types listed + * below then an accurate indication of the OITF’s support for that MIME + * type SHALL be returned. For other values, it is recommended that an OITF returns a value which + * accurately reflects its support for the specified MIME type. + * DAE MIME Type: + * application/notifsocket, application/oipfApplicationManager, + * application/oipfCapabilities, application/oipfCodManager, + * application/oipfCommunicationServices, application/oipfConfiguration, + * application/oipfDownloadManager, application/oipfDownloadTrigger, + * application/oipfDrmAgent, application/oipfGatewayInfo, + * application/oipfCommunicationServices, application/oipfMDTF, + * application/oipfParentalControlManager, application/oipfRecordingScheduler, + * application/oipfRemoteControlFunction, application/oipfRemoteManagement + * */ isObjectSupported: function(mimeType) { }, - /*! - * \method - * \brief - * \return - */ + /*! + * Description: + * If the object type is supported, each of these methods shall return an instance of the + * corresponding embedded object. + * Since objects do not claim scarce resources when they are instantiated, instantiation shall + * never fail if the object type is supported. If the method name to create the object is not + * supported, the OITF SHALL throw an error with the error.name set to the value + * " TypeError ". + * If the object type is supported, the method shall return an HTMLObjectElement equivalent + * to the specified object. The value of the type attribute of the HTMLObjectElement SHALL + * match the mimetype of the instantiated object, for example " video/broadcast " in case of + * method oipfObjectFactory.createVideoBroadcastObject() . + * + * Arguments: + * -requiredCapabilities : + * An optional argument indicating the formats to be supported by + * the resulting player. Each item in the argument SHALL be one of + * the formats specified in [OIPF_MEDIA2]. Scarce resources will + * be claimed by the object at the time of instantiation. The + * allocationMethod property SHALL be set + * STATIC_ALLOCATION . If the OITF is unable to create the player + * object with the requested capabilities, the method SHALL return + * null . + * If this argument is omitted, objects do not claim scarce resources + * so instantiation shall never fail if the object type is supported. The + * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . + */ createVideoBroadcastObject: function() { console.log("[INFO] createVideoBroadcastObject() of OipfObjectFactory class called."); @@ -66,31 +116,58 @@ }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createSearchManagerObject: function() { console.log("[INFO] createSearchManagerObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(searchManager_dae_mime_type); + return this.searchManagerObject; }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createApplicationManagerObject: function() { console.log("[INFO] createApplicationManagerObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(applicationManager_dae_mime_type); + return this.applicationManagerObject; }, - /*! - * \class - * \brief - */ + /* + * Description + * If the object type is supported, each of these methods SHALL return an instance of the + * corresponding embedded object. This may be a new instance or existing instance. For + * example, the object will likely be a global singleton object and calls to this method may + * return the same instance. + * Since objects do not claim scarce resources when they are instantiated, instantiation + * SHALL never fail if the object type is supported. If the method name to create the object is + * not supported, the OITF SHALL throw an error with the name property set to the value + * " TypeError ". + * If the object is supported, the method SHALL return a JavaScript Object which + * implements the interface for the specified object. + */ createCapabilitiesObject: function() { console.log("[INFO] createCapabilitiesObject() of OipfObjectFactory class called."); @@ -104,7 +181,7 @@ createChannelConfig: function() { console.log("[INFO] createChannelConfigObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(channelConfig_type); + return this.channelConfigObject; }, /*! @@ -234,114 +311,74 @@ createRemoteManagementObject: function() { console.log("[INFO] createRemoteManagementObject() of OipfObjectFactory class called."); - return this.verifOipfObjectExisting(remoteManagement_dae_mime_type); + return this.remoteManagementObject; }, - createStatusViewObject: function() { + /*! + * Description: + * If the object type is supported, each of these methods shall return an instance of the + * corresponding embedded object. + * Since objects do not claim scarce resources when they are instantiated, instantiation shall + * never fail if the object type is supported. If the method name to create the object is not + * supported, the OITF SHALL throw an error with the error.name set to the value + * " TypeError ". + * If the object type is supported, the method shall return an HTMLObjectElement equivalent + * to the specified object. The value of the type attribute of the HTMLObjectElement SHALL + * match the mimetype of the instantiated object, for example " video/broadcast " in case of + * method oipfObjectFactory.createVideoBroadcastObject() . + * + * Arguments: + * -requiredCapabilities : + * An optional argument indicating the formats to be supported by + * the resulting player. Each item in the argument SHALL be one of + * the formats specified in [OIPF_MEDIA2]. Scarce resources will + * be claimed by the object at the time of instantiation. The + * allocationMethod property SHALL be set + * STATIC_ALLOCATION . If the OITF is unable to create the player + * object with the requested capabilities, the method SHALL return + * null . + * If this argument is omitted, objects do not claim scarce resources + * so instantiation shall never fail if the object type is supported. The + * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . + */ + createStatusViewObject: function() { console.log("[INFO] createStatusViewObject() of OipfObjectFactory class called."); return new StatusViewObject(); }, - + + /*! + * Description: + * If the object type is supported, each of these methods shall return an instance of the + * corresponding embedded object. + * Since objects do not claim scarce resources when they are instantiated, instantiation shall + * never fail if the object type is supported. If the method name to create the object is not + * supported, the OITF SHALL throw an error with the error.name set to the value + * " TypeError ". + * If the object type is supported, the method shall return an HTMLObjectElement equivalent + * to the specified object. The value of the type attribute of the HTMLObjectElement SHALL + * match the mimetype of the instantiated object, for example " video/broadcast " in case of + * method oipfObjectFactory.createVideoBroadcastObject() . + * + * Arguments: + * -requiredCapabilities : + * An optional argument indicating the formats to be supported by + * the resulting player. Each item in the argument SHALL be one of + * the formats specified in [OIPF_MEDIA2]. Scarce resources will + * be claimed by the object at the time of instantiation. The + * allocationMethod property SHALL be set + * STATIC_ALLOCATION . If the OITF is unable to create the player + * object with the requested capabilities, the method SHALL return + * null . + * If this argument is omitted, objects do not claim scarce resources + * so instantiation shall never fail if the object type is supported. The + * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . + */ createVideoMpegObject: function() { console.log("[INFO] createVideoMpegObject() of OipfObjectFactory class called."); return new VideoMpegObject(); - }, - - verifOipfObjectExisting: function(mimeType) { - - var currentObject = this.listObjects[mimeType]; - - if(!currentObject){ - - switch(mimeType){ - - case searchManager_dae_mime_type : - currentObject = new SearchManagerObject(); - break; - - case notifSocket_dae_mime_type : - currentObject = new NotifSocketObject(); - break; - - case applicationManager_dae_mime_type : - currentObject = new ApplicationManagerObject(); - break; - - case capabilities_dae_mime_type : - currentObject = new CapabilitiesObject(); - break; - - case codManager_dae_mime_type : - currentObject = new CodManagerObject(); - break; - - case configuration_dae_mime_type : - currentObject = new ConfigurationObject(); - break; - - case downloadManager_dae_mime_type : - currentObject = new DownloadManagerObject(); - break; - - case downloadTrigger_dae_mime_type : - currentObject = new DownloadTriggerObject(); - break; - - case drmAgent_dae_mime_type : - currentObject = new DrmAgentObject(); - break; - - case gatewayInfo_dae_mime_type : - currentObject = new GatewayInfoObject(); - break; - - case communicationServices_dae_mime_type : - currentObject = new CommunicationServicesObject(); - break; - - case mdtf_dae_mime_type : - currentObject = new MDTFObject(); - break; - - case parentalControlManager_dae_mime_type : - currentObject = new ParentalControlManagerObject(); - break; - - case recordingScheduler_dae_mime_type : - currentObject = new RecordingSchedulerObject(); - break; - - case remoteControlFunction_dae_mime_type : - currentObject = new RemoteControlFunctionObject(); - break; - - case remoteManagement_dae_mime_type : - currentObject = new RemoteManagementObject(); - break; - - case searchManager_dae_mime_type : - currentObject = new SearchManagerObject(); - break; - - case channelConfig_type: - currentObject = new ChannelConfig(); - break; - - default: - console.log("[Info][ERROR] : This mime-type: "+ mimeType +" not exist!!!"); - return undefined; - } - - - this.listObjects[mimeType] = currentObject; - } - - return this.listObjects[mimeType]; - - } - + } }); Modified: oipf/js/impl/RemoteManagementObject.js =================================================================== --- oipf/js/impl/RemoteManagementObject.js 2015-01-29 14:11:59 UTC (rev 744) +++ oipf/js/impl/RemoteManagementObject.js 2015-01-29 17:10:15 UTC (rev 745) @@ -1,3 +1,7 @@ +/* + * Description: Access to the functionality of the application/oipfRemoteManagement embedded object SHALL adhere to the + * security requirements as defined in section 10. + */ var RemoteManagementObject = Class.extend({ init : function(){ Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-01-29 14:11:59 UTC (rev 744) +++ oipf/js/impl/SearchManagerObject.js 2015-01-29 17:10:15 UTC (rev 745) @@ -7,6 +7,12 @@ elem.dispatchEvent(event); */ +var currentQuery; + +/* + * Description: OITFs SHALL implement the application/oipfSearchManager embedded object. This object provides a + * mechanism for applications to create and manage metadata searches. + */ var SearchManagerObject = Class.extend({ /* @@ -83,9 +89,19 @@ result: null, /* + * Description : + * The target(s) of the search. Valid values are: * - *\type Integer + * Value | Description + * ------ ---------------------------------------------------------- + * 1 | Metadata relating to scheduled content SHALL be searched. + * 2 | Metadata relating to on-demand content SHALL be searched. * + * These values SHALL be treated as a bitfield, allowing searches to be carried out across multiple search + * targets. + * + * Type Integer + * */ searchTarget: null, @@ -95,15 +111,35 @@ }, /* + * Description: + * Set a query and constraints for retrieving metadata for programmes from a given channel + * and given start time from metadata contained in the stream as defined in section 4.1.3 of + * [OIPF_META2]. Setting the search parameters using this method will implicitly remove any + * existing constraints, ordering or queries created by prior calls to methods on this object. + * This method does not cause the search to be performed; applications must call + * getResults() to retrieve the results. + * + * Arguments: + * - channel: The channel for which programme information should be found. * - *\param Channel - *\param Integer + * - startTime: The start of the time period for which results should be returned measured in + * seconds since midnight (GMT) on 1/1/1970. The start time is inclusive; any + * programmes starting at the start time, or which are showing at the start time, + * will be included in the search results. If null , the search will start from the + * current time. * + * -count: Optional argument giving the maximum number of programmes for which + * information should be fetched. This places an upper bound on the number of + * results that will be present in the result set – for instance, specifying a value of + * 2 for this argument will result in at most two results being returned by calls to + * getResults() even if a call to getResults() requests more results. + * If this argument is not specified, no restrictions are imposed on the number of + * results which may be returned by calls to getResults(). + * */ - findProgrammesFromStream: function(channel, startTime) { + findProgrammesFromStream: function(channel, startTime, count) { console.log("[INFO]: findProgrammesFromStream [IN]"); - console.log(channel); - this.metaDataSearch.findProgrammesFromStream(channel, startTime); + currentQuery = new Query(channel, startTime, count); console.log("[INFO]: findProgrammesFromStream [Out]"); }, @@ -153,8 +189,16 @@ var Query = Class.extend({ - init: function() { + channel: null, + startTime: null, + + count: null, + + init: function(channel, startTime, count) { + this.channel= channel; + this.startTime= startTime; + this.count= count; } }); \ No newline at end of file

1 0

r744 - oipf/js/impl
by ygrego＠users.nuiton.org 29 Jan '15

29 Jan '15

Author: ygrego Date: 2015-01-29 14:11:59 +0000 (Thu, 29 Jan 2015) New Revision: 744 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/744 Log: Adding of missing element "this". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-01-29 14:08:53 UTC (rev 743) +++ oipf/js/impl/OipfObjectFactory.js 2015-01-29 14:11:59 UTC (rev 744) @@ -114,7 +114,7 @@ createCodManagerObject: function() { console.log("[INFO] createCodManagerObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(codManager_dae_mime_type); + return this.verifOipfObjectExisting(codManager_dae_mime_type); }, /*! @@ -124,7 +124,7 @@ createConfigurationObject: function() { console.log("[INFO] createConfigurationObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(configuration_dae_mime_type); + return this.verifOipfObjectExisting(configuration_dae_mime_type); }, /*! @@ -134,7 +134,7 @@ createDownloadManagerObject: function() { console.log("[INFO] createDownloadManagerObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(downloadManager_dae_mime_type); + return this.verifOipfObjectExisting(downloadManager_dae_mime_type); }, /*! @@ -144,7 +144,7 @@ createDownloadTriggerObject: function() { console.log("[INFO] createDownloadTriggerObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(downloadTrigger_dae_mime_type); + return this.verifOipfObjectExisting(downloadTrigger_dae_mime_type); }, /*! @@ -154,7 +154,7 @@ createDrmAgentObject: function() { console.log("[INFO] createDrmAgentObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(drmAgent_dae_mime_type); + return this.verifOipfObjectExisting(drmAgent_dae_mime_type); }, /*! @@ -164,7 +164,7 @@ createGatewayInfoObject: function() { console.log("[INFO] createGatewayInfoObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(gatewayInfo_dae_mime_type); + return this.verifOipfObjectExisting(gatewayInfo_dae_mime_type); }, /*! @@ -174,7 +174,7 @@ createIMSObject: function() { console.log("[INFO] createIMSObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(ims_dae_mime_type); + return this.verifOipfObjectExisting(ims_dae_mime_type); }, /*! @@ -184,7 +184,7 @@ createMDTFObject: function() { console.log("[INFO] createMDTFObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(mdtf_dae_mime_type); + return this.verifOipfObjectExisting(mdtf_dae_mime_type); }, /*! @@ -194,7 +194,7 @@ createNotifSocketObject: function() { console.log("[INFO] createNotifSocketObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(notifSocket_dae_mime_type); + return this.verifOipfObjectExisting(notifSocket_dae_mime_type); }, /*! @@ -204,7 +204,7 @@ createParentalControlManagerObject: function() { console.log("[INFO] createParentalControlManangerObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(parentalControlManager_dae_mime_type); + return this.verifOipfObjectExisting(parentalControlManager_dae_mime_type); }, /*! @@ -214,7 +214,7 @@ createRecordingSchedulerObject: function() { console.log("[INFO] createRecordingSchedulerObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(recordingScheduler_dae_mime_type); + return this.verifOipfObjectExisting(recordingScheduler_dae_mime_type); }, /*! @@ -224,7 +224,7 @@ createRemoteControlFunctionObject: function() { console.log("[INFO] createRemoteControlFunctionObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(remoteControlFunction_dae_mime_type); + return this.verifOipfObjectExisting(remoteControlFunction_dae_mime_type); }, /*! @@ -234,7 +234,7 @@ createRemoteManagementObject: function() { console.log("[INFO] createRemoteManagementObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(remoteManagement_dae_mime_type); + return this.verifOipfObjectExisting(remoteManagement_dae_mime_type); }, createStatusViewObject: function() {

1 0

r743 - oipf/js/impl
by ygrego＠users.nuiton.org 29 Jan '15

29 Jan '15

Author: ygrego Date: 2015-01-29 14:08:53 +0000 (Thu, 29 Jan 2015) New Revision: 743 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/743 Log: Implementation of method "createSearch" and MetadataSearch class constructor. Modified: oipf/js/impl/Class.js oipf/js/impl/OipfObjectFactory.js oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/Class.js =================================================================== --- oipf/js/impl/Class.js 2015-01-29 11:11:59 UTC (rev 742) +++ oipf/js/impl/Class.js 2015-01-29 14:08:53 UTC (rev 743) @@ -13,3 +13,5 @@ return child; }; + +var VisualClass = Object.create(HTMLObjectElement.prototype); \ No newline at end of file Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-01-29 11:11:59 UTC (rev 742) +++ oipf/js/impl/OipfObjectFactory.js 2015-01-29 14:08:53 UTC (rev 743) @@ -94,7 +94,7 @@ createCapabilitiesObject: function() { console.log("[INFO] createCapabilitiesObject() of OipfObjectFactory class called."); - return verifOipfObjectExisting(capabilities_dae_mime_type); + return this.verifOipfObjectExisting(capabilities_dae_mime_type); }, /*! @@ -237,16 +237,16 @@ return verifOipfObjectExisting(remoteManagement_dae_mime_type); }, - createStatusViewObject(): function() { + createStatusViewObject: function() { console.log("[INFO] createStatusViewObject() of OipfObjectFactory class called."); return new StatusViewObject(); }, - createVideoMpegObject(): function() { + createVideoMpegObject: function() { - console.log("[INFO] createStatusViewObject() of OipfObjectFactory class called."); + console.log("[INFO] createVideoMpegObject() of OipfObjectFactory class called."); return new VideoMpegObject(); }, Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-01-29 11:11:59 UTC (rev 742) +++ oipf/js/impl/SearchManagerObject.js 2015-01-29 14:08:53 UTC (rev 743) @@ -62,7 +62,7 @@ */ createSearch: function(searchTarget) { - + return new MetadataSearch(); }, /* @@ -89,8 +89,9 @@ */ searchTarget: null, - init: function() { - + init: function(searchTarget) { + + this.searchTarget= searchTarget; }, /*

1 0