From: Vásáry Dániel Date: Fri, 13 Oct 2017 20:36:33 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=52dda3390a41aaa43b9bacce2d55eda566b70abc;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30621 --- diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs index aed1c4e8..11531e59 100644 --- 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); DsError.ThrowExceptionForHR(hr); - IBaseFilter splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter"); - //IBaseFilter splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "SONY MXF Splitter"); + IBaseFilter splitter = null; + //Type typeFromClsid = Type.GetTypeFromCLSID(new Guid("CCE7BD95-3BC4-4cfb-9664-0BF83201BE09")); + //splitter = (IBaseFilter)Activator.CreateInstance(typeFromClsid); + //m_FilterGraph.AddFilter(splitter, "MXF Splitter"); + splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "Sony MXF Splitter"); + + + //splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "LAV Splitter"); if (splitter == null) throw new Exception("No splitter!"); diff --git a/client/DxPlay/MediaDetector.cs b/client/DxPlay/MediaDetector.cs index 95a19118..96b09e56 100644 --- a/client/DxPlay/MediaDetector.cs +++ b/client/DxPlay/MediaDetector.cs @@ -23,7 +23,7 @@ namespace DxPlay { public static MediaDescription GetDescription(string fileName) { MediaDescription mediaDesc = new MediaDescription(); mediaDesc.fileName = fileName; - //return mediaDesc; + return mediaDesc; logger.Debug("Start MediaInfo"); MediaInfo MI = new MediaInfo(); MI.Open(fileName); @@ -60,8 +60,6 @@ namespace DxPlay { int videoStreams = MI.Count_Get(StreamKind.Video); if (videoStreams > 1) throw new Exception("Multiple video streams found!"); - if (videoStreams == 1) { - } int Width = int.Parse(MI.Get(StreamKind.Video, 0, "Width")); int Height = int.Parse(MI.Get(StreamKind.Video, 0, "Height")); mediaDesc.resolution = new Size(Width, Height); diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 5a990989..81105327 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -65,7 +65,7 @@ namespace DxPlay { txtEndTC.Text = m_mediaDescription.Duration.ToString(); } } - catch (COMException ce) { + catch (Exception ce) { MessageBox.Show("Failed to open file: " + ce.Message, "Open Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs index d840107b..8df8c903 100644 --- a/client/Maestro/Sources/FileSystemSource.cs +++ b/client/Maestro/Sources/FileSystemSource.cs @@ -31,6 +31,11 @@ namespace Maestro.Sources { public DataGridViewColumn[] Columns { get { DataGridViewColumn[] result = new DataGridViewColumn[] { + new DataGridViewImageColumn(){ + DataPropertyName = "Icon", + //HeaderText = StringResources.LEJATSZAS, + AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells, + }, new DataGridViewTextBoxColumn(){ DataPropertyName = "Name", HeaderText = StringResources.NEV, @@ -47,11 +52,6 @@ namespace Maestro.Sources { DataPropertyName = "Created", HeaderText = StringResources.LETREHOZVA, AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells - }, - new DataGridViewImageColumn(){ - DataPropertyName = "Icon", - HeaderText = StringResources.LEJATSZAS, - AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells, } }; foreach (DataGridViewColumn column in result) { @@ -83,7 +83,7 @@ namespace Maestro.Sources { SetAcceptableExtensions(fileExtensionFilter); pathWatcherWorker.DoWork += pathWatcherWorker_watchPath; pathWatcherWorker.WorkerReportsProgress = true; - + } private void pathWatcherWorker_watchPath(object sender, DoWorkEventArgs e) { diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs index 68b22ecb..a9c3ce87 100644 --- a/client/Maestro/Sources/NexioRESTSource.cs +++ b/client/Maestro/Sources/NexioRESTSource.cs @@ -167,15 +167,15 @@ namespace Maestro.Sources { private void OnChanged(JToken token) { string id = token[ID].ToString(); var item = Items.Where(x => x.ID == id).SingleOrDefault(); - if (item != null && item.CanHandle(acceptableAgencies)) { - SetItem(ref item, token); - parent.SafeCall(() => { - messageBus.Send(new ModifyFileActionMsg() { - FileName = item.Name, - Source = parent - }); + if (item == null || !item.CanHandle(acceptableAgencies)) + return; + SetItem(ref item, token); + parent.SafeCall(() => { + messageBus.Send(new ModifyFileActionMsg() { + FileName = item.Name, + Source = parent }); - } + }); Debug.WriteLine(string.Format("Changed {0}", item.Name)); } @@ -195,7 +195,9 @@ namespace Maestro.Sources { private void OnDeleted(JToken d) { string id = d[ID].ToString(); - var item = this.Where(i => i.ID != null && i.ID.Equals(id)).First(); + var item = this.Where(i => i.ID != null && i.ID.Equals(id)).SingleOrDefault(); + if (item == null) + return; parent.SafeCall(() => { Remove(item); messageBus.Send(new RemoveFileActionMsg() { diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index a059c44e..3299ca42 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -1,5 +1,5 @@ - + @@ -42,7 +42,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -97,11 +97,11 @@ - + - - - + + + @@ -130,9 +130,9 @@ - - - + + + diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index cbdab181..123bd953 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -16,7 +16,7 @@ 2.23.2 2.5.5 - 1.5.9 + 1.5.9 2.5.0-b42 3.0.11.Final 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 81223996..ecd2f1ca 100644 --- 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(); private String agency = ""; + private void delete(String name) { + RemoteFile remoteFile = null; + try { + remoteFile = sourceUri.getRemoteFile(name); + if (remoteFile == null) + throw new NullPointerException("File not exists: " + name); + sourceUri.delete(remoteFile); + logger.info(getMarker(), "A {} fájl törlése sikeres volt.", remoteFile.getName()); + } catch (Exception e) { + logger.error(getMarker(), "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", remoteFile.getName(), e.getMessage()); + } + } + @StepEntry public Object[] execute(int port, String userName, String password, IJobEngine jobEngine, IJobRuntime jobRuntime) { String nexioHost = System.getProperty("nexio.host"); @@ -73,17 +86,4 @@ public class DeleteNEXIOMaterialsStep extends JobStep { return null; } - private void delete(String name) { - RemoteFile remoteFile = null; - try { - remoteFile = sourceUri.getRemoteFile(name); - if (remoteFile == null) - throw new NullPointerException("File not exists: " + name); - sourceUri.delete(remoteFile); - logger.info(getMarker(), "A {} fájl törlése sikeres volt.", remoteFile.getName()); - } catch (Exception e) { - logger.error(getMarker(), "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", remoteFile.getName(), e.getMessage()); - } - } - }