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

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index fb0d603e7d636c65e0795c9fd11cd1537e4eb191..b26d3bc006f035a607765817b33a669d20c79aaa 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -60,7 +60,7 @@ namespace DxPlay {
         private void cueue() {\r
             m_play = null;\r
             try {\r
-                m_mediaDescription = MediaDetectorLight.GetDescription(selectedFile);\r
+                m_mediaDescription = MediaDetector.GetDescription(selectedFile);\r
 \r
                 trackBar1.Value = 0;\r
                 trackBar1.Minimum = 0;\r

diff --git a/client/Maestro/Configuration/configuration-editor.json b/client/Maestro/Configuration/configuration-editor.json
index 4bd428eac8eb76c566707b253860ea225cc67466..d26f7fa0fd18b1fac67817b0b356e7aa091e639a 100644 (file)
--- a/client/Maestro/Configuration/configuration-editor.json
+++ b/client/Maestro/Configuration/configuration-editor.json
@@ -19,7 +19,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/octopus/",\r
+        "address": "http://localhost:8080/services/rest/octopus/",\r
         "timeout": 1000\r
       }\r
     },\r
@@ -35,7 +35,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/jobengine/",\r
+        "address": "http://localhost:8080/services/rest/jobengine/",\r
         "timeout": 1000\r
       }\r
     }\r

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json
index d6da4739f729d8ac0add01a6f0ed2f8ef445f882..2f21a2f4ea3474588a9ad0fdb24722df58436068 100644 (file)
--- a/client/Maestro/Configuration/configuration-nle.json
+++ b/client/Maestro/Configuration/configuration-nle.json
@@ -19,7 +19,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/octopus/",\r
+        "address": "http://localhost:8080/services/rest/octopus/",\r
         "timeout": 1000\r
       }\r
     },\r
@@ -35,7 +35,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/jobengine/",\r
+        "address": "http://localhost:8080/services/rest/jobengine/",\r
         "timeout": 1000\r
       }\r
     }\r

diff --git a/client/Maestro/Configuration/configuration-playout.json b/client/Maestro/Configuration/configuration-playout.json
index f78970d783642fdcdfafe2554d219b01446b376b..8542dfd69a659fcb8587cc246e227f57cdac0a14 100644 (file)
--- a/client/Maestro/Configuration/configuration-playout.json
+++ b/client/Maestro/Configuration/configuration-playout.json
@@ -27,7 +27,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/octopus/",\r
+        "address": "http://localhost:8080/services/rest/octopus/",\r
         "timeout": 1000\r
       }\r
     },\r
@@ -43,7 +43,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/jobengine/",\r
+        "address": "http://localhost:8080/services/rest/jobengine/",\r
         "timeout": 1000\r
       }\r
     }\r

diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json
index d832d94bc292f9e52eb93c57c4b1894df352826a..e58d2ce15a0e9b514206883e059f774866ae2518 100644 (file)
--- a/client/Maestro/Configuration/configuration-studio.json
+++ b/client/Maestro/Configuration/configuration-studio.json
@@ -9,7 +9,7 @@
   "source": {\r
     "$type": "NEXIOSource",\r
     "local": {\r
-      "address": "ws://10.10.1.28/services/nexio"\r
+      "address": "ws://localhost:8080/services/nexio"\r
     },\r
     "remote": {\r
       "address": "ftp://10.10.1.56:2098",\r
@@ -21,7 +21,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/octopus",\r
+        "address": "http://localhost:8080/services/rest/octopus",\r
         "timeout": 1000\r
       }\r
     },\r
@@ -37,7 +37,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/jobengine",\r
+        "address": "http://localhost:8080/services/rest/jobengine",\r
         "userName": "mediacube",\r
         "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
         "timeout": 1000\r

diff --git a/client/Maestro/Configuration/configuration-sxs.json b/client/Maestro/Configuration/configuration-sxs.json
index c99f650a35aacbd59bff1c05de0c1facf83c35b7..bc4a7287ec33fa0ffd1e1dd4569f36d66a5437ee 100644 (file)
--- a/client/Maestro/Configuration/configuration-sxs.json
+++ b/client/Maestro/Configuration/configuration-sxs.json
@@ -19,7 +19,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/octopus/",\r
+        "address": "http://localhost:8080/services/rest/octopus/",\r
         "timeout": 1000\r
       }\r
     },\r
