git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index aed1c4e834dc781cb31f61be986db9542a15cf77..11531e59c024d2f6c9ed5616785b17807e246713 100644 (file)
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -232,8 +232,14 @@ namespace DxPlay {
                 hr = m_FilterGraph.AddSourceFilter(MediaDescription.FileName, MediaDescription.FileName, out sourceFilter);\r
                 DsError.ThrowExceptionForHR(hr);\r
 \r
-                IBaseFilter splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter");\r
-                //IBaseFilter splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "SONY MXF Splitter");\r
+                IBaseFilter splitter = null;\r
+                //Type typeFromClsid = Type.GetTypeFromCLSID(new Guid("CCE7BD95-3BC4-4cfb-9664-0BF83201BE09"));\r
+                //splitter = (IBaseFilter)Activator.CreateInstance(typeFromClsid);\r
+                //m_FilterGraph.AddFilter(splitter, "MXF Splitter");\r
+                splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "Sony MXF Splitter");\r
+\r
+\r
+                //splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter");\r
                 if (splitter == null)\r
                     throw new Exception("No splitter!");\r
 \r

diff --git a/client/DxPlay/MediaDetector.cs b/client/DxPlay/MediaDetector.cs
index 95a19118a6c9106eed41b3143aaae827b4c7281a..96b09e564ab2d997112be0c5a463b0e41c2473b5 100644 (file)
--- a/client/DxPlay/MediaDetector.cs
+++ b/client/DxPlay/MediaDetector.cs
@@ -23,7 +23,7 @@ namespace DxPlay {
         public static MediaDescription GetDescription(string fileName) {\r
             MediaDescription mediaDesc = new MediaDescription();\r
             mediaDesc.fileName = fileName;\r
-            //return mediaDesc;\r
+            return mediaDesc;\r
             logger.Debug("Start MediaInfo");\r
             MediaInfo MI = new MediaInfo();\r
             MI.Open(fileName);\r
@@ -60,8 +60,6 @@ namespace DxPlay {
             int videoStreams = MI.Count_Get(StreamKind.Video);\r
             if (videoStreams > 1)\r
                 throw new Exception("Multiple video streams found!");\r
-            if (videoStreams == 1) {\r
-            }\r
             int Width = int.Parse(MI.Get(StreamKind.Video, 0, "Width"));\r
             int Height = int.Parse(MI.Get(StreamKind.Video, 0, "Height"));\r
             mediaDesc.resolution = new Size(Width, Height);\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 5a9909895fc6c86bc72c2618d369e8f1673ed470..81105327f086a06bb23848fe7245a8ea7109d117 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -65,7 +65,7 @@ namespace DxPlay {
                     txtEndTC.Text = m_mediaDescription.Duration.ToString();\r
                 }\r
             }\r
-            catch (COMException ce) {\r
+            catch (Exception ce) {\r
                 MessageBox.Show("Failed to open file: " + ce.Message, "Open Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r

diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs
index d840107b2d695c2a414ffd3f125619535724627e..8df8c9036c10056f59d994024d282c69f4af83a7 100644 (file)
--- a/client/Maestro/Sources/FileSystemSource.cs
+++ b/client/Maestro/Sources/FileSystemSource.cs
@@ -31,6 +31,11 @@ namespace Maestro.Sources {
         public DataGridViewColumn[] Columns {\r
             get {\r
                 DataGridViewColumn[] result = new DataGridViewColumn[] {\r
+                    new DataGridViewImageColumn(){\r
+                        DataPropertyName = "Icon",\r
+                        //HeaderText = StringResources.LEJATSZAS,\r
+                        AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells,\r
+                    },\r
                     new DataGridViewTextBoxColumn(){\r
                         DataPropertyName = "Name",\r
                         HeaderText = StringResources.NEV,\r
@@ -47,11 +52,6 @@ namespace Maestro.Sources {
                         DataPropertyName = "Created",\r
                         HeaderText = StringResources.LETREHOZVA,\r
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells\r
-                    },\r
-                    new DataGridViewImageColumn(){\r
-                        DataPropertyName = "Icon",\r
-                        HeaderText = StringResources.LEJATSZAS,\r
-                        AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells,\r
                     }\r
                 };\r
                 foreach (DataGridViewColumn column in result) {\r
@@ -83,7 +83,7 @@ namespace Maestro.Sources {
             SetAcceptableExtensions(fileExtensionFilter);\r
             pathWatcherWorker.DoWork += pathWatcherWorker_watchPath;\r
             pathWatcherWorker.WorkerReportsProgress = true;\r
-            \r
+\r
         }\r
 \r
         private void pathWatcherWorker_watchPath(object sender, DoWorkEventArgs e) {\r

diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs
index 68b22ecbf9354f18cecc0e0fd32b2a3f0f956739..a9c3ce87d7c65ec5ac91eb176ce8dc1ac925e0e3 100644 (file)
--- a/client/Maestro/Sources/NexioRESTSource.cs
+++ b/client/Maestro/Sources/NexioRESTSource.cs
@@ -167,15 +167,15 @@ namespace Maestro.Sources {
         private void OnChanged(JToken token) {\r
             string id = token[ID].ToString();\r
             var item = Items.Where(x => x.ID == id).SingleOrDefault();\r
-            if (item != null && item.CanHandle(acceptableAgencies)) {\r
-                SetItem(ref item, token);\r
-                parent.SafeCall(() => {\r
-                    messageBus.Send(new ModifyFileActionMsg() {\r
-                        FileName = item.Name,\r
-                        Source = parent\r
-                    });\r
+            if (item == null || !item.CanHandle(acceptableAgencies))\r
+                return;\r
+            SetItem(ref item, token);\r
+            parent.SafeCall(() => {\r
+                messageBus.Send(new ModifyFileActionMsg() {\r
+                    FileName = item.Name,\r
+                    Source = parent\r
                 });\r
-            }\r
+            });\r
             Debug.WriteLine(string.Format("Changed {0}", item.Name));\r
         }\r
 \r
@@ -195,7 +195,9 @@ namespace Maestro.Sources {
 \r
         private void OnDeleted(JToken d) {\r
             string id = d[ID].ToString();\r
-            var item = this.Where(i => i.ID != null && i.ID.Equals(id)).First();\r
+            var item = this.Where(i => i.ID != null && i.ID.Equals(id)).SingleOrDefault();\r
+            if (item == null)\r
+                return;\r
             parent.SafeCall(() => {\r
                 Remove(item);\r
                 messageBus.Send(new RemoveFileActionMsg() {\r

diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target
index a059c44eba206dbc1a0f96185904910c8add5861..3299ca42c4715c3efded0ac50b2643c8ea72ed3f 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" sequenceNumber="241">\r
+<?pde version="3.8"?><target name="JobEngine" sequenceNumber="245">\r
 <locations>\r
 <location path="${eclipse_home}" type="Profile"/>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
@@ -42,7 +42,7 @@
 <plugin id="javax.ws.rs-api" version="2.0.1"/>\r
 <plugin id="jcifs"/>\r
 <plugin id="joda-time"/>\r
-<plugin id="org.apache.aries.spifly.dynamic.bundle" version="1.0.8"/>\r
+<plugin id="org.apache.aries.spifly.dynamic.bundle"/>\r
 <plugin id="org.apache.aries.util" version="1.1.3"/>\r
 <plugin id="org.apache.commons.beanutils"/>\r
 <plugin id="org.apache.commons.codec" version="1.10.0"/>\r
@@ -79,7 +79,7 @@
 <plugin id="org.eclipse.jdt.core.compiler.batch" version="3.10.2.v20150120-1634"/>\r
 <plugin id="org.eclipse.jetty.annotations"/>\r
 <plugin id="org.eclipse.jetty.apache-jsp"/>\r
-<plugin id="org.eclipse.jetty.client" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.client"/>\r
 <plugin id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.jetty.deploy"/>\r
 <plugin id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>\r
@@ -97,11 +97,11 @@
 <plugin id="org.eclipse.jetty.servlet.source"/>\r
 <plugin id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.jetty.webapp" version="9.3.9.v20160517"/>\r
-<plugin id="org.eclipse.jetty.websocket.api" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.websocket.api"/>\r
 <plugin id="org.eclipse.jetty.websocket.client"/>\r
-<plugin id="org.eclipse.jetty.websocket.common" version="9.3.9.v20160517"/>\r
-<plugin id="org.eclipse.jetty.websocket.server" version="9.3.9.v20160517"/>\r
-<plugin id="org.eclipse.jetty.websocket.servlet" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.websocket.common"/>\r
+<plugin id="org.eclipse.jetty.websocket.server"/>\r
+<plugin id="org.eclipse.jetty.websocket.servlet"/>\r
 <plugin id="org.eclipse.jetty.xml" version="9.3.9.v20160517"/>\r
 <plugin id="org.eclipse.osgi" version="3.11.2.v20161107-1947"/>\r
 <plugin id="org.eclipse.osgi.services" version="3.2.100.v20100503"/>\r
@@ -130,9 +130,9 @@
 <plugin id="org.jvnet.mimepull" version="1.9.6"/>\r
 <plugin id="org.mortbay.jasper.apache-jsp"/>\r
 <plugin id="org.mortbay.jasper.apache-jsp.source"/>\r
-<plugin id="org.objectweb.asm" version="5.0.1.v201404251740"/>\r
-<plugin id="org.objectweb.asm.commons" version="5.0.1.v201404251740"/>\r
-<plugin id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>\r
+<plugin id="org.objectweb.asm" version="5.0.1"/>\r
+<plugin id="org.objectweb.asm.commons"/>\r
+<plugin id="org.objectweb.asm.tree" version="5.0.1"/>\r
 <plugin id="org.objectweb.asm.util"/>\r
 <plugin id="org.reflections"/>\r
 <plugin id="org.slf4j.api"/>\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index cbdab18126afd448c3ea333db67578eed6ff217d..123bd9536bc77ff13a0d8a0068e74450f00568a6 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -16,7 +16,7 @@
                <!-- <jetty.version>9.4.6.v20170531</jetty.version> -->\r
                <jersey.version>2.23.2</jersey.version>\r
                <jackson.version>2.5.5</jackson.version>\r
-               <swagger-core-version>1.5.9</swagger-core-version>\r
+               <swagger-core-version>1.5.9</swagger-core-versio0n>\r
                <hk2.version>2.5.0-b42</hk2.version>\r
                <resteasy-version>3.0.11.Final</resteasy-version>\r
        </properties>\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java
index 81223996be394b21c803c7498e56a53718378741..ecd2f1ca77595eaeee150cbd7bcfbf6262a44ad6 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java
@@ -33,6 +33,19 @@ public class DeleteNEXIOMaterialsStep extends JobStep {
        private Date modified = new Date();\r
        private String agency = "";\r
 \r
+       private void delete(String name) {\r
+               RemoteFile remoteFile = null;\r
+               try {\r
+                       remoteFile = sourceUri.getRemoteFile(name);\r
+                       if (remoteFile == null)\r
+                               throw new NullPointerException("File not exists: " + name);\r
+                       sourceUri.delete(remoteFile);\r
+                       logger.info(getMarker(), "A {} fájl törlése sikeres volt.", remoteFile.getName());\r
+               } catch (Exception e) {\r
+                       logger.error(getMarker(), "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", remoteFile.getName(), e.getMessage());\r
+               }\r
+       }\r
+\r
        @StepEntry\r
        public Object[] execute(int port, String userName, String password, IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
                String nexioHost = System.getProperty("nexio.host");\r
@@ -73,17 +86,4 @@ public class DeleteNEXIOMaterialsStep extends JobStep {
                return null;\r
        }\r
 \r
-       private void delete(String name) {\r
-               RemoteFile remoteFile = null;\r
-               try {\r
-                       remoteFile = sourceUri.getRemoteFile(name);\r
-                       if (remoteFile == null)\r
-                               throw new NullPointerException("File not exists: " + name);\r
-                       sourceUri.delete(remoteFile);\r
-                       logger.info(getMarker(), "A {} fájl törlése sikeres volt.", remoteFile.getName());\r
-               } catch (Exception e) {\r
-                       logger.error(getMarker(), "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", remoteFile.getName(), e.getMessage());\r
-               }\r
-       }\r
-\r
 }\r