Add listeners to DJPlayer

tobanteAudio · Jun 11, 2022 · 34abd99 · 34abd99
1 parent ca4473f
commit 34abd99
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 deletions.
diff --git a/src/DSP/DJPlayer.cpp b/src/DSP/DJPlayer.cpp
@@ -5,7 +5,7 @@ namespace ta
 
 DJPlayer::DJPlayer(juce::AudioFormatManager& _formatManager) : formatManager(_formatManager) {}
 
-DJPlayer::~DJPlayer() {}
+DJPlayer::~DJPlayer() = default;
 
 auto DJPlayer::prepareToPlay(int samplesPerBlockExpected, double sampleRate) -> void
 {
@@ -37,6 +37,10 @@ auto DJPlayer::loadFile(juce::File audioFile) -> LengthAndSamplerate
  readerSource.reset(newSource.release());
  }
 
+ gain(1.0);
+ positionRelative(0.0);
+ _listeners.call(&Listener::djPlayerFileChanged, audioFile);
+
  return LengthAndSamplerate{length, sr};
 }
 

diff --git a/src/MainComponent.cpp b/src/MainComponent.cpp
@@ -65,7 +65,4 @@ auto MainComponent::setAudioDevices() -> void
 
  auto file = juce::File{"/home/tobante/Music/Loops/Bass.wav"};
  _djPlayer.loadFile(file);
- _display.loadURL(juce::URL{file});
- _djPlayer.gain(1.0);
- _djPlayer.positionRelative(0.0);
 }
diff --git a/src/MainComponent.hpp b/src/MainComponent.hpp
@@ -28,7 +28,7 @@ struct MainComponent final : juce::Component
  ta::SideBarLeft _sideBarLeft{};
  ta::SideBarRight _sideBarRight{};
  ta::MainSection _jogWheel;
- ta::Display _display{_formatManager};
+ ta::Display _display{_formatManager, _djPlayer};
 
  JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MainComponent)
 };
diff --git a/src/UI/Component/WaveformDisplay.cpp b/src/UI/Component/WaveformDisplay.cpp
@@ -13,7 +13,15 @@ void WaveformDisplay::paint(juce::Graphics& g)
  auto area = getLocalBounds().reduced(5);
 
  g.setColour(juce::Colours::white);
- if (fileLoaded_) { audioThumb_.drawChannel(g, area, 0, audioThumb_.getTotalLength(), 0, 1.0f); }
+ if (fileLoaded_)
+ {
+ audioThumb_.drawChannel(g, area, 0, audioThumb_.getTotalLength(), 0, 1.0f);
+
+ auto x = area.getX() + (area.getWidth() * position_);
+ auto top = area.getY();
+ auto bottom = area.getBottom();
+ g.fillRect(juce::Rectangle<float>(x, top, 3.0f, bottom - top));
+ }
 }
 
 void WaveformDisplay::loadURL(juce::URL audioURL)

diff --git a/src/UI/Section/Display.cpp b/src/UI/Section/Display.cpp
@@ -4,14 +4,22 @@
 
 namespace ta
 {
-Display::Display(juce::AudioFormatManager& formatManager)
- : _thumbnailCache{1}, _waveformDisplay{formatManager, _thumbnailCache}
+Display::Display(juce::AudioFormatManager& formatManager, DJPlayer& djPlayer)
+ : _djPlayer{djPlayer}, _thumbnailCache{1}, _waveformDisplay{formatManager, _thumbnailCache}
 {
  addAndMakeVisible(_waveformDisplay);
+ _djPlayer.addListener(this);
+ startTimerHz(30);
 }
 
+Display::~Display() { _djPlayer.removeListener(this); }
+
 auto Display::resized() -> void { _waveformDisplay.setBounds(getLocalBounds()); }
 
+auto Display::timerCallback() -> void { _waveformDisplay.setPositionRelative(_djPlayer.positionRelative()); }
+
 auto Display::loadURL(juce::URL url) -> void { _waveformDisplay.loadURL(url); }
 
+auto Display::djPlayerFileChanged(juce::File const& file) -> void { _waveformDisplay.loadURL(juce::URL{file}); }
+
 } // namespace ta
diff --git a/src/UI/Section/Display.hpp b/src/UI/Section/Display.hpp
@@ -1,19 +1,26 @@
 #pragma once
 
+#include "DSP/DJPlayer.hpp"
 #include "UI/Component/WaveformDisplay.hpp"
 
 namespace ta
 {
-struct Display final : juce::Component
+struct Display final
+ : juce::Component
+ , juce::Timer
+ , DJPlayer::Listener
 {
- explicit Display(juce::AudioFormatManager& formatManager);
- ~Display() override = default;
+ Display(juce::AudioFormatManager& formatManager, DJPlayer& djPlayer);
+ ~Display() override;
 
  auto loadURL(juce::URL url) -> void;
 
  auto resized() -> void override;
+ auto timerCallback() -> void override;
+ auto djPlayerFileChanged(juce::File const& file) -> void override;
 
 private:
+ DJPlayer& _djPlayer;
  juce::AudioThumbnailCache _thumbnailCache;
  WaveformDisplay _waveformDisplay;