From: Vásáry Dániel Date: Tue, 24 Oct 2017 14:11:14 +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=795faf2c32e9b347fd5ca1f90f102391a1bae327;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30666 --- diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index fb0d603e..b26d3bc0 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -60,7 +60,7 @@ namespace DxPlay { private void cueue() { m_play = null; try { - m_mediaDescription = MediaDetectorLight.GetDescription(selectedFile); + m_mediaDescription = MediaDetector.GetDescription(selectedFile); trackBar1.Value = 0; trackBar1.Minimum = 0; diff --git a/client/Maestro/Configuration/configuration-editor.json b/client/Maestro/Configuration/configuration-editor.json index 4bd428ea..d26f7fa0 100644 --- a/client/Maestro/Configuration/configuration-editor.json +++ b/client/Maestro/Configuration/configuration-editor.json @@ -19,7 +19,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://10.10.1.28/services/rest/octopus/", + "address": "http://localhost:8080/services/rest/octopus/", "timeout": 1000 } }, @@ -35,7 +35,7 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://10.10.1.28/services/rest/jobengine/", + "address": "http://localhost:8080/services/rest/jobengine/", "timeout": 1000 } } diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json index d6da4739..2f21a2f4 100644 --- a/client/Maestro/Configuration/configuration-nle.json +++ b/client/Maestro/Configuration/configuration-nle.json @@ -19,7 +19,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://10.10.1.28/services/rest/octopus/", + "address": "http://localhost:8080/services/rest/octopus/", "timeout": 1000 } }, @@ -35,7 +35,7 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://10.10.1.28/services/rest/jobengine/", + "address": "http://localhost:8080/services/rest/jobengine/", "timeout": 1000 } } diff --git a/client/Maestro/Configuration/configuration-playout.json b/client/Maestro/Configuration/configuration-playout.json index f78970d7..8542dfd6 100644 --- a/client/Maestro/Configuration/configuration-playout.json +++ b/client/Maestro/Configuration/configuration-playout.json @@ -27,7 +27,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://10.10.1.28/services/rest/octopus/", + "address": "http://localhost:8080/services/rest/octopus/", "timeout": 1000 } }, @@ -43,7 +43,7 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://10.10.1.28/services/rest/jobengine/", + "address": "http://localhost:8080/services/rest/jobengine/", "timeout": 1000 } } diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json index d832d94b..e58d2ce1 100644 --- a/client/Maestro/Configuration/configuration-studio.json +++ b/client/Maestro/Configuration/configuration-studio.json @@ -9,7 +9,7 @@ "source": { "$type": "NEXIOSource", "local": { - "address": "ws://10.10.1.28/services/nexio" + "address": "ws://localhost:8080/services/nexio" }, "remote": { "address": "ftp://10.10.1.56:2098", @@ -21,7 +21,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://10.10.1.28/services/rest/octopus", + "address": "http://localhost:8080/services/rest/octopus", "timeout": 1000 } }, @@ -37,7 +37,7 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://10.10.1.28/services/rest/jobengine", + "address": "http://localhost:8080/services/rest/jobengine", "userName": "mediacube", "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", "timeout": 1000 diff --git a/client/Maestro/Configuration/configuration-sxs.json b/client/Maestro/Configuration/configuration-sxs.json index c99f650a..bc4a7287 100644 --- a/client/Maestro/Configuration/configuration-sxs.json +++ b/client/Maestro/Configuration/configuration-sxs.json @@ -19,7 +19,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://10.10.1.28/services/rest/octopus/", + "address": "http://localhost:8080/services/rest/octopus/", "timeout": 1000 } }, @@ -35,7 +35,7 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://10.10.1.28/services/rest/jobengine/", + "address": "http://localhost:8080/services/rest/jobengine/", "timeout": 1000 } } diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs index f35d0414..df6b0089 100644 --- a/client/PlanAIRClient/Resources.Designer.cs +++ b/client/PlanAIRClient/Resources.Designer.cs @@ -60,15 +60,6 @@ namespace TrafficClient { } } - /// - /// Looks up a localized string similar to Adás. - /// - internal static string ADAS { - get { - return ResourceManager.GetString("ADAS", resourceCulture); - } - } - /// /// Looks up a localized string similar to Cím. /// @@ -97,11 +88,11 @@ namespace TrafficClient { } /// - /// Looks up a localized string similar to Hiányzó kópia. + /// Looks up a localized string similar to Hiányos. /// - internal static string HIANYZO_KOPIA { + internal static string HIANYOS { get { - return ResourceManager.GetString("HIANYZO_KOPIA", resourceCulture); + return ResourceManager.GetString("HIANYOS", resourceCulture); } } @@ -141,6 +132,15 @@ namespace TrafficClient { } } + /// + /// Looks up a localized string similar to Műsor. + /// + internal static string MUSOR { + get { + return ResourceManager.GetString("MUSOR", resourceCulture); + } + } + /// /// Looks up a localized string similar to Promó. /// diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx index 97497eee..b333af26 100644 --- a/client/PlanAIRClient/Resources.resx +++ b/client/PlanAIRClient/Resources.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Adás - Cím @@ -129,8 +126,8 @@ Epizod cím - - Hiányzó kópia + + Hiányos Keresés @@ -144,6 +141,9 @@ Mégse + + Műsor + Promó diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs index c8aa2be7..99f3628f 100644 --- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs +++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs @@ -38,7 +38,7 @@ this.backgroundWorker3 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker4 = new System.ComponentModel.BackgroundWorker(); this.panel1 = new System.Windows.Forms.Panel(); - this.dgTraffic = new TrafficClient.CustomDataGridView(); + this.dgTraffic = new System.Windows.Forms.DataGridView(); this.scheduledDate = new System.Windows.Forms.DateTimePicker(); this.textBox1 = new System.Windows.Forms.TextBox(); this.searchButton = new System.Windows.Forms.Button(); @@ -66,7 +66,7 @@ this.panel1.Size = new System.Drawing.Size(263, 217); this.panel1.TabIndex = 11; // - // dataGridView1 + // dgTraffic // this.dgTraffic.AllowUserToAddRows = false; this.dgTraffic.AllowUserToDeleteRows = false; @@ -96,7 +96,7 @@ this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dgTraffic.Location = new System.Drawing.Point(0, 0); this.dgTraffic.MultiSelect = false; - this.dgTraffic.Name = "dataGridView1"; + this.dgTraffic.Name = "dgTraffic"; this.dgTraffic.RowHeadersVisible = false; dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle3; @@ -275,6 +275,6 @@ private System.Windows.Forms.RadioButton radioButtonPromo; private System.Windows.Forms.RadioButton radioButtonAD; private System.Windows.Forms.Panel panel2; - private CustomDataGridView dgTraffic; + private System.Windows.Forms.DataGridView dgTraffic; } } diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 9a20e9b0..3ba9fcad 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -30,7 +30,7 @@ namespace TrafficClient { private void InitializeTexts() { searchButton.Text = Resources.KERESES; - copiaCheckBox.Text = Resources.HIANYZO_KOPIA; + copiaCheckBox.Text = Resources.HIANYOS; dgTraffic.AutoGenerateColumns = false; dgTraffic.Columns.AddRange( @@ -68,7 +68,7 @@ namespace TrafficClient { ); radioButtonPromo.Text = Resources.PROMO; radioButtonAD.Text = Resources.REKLAM; - radioButtonBroadCast.Text = Resources.ADAS; + radioButtonBroadCast.Text = Resources.MUSOR; } public TrafficConfiguration Configuration { diff --git a/client/PlanAIRClient/Workers/AdvertisementWorker.cs b/client/PlanAIRClient/Workers/AdvertisementWorker.cs index 893e9419..9350a8b9 100644 --- a/client/PlanAIRClient/Workers/AdvertisementWorker.cs +++ b/client/PlanAIRClient/Workers/AdvertisementWorker.cs @@ -21,7 +21,8 @@ namespace TrafficClient.Workers { using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) { cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@Operation", 3001); - cmd.Parameters.AddWithValue("@@@Options", 40); + //Hiányos 1 + cmd.Parameters.AddWithValue("@@@Options", 0); cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); cmd.Parameters.AddWithValue("@@StrParam1", strParam); sqlResult = ExecuteAndReadAdvertisement(cmd); diff --git a/client/PlanAIRClient/Workers/BroadcastWorker.cs b/client/PlanAIRClient/Workers/BroadcastWorker.cs index 64eccb26..a9120d87 100644 --- a/client/PlanAIRClient/Workers/BroadcastWorker.cs +++ b/client/PlanAIRClient/Workers/BroadcastWorker.cs @@ -23,20 +23,14 @@ namespace TrafficClient.Workers { cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@Operation", 1001); cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); - if (!missingCopia) { - cmd.Parameters.AddWithValue("@@@Options", 1); - cmd.Parameters.AddWithValue("@@StrParam1", strParam); - cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date); - cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date); + if (missingCopia) { + cmd.Parameters.AddWithValue("@@@Options", 8); } else { - cmd.Parameters.AddWithValue("@@@Options", 24); - if (!String.IsNullOrEmpty(strParam)) - cmd.Parameters.AddWithValue("@@StrParam1", strParam); - if (from.HasValue) { - cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date); - cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date); - } + cmd.Parameters.AddWithValue("@@@Options", 0); //1 adná az élőket is } + cmd.Parameters.AddWithValue("@@StrParam1", strParam); + cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date); + cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date); sqlResult = ExecuteAndReadBradcast(cmd); result = ProcessMamBroadcastResult(sqlResult); } diff --git a/client/PlanAIRClient/Workers/PromotionalWorker.cs b/client/PlanAIRClient/Workers/PromotionalWorker.cs index f8f18ce0..636116cf 100644 --- a/client/PlanAIRClient/Workers/PromotionalWorker.cs +++ b/client/PlanAIRClient/Workers/PromotionalWorker.cs @@ -21,7 +21,8 @@ namespace TrafficClient.Workers { using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) { cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@Operation", 2001); - cmd.Parameters.AddWithValue("@@@Options", 16); + //Hiányos 1 + cmd.Parameters.AddWithValue("@@@Options", 0); cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); cmd.Parameters.AddWithValue("@@StrParam1", strParam); sqlResult = ExecuteAndReadPromotionals(cmd);