"isMaximized": false,\r
"isStandalone": true,\r
"player": {\r
+ "rendererType": "VM7",\r
"autoStart": false,\r
"segmentEditor": false\r
}\r
-using MaestroShared.Configuration;\r
+using MaestroShared.Commons;\r
+using MaestroShared.Configuration;\r
using MaestroShared.Metadata;\r
using System.ComponentModel;\r
\r
namespace DxPlay {\r
+\r
public class DxPlaySettings : UISettings {\r
public string TargetDirectory { get; set; }\r
public Player Player { get; set; }\r
}\r
\r
private void SetupGraph() {\r
- graph = new PlayerGraph(MediaDescription.FileName, playerWindow.Handle);\r
+ var rendererType = settings.Player.RendererType;\r
+ graph = new PlayerGraph(MediaDescription.FileName, playerWindow.Handle, rendererType);\r
\r
AMMediaType media = new AMMediaType();\r
graph.SampleGrabber.GetConnectedMediaType(media);\r
}\r
}\r
\r
+\r
/// <summary>\r
/// Save a DirectShow Graph to a GRF file\r
/// </summary>\r
using DirectShowLib;\r
using DirectShowLib.Utils;\r
+using MaestroShared.Commons;\r
using NLog;\r
using System;\r
using System.Runtime.InteropServices;\r
\r
private bool isDisposed;\r
\r
- public PlayerGraph(string fileName, IntPtr handle) {\r
+ public PlayerGraph(string fileName, IntPtr handle, VideoRendererType rendererType) {\r
try {\r
MediaSeeking = this as IMediaSeeking;\r
MediaControl = this as IMediaControl;\r
EnableDeinterlace(videoDecoder);\r
IBaseFilter sampleGrabber = AddSampleGrabber(graphBuilder, videoDecoder);\r
SampleGrabber = (ISampleGrabber)sampleGrabber;\r
- //IBaseFilter videoRenderer = AddRenderer(graphBuilder, sampleGrabber);\r
- //IBaseFilter videoRenderer = AddSimpleRenderer(graphBuilder, sampleGrabber);\r
- //IBaseFilter videoRenderer = AddEVRRenderer(graphBuilder, sampleGrabber);\r
+\r
+ switch (rendererType) {\r
+ case VideoRendererType.VM7:\r
+ AddVM7Renderer(graphBuilder, sampleGrabber);\r
+ break;\r
+ case VideoRendererType.VM9:\r
+ AddVM9Renderer(graphBuilder, sampleGrabber);\r
+ break;\r
+ case VideoRendererType.ENHANCED:\r
+ AddEVRRenderer(graphBuilder, sampleGrabber);\r
+ break;\r
+ case VideoRendererType.DEFAULT:\r
+ AddDefaultRenderer(graphBuilder, sampleGrabber);\r
+ break;\r
+ }\r
FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output");\r
ConfigureSimpleRenderer(handle);\r
\r
return audioDecoder;\r
}\r
\r
- private IBaseFilter AddRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
+ private IBaseFilter AddVM9Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
logger.Debug("Add VideoMixingRenderer9 to graph");\r
IBaseFilter videoRenderer = (IBaseFilter)new VideoMixingRenderer9();\r
DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "Video Mixing Renderer 9"));\r
logger.Error(e);\r
graphBuilder.RemoveFilter(videoRenderer);\r
logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 9");\r
- AddSimpleRenderer(graphBuilder, sampleGrabber);\r
+ AddDefaultRenderer(graphBuilder, sampleGrabber);\r
+ }\r
+\r
+ return videoRenderer;\r
+ }\r
+\r
+ private IBaseFilter AddVM7Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
+ logger.Debug("Add VideoMixingRenderer7 to graph");\r
+ IBaseFilter videoRenderer = (IBaseFilter)new VideoMixingRenderer();\r
+ DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "Video Mixing Renderer 7"));\r
+ logger.Debug("Connect SampleGrabber -> VideoMixingRenderer7");\r
+\r
+ try {\r
+ //IVMRFilterConfig9 filterConfig = (IVMRFilterConfig9) videoRenderer;\r
+ //filterConfig.SetRenderingMode(VMR9Mode.Windowless);\r
+ //WindowlessControl = (IVMRWindowlessControl9) videoRenderer;\r
+ //WindowlessControl.SetVideoClippingWindow(handle);\r
+ //WindowlessControl.SetAspectRatioMode(VMR9AspectRatioMode.LetterBox);\r
+ FilterGraphTools.ConnectFilters(graphBuilder, sampleGrabber, "Output", videoRenderer, "VMR Input0", true);\r
+ } catch (Exception e) {\r
+ logger.Error(e);\r
+ graphBuilder.RemoveFilter(videoRenderer);\r
+ logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 7");\r
+ AddDefaultRenderer(graphBuilder, sampleGrabber);\r
}\r
\r
return videoRenderer;\r
DsError.ThrowExceptionForHR(hr);\r
}\r
\r
- private IBaseFilter AddSimpleRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
+ private IBaseFilter AddDefaultRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
logger.Debug("Add default VideoRenderer to graph");\r
IBaseFilter videoRenderer = (IBaseFilter)new VideoRendererDefault();\r
DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "VideoRendererDefault"));\r
"source": {\r
"$type": "UNCSource",\r
"filter": "avi,wav,mxf,mts,mov",\r
- "useAlternateCopy": false,\r
- "autoTarget": "AUTOTARGET",\r
- "autoTags": [ "AUTOTAG" ],\r
+ "useAlternateCopy": true,\r
"local": {\r
- "address": "file://c:/_video",\r
- "userName": "mediacube",\r
- "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
- "timeout": 1000\r
+ "address": "file://c:/_video"\r
}\r
},\r
"metadatas": [\r
- {\r
- "$type": "MediaCubeMetadata",\r
- "server": {\r
- "address": "http://localhost:8888/services/rest/jobengine",\r
- "userName": "mediacube",\r
- "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
- "timeout": 1000\r
- },\r
- "wsserver": {\r
- "address": "ws://10.10.1.27/services/wsapi",\r
- "timeout": 1000\r
- },\r
- "jobTemplate": "retrieve-material.xml",\r
- "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE",\r
- "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE",\r
- "restoreNamePattern": "%s_%GUID%",\r
- "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE",\r
- "killDateDays": 1\r
- }\r
],\r
"targets": [\r
{\r
- "label": "Stúdióba küldés",\r
- "processor": "FTPTargetProcessor",\r
+ "label": "Target1",\r
+ "processor": "UNCTargetProcessor",\r
"outputFormat": "%ID%",\r
- "tag": "TESZT",\r
- "nexioServer": true,\r
- "nexioFileExistsMessage": "A feltöltéshez új 'placeholder' generálása szükséges az Octopus rendszerben, az anyagon belül az ALT+1 billenytűkombináció segítségével.",\r
- "killDateDays": 1,\r
- "disableFileVersioning": true,\r
- "agency": "ARCHIVED",\r
+ "reference": [ "AUTOTARGET" ],\r
"remote": {\r
- "address": "ftp://10.10.1.55:2098",\r
- "userName": "administrator",\r
- "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh",\r
- "timeout": 1000\r
+ "address": "file://c:/_video/t1"\r
}\r
},\r
{\r
- "label": "Adáskész",\r
- "processor": "FTPTargetProcessor",\r
+ "label": "Target2",\r
+ "processor": "UNCTargetProcessor",\r
"outputFormat": "%ID%",\r
- "killDateDays": 5,\r
- "saveSegments": true,\r
- "tag": "Adáskész",\r
- "disableFileVersioning": true,\r
- "enableOverride": false,\r
- "saveMorpheusMetadata": true,\r
- "pathMorpheusMetadata": "/TESZT/TC/CHECK/Input",\r
- "deviceIdMorpheus": "ISILON",\r
+ "reference": [ "AUTOTARGET" ],\r
"remote": {\r
- "address": "ftp://10.10.1.105/TESZT/TC/CHECK",\r
- "userName": "mediacube",\r
- "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
- "timeout": 1000\r
+ "address": "file://c:/_video/t2"\r
}\r
},\r
{\r
"label": "AUTOTARGET",\r
"processor": "UNCTargetProcessor",\r
- "outputFormat": "%SOURCENAME%",\r
- "tag": "Betöltés",\r
- "killDateDays": 0,\r
- "saveArchiveMetadata": true,\r
- "remote": {\r
- "address": "file://c:/_video/y",\r
- "userName": "mediacube",\r
- "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
- "timeout": 1000\r
- }\r
- },\r
- {\r
- "label": "Napi megtekintőbe",\r
- "processor": "FTPTargetProcessor",\r
- "outputFormat": "%ID%-%TEXT%",\r
- "tag": "Online",\r
- "disableFileVersioning": true,\r
- "killDateDays": 2,\r
- "saveArchiveMetadata": false,\r
+ "outputFormat": "%ID%",\r
"remote": {\r
- "address": "ftp://10.10.1.105/TESZT/CHECK",\r
- "userName": "mediacube",\r
- "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
- "timeout": 1000\r
+ "address": "file://c:/_video/ta"\r
}\r
}\r
\r
player.Settings = new DxPlaySettings {\r
Player = new Player {\r
AutoStart = Configuration.Player.AutoStart,\r
- SegmentEditor = Configuration.Player.SegmentEditor && segmentEditor\r
+ SegmentEditor = Configuration.Player.SegmentEditor && segmentEditor,\r
+ RendererType = Configuration.Player.RendererType\r
},\r
Metadata = trafficIDSelector.Parameters.Configuration,\r
Segments = MovieSegments\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.1.1.1")]\r
-[assembly: AssemblyFileVersion("2.1.1.1")]\r
+[assembly: AssemblyVersion("2.1.1.2")]\r
+[assembly: AssemblyFileVersion("2.1.1.2")]\r
--- /dev/null
+namespace MaestroShared.Commons {\r
+ public enum VideoRendererType {\r
+ AUTO, DEFAULT, VM7, VM9, ENHANCED\r
+ }\r
+}\r
[DefaultValue(new[] { "MXF" })]\r
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]\r
public string[] Extensions { get; set; }\r
+\r
+ public VideoRendererType RendererType { get; set; }\r
}\r
\r
public class Target {\r
<Compile Include="Commons\PatternNameMaker.cs" />\r
<Compile Include="Commons\StringExtensions.cs" />\r
<Compile Include="Commons\TopMostMessageBox.cs" />\r
+ <Compile Include="Commons\VideoRendererType.cs" />\r
<Compile Include="Commons\Win32File.cs" />\r
<Compile Include="Configuration\ConfigurationInfo.cs" />\r
<Compile Include="Configuration\KeysColorConverter.cs" />\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.1.0.8")]\r
-[assembly: AssemblyFileVersion("2.1.0.8")]\r
+[assembly: AssemblyVersion("2.1.0.9")]\r
+[assembly: AssemblyFileVersion("2.1.0.9")]\r
+++ /dev/null
-#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Sun Apr 18 21:25:34 CEST 2021\r
-osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
-equinox.use.ds=true\r
-osgi.bundles.defaultStartLevel=4\r
-osgi.framework=file\:plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar\r
-osgi.framework.extensions=\r
-eclipse.p2.data.area=@config.dir/../p2\r
-eclipse.p2.profile=DefaultProfile\r
+++ /dev/null
-#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Sun Apr 18 21:25:34 CEST 2021\r
-osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
-equinox.use.ds=true\r
-osgi.bundles.defaultStartLevel=4\r
-osgi.framework=file\:plugins/org.eclipse.osgi_3.11.2.v20161107-1947.jar\r
-osgi.framework.extensions=\r
-eclipse.p2.data.area=@config.dir/../p2\r
-eclipse.p2.profile=DefaultProfile\r
--- /dev/null
+/*
+ jQuery Masked Input Plugin
+ Copyright (c) 2007 - 2015 Josh Bush (digitalbush.com)
+ Licensed under the MIT license (http://digitalbush.com/projects/masked-input-plugin/#license)
+ Version: 1.4.1
+*/
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){var b,c=navigator.userAgent,d=/iphone/i.test(c),e=/chrome/i.test(c),f=/android/i.test(c);a.mask={definitions:{9:"[0-9]",a:"[A-Za-z]","*":"[A-Za-z0-9]"},autoclear:!0,dataName:"rawMaskFn",placeholder:"_"},a.fn.extend({caret:function(a,b){var c;if(0!==this.length&&!this.is(":hidden"))return"number"==typeof a?(b="number"==typeof b?b:a,this.each(function(){this.setSelectionRange?this.setSelectionRange(a,b):this.createTextRange&&(c=this.createTextRange(),c.collapse(!0),c.moveEnd("character",b),c.moveStart("character",a),c.select())})):(this[0].setSelectionRange?(a=this[0].selectionStart,b=this[0].selectionEnd):document.selection&&document.selection.createRange&&(c=document.selection.createRange(),a=0-c.duplicate().moveStart("character",-1e5),b=a+c.text.length),{begin:a,end:b})},unmask:function(){return this.trigger("unmask")},mask:function(c,g){var h,i,j,k,l,m,n,o;if(!c&&this.length>0){h=a(this[0]);var p=h.data(a.mask.dataName);return p?p():void 0}return g=a.extend({autoclear:a.mask.autoclear,placeholder:a.mask.placeholder,completed:null},g),i=a.mask.definitions,j=[],k=n=c.length,l=null,a.each(c.split(""),function(a,b){"?"==b?(n--,k=a):i[b]?(j.push(new RegExp(i[b])),null===l&&(l=j.length-1),k>a&&(m=j.length-1)):j.push(null)}),this.trigger("unmask").each(function(){function h(){if(g.completed){for(var a=l;m>=a;a++)if(j[a]&&C[a]===p(a))return;g.completed.call(B)}}function p(a){return g.placeholder.charAt(a<g.placeholder.length?a:0)}function q(a){for(;++a<n&&!j[a];);return a}function r(a){for(;--a>=0&&!j[a];);return a}function s(a,b){var c,d;if(!(0>a)){for(c=a,d=q(b);n>c;c++)if(j[c]){if(!(n>d&&j[c].test(C[d])))break;C[c]=C[d],C[d]=p(d),d=q(d)}z(),B.caret(Math.max(l,a))}}function t(a){var b,c,d,e;for(b=a,c=p(a);n>b;b++)if(j[b]){if(d=q(b),e=C[b],C[b]=c,!(n>d&&j[d].test(e)))break;c=e}}function u(){var a=B.val(),b=B.caret();if(o&&o.length&&o.length>a.length){for(A(!0);b.begin>0&&!j[b.begin-1];)b.begin--;if(0===b.begin)for(;b.begin<l&&!j[b.begin];)b.begin++;B.caret(b.begin,b.begin)}else{for(A(!0);b.begin<n&&!j[b.begin];)b.begin++;B.caret(b.begin,b.begin)}h()}function v(){A(),B.val()!=E&&B.change()}function w(a){if(!B.prop("readonly")){var b,c,e,f=a.which||a.keyCode;o=B.val(),8===f||46===f||d&&127===f?(b=B.caret(),c=b.begin,e=b.end,e-c===0&&(c=46!==f?r(c):e=q(c-1),e=46===f?q(e):e),y(c,e),s(c,e-1),a.preventDefault()):13===f?v.call(this,a):27===f&&(B.val(E),B.caret(0,A()),a.preventDefault())}}function x(b){if(!B.prop("readonly")){var c,d,e,g=b.which||b.keyCode,i=B.caret();if(!(b.ctrlKey||b.altKey||b.metaKey||32>g)&&g&&13!==g){if(i.end-i.begin!==0&&(y(i.begin,i.end),s(i.begin,i.end-1)),c=q(i.begin-1),n>c&&(d=String.fromCharCode(g),j[c].test(d))){if(t(c),C[c]=d,z(),e=q(c),f){var k=function(){a.proxy(a.fn.caret,B,e)()};setTimeout(k,0)}else B.caret(e);i.begin<=m&&h()}b.preventDefault()}}}function y(a,b){var c;for(c=a;b>c&&n>c;c++)j[c]&&(C[c]=p(c))}function z(){B.val(C.join(""))}function A(a){var b,c,d,e=B.val(),f=-1;for(b=0,d=0;n>b;b++)if(j[b]){for(C[b]=p(b);d++<e.length;)if(c=e.charAt(d-1),j[b].test(c)){C[b]=c,f=b;break}if(d>e.length){y(b+1,n);break}}else C[b]===e.charAt(d)&&d++,k>b&&(f=b);return a?z():k>f+1?g.autoclear||C.join("")===D?(B.val()&&B.val(""),y(0,n)):z():(z(),B.val(B.val().substring(0,f+1))),k?b:l}var B=a(this),C=a.map(c.split(""),function(a,b){return"?"!=a?i[a]?p(b):a:void 0}),D=C.join(""),E=B.val();B.data(a.mask.dataName,function(){return a.map(C,function(a,b){return j[b]&&a!=p(b)?a:null}).join("")}),B.one("unmask",function(){B.off(".mask").removeData(a.mask.dataName)}).on("focus.mask",function(){if(!B.prop("readonly")){clearTimeout(b);var a;E=B.val(),a=A(),b=setTimeout(function(){B.get(0)===document.activeElement&&(z(),a==c.replace("?","").length?B.caret(0,a):B.caret(a))},10)}}).on("blur.mask",v).on("keydown.mask",w).on("keypress.mask",x).on("input.mask paste.mask",function(){B.prop("readonly")||setTimeout(function(){var a=A(!0);B.caret(a),h()},0)}),e&&f&&B.off("input.mask").on("input.mask",u),A()})}})});
\ No newline at end of file
+<zk xmlns:w="client">\r
<window id="metadataEditorWnd" title="Leírás szerkesztése" width="50%" height="50%" mode="overlapped" closable="true" maximizable="true" minimizable="false"\r
sizable="true" position="left,top" viewModel="@id('vm') @init('user.jobengine.zk.model.MetadataDetailsModel')" forward="onCancel=closeButton.onClick">\r
\r
+<!-- <script type="text/javascript" src="/js/jquery.maskedinput.min.js" /> -->\r
+<!-- <script type="text/javascript"> -->\r
+\r
+<!-- $.mask.definitions['a']='[012]'; -->\r
+<!-- $.mask.definitions['b']='[0123]'; -->\r
+<!-- </script> -->\r
<vlayout height="100%">\r
<tabbox id="pagesTab" vflex="true" hflex="true" orient="top">\r
<tabs visible="true">\r
<datebox value="@load(vm.archivedMedia.media.creation) @save(vm.archivedMedia.media.creation,before='save')" />\r
</listcell>\r
</listitem>\r
+ <listitem id="media_length">\r
+ <listcell label="Média hossz" />\r
+ <listcell>\r
+<!-- <textbox value="@load(vm.archivedMedia.media.length) @save(vm.archivedMedia.media.length,before='save') @converter('user.jobengine.zk.model.TCConverter')" constraint="/^([0-1]\d|2[0-3]):([0-5]\d):([0-5]\d):([0-1]\d|2[0-4])$/: Timecode formátum kötelező (HH:MM:SS:FF)!" w:onBind="jq(this).mask('[0-2][0-3]:[0-5]9:[0-5]9:[0-2][0-4]');"/> -->\r
+ <longbox constraint="no empty, no negative" value="@load(vm.archivedMedia.media.length) @save(vm.archivedMedia.media.length,before='save')"/>\r
+ </listcell>\r
+ </listitem>\r
+ \r
<listitem id="media_title">\r
<listcell label="Média címe" />\r
<listcell>\r
</h:script>\r
-->\r
</window>\r
+</zk>
\ No newline at end of file
import user.commons.mediatool.Timecode.Type;\r
\r
public class TCConverter implements Converter<String, Long, Label> {\r
-\r
@Override\r
public Long coerceToBean(String text, Label label, BindContext context) {\r
- return null;\r
+ Long result = 0L;\r
+\r
+ if (text != null) {\r
+ String[] tokens = text.split(":");\r
+ if (tokens.length == 4) {\r
+ try {\r
+ long f = Integer.parseInt(tokens[3]);\r
+ long s = Integer.parseInt(tokens[2]);\r
+ long m = Integer.parseInt(tokens[1]);\r
+ long h = Integer.parseInt(tokens[0]);\r
+ result = f + s * 25 + m * 60 * 25 + +h * m * 60 * 25;\r
+ } finally {\r
+ }\r
+\r
+ }\r
+ }\r
+ return result;\r
}\r
\r
@Override\r
public String coerceToUi(Long frames, Label label, BindContext context) {\r
- //kell a konverzio, mert egyebkent float-ra cast-ol es rosszul szamol\r
Timecode timecode = new Timecode(frames, Type.PAL);\r
return timecode.toString();\r
- // double reminder = frames;\r
- // int hour = (int) Math.floor(reminder / (60 * 60 * 25));\r
- // reminder = reminder % (60 * 60 * 25);\r
- // int minute = (int) Math.floor(reminder / (60 * 25));\r
- // reminder = reminder % (60 * 25);\r
- // int sec = (int) Math.floor(reminder / 25);\r
- // reminder = reminder % 25;\r
- // int frame = (int) Math.floor(reminder);\r
- // return String.format("%02d:%02d:%02d:%02d", hour, minute, sec, frame);\r
}\r
\r
}\r
https://git.useribm.hu / mediacube.git / commitdiff