Merge pull request #69 from hiroxpepe/develop

refactor: #13 keeping codes clean.
hiroxpepe · Mar 5, 2022 · ce60a77 · ce60a77
2 parents 002820e + 0cb5cb5
commit ce60a77
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/MidiPlayer.Droid/MainActivity.cs b/MidiPlayer.Droid/MainActivity.cs
@@ -342,9 +342,9 @@ static void logMemoryInro() {
             var maxMemory = Java.Lang.Runtime.GetRuntime().MaxMemory();
             var freeMemory = Java.Lang.Runtime.GetRuntime().FreeMemory();
             var totalMemory = Java.Lang.Runtime.GetRuntime().TotalMemory();
-            Log.Info($"maxMemory: {maxMemory.ToMegabytes()}MB");
-            Log.Info($"freeMemory: {freeMemory.ToMegabytes()}MB");
-            Log.Info($"totalMemory: {totalMemory.ToMegabytes()}MB");
+            Log.Debug($"maxMemory: {maxMemory.ToMegabytes()}MB");
+            Log.Debug($"freeMemory: {freeMemory.ToMegabytes()}MB");
+            Log.Debug($"totalMemory: {totalMemory.ToMegabytes()}MB");
             // TODO: Mono runtime.
         }
     }

diff --git a/MidiPlayer.FluidSynth/MidiPlayer.FluidSynth.csproj b/MidiPlayer.FluidSynth/MidiPlayer.FluidSynth.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <DefineConstants>RUNTIME_LINUX</DefineConstants>
+    <DefineConstants>RUNTIME_WINDOWS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MidiPlayer.FluidSynth/Synth.cs b/MidiPlayer.FluidSynth/Synth.cs
@@ -72,7 +72,7 @@ static Synth() {
                 var value = fluid_midi_event_get_value(evt);
                 var program = fluid_midi_event_get_program(evt);
                 if (type != 128 && type != 144) { // not note on or note off
-                    Log.Info($"_type: {type} _channel: {channel} _control: {control} _value: {value} _program: {program}");
+                    Log.Debug($"_type: {type} _channel: {channel} _control: {control} _value: {value} _program: {program}");
                 }
                 Task.Run(() => {
                     if (type == 144) { // NOTE_ON = 144

diff --git a/MidiPlayer/Conf.cs b/MidiPlayer/Conf.cs
@@ -44,10 +44,10 @@ public static void Load() {
                 using var stream = new StreamReader(ConfEnv.ConfPath);
                 _json = loadJson(stream.ReadToEnd().ToMemoryStream());
                 Log.Info("Conf loaded.");
-                Log.Info("Conf soundFontDir: " + _json.App.Synth.SoundFontDir);
-                Log.Info("Conf soundFontName: " + _json.App.Synth.SoundFontName);
-                Log.Info("Conf midiFileDir: " + _json.App.Synth.MidiFileDir);
-                Log.Info("Conf midiFileName: " + _json.App.Synth.MidiFileName);
+                Log.Debug("Conf soundFontDir: " + _json.App.Synth.SoundFontDir);
+                Log.Debug("Conf soundFontName: " + _json.App.Synth.SoundFontName);
+                Log.Debug("Conf midiFileDir: " + _json.App.Synth.MidiFileDir);
+                Log.Debug("Conf midiFileName: " + _json.App.Synth.MidiFileName);
             } else {
                 Synth synth = new Synth();
                 synth.SoundFontDir = "undefined";
@@ -70,10 +70,10 @@ public static void Save() {
             using var stream = new FileStream(ConfEnv.ConfPath, FileMode.Create, FileAccess.Write);
             saveJson(stream);
             Log.Info("Conf saved.");
-            Log.Info("Conf soundFontDir: " + _json.App.Synth.SoundFontDir);
-            Log.Info("Conf soundFontName: " + _json.App.Synth.SoundFontName);
-            Log.Info("Conf midiFileDir: " + _json.App.Synth.MidiFileDir);
-            Log.Info("Conf midiFileName: " + _json.App.Synth.MidiFileName);
+            Log.Debug("Conf soundFontDir: " + _json.App.Synth.SoundFontDir);
+            Log.Debug("Conf soundFontName: " + _json.App.Synth.SoundFontName);
+            Log.Debug("Conf midiFileDir: " + _json.App.Synth.MidiFileDir);
+            Log.Debug("Conf midiFileName: " + _json.App.Synth.MidiFileName);
         }
 
         ///////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/MidiPlayer/Log.cs b/MidiPlayer/Log.cs
@@ -38,13 +38,17 @@ public static void Info(string target) {
         }
 
         public static void Debug(string target) {
+#if DEBUG
             LogEventInfo eventInfo = new LogEventInfo(LogLevel.Debug, _logger.Name, target);
             _logger.Log(typeof(Log), eventInfo);
+#endif
         }
 
         public static void Trace(string target) {
+#if DEBUG
             LogEventInfo eventInfo = new LogEventInfo(LogLevel.Trace, _logger.Name, target);
             _logger.Log(typeof(Log), eventInfo);
+#endif
         }
     }
-}
+}