From 79005de818bb4cc7a8ef216bd7b41e8385b37301 Mon Sep 17 00:00:00 2001
From: Mikkeli Matlock <mikkeli@Matlock-ter>
Date: Fri, 11 Oct 2024 14:23:56 +0900
Subject: [PATCH] objectification, but with minor problems

---
 __pycache__/master_core.cpython-39.pyc | Bin 0 -> 3247 bytes
 master_core.py                         |  33 ++++++++++++++++---------
 2 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 __pycache__/master_core.cpython-39.pyc

diff --git a/__pycache__/master_core.cpython-39.pyc b/__pycache__/master_core.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..96baa072b4160518187f7b16f57223340f2836ad
GIT binary patch
literal 3247
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
I7Jte79#m^43IG5A

literal 0
HcmV?d00001

diff --git a/master_core.py b/master_core.py
index 41c61e0..cd2aa74 100644
--- a/master_core.py
+++ b/master_core.py
@@ -46,16 +46,16 @@ class AudioFile:
         hop (int, optional): Length of window hop in seconds. Defaults to 2.
     """
     # check if the window and hop are the same as before    
-    if (self.window != window) or (self.hop != hop):
+    if (not hasattr(self, 'window')) or ((self.window != window) or (self.hop != hop)):
       self.window, self.hop = window, hop
       # only calculate if not already calculated
-      if self.rms_array is None:
+      if not hasattr(self, 'rms_array'):
         # window and hop are in seconds
         window_samples = window * self.sr
         hop_samples = hop * self.sr
         
         # Calculate RMS over the rolling windows
-        self.rms_array = librosa.feature.rms(y=y, frame_length=window_samples, hop_length=hop_samples)
+        self.rms_array = librosa.feature.rms(y=self.y, frame_length=window_samples, hop_length=hop_samples)
     
   def plot_energy_levels_over_time(self, display='window'):  
     """_summary_
@@ -65,14 +65,21 @@ class AudioFile:
                                  'window' - display in a pyplot window
                                  'gui' - for directing to the GUI (TBD)
     """
-    
-    # Convert frame indices to time
-    times = librosa.frames_to_time(np.arange(self.rms_array.shape[1]), sr=sr, hop_length=hop_samples)
-    if self.rms_array is None:
+    if not hasattr(self, 'rms_array'):
       self.get_energy_levels_over_time()
+
+    # Convert frame indices to time
+    times = librosa.frames_to_time(np.arange(self.rms_array.shape[1]), sr=self.sr, hop_length=self.hop*self.sr)
+    
     
     # Normalize RMS for color mapping
-    self.norm = mcolors.Normalize(vmin=0, vmax=1.0)
+    # check maximum amplitude to determine mastering headspace
+    if self.max_amplitude > 0.95:
+      norm = mcolors.Normalize(vmin=0, vmax=0.6)
+      maxpower = 0.6
+    else:
+      norm = mcolors.Normalize(vmin=0, vmax=0.3)
+      maxpower = 0.3
     
     # colour map
     cmap = cm.autumn
@@ -80,9 +87,9 @@ class AudioFile:
     # Plot
     if display == 'window':
       fig, ax = plt.subplots(figsize=(10, 4))
-      ax.set_ylim(0., 0.4)
+      ax.set_ylim(0., maxpower)
       for i in range(len(times)-1):
-          ax.fill_between(times[i:i+2], 0, rms[0][i], color=cmap(norm(rms[0][i])), edgecolor='none')
+          ax.fill_between(times[i:i+2], 0, self.rms_array[0][i], color=cmap(norm(self.rms_array[0][i])), edgecolor='none')
       
       # Adding a colorbar to indicate the scale of RMS values
       sm = cm.ScalarMappable(cmap=cmap, norm=norm)
@@ -92,7 +99,7 @@ class AudioFile:
       
       ax.set_ylabel('Power')
       ax.set_xlabel('Time')
-      ax.set_title(f'{os.path.basename(file_path)}')
+      ax.set_title(f'{os.path.basename(self.file_path)}')
 
       plt.show(block=False)
       plt.pause(0.001)
@@ -193,6 +200,8 @@ for file in file_path:
   print(f"Average Amplitude: {avg_amplitude:.2f} dBFS")
   print(f"Average Power: {avg_power:.2f} dBFS")
   print(f"Average Power (STFT): {avg_power_stft:.2f} dBFS")
-  plot_macro_time_power_graph(file)
+  currentsong = AudioFile(file)
+  currentsong.plot_energy_levels_over_time()
+  # plot_macro_time_power_graph(file)
 
 plt.show()