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

diff --git a/client/AudioRecorder/AudioDeviceSelectorForm.cs b/client/AudioRecorder/AudioDeviceSelectorForm.cs
index 20f62e2a0a5232288d19cb32b939f84453759520..053a411fddff0c06580cead47c73666fc01d3b9b 100644 (file)
--- a/client/AudioRecorder/AudioDeviceSelectorForm.cs
+++ b/client/AudioRecorder/AudioDeviceSelectorForm.cs
@@ -1,4 +1,5 @@
-using System;\r
+using AudioRecorder.Properties;\r
+using System;\r
 using System.Collections.Generic;\r
 using System.Windows.Forms;\r
 \r
@@ -10,7 +11,6 @@ namespace AudioRecorder {
 \r
         public AudioDeviceSelectorForm() {\r
             InitializeComponent();\r
-            InitializeControlTexts();\r
 \r
             audioDevicesComboBox.KeyDown += (sender, args) => {\r
                 if (args.KeyCode == Keys.Return)\r
@@ -23,8 +23,8 @@ namespace AudioRecorder {
         }\r
 \r
         private void InitializeControlTexts() {\r
-            cancelButton.Text = Resources.MEGSE;\r
-            this.Text = Resources.VALASSZON_MIKROFONT;\r
+            cancelButton.Text = parameters.Resource("CANCEL", Resources.CANCEL);\r
+            Text = parameters.Resource("CHOOSEINPUTTITLE", Resources.CHOOSEINPUTTITLE);\r
         }\r
 \r
         public int Open(List<string> deviceNames, int selectedIndex, ref AudioRecorderSettings parameters) {\r
@@ -36,6 +36,7 @@ namespace AudioRecorder {
             if (selectedIndex == -1 && deviceNames.Count > 0)\r
                 audioDevicesComboBox.SelectedIndex = 0;\r
             this.parameters = parameters;\r
+            InitializeControlTexts();\r
             if (ShowDialog() == DialogResult.OK)\r
                 return audioDevicesComboBox.SelectedIndex;\r
             else\r

diff --git a/client/AudioRecorder/AudioRecorder.csproj b/client/AudioRecorder/AudioRecorder.csproj
index 5afd109f6ba1f27f0f9f1c69836343d2c7b101c6..631bac362cc9cff163ab36d1b472de794bb22906 100644 (file)
--- a/client/AudioRecorder/AudioRecorder.csproj
+++ b/client/AudioRecorder/AudioRecorder.csproj
@@ -76,7 +76,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
     <DebugSymbols>true</DebugSymbols>\r
-    <OutputPath>..\bin\x64\AudioRecorder\Debug\</OutputPath>\r
+    <OutputPath>..\bin\AudioRecorder\x64\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <DebugType>full</DebugType>\r
     <PlatformTarget>x64</PlatformTarget>\r
@@ -84,7 +84,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
-    <OutputPath>..\bin\x64\AudioRecorder\Release\</OutputPath>\r
+    <OutputPath>..\bin\AudioRecorder\x64\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <Optimize>true</Optimize>\r
     <DebugType>pdbonly</DebugType>\r
@@ -148,7 +148,7 @@
     </Compile>\r
     <Compile Include="Program.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Resources.Designer.cs">\r
+    <Compile Include="Properties\Resources.Designer.cs">\r
       <AutoGen>True</AutoGen>\r
       <DesignTime>True</DesignTime>\r
       <DependentUpon>Resources.resx</DependentUpon>\r
@@ -166,7 +166,7 @@
     <EmbeddedResource Include="MainForm.resx">\r
       <DependentUpon>MainForm.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="Resources.resx">\r
+    <EmbeddedResource Include="Properties\Resources.resx">\r
       <Generator>ResXFileCodeGenerator</Generator>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
     </EmbeddedResource>\r

diff --git a/client/AudioRecorder/AudioRecorderSettings.cs b/client/AudioRecorder/AudioRecorderSettings.cs
index e03dd9264d9759ef74617847234100870d14b7cb..21ff49a37021f85db6aeecdc8012466caca0858e 100644 (file)
--- a/client/AudioRecorder/AudioRecorderSettings.cs
+++ b/client/AudioRecorder/AudioRecorderSettings.cs
@@ -1,13 +1,14 @@
 using System;\r
 using MaestroShared.Configuration;\r
+using Newtonsoft.Json;\r
 \r
 namespace AudioRecorder {\r
-    public class AudioRecorderSettings {\r
+    public class AudioRecorderSettings : UISettings {\r
         public string DeviceName { get; set; }\r
         public int PeekMeterStep { get; set; }\r
         public Uri WorkingDirectory { get; set; }\r
+        [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Objects)]\r
         public MetadataProvider[] Metadatas { get; set; }\r
-        public UISettings UISettings { get; set; }\r
         public Target OctopusTarget { get; set; }\r
         public Target TrafficTarget { get; set; }\r
     }\r

diff --git a/client/AudioRecorder/Configuration/audiorecorder.en b/client/AudioRecorder/Configuration/audiorecorder.en
index f43a5d8a4a517c22d055d8945ccdb021cb77ce4a..69185a7966f5c4f6a3f3d6c61b9e0465be71e5cf 100644 (file)
--- a/client/AudioRecorder/Configuration/audiorecorder.en
+++ b/client/AudioRecorder/Configuration/audiorecorder.en
@@ -2,8 +2,13 @@
   "RUNDOWN": "Rundown",\r
   "FOLDER": "Story folder",\r
   "CHOOSE": "Choose an item",\r
-  "SELECTORTITLE": "Choose an ID",\r
+  "CHOOSEINPUTTITLE": "Choose audio input device",\r
+  "SELECTORTITLE": "Choose ID",\r
   "SELECTEDID": "Selected ID",\r
   "CANCEL": "Cancel",\r
-  "DONE": "Done"\r
+  "DONE": "Done",\r
+  "PAUSE": "Pause",\r
+  "PLAY": "Play",\r
+  "RECORD": "Record",\r
+  "STOP": "Stop"\r
 }\r

diff --git a/client/AudioRecorder/Configuration/audiorecorder.json b/client/AudioRecorder/Configuration/audiorecorder.json
index 91daa4d8a5633e772506a7b4d1ba858dcaffd039..32bb81e65a06f42e7b2871beeadf993ef34fd4ee 100644 (file)
--- a/client/AudioRecorder/Configuration/audiorecorder.json
+++ b/client/AudioRecorder/Configuration/audiorecorder.json
@@ -1,5 +1,6 @@
 {\r
   "deviceName": "",\r
+  "uiFileName": "audiorecorder.en",\r
   "workingDirectory": "file://C:\\temp",\r
   "peekMeterStep": 200,\r
   "octopusTarget": {\r
@@ -16,9 +17,6 @@
       "timeout": 1000\r
     }\r
   },\r
-  "uiSettings": {\r
-    "uiFileName": "audiorecorder.en"\r
-  },\r
   "metadatas": [\r
     {\r
       "$type": "NativeOctopusMetadata",\r

diff --git a/client/AudioRecorder/MainForm.cs b/client/AudioRecorder/MainForm.cs
index 7491923b90dbec707cbccdbfdaea931f310e0abe..4b39726672d088903f30e15823b8bb12877a6b8c 100644 (file)
--- a/client/AudioRecorder/MainForm.cs
+++ b/client/AudioRecorder/MainForm.cs
@@ -13,6 +13,7 @@ using System.Security.Principal;
 using MaestroShared.Targets;\r
 using static AudioRecorder.MetadataSelectorForm;\r
 using MaestroShared.Metadata;\r
+using AudioRecorder.Properties;\r
 \r
 namespace AudioRecorder {\r
     public delegate void RefreshPanelDelegate();\r
@@ -39,7 +40,6 @@ namespace AudioRecorder {
 \r
         public MainForm() {\r
             InitializeComponent();\r
-            InitializeControlTexts();\r
         }\r
 \r
         public int SelectedDeviceIndex {\r
@@ -78,6 +78,7 @@ namespace AudioRecorder {
             try {\r
                 Type[] knownTypes = { typeof(OctopusMetadata), typeof(NativeOctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) };\r
                 parameters = ConfigurationSerializer.Load<AudioRecorderSettings>(CONFIG_FILE, knownTypes);\r
+                InitializeControlTexts();\r
 \r
                 UpdateGUI();\r
                 timeCodeWorker = new TimeCodeWorker(timecodeLabel);\r
@@ -136,11 +137,11 @@ namespace AudioRecorder {
         }\r
 \r
         private void InitializeControlTexts() {\r
-            recordButton.Text = Resources.FELVETEL;\r
-            stopButton.Text = Resources.LEALLITAS;\r
-            pauseButton.Text = Resources.SZUNET;\r
-            btnSelectAudio.Text = Resources.VALASSZON_MIKROFONT;\r
-            playButton.Text = Resources.LEJATSZAS;\r
+            recordButton.Text = parameters.Resource("RECORD", Resources.RECORD);\r
+            stopButton.Text = parameters.Resource("STOP", Resources.STOP);\r
+            pauseButton.Text = parameters.Resource("PAUSE", Resources.PAUSE);\r
+            btnSelectAudio.Text = parameters.Resource("CHOOSEINPUTTITLE", Resources.CHOOSEINPUTTITLE);\r
+            playButton.Text = parameters.Resource("PLAY", Resources.PLAY);\r
         }\r
 \r
         public void Initialize() {\r

diff --git a/client/AudioRecorder/MetadataSelectorForm.cs b/client/AudioRecorder/MetadataSelectorForm.cs
index 2606de1a725f5286e22a5fc4a682fd3fbc6ab185..da46e980778493b9a2872e57599dd9c5818a7ca5 100644 (file)
--- a/client/AudioRecorder/MetadataSelectorForm.cs
+++ b/client/AudioRecorder/MetadataSelectorForm.cs
@@ -1,4 +1,5 @@
-using MaestroShared.Configuration;\r
+using AudioRecorder.Properties;\r
+using MaestroShared.Configuration;\r
 using System;\r
 using System.Windows.Forms;\r
 \r
@@ -24,15 +25,14 @@ namespace AudioRecorder {
         public MetadataSelectorForm(AudioRecorderSettings settings) {\r
             InitializeComponent();\r
             metadataIDSelector.Providers = settings.Metadatas;\r
-            metadataIDSelector.Settings = settings.UISettings;\r
+            metadataIDSelector.Settings = settings;\r
             metadataIDSelector.OctopusIDSelector.IDChangedEvent += OctopusIDChangedEvent;\r
             metadataIDSelector.NativeOctopusIDSelector.IDChangedEvent += NativeOctopusIDChangedEvent;\r
             metadataIDSelector.TrafficIDSelector.IDChangedEvent += TrafficIDChangedEvent;\r
             metadataIDSelector.MetadataIDText.TextChanged += OnMetadataIDChanged;\r
-            settings.UISettings = settings.UISettings ?? new UISettings();\r
-            buttonCancel.Text = settings.UISettings.Resource("CANCEL", Resources.CANCEL);\r
-            buttonOK.Text = settings.UISettings.Resource("DONE", Resources.DONE);\r
-            Text = settings.UISettings.Resource("SELECTORTITLE", Resources.SELECTORTITLE);\r
+            buttonCancel.Text = settings.Resource("CANCEL", Resources.CANCEL);\r
+            buttonOK.Text = settings.Resource("DONE", Resources.DONE);\r
+            Text = settings.Resource("SELECTORTITLE", Resources.SELECTORTITLE);\r
         }\r
 \r
         private void OnMetadataIDChanged(object sender, EventArgs e) {\r

diff --git a/client/AudioRecorder/Resources.Designer.cs b/client/AudioRecorder/Properties/Resources.Designer.cs
similarity index 70%
rename from client/AudioRecorder/Resources.Designer.cs
rename to client/AudioRecorder/Properties/Resources.Designer.cs
index a0a70c96b3bcc0c4fed946f3057fdaa560f04d3c..d543edb092efa785953cf5d8b1bc6f776077df14 100644 (file)
--- a/client/AudioRecorder/Resources.Designer.cs
+++ b/client/AudioRecorder/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>\r
 //------------------------------------------------------------------------------\r
 \r
-namespace AudioRecorder {\r
+namespace AudioRecorder.Properties {\r
     using System;\r
     \r
     \r
@@ -39,7 +39,7 @@ namespace AudioRecorder {
         internal static global::System.Resources.ResourceManager ResourceManager {\r
             get {\r
                 if (object.ReferenceEquals(resourceMan, null)) {\r
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AudioRecorder.Resources", typeof(Resources).Assembly);\r
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AudioRecorder.Properties.Resources", typeof(Resources).Assembly);\r
                     resourceMan = temp;\r
                 }\r
                 return resourceMan;\r
@@ -70,66 +70,47 @@ namespace AudioRecorder {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Rendben.\r
-        /// </summary>\r
-        internal static string DONE {\r
-            get {\r
-                return ResourceManager.GetString("DONE", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Felvétel.\r
+        ///   Looks up a localized string similar to Válasszon mikrofont.\r
         /// </summary>\r
-        internal static string FELVETEL {\r
+        internal static string CHOOSEINPUTTITLE {\r
             get {\r
-                return ResourceManager.GetString("FELVETEL", resourceCulture);\r
+                return ResourceManager.GetString("CHOOSEINPUTTITLE", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
+        ///   Looks up a localized string similar to Rendben.\r
         /// </summary>\r
-        internal static System.Drawing.Bitmap ic_refresh_black_24dp_1x {\r
+        internal static string DONE {\r
             get {\r
-                object obj = ResourceManager.GetObject("ic_refresh_black_24dp_1x", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
+                return ResourceManager.GetString("DONE", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Leállítás.\r
+        ///   Looks up a localized string similar to Szunet.\r
         /// </summary>\r
-        internal static string LEALLITAS {\r
+        internal static string PAUSE {\r
             get {\r
-                return ResourceManager.GetString("LEALLITAS", resourceCulture);\r
+                return ResourceManager.GetString("PAUSE", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
         ///   Looks up a localized string similar to Lejátszás.\r
         /// </summary>\r
-        internal static string LEJATSZAS {\r
+        internal static string PLAY {\r
             get {\r
-                return ResourceManager.GetString("LEJATSZAS", resourceCulture);\r
+                return ResourceManager.GetString("PLAY", resourceCulture);\r
             }\r
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Mégse.\r
-        /// </summary>\r
-        internal static string MEGSE {\r
-            get {\r
-                return ResourceManager.GetString("MEGSE", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Mikrofon választás.\r
+        ///   Looks up a localized string similar to Felvétel.\r
         /// </summary>\r
-        internal static string MIKROFON_VALASZTAS {\r
+        internal static string RECORD {\r
             get {\r
-                return ResourceManager.GetString("MIKROFON_VALASZTAS", resourceCulture);\r
+                return ResourceManager.GetString("RECORD", resourceCulture);\r
             }\r
         }\r
         \r
@@ -143,20 +124,11 @@ namespace AudioRecorder {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Szunet.\r
-        /// </summary>\r
-        internal static string SZUNET {\r
-            get {\r
-                return ResourceManager.GetString("SZUNET", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Válasszon mikrofont.\r
+        ///   Looks up a localized string similar to Leállítás.\r
         /// </summary>\r
-        internal static string VALASSZON_MIKROFONT {\r
+        internal static string STOP {\r
             get {\r
-                return ResourceManager.GetString("VALASSZON_MIKROFONT", resourceCulture);\r
+                return ResourceManager.GetString("STOP", resourceCulture);\r
             }\r
         }\r
     }\r

diff --git a/client/AudioRecorder/Resources.resx b/client/AudioRecorder/Properties/Resources.resx
similarity index 86%
rename from client/AudioRecorder/Resources.resx
rename to client/AudioRecorder/Properties/Resources.resx
index 143055a5ec2d5e1d8fd849ba612682d5835ce024..a03ecf13fe0b45a1fb5fe0f9b7e050968fbd1921 100644 (file)
--- a/client/AudioRecorder/Resources.resx
+++ b/client/AudioRecorder/Properties/Resources.resx
@@ -117,38 +117,28 @@
   <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="FELVETEL" xml:space="preserve">\r
-    <value>Felvétel</value>\r
-  </data>\r
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
-  <data name="ic_refresh_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
-  <data name="LEALLITAS" xml:space="preserve">\r
-    <value>Leállítás</value>\r
-  </data>\r
-  <data name="LEJATSZAS" xml:space="preserve">\r
-    <value>Lejátszás</value>\r
+  <data name="CANCEL" xml:space="preserve">\r
+    <value>Mégsem</value>\r
   </data>\r
-  <data name="MEGSE" xml:space="preserve">\r
-    <value>Mégse</value>\r
+  <data name="CHOOSEINPUTTITLE" xml:space="preserve">\r
+    <value>Válasszon mikrofont</value>\r
   </data>\r
-  <data name="MIKROFON_VALASZTAS" xml:space="preserve">\r
-    <value>Mikrofon választás</value>\r
+  <data name="DONE" xml:space="preserve">\r
+    <value>Rendben</value>\r
   </data>\r
-  <data name="SZUNET" xml:space="preserve">\r
+  <data name="PAUSE" xml:space="preserve">\r
     <value>Szunet</value>\r
   </data>\r
-  <data name="VALASSZON_MIKROFONT" xml:space="preserve">\r
-    <value>Válasszon mikrofont</value>\r
-  </data>\r
-  <data name="CANCEL" xml:space="preserve">\r
-    <value>Mégsem</value>\r
+  <data name="PLAY" xml:space="preserve">\r
+    <value>Lejátszás</value>\r
   </data>\r
-  <data name="DONE" xml:space="preserve">\r
-    <value>Rendben</value>\r
+  <data name="RECORD" xml:space="preserve">\r
+    <value>Felvétel</value>\r
   </data>\r
   <data name="SELECTORTITLE" xml:space="preserve">\r
     <value>Azonosító kiválasztása</value>\r
   </data>\r
+  <data name="STOP" xml:space="preserve">\r
+    <value>Leállítás</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/client/DxPlay/Configuration/dxplay.en b/client/DxPlay/Configuration/dxplay.en
index 03ae8ad3bfcd0460205bbfaf73117cfbd4b969b8..0ad1e7eb85f5a9e6a2bb4ca22a086b99502a9257 100644 (file)
--- a/client/DxPlay/Configuration/dxplay.en
+++ b/client/DxPlay/Configuration/dxplay.en
@@ -25,5 +25,20 @@
   "STOP": "Stop",\r
   "STOPPED": "STOPPED",\r
   "TCIN": "TC in",\r
-  "TCOUT": "TC out"\r
+  "TCOUT": "TC out",\r
+  "TITLE": "Title",\r
+  "FIRSTBROADCASTDATE": "First broadcast",\r
+  "EPISODENUMBER": "Episode nr.",\r
+  "EPISODEID": "Episode ID",\r
+  "EPISODETITLE": "Episode title",\r
+  "PROBLEMATIC": "Problematic",\r
+  "SEARCH": "Search",\r
+  "SERACHRESULTS": "Searh results",\r
+  "NEXTBROADCASTDATE": "Next broadcast",\r
+  "CANCEL": "Cancel",\r
+  "MATERIAL": "Material",\r
+  "PROMOTION": "Promotion",\r
+  "ADVERTISEMENT": "Advertisement",\r
+  "SEGMENTCOUNT": "Segment count",\r
+  "TRAFFICID": "Traffic ID"\r
 }\r

diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json
index bf8f97100708e61f876a8d8343ac20c73ce30127..2c911b66a7e2e884146733bf1c0640e12df6d721 100644 (file)
--- a/client/DxPlay/Configuration/dxplay.json
+++ b/client/DxPlay/Configuration/dxplay.json
@@ -7,7 +7,7 @@
   },\r
   "metadata": {\r
     "$type": "TrafficMetadata",\r
-    "uiFileName": "planair.en",\r
+    "uiFileName": "dxplay.en",\r
     "server": {\r
       "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
       "userName": "MAM",\r

diff --git a/client/DxPlay/Configuration/planair.en b/client/DxPlay/Configuration/planair.en
deleted file mode 100644 (file)
index da4788f..0000000
--- a/client/DxPlay/Configuration/planair.en
+++ /dev/null
@@ -1,17 +0,0 @@
-{\r
-  "TITLE": "Title",\r
-  "FIRSTBROADCASTDATE": "First broadcast",\r
-  "EPISODENUMBER": "Episode nr.",\r
-  "EPISODEID": "Episode ID",\r
-  "EPISODETITLE": "Episode title",\r
-  "PROBLEMATIC": "Problematic",\r
-  "SEARCH": "Search",\r
-  "SERACHRESULTS": "Searh results",\r
-  "NEXTBROADCASTDATE": "Next broadcast",\r
-  "CANCEL": "Cancel",\r
-  "MATERIAL": "Material",\r
-  "PROMOTION": "Promotion",\r
-  "ADVERTISEMENT": "Advertisement",\r
-  "SEGMENTCOUNT": "Segment count",\r
-  "TRAFFICID": "Traffic ID"\r
-}\r

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index cc8d221ef130b105bf5cd23e1fd2c64df7ff6dca..2816111ae43cb8655847133195a7533bb40091b9 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -49,7 +49,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <OutputPath>bin\Debug\</OutputPath>\r
+    <OutputPath>..\bin\DXPlay\Debug\</OutputPath>\r
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>\r
     <BaseAddress>285212672</BaseAddress>\r
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>\r
@@ -73,7 +73,7 @@
     <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <OutputPath>bin\Release\</OutputPath>\r
+    <OutputPath>..\bin\DXPlay\Release\</OutputPath>\r
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>\r
     <BaseAddress>285212672</BaseAddress>\r
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>\r
@@ -98,7 +98,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
     <DebugSymbols>true</DebugSymbols>\r
-    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <OutputPath>..\bin\DXPlay\x64\Debug\</OutputPath>\r
     <DefineConstants>TRACE;DEBUG;USING_NET20</DefineConstants>\r
     <BaseAddress>285212672</BaseAddress>\r
     <FileAlignment>4096</FileAlignment>\r
@@ -109,7 +109,7 @@
     <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
-    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <OutputPath>..\bin\DXPlay\x64\Release\</OutputPath>\r
     <DefineConstants>TRACE;USING_NET20</DefineConstants>\r
     <BaseAddress>285212672</BaseAddress>\r
     <Optimize>true</Optimize>\r
@@ -235,9 +235,6 @@
     </Compile>\r
     <Content Include="DirectShowLib.dll" />\r
     <Content Include="maestro.ico" />\r
-    <None Include="Configuration\planair.en">\r
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
-    </None>\r
     <None Include="Configuration\dxplay.en">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 0f3aaeabc46c9ff28eb0826d7b32f272f997b080..b83cb1ac3080a4fbfcd514b14aab3b436516f321 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -51,6 +51,9 @@ namespace DxPlay {
                 return cp;\r
             }\r
         }\r
+\r
+        public bool openFileDialogOpened;\r
+\r
         private void ApplyModel() {\r
             bsSegments.DataSource = model.Segments;\r
             dgSegments.AutoGenerateColumns = true;\r
@@ -291,7 +294,7 @@ namespace DxPlay {
 \r
         private bool HandleHotKey(Keys keyCode) {\r
             logger.Debug("Key pressed " + keyCode);\r
-            if (dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus))\r
+            if (openFileDialogOpened || dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus))\r
                 return true;\r
             logger.Debug("Handling " + keyCode);\r
             bool result = false;\r
@@ -553,8 +556,10 @@ namespace DxPlay {
         }\r
 \r
         private void menuOpenFile_Click(object sender, EventArgs e) {\r
+            openFileDialogOpened = true;\r
             if (openFileDialog.ShowDialog() == DialogResult.OK)\r
                 OpenFile(new FileInfo(openFileDialog.FileName));\r
+            openFileDialogOpened = false;\r
         }\r
 \r
         private void OnApprove(object sender, EventArgs e) {\r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index 5e1103014fbcc5d835d2f2dfbd8d3096bc0696ba..1b46ebd5600faf191f574eacd48e933cf226cb6c 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -18,7 +18,7 @@ namespace MaestroShared.Configuration {
             return Path.Combine(CONFIGURATION_FOLDER, fileName);\r
         }\r
 \r
-        private static Type[] MinimalKnownTypes = { typeof(UNCSource), typeof(NEXIOSource), typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) };\r
+        private static Type[] MinimalKnownTypes = { typeof(UNCSource), typeof(NEXIOSource), typeof(NativeOctopusMetadata), typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) };\r
 \r
         public static JObject Load(string fileName) {\r
             string configuration = File.ReadAllText(fileName);\r
@@ -48,7 +48,7 @@ namespace MaestroShared.Configuration {
                     ContractResolver = new CamelCasePropertyNamesContractResolver(),\r
                     NullValueHandling = NullValueHandling.Ignore,\r
                     DefaultValueHandling = DefaultValueHandling.Ignore,\r
-                    TypeNameHandling = TypeNameHandling.Objects,\r
+                    //TypeNameHandling = TypeNameHandling.Objects,\r
                     SerializationBinder = knownTypesBinder\r
                 };\r
 \r
@@ -192,6 +192,7 @@ namespace MaestroShared.Configuration {
 \r
     public class UISettings {\r
         public string UIFileName { get; set; }\r
+        [JsonIgnoreAttribute]\r
         public JObject UIStrings { get; set; }\r
 \r
 \r

diff --git a/client/MediaCube.sln b/client/MediaCube.sln
index 54038f05f635f972525cf77364b24cefe4bab3b2..587ed2097bc5c70e975b023a06681664a5fc8ac7 100644 (file)
--- a/client/MediaCube.sln
+++ b/client/MediaCube.sln
@@ -28,6 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MCTool", "MCTool\MCTool.csp
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B29016BD-2E82-407B-B0DB-628EC92C7751}"\r
        ProjectSection(SolutionItems) = preProject\r
+               ..\docs\mediacube-audiorecorder.md = ..\docs\mediacube-audiorecorder.md\r
                ..\docs\mediacube-dxplay.md = ..\docs\mediacube-dxplay.md\r
        EndProjectSection\r
 EndProject\r
@@ -37,168 +38,114 @@ Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
                Debug|x64 = Debug|x64\r
-               Debug|x86 = Debug|x86\r
                Release|Any CPU = Release|Any CPU\r
                Release|x64 = Release|x64\r
-               Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.ActiveCfg = Debug|x64\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.Build.0 = Debug|x64\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.ActiveCfg = Debug|x86\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.Build.0 = Debug|x86\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.ActiveCfg = Release|x64\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.Build.0 = Release|x64\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x86.Build.0 = Release|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.ActiveCfg = Debug|x64\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.Build.0 = Debug|x64\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.ActiveCfg = Debug|x86\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.Build.0 = Debug|x86\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.ActiveCfg = Release|x64\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.Build.0 = Release|x64\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x86.Build.0 = Release|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.ActiveCfg = Debug|x64\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.Build.0 = Debug|x64\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.ActiveCfg = Debug|x86\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.Build.0 = Debug|x86\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.ActiveCfg = Release|x64\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.Build.0 = Release|x64\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x86.Build.0 = Release|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.ActiveCfg = Debug|x64\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.Build.0 = Debug|x64\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.ActiveCfg = Debug|x86\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.Build.0 = Debug|x86\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.ActiveCfg = Release|x64\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.Build.0 = Release|x64\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x86.Build.0 = Release|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.ActiveCfg = Debug|x64\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.Build.0 = Debug|x64\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.ActiveCfg = Debug|x86\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.Build.0 = Debug|x86\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.ActiveCfg = Release|x64\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.Build.0 = Release|x64\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x86.Build.0 = Release|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.ActiveCfg = Debug|x64\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.Build.0 = Debug|x64\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x86.ActiveCfg = Debug|x86\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x86.Build.0 = Debug|x86\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.ActiveCfg = Release|x64\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.Build.0 = Release|x64\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x86.ActiveCfg = Release|x86\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x86.Build.0 = Release|x86\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.ActiveCfg = Debug|x64\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.Build.0 = Debug|x64\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.ActiveCfg = Debug|x86\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.Build.0 = Debug|x86\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.ActiveCfg = Release|x64\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.Build.0 = Release|x64\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x86.Build.0 = Release|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.ActiveCfg = Debug|x64\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.Build.0 = Debug|x64\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x86.Build.0 = Debug|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.ActiveCfg = Release|x64\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.Build.0 = Release|x64\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x86.Build.0 = Release|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.ActiveCfg = Debug|x64\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.Build.0 = Debug|x64\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x86.Build.0 = Debug|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.ActiveCfg = Release|x64\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.Build.0 = Release|x64\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x86.Build.0 = Release|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x86.Build.0 = Debug|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.ActiveCfg = Release|x64\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.Build.0 = Release|x64\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x86.Build.0 = Release|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x86.Build.0 = Debug|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.ActiveCfg = Release|Any CPU\r
                {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.Build.0 = Release|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x86.Build.0 = Release|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x86.Build.0 = Debug|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.ActiveCfg = Release|Any CPU\r
                {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.Build.0 = Release|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x86.Build.0 = Release|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x86.ActiveCfg = Debug|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x86.Build.0 = Debug|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.ActiveCfg = Release|Any CPU\r
                {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.Build.0 = Release|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x86.ActiveCfg = Release|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x86.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/docs/mediacube-audiorecorder.md b/docs/mediacube-audiorecorder.md
new file mode 100644 (file)
index 0000000..04178b3
--- /dev/null
+++ b/docs/mediacube-audiorecorder.md
@@ -0,0 +1,48 @@
+# MediaCube Maestro Audio Recorder\r
+> *Verzió: 1.0 - 2018.08.28*\r
+\r
+Az AudioRecorder alkalmazás lehetővé teszi hangfájlok rögzítését a kiválasztott hangbemenetről, amit egy Octopus azonosítóhoz rendelve a rögzítés befejezésekor a rendszer egy előre beállított mappába másol.\r
+\r
+## Működés\r
+\r
+A program elindítása után a főablak jelenik meg.\r
+\r
+![Audio Recorder](audiorecorder-main.png)\r
+\r
+Az ablakban látható információs- és vezérlőelemek:\r
+ \r
+* Rögzített anyag hossza: felvétel közben mutatja a hosszt.\r
+* Felvétel gomb: megjelenik a metaadat azonosító kiválasztás ablak. Sikeres kiválasztás után a gombon megjelenik egy visszaszámláló, és amikor az a nullához ér, elkezdődik a rögzítés a kiválasztott hangbemenetről.\r
+* Pillanat állj gomb: felvétel közben megszakítható a folyamat, újra rákattintva folyatatódik a rögzítés.\r
+* Állj gomb: a rögzítés befelyezése. A rögzített állományt a program  beállítások figyelembe vételévelfogja elmozgatni a megfelelő névvel a megfelelő helyre.\r
+* Hangbement kiválasztása gomb: megjelenik a lehetséges hangbemeneteket tartalmaző legördülő menü, a kiválasztást megerősítés után a program megjegyzi. Amennyiben még nem volt kiválasztott hangbemenet, a program indulásakor automatikusan megnyílik ez az ablak.  \r
+\r
+![Choose audio device](audiorecorder-input.png)\r
+\r
+A rögzített fájl formátuma fixen:\r
+\r
+> Format : PCM  \r
+> Format profile : Float    \r
+> Bit rate mode        : Constant  \r
+> Bit rate : 3 072 kb/s  \r
+> Channel(s) : 2 channels  \r
+> Sampling rate        : 48.0 kHz  \r
+> Bit depth : 32 bits  \r
+\r
+* Fájlnév: a rögzített fájl útvonala.\r
+* Lejátszás: a korábban rögzített fájlt lejátssza a WAV fájlkiterjesztéshez a rendszerben beállított lejátszóval. \r
+* Hangerő kijelzés: a konfigurációs állományban megadott szinthez képest az aktuálisan érzékelt hang erőssége. A halk hangok zöld, a hangos hangok sárga a nagyon hangos hangok a piros tartományban kerülnek kijelzésre.\r
+* Rögzítés hangereje: a csúszka segítségével a rögzítés hangereje állítható be. Ezt javasolt úgy megtenni, hogy a hangerő kijelzés minél kevesebbet tartózkodjon a piros tartományban, de hagyja el a zöldet.\r
+\r
+### Metaadat kiválasztása\r
+\r
+A felvétel gombra kattintva minden alkalommal megjelenik a metaadat kiválasztáshoz a tallózó ablak.\r
+\r
+![Choose ID](audiorecorder-metadata.png)\r
+\r
+Az ablakban látható információs- és vezérlőelemek:\r
+\r
+\r
+## Konfigurációs állomány\r
+\r
+## Naplózás\r