@@ -35,7 +35,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://10.10.1.28/services/rest/jobengine/",\r
+        "address": "http://localhost:8080/services/rest/jobengine/",\r
         "timeout": 1000\r
       }\r
     }\r

diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs
index f35d04143b1ad1a49d9b94b98166714d93ffec4b..df6b008903a929df1f7b3f199aed15b6ee37f199 100644 (file)
--- a/client/PlanAIRClient/Resources.Designer.cs
+++ b/client/PlanAIRClient/Resources.Designer.cs
@@ -60,15 +60,6 @@ namespace TrafficClient {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Adás.\r
-        /// </summary>\r
-        internal static string ADAS {\r
-            get {\r
-                return ResourceManager.GetString("ADAS", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Cím.\r
         /// </summary>\r
@@ -97,11 +88,11 @@ namespace TrafficClient {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Hiányzó kópia.\r
+        ///   Looks up a localized string similar to Hiányos.\r
         /// </summary>\r
-        internal static string HIANYZO_KOPIA {\r
+        internal static string HIANYOS {\r
             get {\r
-                return ResourceManager.GetString("HIANYZO_KOPIA", resourceCulture);\r
+                return ResourceManager.GetString("HIANYOS", resourceCulture);\r
             }\r
         }\r
         \r
@@ -141,6 +132,15 @@ namespace TrafficClient {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Műsor.\r
+        /// </summary>\r
+        internal static string MUSOR {\r
+            get {\r
+                return ResourceManager.GetString("MUSOR", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Promó.\r
         /// </summary>\r

diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx
index 97497eeef9dc0815657d5c94a5ce8a9efbb97414..b333af260f0f43c1c77f9cd56a50ce8396503e7a 100644 (file)
--- a/client/PlanAIRClient/Resources.resx
+++ b/client/PlanAIRClient/Resources.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <data name="ADAS" xml:space="preserve">\r
-    <value>Adás</value>\r
-  </data>\r
   <data name="CIM" xml:space="preserve">\r
     <value>Cím</value>\r
   </data>\r
@@ -129,8 +126,8 @@
   <data name="EPIZOD_CIM" xml:space="preserve">\r
     <value>Epizod cím</value>\r
   </data>\r
-  <data name="HIANYZO_KOPIA" xml:space="preserve">\r
-    <value>Hiányzó kópia</value>\r
+  <data name="HIANYOS" xml:space="preserve">\r
+    <value>Hiányos</value>\r
   </data>\r
   <data name="KERESES" xml:space="preserve">\r
     <value>Keresés</value>\r
@@ -144,6 +141,9 @@
   <data name="MEGSE" xml:space="preserve">\r
     <value>Mégse</value>\r
   </data>\r
+  <data name="MUSOR" xml:space="preserve">\r
+    <value>Műsor</value>\r
+  </data>\r
   <data name="PROMO" xml:space="preserve">\r
     <value>Promó</value>\r
   </data>\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs
index c8aa2be7732cbc19df9e1a6ef15f8f0ccd6277f1..99f3628f2daec6bf6c898dd161530ade443446bc 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs
@@ -38,7 +38,7 @@
             this.backgroundWorker3 = new System.ComponentModel.BackgroundWorker();\r
             this.backgroundWorker4 = new System.ComponentModel.BackgroundWorker();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
-            this.dgTraffic = new TrafficClient.CustomDataGridView();\r
+            this.dgTraffic = new System.Windows.Forms.DataGridView();\r
             this.scheduledDate = new System.Windows.Forms.DateTimePicker();\r
             this.textBox1 = new System.Windows.Forms.TextBox();\r
             this.searchButton = new System.Windows.Forms.Button();\r
@@ -66,7 +66,7 @@
             this.panel1.Size = new System.Drawing.Size(263, 217);\r
             this.panel1.TabIndex = 11;\r
             // \r
-            // dataGridView1\r
+            // dgTraffic\r
             // \r
             this.dgTraffic.AllowUserToAddRows = false;\r
             this.dgTraffic.AllowUserToDeleteRows = false;\r
@@ -96,7 +96,7 @@
             this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgTraffic.Location = new System.Drawing.Point(0, 0);\r
             this.dgTraffic.MultiSelect = false;\r
-            this.dgTraffic.Name = "dataGridView1";\r
+            this.dgTraffic.Name = "dgTraffic";\r
             this.dgTraffic.RowHeadersVisible = false;\r
             dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
             this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
@@ -275,6 +275,6 @@
         private System.Windows.Forms.RadioButton radioButtonPromo;\r
         private System.Windows.Forms.RadioButton radioButtonAD;\r
         private System.Windows.Forms.Panel panel2;\r
-        private CustomDataGridView dgTraffic;\r
+        private System.Windows.Forms.DataGridView dgTraffic;\r
     }\r
 }\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 9a20e9b054574b403dcd498de7f8d654223e04a1..3ba9fcada66ffdf6dcfd6b81a49faf9de6946f8f 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -30,7 +30,7 @@ namespace TrafficClient {
 \r
         private void InitializeTexts() {\r
             searchButton.Text = Resources.KERESES;\r
-            copiaCheckBox.Text = Resources.HIANYZO_KOPIA;\r
+            copiaCheckBox.Text = Resources.HIANYOS;\r
 \r
             dgTraffic.AutoGenerateColumns = false;\r
             dgTraffic.Columns.AddRange(\r
@@ -68,7 +68,7 @@ namespace TrafficClient {
                 );\r
             radioButtonPromo.Text = Resources.PROMO;\r
             radioButtonAD.Text = Resources.REKLAM;\r
-            radioButtonBroadCast.Text = Resources.ADAS;\r
+            radioButtonBroadCast.Text = Resources.MUSOR;\r
         }\r
 \r
         public TrafficConfiguration Configuration {\r

diff --git a/client/PlanAIRClient/Workers/AdvertisementWorker.cs b/client/PlanAIRClient/Workers/AdvertisementWorker.cs
index 893e9419a95a010ae4da488dbef3e0a501b9e554..9350a8b9b23e6b269963e79b776d2b1b4b957576 100644 (file)
--- 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)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 3001);\r
-                    cmd.Parameters.AddWithValue("@@@Options", 40);\r
+                    //Hiányos 1\r
+                    cmd.Parameters.AddWithValue("@@@Options", 0);\r
                     cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
                     cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
                     sqlResult = ExecuteAndReadAdvertisement(cmd);\r

diff --git a/client/PlanAIRClient/Workers/BroadcastWorker.cs b/client/PlanAIRClient/Workers/BroadcastWorker.cs
index 64eccb268c31439c231029975d41a5646fd4dea5..a9120d87cac4340085ddf5d24445f7be7b0e3177 100644 (file)
--- a/client/PlanAIRClient/Workers/BroadcastWorker.cs
+++ b/client/PlanAIRClient/Workers/BroadcastWorker.cs
@@ -23,20 +23,14 @@ namespace TrafficClient.Workers {
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1001);\r
                     cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
-                    if (!missingCopia) {\r
-                        cmd.Parameters.AddWithValue("@@@Options", 1);\r
-                        cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
-                        cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date);\r
-                        cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date);\r
+                    if (missingCopia) {\r
+                        cmd.Parameters.AddWithValue("@@@Options", 8);\r
                     } else {\r
-                        cmd.Parameters.AddWithValue("@@@Options", 24);\r
-                        if (!String.IsNullOrEmpty(strParam))\r
-                            cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
-                        if (from.HasValue) {\r
-                            cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date);\r
-                            cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date);\r
-                        }\r
+                        cmd.Parameters.AddWithValue("@@@Options", 0); //1 adná az élőket is\r
                     }\r
+                    cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
+                    cmd.Parameters.AddWithValue("@@DateParam1", from.Value.Date);\r
+                    cmd.Parameters.AddWithValue("@@DateParam2", to.Value.Date);\r
                     sqlResult = ExecuteAndReadBradcast(cmd);\r
                     result = ProcessMamBroadcastResult(sqlResult);\r
                 }\r

diff --git a/client/PlanAIRClient/Workers/PromotionalWorker.cs b/client/PlanAIRClient/Workers/PromotionalWorker.cs
index f8f18ce0e5abd57a04fe4515de89ee4b6dfd5d63..636116cf072047b0ea202718e713501c16ac8886 100644 (file)
--- 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)) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 2001);\r
-                    cmd.Parameters.AddWithValue("@@@Options", 16);\r
+                    //Hiányos 1\r
+                    cmd.Parameters.AddWithValue("@@@Options", 0);\r
                     cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
                     cmd.Parameters.AddWithValue("@@StrParam1", strParam);\r
                     sqlResult = ExecuteAndReadPromotionals(cmd);\r