From: Vásáry Dániel Date: Thu, 30 Aug 2018 13:45:11 +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=06ba2ee761caf52af807f6225793079b1a503027;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31252 --- diff --git a/client/AudioRecorder/AudioDeviceSelectorForm.cs b/client/AudioRecorder/AudioDeviceSelectorForm.cs index 20f62e2a..053a411f 100644 --- a/client/AudioRecorder/AudioDeviceSelectorForm.cs +++ b/client/AudioRecorder/AudioDeviceSelectorForm.cs @@ -1,4 +1,5 @@ -using System; +using AudioRecorder.Properties; +using System; using System.Collections.Generic; using System.Windows.Forms; @@ -10,7 +11,6 @@ namespace AudioRecorder { public AudioDeviceSelectorForm() { InitializeComponent(); - InitializeControlTexts(); audioDevicesComboBox.KeyDown += (sender, args) => { if (args.KeyCode == Keys.Return) @@ -23,8 +23,8 @@ namespace AudioRecorder { } private void InitializeControlTexts() { - cancelButton.Text = Resources.MEGSE; - this.Text = Resources.VALASSZON_MIKROFONT; + cancelButton.Text = parameters.Resource("CANCEL", Resources.CANCEL); + Text = parameters.Resource("CHOOSEINPUTTITLE", Resources.CHOOSEINPUTTITLE); } public int Open(List deviceNames, int selectedIndex, ref AudioRecorderSettings parameters) { @@ -36,6 +36,7 @@ namespace AudioRecorder { if (selectedIndex == -1 && deviceNames.Count > 0) audioDevicesComboBox.SelectedIndex = 0; this.parameters = parameters; + InitializeControlTexts(); if (ShowDialog() == DialogResult.OK) return audioDevicesComboBox.SelectedIndex; else diff --git a/client/AudioRecorder/AudioRecorder.csproj b/client/AudioRecorder/AudioRecorder.csproj index 5afd109f..631bac36 100644 --- a/client/AudioRecorder/AudioRecorder.csproj +++ b/client/AudioRecorder/AudioRecorder.csproj @@ -76,7 +76,7 @@ true - ..\bin\x64\AudioRecorder\Debug\ + ..\bin\AudioRecorder\x64\Debug\ DEBUG;TRACE full x64 @@ -84,7 +84,7 @@ MinimumRecommendedRules.ruleset - ..\bin\x64\AudioRecorder\Release\ + ..\bin\AudioRecorder\x64\Release\ TRACE true pdbonly @@ -148,7 +148,7 @@ - + True True Resources.resx @@ -166,7 +166,7 @@ MainForm.cs - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/client/AudioRecorder/AudioRecorderSettings.cs b/client/AudioRecorder/AudioRecorderSettings.cs index e03dd926..21ff49a3 100644 --- a/client/AudioRecorder/AudioRecorderSettings.cs +++ b/client/AudioRecorder/AudioRecorderSettings.cs @@ -1,13 +1,14 @@ using System; using MaestroShared.Configuration; +using Newtonsoft.Json; namespace AudioRecorder { - public class AudioRecorderSettings { + public class AudioRecorderSettings : UISettings { public string DeviceName { get; set; } public int PeekMeterStep { get; set; } public Uri WorkingDirectory { get; set; } + [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Objects)] public MetadataProvider[] Metadatas { get; set; } - public UISettings UISettings { get; set; } public Target OctopusTarget { get; set; } public Target TrafficTarget { get; set; } } diff --git a/client/AudioRecorder/Configuration/audiorecorder.en b/client/AudioRecorder/Configuration/audiorecorder.en index f43a5d8a..69185a79 100644 --- a/client/AudioRecorder/Configuration/audiorecorder.en +++ b/client/AudioRecorder/Configuration/audiorecorder.en @@ -2,8 +2,13 @@ "RUNDOWN": "Rundown", "FOLDER": "Story folder", "CHOOSE": "Choose an item", - "SELECTORTITLE": "Choose an ID", + "CHOOSEINPUTTITLE": "Choose audio input device", + "SELECTORTITLE": "Choose ID", "SELECTEDID": "Selected ID", "CANCEL": "Cancel", - "DONE": "Done" + "DONE": "Done", + "PAUSE": "Pause", + "PLAY": "Play", + "RECORD": "Record", + "STOP": "Stop" } diff --git a/client/AudioRecorder/Configuration/audiorecorder.json b/client/AudioRecorder/Configuration/audiorecorder.json index 91daa4d8..32bb81e6 100644 --- a/client/AudioRecorder/Configuration/audiorecorder.json +++ b/client/AudioRecorder/Configuration/audiorecorder.json @@ -1,5 +1,6 @@ { "deviceName": "", + "uiFileName": "audiorecorder.en", "workingDirectory": "file://C:\\temp", "peekMeterStep": 200, "octopusTarget": { @@ -16,9 +17,6 @@ "timeout": 1000 } }, - "uiSettings": { - "uiFileName": "audiorecorder.en" - }, "metadatas": [ { "$type": "NativeOctopusMetadata", diff --git a/client/AudioRecorder/MainForm.cs b/client/AudioRecorder/MainForm.cs index 7491923b..4b397266 100644 --- a/client/AudioRecorder/MainForm.cs +++ b/client/AudioRecorder/MainForm.cs @@ -13,6 +13,7 @@ using System.Security.Principal; using MaestroShared.Targets; using static AudioRecorder.MetadataSelectorForm; using MaestroShared.Metadata; +using AudioRecorder.Properties; namespace AudioRecorder { public delegate void RefreshPanelDelegate(); @@ -39,7 +40,6 @@ namespace AudioRecorder { public MainForm() { InitializeComponent(); - InitializeControlTexts(); } public int SelectedDeviceIndex { @@ -78,6 +78,7 @@ namespace AudioRecorder { try { Type[] knownTypes = { typeof(OctopusMetadata), typeof(NativeOctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) }; parameters = ConfigurationSerializer.Load(CONFIG_FILE, knownTypes); + InitializeControlTexts(); UpdateGUI(); timeCodeWorker = new TimeCodeWorker(timecodeLabel); @@ -136,11 +137,11 @@ namespace AudioRecorder { } private void InitializeControlTexts() { - recordButton.Text = Resources.FELVETEL; - stopButton.Text = Resources.LEALLITAS; - pauseButton.Text = Resources.SZUNET; - btnSelectAudio.Text = Resources.VALASSZON_MIKROFONT; - playButton.Text = Resources.LEJATSZAS; + recordButton.Text = parameters.Resource("RECORD", Resources.RECORD); + stopButton.Text = parameters.Resource("STOP", Resources.STOP); + pauseButton.Text = parameters.Resource("PAUSE", Resources.PAUSE); + btnSelectAudio.Text = parameters.Resource("CHOOSEINPUTTITLE", Resources.CHOOSEINPUTTITLE); + playButton.Text = parameters.Resource("PLAY", Resources.PLAY); } public void Initialize() { diff --git a/client/AudioRecorder/MetadataSelectorForm.cs b/client/AudioRecorder/MetadataSelectorForm.cs index 2606de1a..da46e980 100644 --- a/client/AudioRecorder/MetadataSelectorForm.cs +++ b/client/AudioRecorder/MetadataSelectorForm.cs @@ -1,4 +1,5 @@ -using MaestroShared.Configuration; +using AudioRecorder.Properties; +using MaestroShared.Configuration; using System; using System.Windows.Forms; @@ -24,15 +25,14 @@ namespace AudioRecorder { public MetadataSelectorForm(AudioRecorderSettings settings) { InitializeComponent(); metadataIDSelector.Providers = settings.Metadatas; - metadataIDSelector.Settings = settings.UISettings; + metadataIDSelector.Settings = settings; metadataIDSelector.OctopusIDSelector.IDChangedEvent += OctopusIDChangedEvent; metadataIDSelector.NativeOctopusIDSelector.IDChangedEvent += NativeOctopusIDChangedEvent; metadataIDSelector.TrafficIDSelector.IDChangedEvent += TrafficIDChangedEvent; metadataIDSelector.MetadataIDText.TextChanged += OnMetadataIDChanged; - settings.UISettings = settings.UISettings ?? new UISettings(); - buttonCancel.Text = settings.UISettings.Resource("CANCEL", Resources.CANCEL); - buttonOK.Text = settings.UISettings.Resource("DONE", Resources.DONE); - Text = settings.UISettings.Resource("SELECTORTITLE", Resources.SELECTORTITLE); + buttonCancel.Text = settings.Resource("CANCEL", Resources.CANCEL); + buttonOK.Text = settings.Resource("DONE", Resources.DONE); + Text = settings.Resource("SELECTORTITLE", Resources.SELECTORTITLE); } private void OnMetadataIDChanged(object sender, EventArgs e) { 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 a0a70c96..d543edb0 100644 --- a/client/AudioRecorder/Resources.Designer.cs +++ b/client/AudioRecorder/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace AudioRecorder { +namespace AudioRecorder.Properties { using System; @@ -39,7 +39,7 @@ namespace AudioRecorder { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AudioRecorder.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AudioRecorder.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -70,66 +70,47 @@ namespace AudioRecorder { } /// - /// Looks up a localized string similar to Rendben. - /// - internal static string DONE { - get { - return ResourceManager.GetString("DONE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Felvétel. + /// Looks up a localized string similar to Válasszon mikrofont. /// - internal static string FELVETEL { + internal static string CHOOSEINPUTTITLE { get { - return ResourceManager.GetString("FELVETEL", resourceCulture); + return ResourceManager.GetString("CHOOSEINPUTTITLE", resourceCulture); } } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Looks up a localized string similar to Rendben. /// - internal static System.Drawing.Bitmap ic_refresh_black_24dp_1x { + internal static string DONE { get { - object obj = ResourceManager.GetObject("ic_refresh_black_24dp_1x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ResourceManager.GetString("DONE", resourceCulture); } } /// - /// Looks up a localized string similar to Leállítás. + /// Looks up a localized string similar to Szunet. /// - internal static string LEALLITAS { + internal static string PAUSE { get { - return ResourceManager.GetString("LEALLITAS", resourceCulture); + return ResourceManager.GetString("PAUSE", resourceCulture); } } /// /// Looks up a localized string similar to Lejátszás. /// - internal static string LEJATSZAS { + internal static string PLAY { get { - return ResourceManager.GetString("LEJATSZAS", resourceCulture); + return ResourceManager.GetString("PLAY", resourceCulture); } } /// - /// Looks up a localized string similar to Mégse. - /// - internal static string MEGSE { - get { - return ResourceManager.GetString("MEGSE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Mikrofon választás. + /// Looks up a localized string similar to Felvétel. /// - internal static string MIKROFON_VALASZTAS { + internal static string RECORD { get { - return ResourceManager.GetString("MIKROFON_VALASZTAS", resourceCulture); + return ResourceManager.GetString("RECORD", resourceCulture); } } @@ -143,20 +124,11 @@ namespace AudioRecorder { } /// - /// Looks up a localized string similar to Szunet. - /// - internal static string SZUNET { - get { - return ResourceManager.GetString("SZUNET", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Válasszon mikrofont. + /// Looks up a localized string similar to Leállítás. /// - internal static string VALASSZON_MIKROFONT { + internal static string STOP { get { - return ResourceManager.GetString("VALASSZON_MIKROFONT", resourceCulture); + return ResourceManager.GetString("STOP", resourceCulture); } } } 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 143055a5..a03ecf13 100644 --- a/client/AudioRecorder/Resources.resx +++ b/client/AudioRecorder/Properties/Resources.resx @@ -117,38 +117,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Felvétel - - - - Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Leállítás - - - Lejátszás + + Mégsem - - Mégse + + Válasszon mikrofont - - Mikrofon választás + + Rendben - + Szunet - - Válasszon mikrofont - - - Mégsem + + Lejátszás - - Rendben + + Felvétel Azonosító kiválasztása + + Leállítás + \ No newline at end of file diff --git a/client/DxPlay/Configuration/dxplay.en b/client/DxPlay/Configuration/dxplay.en index 03ae8ad3..0ad1e7eb 100644 --- a/client/DxPlay/Configuration/dxplay.en +++ b/client/DxPlay/Configuration/dxplay.en @@ -25,5 +25,20 @@ "STOP": "Stop", "STOPPED": "STOPPED", "TCIN": "TC in", - "TCOUT": "TC out" + "TCOUT": "TC out", + "TITLE": "Title", + "FIRSTBROADCASTDATE": "First broadcast", + "EPISODENUMBER": "Episode nr.", + "EPISODEID": "Episode ID", + "EPISODETITLE": "Episode title", + "PROBLEMATIC": "Problematic", + "SEARCH": "Search", + "SERACHRESULTS": "Searh results", + "NEXTBROADCASTDATE": "Next broadcast", + "CANCEL": "Cancel", + "MATERIAL": "Material", + "PROMOTION": "Promotion", + "ADVERTISEMENT": "Advertisement", + "SEGMENTCOUNT": "Segment count", + "TRAFFICID": "Traffic ID" } diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json index bf8f9710..2c911b66 100644 --- a/client/DxPlay/Configuration/dxplay.json +++ b/client/DxPlay/Configuration/dxplay.json @@ -7,7 +7,7 @@ }, "metadata": { "$type": "TrafficMetadata", - "uiFileName": "planair.en", + "uiFileName": "dxplay.en", "server": { "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;", "userName": "MAM", diff --git a/client/DxPlay/Configuration/planair.en b/client/DxPlay/Configuration/planair.en deleted file mode 100644 index da4788f7..00000000 --- a/client/DxPlay/Configuration/planair.en +++ /dev/null @@ -1,17 +0,0 @@ -{ - "TITLE": "Title", - "FIRSTBROADCASTDATE": "First broadcast", - "EPISODENUMBER": "Episode nr.", - "EPISODEID": "Episode ID", - "EPISODETITLE": "Episode title", - "PROBLEMATIC": "Problematic", - "SEARCH": "Search", - "SERACHRESULTS": "Searh results", - "NEXTBROADCASTDATE": "Next broadcast", - "CANCEL": "Cancel", - "MATERIAL": "Material", - "PROMOTION": "Promotion", - "ADVERTISEMENT": "Advertisement", - "SEGMENTCOUNT": "Segment count", - "TRAFFICID": "Traffic ID" -} diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj index cc8d221e..2816111a 100644 --- a/client/DxPlay/DxPlay.csproj +++ b/client/DxPlay/DxPlay.csproj @@ -49,7 +49,7 @@ true - bin\Debug\ + ..\bin\DXPlay\Debug\ false 285212672 false @@ -73,7 +73,7 @@ false - bin\Release\ + ..\bin\DXPlay\Release\ false 285212672 false @@ -98,7 +98,7 @@ true - bin\x64\Debug\ + ..\bin\DXPlay\x64\Debug\ TRACE;DEBUG;USING_NET20 285212672 4096 @@ -109,7 +109,7 @@ false - bin\x64\Release\ + ..\bin\DXPlay\x64\Release\ TRACE;USING_NET20 285212672 true @@ -235,9 +235,6 @@ - - Always - Always diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 0f3aaeab..b83cb1ac 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -51,6 +51,9 @@ namespace DxPlay { return cp; } } + + public bool openFileDialogOpened; + private void ApplyModel() { bsSegments.DataSource = model.Segments; dgSegments.AutoGenerateColumns = true; @@ -291,7 +294,7 @@ namespace DxPlay { private bool HandleHotKey(Keys keyCode) { logger.Debug("Key pressed " + keyCode); - if (dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus)) + if (openFileDialogOpened || dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus)) return true; logger.Debug("Handling " + keyCode); bool result = false; @@ -553,8 +556,10 @@ namespace DxPlay { } private void menuOpenFile_Click(object sender, EventArgs e) { + openFileDialogOpened = true; if (openFileDialog.ShowDialog() == DialogResult.OK) OpenFile(new FileInfo(openFileDialog.FileName)); + openFileDialogOpened = false; } private void OnApprove(object sender, EventArgs e) { diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index 5e110301..1b46ebd5 100644 --- 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); } - private static Type[] MinimalKnownTypes = { typeof(UNCSource), typeof(NEXIOSource), typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) }; + private static Type[] MinimalKnownTypes = { typeof(UNCSource), typeof(NEXIOSource), typeof(NativeOctopusMetadata), typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) }; public static JObject Load(string fileName) { string configuration = File.ReadAllText(fileName); @@ -48,7 +48,7 @@ namespace MaestroShared.Configuration { ContractResolver = new CamelCasePropertyNamesContractResolver(), NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore, - TypeNameHandling = TypeNameHandling.Objects, + //TypeNameHandling = TypeNameHandling.Objects, SerializationBinder = knownTypesBinder }; @@ -192,6 +192,7 @@ namespace MaestroShared.Configuration { public class UISettings { public string UIFileName { get; set; } + [JsonIgnoreAttribute] public JObject UIStrings { get; set; } diff --git a/client/MediaCube.sln b/client/MediaCube.sln index 54038f05..587ed209 100644 --- a/client/MediaCube.sln +++ b/client/MediaCube.sln @@ -28,6 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MCTool", "MCTool\MCTool.csp EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B29016BD-2E82-407B-B0DB-628EC92C7751}" ProjectSection(SolutionItems) = preProject + ..\docs\mediacube-audiorecorder.md = ..\docs\mediacube-audiorecorder.md ..\docs\mediacube-dxplay.md = ..\docs\mediacube-dxplay.md EndProjectSection EndProject @@ -37,168 +38,114 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.ActiveCfg = Debug|x64 {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.Build.0 = Debug|x64 - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.ActiveCfg = Debug|x86 - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x86.Build.0 = Debug|x86 {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.Build.0 = Release|Any CPU {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.ActiveCfg = Release|x64 {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.Build.0 = Release|x64 - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x86.ActiveCfg = Release|Any CPU - {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x86.Build.0 = Release|Any CPU {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.ActiveCfg = Debug|x64 {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.Build.0 = Debug|x64 - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.ActiveCfg = Debug|x86 - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x86.Build.0 = Debug|x86 {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.Build.0 = Release|Any CPU {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.ActiveCfg = Release|x64 {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.Build.0 = Release|x64 - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x86.ActiveCfg = Release|Any CPU - {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x86.Build.0 = Release|Any CPU {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.ActiveCfg = Debug|x64 {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.Build.0 = Debug|x64 - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.ActiveCfg = Debug|x86 - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x86.Build.0 = Debug|x86 {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.Build.0 = Release|Any CPU {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.ActiveCfg = Release|x64 {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.Build.0 = Release|x64 - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x86.ActiveCfg = Release|Any CPU - {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x86.Build.0 = Release|Any CPU {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.ActiveCfg = Debug|x64 {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.Build.0 = Debug|x64 - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.ActiveCfg = Debug|x86 - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x86.Build.0 = Debug|x86 {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.ActiveCfg = Release|Any CPU {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.Build.0 = Release|Any CPU {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.ActiveCfg = Release|x64 {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.Build.0 = Release|x64 - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x86.ActiveCfg = Release|Any CPU - {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x86.Build.0 = Release|Any CPU {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.ActiveCfg = Debug|x64 {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.Build.0 = Debug|x64 - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.ActiveCfg = Debug|x86 - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x86.Build.0 = Debug|x86 {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.ActiveCfg = Release|Any CPU {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.Build.0 = Release|Any CPU {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.ActiveCfg = Release|x64 {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.Build.0 = Release|x64 - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x86.ActiveCfg = Release|Any CPU - {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x86.Build.0 = Release|Any CPU {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.Build.0 = Debug|Any CPU {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.ActiveCfg = Debug|x64 {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.Build.0 = Debug|x64 - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x86.ActiveCfg = Debug|x86 - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x86.Build.0 = Debug|x86 {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.ActiveCfg = Release|Any CPU {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.Build.0 = Release|Any CPU {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.ActiveCfg = Release|x64 {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.Build.0 = Release|x64 - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x86.ActiveCfg = Release|x86 - {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x86.Build.0 = Release|x86 {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.ActiveCfg = Debug|x64 {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.Build.0 = Debug|x64 - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.ActiveCfg = Debug|x86 - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x86.Build.0 = Debug|x86 {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.Build.0 = Release|Any CPU {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.ActiveCfg = Release|x64 {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.Build.0 = Release|x64 - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x86.ActiveCfg = Release|Any CPU - {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x86.Build.0 = Release|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.ActiveCfg = Debug|x64 {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.Build.0 = Debug|x64 - {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x86.ActiveCfg = Debug|Any CPU - {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x86.Build.0 = Debug|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.ActiveCfg = Release|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.Build.0 = Release|Any CPU {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.ActiveCfg = Release|x64 {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.Build.0 = Release|x64 - {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x86.ActiveCfg = Release|Any CPU - {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x86.Build.0 = Release|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.ActiveCfg = Debug|x64 {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.Build.0 = Debug|x64 - {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x86.ActiveCfg = Debug|Any CPU - {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x86.Build.0 = Debug|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.Build.0 = Release|Any CPU {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.ActiveCfg = Release|x64 {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.Build.0 = Release|x64 - {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x86.ActiveCfg = Release|Any CPU - {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x86.Build.0 = Release|Any CPU {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.ActiveCfg = Debug|Any CPU {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.Build.0 = Debug|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x86.ActiveCfg = Debug|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x86.Build.0 = Debug|Any CPU {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.ActiveCfg = Release|Any CPU {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.Build.0 = Release|Any CPU {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.ActiveCfg = Release|x64 {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.Build.0 = Release|x64 - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x86.ActiveCfg = Release|Any CPU - {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x86.Build.0 = Release|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.ActiveCfg = Debug|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.Build.0 = Debug|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x86.ActiveCfg = Debug|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x86.Build.0 = Debug|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.Build.0 = Release|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.ActiveCfg = Release|Any CPU {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.Build.0 = Release|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x86.ActiveCfg = Release|Any CPU - {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x86.Build.0 = Release|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.Build.0 = Debug|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.ActiveCfg = Debug|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.Build.0 = Debug|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x86.ActiveCfg = Debug|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x86.Build.0 = Debug|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.ActiveCfg = Release|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.Build.0 = Release|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.ActiveCfg = Release|Any CPU {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.Build.0 = Release|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x86.ActiveCfg = Release|Any CPU - {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x86.Build.0 = Release|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.ActiveCfg = Debug|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.Build.0 = Debug|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x86.ActiveCfg = Debug|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x86.Build.0 = Debug|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.Build.0 = Release|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.ActiveCfg = Release|Any CPU {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.Build.0 = Release|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x86.ActiveCfg = Release|Any CPU - {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/docs/mediacube-audiorecorder.md b/docs/mediacube-audiorecorder.md new file mode 100644 index 00000000..04178b35 --- /dev/null +++ b/docs/mediacube-audiorecorder.md @@ -0,0 +1,48 @@ +# MediaCube Maestro Audio Recorder +> *Verzió: 1.0 - 2018.08.28* + +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. + +## Működés + +A program elindítása után a főablak jelenik meg. + +![Audio Recorder](audiorecorder-main.png) + +Az ablakban látható információs- és vezérlőelemek: + +* Rögzített anyag hossza: felvétel közben mutatja a hosszt. +* 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. +* Pillanat állj gomb: felvétel közben megszakítható a folyamat, újra rákattintva folyatatódik a rögzítés. +* Á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. +* 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. + +![Choose audio device](audiorecorder-input.png) + +A rögzített fájl formátuma fixen: + +> Format : PCM +> Format profile : Float +> Bit rate mode : Constant +> Bit rate : 3 072 kb/s +> Channel(s) : 2 channels +> Sampling rate : 48.0 kHz +> Bit depth : 32 bits + +* Fájlnév: a rögzített fájl útvonala. +* 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. +* 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ö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. + +### Metaadat kiválasztása + +A felvétel gombra kattintva minden alkalommal megjelenik a metaadat kiválasztáshoz a tallózó ablak. + +![Choose ID](audiorecorder-metadata.png) + +Az ablakban látható információs- és vezérlőelemek: + + +## Konfigurációs állomány + +## Naplózás